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.

Vercel image optimisation support (#2297)

Ivan Starkov53c97d8d1806
diff --git a/apps/builder/app/canvas/canvas.tsx b/apps/builder/app/canvas/canvas.tsx
index 9f452cf583..dfcbb0b653 100644
--- a/apps/builder/app/canvas/canvas.tsx
+++ b/apps/builder/app/canvas/canvas.tsx
@@ -59,6 +59,7 @@ import { useHashLinkSync } from "~/shared/pages";
import { useMount } from "~/shared/hook-utils/use-mount";
import { useSelectedInstance } from "./instance-selected-react";
import { subscribeInterceptedEvents } from "./interceptor";
+import type { ImageLoader } from "@webstudio-is/image";
registerContainers();
@@ -85,7 +86,8 @@ const onDataSourceUpdate = (newValues: Map<DataSource["id"], unknown>) => {
const useElementsTree = (
components: Components,
instances: Instances,
- params: Params
+ params: Params,
+ imageLoader: ImageLoader
) => {
const metas = useStore(registeredComponentMetasStore);
const page = useStore(selectedPageStore);
@@ -128,6 +130,7 @@ const useElementsTree = (
renderer: isPreviewMode ? "preview" : "canvas",
imageBaseUrl: params.imageBaseUrl,
assetBaseUrl: params.assetBaseUrl,
+ imageLoader,
instances,
rootInstanceId,
indexesWithinAncestors,
@@ -157,6 +160,7 @@ const useElementsTree = (
pagesMapStore,
isPreviewMode,
indexesWithinAncestors,
+ imageLoader,
]);
};
@@ -178,9 +182,13 @@ const DesignMode = ({ params }: { params: Params }) => {
type CanvasProps = {
params: Params;
+ imageLoader: ImageLoader;
};
-export const Canvas = ({ params }: CanvasProps): JSX.Element | null => {
+export const Canvas = ({
+ params,
+ imageLoader,
+}: CanvasProps): JSX.Element | null => {
const handshaken = useStore(handshakenStore);
useCanvasStore(publish);
const [isPreviewMode] = useIsPreviewMode();
@@ -234,7 +242,7 @@ export const Canvas = ({ params }: CanvasProps): JSX.Element | null => {
const components = useStore(registeredComponentsStore);
const instances = useStore(instancesStore);
- const elements = useElementsTree(components, instances, params);
+ const elements = useElementsTree(components, instances, params, imageLoader);
if (components.size === 0 || instances.size === 0) {
return (
diff --git a/apps/builder/app/routes/$.tsx b/apps/builder/app/routes/$.tsx
index e9fe935b3a..de56e2d52c 100644
--- a/apps/builder/app/routes/$.tsx
+++ b/apps/builder/app/routes/$.tsx
@@ -11,6 +11,7 @@ import { sentryException } from "~/shared/sentry";
import { Canvas } from "~/canvas";
import { ErrorMessage } from "~/shared/error";
import { getBuildParams, dashboardPath } from "~/shared/router-utils";
+import { createImageLoader } from "@webstudio-is/image";
export const loader = async ({ request }: LoaderArgs) => {
const url = new URL(request.url);
@@ -52,7 +53,10 @@ export const ErrorBoundary = () => {
const Outlet = () => {
const { params } = useLoaderData<typeof loader>();
- return <Canvas params={params} />;
+ const imageLoader = createImageLoader({
+ imageBaseUrl: params.imageBaseUrl,
+ });
+ return <Canvas params={params} imageLoader={imageLoader} />;
};
/**
diff --git a/fixtures/webstudio-remix-vercel/app/constants.ts b/fixtures/webstudio-remix-vercel/app/constants.ts
index 4ee7631403..53c50668a5 100644
--- a/fixtures/webstudio-remix-vercel/app/constants.ts
+++ b/fixtures/webstudio-remix-vercel/app/constants.ts
@@ -1,2 +1,20 @@
+import type { ImageLoader } from "@webstudio-is/image";
+
export const assetBaseUrl = "/assets/";
export const imageBaseUrl = "/assets/";
+
+export const imageLoader: ImageLoader = ({ quality, src, width }) => {
+ if (process.env.NODE_ENV !== "production") {
+ return imageBaseUrl + src;
+ }
+
+ // https://vercel.com/blog/build-your-own-web-framework#automatic-image-optimization
+ return (
+ "/_vercel/image?url=" +
+ encodeURIComponent(imageBaseUrl + src) +
+ "&w=" +
+ width +
+ "&q=" +
+ quality
+ );
+};
diff --git a/fixtures/webstudio-remix-vercel/app/routes/[blog].[page].[deep-nested-page]._index.tsx b/fixtures/webstudio-remix-vercel/app/routes/[blog].[page].[deep-nested-page]._index.tsx
index 1b34d01b6e..2b040827ef 100644
--- a/fixtures/webstudio-remix-vercel/app/routes/[blog].[page].[deep-nested-page]._index.tsx
+++ b/fixtures/webstudio-remix-vercel/app/routes/[blog].[page].[deep-nested-page]._index.tsx
@@ -24,7 +24,7 @@ import {
} from "../__generated__/[blog].[page].[deep-nested-page]._index.tsx";
import css from "../__generated__/index.css";
import type { Data } from "@webstudio-is/http-client";
-import { assetBaseUrl, imageBaseUrl } from "~/constants.ts";
+import { assetBaseUrl, imageBaseUrl, imageLoader } from "~/constants.ts";
export type PageData = Omit<Data, "build"> & {
build: Pick<Data["build"], "props" | "instances" | "dataSources">;
@@ -163,6 +163,7 @@ const Outlet = () => {
return (
<InstanceRoot
+ imageLoader={imageLoader}
data={data}
components={components}
utils={utils}
diff --git a/fixtures/webstudio-remix-vercel/app/routes/[blog].[page]._index.tsx b/fixtures/webstudio-remix-vercel/app/routes/[blog].[page]._index.tsx
index a8c035f29c..278fda30ea 100644
--- a/fixtures/webstudio-remix-vercel/app/routes/[blog].[page]._index.tsx
+++ b/fixtures/webstudio-remix-vercel/app/routes/[blog].[page]._index.tsx
@@ -24,7 +24,7 @@ import {
} from "../__generated__/[blog].[page]._index.tsx";
import css from "../__generated__/index.css";
import type { Data } from "@webstudio-is/http-client";
-import { assetBaseUrl, imageBaseUrl } from "~/constants.ts";
+import { assetBaseUrl, imageBaseUrl, imageLoader } from "~/constants.ts";
export type PageData = Omit<Data, "build"> & {
build: Pick<Data["build"], "props" | "instances" | "dataSources">;
@@ -163,6 +163,7 @@ const Outlet = () => {
return (
<InstanceRoot
+ imageLoader={imageLoader}
data={data}
components={components}
utils={utils}
diff --git a/fixtures/webstudio-remix-vercel/app/routes/[blog]._index.tsx b/fixtures/webstudio-remix-vercel/app/routes/[blog]._index.tsx
index adf9f6b332..02c3f192ff 100644
--- a/fixtures/webstudio-remix-vercel/app/routes/[blog]._index.tsx
+++ b/fixtures/webstudio-remix-vercel/app/routes/[blog]._index.tsx
@@ -24,7 +24,7 @@ import {
} from "../__generated__/[blog]._index.tsx";
import css from "../__generated__/index.css";
import type { Data } from "@webstudio-is/http-client";
-import { assetBaseUrl, imageBaseUrl } from "~/constants.ts";
+import { assetBaseUrl, imageBaseUrl, imageLoader } from "~/constants.ts";
export type PageData = Omit<Data, "build"> & {
build: Pick<Data["build"], "props" | "instances" | "dataSources">;
@@ -163,6 +163,7 @@ const Outlet = () => {
return (
<InstanceRoot
+ imageLoader={imageLoader}
data={data}
components={components}
utils={utils}
diff --git a/fixtures/webstudio-remix-vercel/app/routes/[radix]._index.tsx b/fixtures/webstudio-remix-vercel/app/routes/[radix]._index.tsx
index 573fe6be53..44c37675e1 100644
--- a/fixtures/webstudio-remix-vercel/app/routes/[radix]._index.tsx
+++ b/fixtures/webstudio-remix-vercel/app/routes/[radix]._index.tsx
@@ -24,7 +24,7 @@ import {
} from "../__generated__/[radix]._index.tsx";
import css from "../__generated__/index.css";
import type { Data } from "@webstudio-is/http-client";
-import { assetBaseUrl, imageBaseUrl } from "~/constants.ts";
+import { assetBaseUrl, imageBaseUrl, imageLoader } from "~/constants.ts";
export type PageData = Omit<Data, "build"> & {
build: Pick<Data["build"], "props" | "instances" | "dataSources">;
@@ -163,6 +163,7 @@ const Outlet = () => {
return (
<InstanceRoot
+ imageLoader={imageLoader}
data={data}
components={components}
utils={utils}
diff --git a/fixtures/webstudio-remix-vercel/app/routes/_index.tsx b/fixtures/webstudio-remix-vercel/app/routes/_index.tsx
index c19d3717db..00fe53d91e 100644
--- a/fixtures/webstudio-remix-vercel/app/routes/_index.tsx
+++ b/fixtures/webstudio-remix-vercel/app/routes/_index.tsx
@@ -24,7 +24,7 @@ import {
} from "../__generated__/_index.tsx";
import css from "../__generated__/index.css";
import type { Data } from "@webstudio-is/http-client";
-import { assetBaseUrl, imageBaseUrl } from "~/constants.ts";
+import { assetBaseUrl, imageBaseUrl, imageLoader } from "~/constants.ts";
export type PageData = Omit<Data, "build"> & {
build: Pick<Data["build"], "props" | "instances" | "dataSources">;
@@ -163,6 +163,7 @@ const Outlet = () => {
return (
<InstanceRoot
+ imageLoader={imageLoader}
data={data}
components={components}
utils={utils}
diff --git a/fixtures/webstudio-remix-vercel/package.json b/fixtures/webstudio-remix-vercel/package.json
index e025dc1191..972c0e0a72 100644
--- a/fixtures/webstudio-remix-vercel/package.json
+++ b/fixtures/webstudio-remix-vercel/package.json
@@ -16,6 +16,7 @@
"@webstudio-is/sdk-components-react-remix": "workspace:^",
"@webstudio-is/sdk-components-react": "workspace:^",
"@webstudio-is/form-handlers": "workspace:^",
+ "@webstudio-is/image": "workspace:^",
"@webstudio-is/sdk": "workspace:^",
"isbot": "^3.6.8",
"react": "^18.2.0",
diff --git a/fixtures/webstudio-remix-vercel/vercel.json b/fixtures/webstudio-remix-vercel/vercel.json
new file mode 100644
index 0000000000..18097e0c38
--- /dev/null
+++ b/fixtures/webstudio-remix-vercel/vercel.json
@@ -0,0 +1,11 @@
+{
+ "images": {
+ "domains": [],
+ "sizes": [
+ 16, 32, 48, 64, 96, 128, 256, 384, 640, 750, 828, 1080, 1200, 1920, 2048,
+ 3840
+ ],
+ "minimumCacheTTL": 60,
+ "formats": ["image/webp", "image/avif"]
+ }
+}
diff --git a/packages/cli/src/__generated__/router.ts b/packages/cli/src/__generated__/router.ts
index 8c638be6d5..ac4f22d012 100644
--- a/packages/cli/src/__generated__/router.ts
+++ b/packages/cli/src/__generated__/router.ts
@@ -32,7 +32,7 @@ import {
} from "../__generated__/index";
import css from "../__generated__/index.css";
import type { Data } from "@webstudio-is/http-client";
-import { assetBaseUrl, imageBaseUrl } from "~/constants.ts";
+import { assetBaseUrl, imageBaseUrl, imageLoader } from "~/constants.ts";
export type PageData = Omit<Data, "build"> & {
build: Pick<Data["build"], "props" | "instances" | "dataSources">;
@@ -171,6 +171,7 @@ const Outlet = () => {
return (
<InstanceRoot
+ imageLoader={imageLoader}
data={data}
components={components}
utils={utils}
diff --git a/packages/cli/src/__generated__/templates.ts b/packages/cli/src/__generated__/templates.ts
index fb97f01c0f..787483a829 100644
--- a/packages/cli/src/__generated__/templates.ts
+++ b/packages/cli/src/__generated__/templates.ts
@@ -14,7 +14,7 @@ export const templates: Record<ProjectTarget, Folder> = {
{
name: "package.json",
content:
- '{\n "private": true,\n "sideEffects": false,\n "scripts": {\n "build": "remix build",\n "dev": "remix dev",\n "start": "remix-serve build",\n "typecheck": "tsc"\n },\n "dependencies": {\n "@remix-run/node": "^1.19.2",\n "@remix-run/react": "^1.19.2",\n "@webstudio-is/react-sdk": "^0.96.0",\n "@webstudio-is/sdk-components-react-radix": "^0.96.0",\n "@webstudio-is/sdk-components-react-remix": "^0.96.0",\n "@webstudio-is/sdk-components-react": "^0.96.0",\n "@webstudio-is/form-handlers": "^0.96.0",\n "@webstudio-is/sdk": "^0.96.0",\n "isbot": "^3.6.8",\n "react": "^18.2.0",\n "react-dom": "^18.2.0"\n },\n "devDependencies": {\n "@remix-run/serve": "^1.19.2",\n "@remix-run/dev": "^1.19.2",\n "@types/react": "^18.2.20",\n "@types/react-dom": "^18.2.7",\n "@webstudio-is/http-client": "^0.96.0",\n "eslint": "^8.48.0",\n "typescript": "5.2.2"\n },\n "engines": {\n "node": ">=18.0.0"\n }\n}\n',
+ '{\n "private": true,\n "sideEffects": false,\n "scripts": {\n "build": "remix build",\n "dev": "remix dev",\n "start": "remix-serve build",\n "typecheck": "tsc"\n },\n "dependencies": {\n "@remix-run/node": "^1.19.2",\n "@remix-run/react": "^1.19.2",\n "@webstudio-is/react-sdk": "^0.96.0",\n "@webstudio-is/sdk-components-react-radix": "^0.96.0",\n "@webstudio-is/sdk-components-react-remix": "^0.96.0",\n "@webstudio-is/sdk-components-react": "^0.96.0",\n "@webstudio-is/form-handlers": "^0.96.0",\n "@webstudio-is/image": "^0.96.0",\n "@webstudio-is/sdk": "^0.96.0",\n "isbot": "^3.6.8",\n "react": "^18.2.0",\n "react-dom": "^18.2.0"\n },\n "devDependencies": {\n "@remix-run/serve": "^1.19.2",\n "@remix-run/dev": "^1.19.2",\n "@types/react": "^18.2.20",\n "@types/react-dom": "^18.2.7",\n "@webstudio-is/http-client": "^0.96.0",\n "eslint": "^8.48.0",\n "typescript": "5.2.2"\n },\n "engines": {\n "node": ">=18.0.0"\n }\n}\n',
encoding: "utf-8",
merge: true,
},
@@ -39,6 +39,13 @@ export const templates: Record<ProjectTarget, Folder> = {
encoding: "utf-8",
merge: false,
},
+ {
+ name: "vercel.json",
+ content:
+ '{\n "images": {\n "domains": [],\n "sizes": [\n 16, 32, 48, 64, 96, 128, 256, 384, 640, 750, 828, 1080, 1200, 1920, 2048,\n 3840\n ],\n "minimumCacheTTL": 60,\n "formats": ["image/webp", "image/avif"]\n }\n}\n',
+ encoding: "utf-8",
+ merge: false,
+ },
],
subFolders: [
{
@@ -47,7 +54,7 @@ export const templates: Record<ProjectTarget, Folder> = {
{
name: "constants.ts",
content:
- 'export const assetBaseUrl = "/assets/";\nexport const imageBaseUrl = "/assets/";\n',
+ 'import type { ImageLoader } from "@webstudio-is/image";\n\nexport const assetBaseUrl = "/assets/";\nexport const imageBaseUrl = "/assets/";\n\nexport const imageLoader: ImageLoader = ({ quality, src, width }) => {\n if (process.env.NODE_ENV !== "production") {\n return imageBaseUrl + src;\n }\n\n // https://vercel.com/blog/build-your-own-web-framework#automatic-image-optimization\n return (\n "/_vercel/image?url=" +\n encodeURIComponent(imageBaseUrl + src) +\n "&w=" +\n width +\n "&q=" +\n quality\n );\n};\n',
encoding: "utf-8",
merge: false,
},
diff --git a/packages/cli/templates/defaults/app/constants.ts b/packages/cli/templates/defaults/app/constants.ts
index 4ee7631403..53c50668a5 100644
--- a/packages/cli/templates/defaults/app/constants.ts
+++ b/packages/cli/templates/defaults/app/constants.ts
@@ -1,2 +1,20 @@
+import type { ImageLoader } from "@webstudio-is/image";
+
export const assetBaseUrl = "/assets/";
export const imageBaseUrl = "/assets/";
+
+export const imageLoader: ImageLoader = ({ quality, src, width }) => {
+ if (process.env.NODE_ENV !== "production") {
+ return imageBaseUrl + src;
+ }
+
+ // https://vercel.com/blog/build-your-own-web-framework#automatic-image-optimization
+ return (
+ "/_vercel/image?url=" +
+ encodeURIComponent(imageBaseUrl + src) +
+ "&w=" +
+ width +
+ "&q=" +
+ quality
+ );
+};
diff --git a/packages/cli/templates/defaults/package.json b/packages/cli/templates/defaults/package.json
index db2e850c89..494147c90b 100644
--- a/packages/cli/templates/defaults/package.json
+++ b/packages/cli/templates/defaults/package.json
@@ -15,6 +15,7 @@
"@webstudio-is/sdk-components-react-remix": "^0.96.0",
"@webstudio-is/sdk-components-react": "^0.96.0",
"@webstudio-is/form-handlers": "^0.96.0",
+ "@webstudio-is/image": "^0.96.0",
"@webstudio-is/sdk": "^0.96.0",
"isbot": "^3.6.8",
"react": "^18.2.0",
diff --git a/packages/cli/templates/defaults/vercel.json b/packages/cli/templates/defaults/vercel.json
new file mode 100644
index 0000000000..18097e0c38
--- /dev/null
+++ b/packages/cli/templates/defaults/vercel.json
@@ -0,0 +1,11 @@
+{
+ "images": {
+ "domains": [],
+ "sizes": [
+ 16, 32, 48, 64, 96, 128, 256, 384, 640, 750, 828, 1080, 1200, 1920, 2048,
+ 3840
+ ],
+ "minimumCacheTTL": 60,
+ "formats": ["image/webp", "image/avif"]
+ }
+}
diff --git a/packages/cli/templates/route-template.tsx b/packages/cli/templates/route-template.tsx
index d4d11b5783..28cb3c41d8 100644
--- a/packages/cli/templates/route-template.tsx
+++ b/packages/cli/templates/route-template.tsx
@@ -24,7 +24,7 @@ import {
} from "../__generated__/index";
import css from "../__generated__/index.css";
import type { Data } from "@webstudio-is/http-client";
-import { assetBaseUrl, imageBaseUrl } from "~/constants.ts";
+import { assetBaseUrl, imageBaseUrl, imageLoader } from "~/constants.ts";
export type PageData = Omit<Data, "build"> & {
build: Pick<Data["build"], "props" | "instances" | "dataSources">;
@@ -163,6 +163,7 @@ const Outlet = () => {
return (
<InstanceRoot
+ imageLoader={imageLoader}
data={data}
components={components}
utils={utils}
diff --git a/packages/react-sdk/package.json b/packages/react-sdk/package.json
index d264efa51a..afd62eec30 100644
--- a/packages/react-sdk/package.json
+++ b/packages/react-sdk/package.json
@@ -38,6 +38,7 @@
"@nanostores/react": "^0.7.1",
"@webstudio-is/css-engine": "workspace:^",
"@webstudio-is/fonts": "workspace:^",
+ "@webstudio-is/image": "workspace:^",
"@webstudio-is/sdk": "workspace:^",
"html-tags": "^3.3.1",
"jsep": "^1.3.8",
diff --git a/packages/react-sdk/src/component-renderer.tsx b/packages/react-sdk/src/component-renderer.tsx
index e8781f0ff5..7863855fa5 100644
--- a/packages/react-sdk/src/component-renderer.tsx
+++ b/packages/react-sdk/src/component-renderer.tsx
@@ -16,18 +16,21 @@ import {
executeEffectfulExpression,
} from "./expression";
import { getIndexesWithinAncestors } from "./instance-utils";
+import type { ImageLoader } from "@webstudio-is/image";
export const renderComponentTemplate = ({
name,
metas: metasRecord,
components,
props,
+ imageLoader,
}: {
name: Instance["component"];
metas: Record<string, WsComponentMeta>;
props?: Record<string, unknown>;
// eslint-disable-next-line @typescript-eslint/no-explicit-any
components: Record<string, ExoticComponent<any>>;
+ imageLoader?: ImageLoader;
}) => {
const metas = new Map(Object.entries(metasRecord));
@@ -140,6 +143,7 @@ export const renderComponentTemplate = ({
}}
Component={WebstudioComponent}
components={new Map(Object.entries(components))}
+ imageLoader={imageLoader ?? (({ src }) => src)}
/>
</>
);
diff --git a/packages/react-sdk/src/context.tsx b/packages/react-sdk/src/context.tsx
index ca3b764899..c7c89610b3 100644
--- a/packages/react-sdk/src/context.tsx
+++ b/packages/react-sdk/src/context.tsx
@@ -3,6 +3,7 @@ import { createContext } from "react";
import type { DataSource, Instance, Prop, Assets } from "@webstudio-is/sdk";
import type { Pages, PropsByInstanceId } from "./props";
import type { IndexesWithinAncestors } from "./instance-utils";
+import type { ImageLoader } from "@webstudio-is/image";
export type Params = {
renderer?: "canvas" | "preview";
@@ -35,6 +36,7 @@ export type DataSourceValues = Map<DataSource["id"], unknown>;
export const ReactSdkContext = createContext<
Params & {
+ imageLoader: ImageLoader;
propsByInstanceIdStore: ReadableAtom<PropsByInstanceId>;
assetsStore: ReadableAtom<Assets>;
pagesStore: ReadableAtom<Pages>;
@@ -53,8 +55,9 @@ export const ReactSdkContext = createContext<
indexesWithinAncestors: IndexesWithinAncestors;
}
>({
- imageBaseUrl: "/",
assetBaseUrl: "/",
+ imageBaseUrl: "/",
+ imageLoader: ({ src }) => src,
propsByInstanceIdStore: atom(new Map()),
assetsStore: atom(new Map()),
pagesStore: atom(new Map()),
diff --git a/packages/react-sdk/src/tree/create-elements-tree.tsx b/packages/react-sdk/src/tree/create-elements-tree.tsx
index 8a29e54359..74242f41cd 100644
--- a/packages/react-sdk/src/tree/create-elements-tree.tsx
+++ b/packages/react-sdk/src/tree/create-elements-tree.tsx
@@ -15,13 +15,15 @@ import {
import type { Pages, PropsByInstanceId } from "../props";
import type { WebstudioComponentProps } from "./webstudio-component";
import type { IndexesWithinAncestors } from "../instance-utils";
+import type { ImageLoader } from "@webstudio-is/image";
type InstanceSelector = Instance["id"][];
export const createElementsTree = ({
renderer,
- imageBaseUrl,
assetBaseUrl,
+ imageBaseUrl,
+ imageLoader,
instances,
rootInstanceId,
propsByInstanceIdStore,
@@ -36,6 +38,7 @@ export const createElementsTree = ({
scripts,
}: Params & {
instances: Instances;
+ imageLoader: ImageLoader;
rootInstanceId: Instance["id"];
propsByInstanceIdStore: ReadableAtom<PropsByInstanceId>;
assetsStore: ReadableAtom<Assets>;
@@ -88,8 +91,9 @@ export const createElementsTree = ({
pagesStore,
dataSourceValuesStore,
renderer,
- imageBaseUrl,
+ imageLoader,
assetBaseUrl,
+ imageBaseUrl,
indexesWithinAncestors,
executeEffectfulExpression,
setDataSourceValues: onDataSourceUpdate,
diff --git a/packages/react-sdk/src/tree/root.ts b/packages/react-sdk/src/tree/root.ts
index 9e79e0fc96..e7706dfa3c 100644
--- a/packages/react-sdk/src/tree/root.ts
+++ b/packages/react-sdk/src/tree/root.ts
@@ -27,6 +27,7 @@ import { getPropsByInstanceId } from "../props";
import type { Components } from "../components/components-utils";
import type { Params, DataSourceValues } from "../context";
import type { GeneratedUtils } from "../generator";
+import type { ImageLoader } from "@webstudio-is/image";
export type RootPropsData = {
params?: Params;
@@ -48,6 +49,7 @@ type RootProps = {
>;
components: Components;
scripts?: ReactNode;
+ imageLoader: ImageLoader;
};
export const InstanceRoot = ({
@@ -56,6 +58,7 @@ export const InstanceRoot = ({
Component,
components,
scripts,
+ imageLoader,
}: RootProps): JSX.Element | null => {
const {
indexesWithinAncestors,
@@ -116,6 +119,7 @@ export const InstanceRoot = ({
);
return createElementsTree({
+ imageLoader,
imageBaseUrl: data.params?.imageBaseUrl ?? "/",
assetBaseUrl: data.params?.assetBaseUrl ?? "/",
instances: new Map(data.build.instances),
diff --git a/packages/sdk-components-react/src/image.tsx b/packages/sdk-components-react/src/image.tsx
index d1aabdafa6..370613ad03 100644
--- a/packages/sdk-components-react/src/image.tsx
+++ b/packages/sdk-components-react/src/image.tsx
@@ -2,13 +2,9 @@ import {
type ComponentPropsWithoutRef,
type ElementRef,
forwardRef,
- useMemo,
useContext,
} from "react";
-import {
- Image as WebstudioImage,
- createImageLoader,
-} from "@webstudio-is/image";
+import { Image as WebstudioImage } from "@webstudio-is/image";
import {
usePropAsset,
getInstanceIdFromComponentProps,
@@ -45,16 +41,12 @@ type Props = Omit<ComponentPropsWithoutRef<typeof WebstudioImage>, "loader">;
export const Image = forwardRef<ElementRef<typeof defaultTag>, Props>(
({ loading = "lazy", ...props }, ref) => {
- const { imageBaseUrl } = useContext(ReactSdkContext);
+ const { imageLoader } = useContext(ReactSdkContext);
const asset = usePropAsset(getInstanceIdFromComponentProps(props), "src");
- const loader = useMemo(() => {
- return createImageLoader({ imageBaseUrl });
- }, [imageBaseUrl]);
-
const src = asset?.name ?? props.src;
- if (asset == null || loader == null) {
+ if (asset == null) {
return (
<img
key={src}
@@ -80,7 +72,7 @@ export const Image = forwardRef<ElementRef<typeof defaultTag>, Props>(
key={src}
loading={loading}
{...props}
- loader={loader}
+ loader={imageLoader}
src={src}
ref={ref}
/>
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index b38850c8a3..e4bb80fbf2 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -376,6 +376,9 @@ importers:
'@webstudio-is/form-handlers':
specifier: workspace:^
version: link:../../packages/form-handlers
+ '@webstudio-is/image':
+ specifier: workspace:^
+ version: link:../../packages/image
'@webstudio-is/react-sdk':
specifier: workspace:^
version: link:../../packages/react-sdk
@@ -1252,6 +1255,9 @@ importers:
'@webstudio-is/fonts':
specifier: workspace:^
version: link:../fonts
+ '@webstudio-is/image':
+ specifier: workspace:^
+ version: link:../image
'@webstudio-is/sdk':
specifier: workspace:^
version: link:../sdk