Skip to content

Open source website builder and Webflow alternative. Webstudio is an advanced visual builder that connects to any headless CMS, supports all CSS properties, and can be hosted anywhere, including with us.

refactor: enable isolated declarations for image package (#4500)

Bogdan Chadkinc896006fe3d6
diff --git a/packages/image/src/image-dev.stories.tsx b/packages/image/src/image-dev.stories.tsx
index b02b80746a..8a11a4d4e0 100644
--- a/packages/image/src/image-dev.stories.tsx
+++ b/packages/image/src/image-dev.stories.tsx
@@ -9,9 +9,10 @@ import { Image as ImagePrimitive, createImageLoader } from "./";
// @ts-ignore
import localLogoImage from "../storybook-assets/logo.webp";
-export default {
+const meta: Meta<typeof ImagePrimitive> = {
title: "Components/ImageDev",
-} satisfies Meta<typeof ImagePrimitive>;
+};
+export default meta;
type ImageProps = React.ComponentProps<typeof ImagePrimitive>;
diff --git a/packages/image/src/image-optimize.ts b/packages/image/src/image-optimize.ts
index 6803f72490..770d1eee0a 100644
--- a/packages/image/src/image-optimize.ts
+++ b/packages/image/src/image-optimize.ts
@@ -104,7 +104,7 @@ export type ImageLoader = (
const imageSizes = [16, 32, 48, 64, 96, 128, 256, 384];
const deviceSizes = [640, 750, 828, 1080, 1200, 1920, 2048, 3840];
-export const allSizes = [...imageSizes, ...deviceSizes];
+export const allSizes: number[] = [...imageSizes, ...deviceSizes];
/**
* https://github.com/vercel/next.js/blob/canary/packages/next/client/image.tsx
@@ -235,7 +235,7 @@ const DEFAULT_QUALITY = 80;
/**
* URL.canParse(props.src)
*/
-export const UrlCanParse = (url: string) => {
+export const UrlCanParse = (url: string): boolean => {
try {
new URL(url);
return true;
diff --git a/packages/image/src/image.tsx b/packages/image/src/image.tsx
index ac4b9c733a..6d320422c5 100644
--- a/packages/image/src/image.tsx
+++ b/packages/image/src/image.tsx
@@ -1,4 +1,8 @@
-import { forwardRef, type ElementRef, type ComponentProps } from "react";
+import {
+ forwardRef,
+ type ComponentProps,
+ type ForwardRefExoticComponent,
+} from "react";
import { getImageAttributes, type ImageLoader } from "./image-optimize";
const defaultTag = "img";
@@ -9,7 +13,7 @@ type ImageProps = ComponentProps<typeof defaultTag> & {
loader: ImageLoader;
};
-export const Image = forwardRef<ElementRef<typeof defaultTag>, ImageProps>(
+export const Image: ForwardRefExoticComponent<ImageProps> = forwardRef(
(
{
quality,
@@ -46,7 +50,7 @@ export const Image = forwardRef<ElementRef<typeof defaultTag>, ImageProps>(
Image.displayName = "Image";
-export const imagePlaceholderDataUrl = `data:image/svg+xml;base64,${btoa(`<svg
+export const imagePlaceholderDataUrl: string = `data:image/svg+xml;base64,${btoa(`<svg
width="140"
height="140"
viewBox="0 0 600 600"
diff --git a/packages/image/tsconfig.json b/packages/image/tsconfig.json
index d2e5040f8f..9648eaf0a1 100644
--- a/packages/image/tsconfig.json
+++ b/packages/image/tsconfig.json
@@ -1,3 +1,6 @@
{
- "extends": "@webstudio-is/tsconfig/base.json"
+ "extends": "@webstudio-is/tsconfig/base.json",
+ "compilerOptions": {
+ "isolatedDeclarations": true
+ }
}