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.

Add image proxy route (#1453)

Bogdan Chadkin3fcf37e02be7
diff --git a/apps/builder/.env.example b/apps/builder/.env.example
index 309c05b2c8..d9344162c7 100644
--- a/apps/builder/.env.example
+++ b/apps/builder/.env.example
@@ -8,8 +8,8 @@ DEV_LOGIN=true
# Restrictions
MAX_ASSETS_PER_PROJECT=50
-# relative to the public directory
-FILE_UPLOAD_PATH="uploads"
+# relative to current working directory
+FILE_UPLOAD_PATH="public/s/uploads"
ASSET_BASE_URL=/s/uploads/
# Optional max upload size in Mb
diff --git a/apps/builder/.gitignore b/apps/builder/.gitignore
index 407044ce9a..1c057d94aa 100644
--- a/apps/builder/.gitignore
+++ b/apps/builder/.gitignore
@@ -8,6 +8,4 @@
/api/index.js
/api/index.js.map
/api/_assets
-/public/uploads
/public/s/uploads
-/uploads
diff --git a/apps/builder/app/builder/features/style-panel/sections/backgrounds/background-thumbnail.tsx b/apps/builder/app/builder/features/style-panel/sections/backgrounds/background-thumbnail.tsx
index 0598033f9d..48098a067c 100644
--- a/apps/builder/app/builder/features/style-panel/sections/backgrounds/background-thumbnail.tsx
+++ b/apps/builder/app/builder/features/style-panel/sections/backgrounds/background-thumbnail.tsx
@@ -1,6 +1,9 @@
import { useStore } from "@nanostores/react";
import type { Assets } from "@webstudio-is/asset-uploader";
-import { Image as WebstudioImage, loaders } from "@webstudio-is/image";
+import {
+ Image as WebstudioImage,
+ createImageLoader,
+} from "@webstudio-is/image";
import { styled, theme } from "@webstudio-is/design-system";
import { assetsStore } from "~/shared/nano-states";
import type { StyleInfo } from "../../shared/style-info";
@@ -94,16 +97,8 @@ export const LayerThumbnail = (props: { layerStyle: StyleInfo }) => {
if (asset === undefined) {
return null;
}
- const remoteLocation = asset.location === "REMOTE";
-
- const loader = remoteLocation
- ? loaders.cloudflareImageLoader({
- resizeOrigin: env.RESIZE_ORIGIN,
- cdnUrl: env.ASSET_BASE_URL,
- })
- : loaders.localImageLoader({
- publicPath: env.ASSET_BASE_URL,
- });
+
+ const loader = createImageLoader({ imageBaseUrl: env.IMAGE_BASE_URL });
return (
<StyledWebstudioImage
diff --git a/apps/builder/app/builder/shared/image-manager/image.tsx b/apps/builder/app/builder/shared/image-manager/image.tsx
index 86c93cd039..cbe05ca83b 100644
--- a/apps/builder/app/builder/shared/image-manager/image.tsx
+++ b/apps/builder/app/builder/shared/image-manager/image.tsx
@@ -1,6 +1,9 @@
import { useMemo } from "react";
import { styled } from "@webstudio-is/design-system";
-import { Image as WebstudioImage, loaders } from "@webstudio-is/image";
+import {
+ Image as WebstudioImage,
+ createImageLoader,
+} from "@webstudio-is/image";
import env from "~/shared/env";
import type { AssetContainer } from "../assets";
import brokenImage from "~/shared/images/broken-image-placeholder.svg";
@@ -40,26 +43,14 @@ const StyledWebstudioImage = styled(WebstudioImage, {
export const Image = ({ assetContainer, alt, width }: ImageProps) => {
const { asset } = assetContainer;
const optimize = assetContainer.status === "uploaded";
- const remoteLocation =
- assetContainer.status === "uploaded" &&
- assetContainer.asset.location === "REMOTE";
// Avoid image flickering on switching from preview to asset (during upload)
// Possible optimisation, we can set it to "sync" only if asset.path has changed or add isNew prop to UploadedAssetContainer
const decoding = "sync";
const loader = useMemo(() => {
- if (remoteLocation) {
- return loaders.cloudflareImageLoader({
- resizeOrigin: env.RESIZE_ORIGIN,
- cdnUrl: env.ASSET_BASE_URL,
- });
- }
-
- return loaders.localImageLoader({
- publicPath: env.ASSET_BASE_URL,
- });
- }, [remoteLocation]);
+ return createImageLoader({ imageBaseUrl: env.IMAGE_BASE_URL });
+ }, []);
const src =
assetContainer.status === "uploading"
diff --git a/apps/builder/app/env/env.public.server.ts b/apps/builder/app/env/env.public.server.ts
index 2a56b68b09..2739acf1be 100644
--- a/apps/builder/app/env/env.public.server.ts
+++ b/apps/builder/app/env/env.public.server.ts
@@ -3,17 +3,6 @@
**/
import serverEnv from "./env.server";
-const getCdnUrlFromS3 = () => {
- const S3_ENDPOINT = process.env.S3_ENDPOINT;
- const S3_BUCKET = process.env.S3_BUCKET;
- if (S3_ENDPOINT === undefined || S3_BUCKET === undefined) {
- return undefined;
- }
- const s3Url = new URL(S3_ENDPOINT);
- s3Url.hostname = `${S3_BUCKET}.${s3Url.hostname}`;
- return s3Url.toString();
-};
-
/**
* Environment variables we want to send to the UI inlined in the document.
* Never use a private key here, because it will become public.
@@ -28,15 +17,8 @@ const env = {
PUBLISHER_HOST: process.env.PUBLISHER_HOST || null,
BUILD_REQUIRE_SUBDOMAIN: process.env.BUILD_REQUIRE_SUBDOMAIN === "true",
- // Must be set for Vercel deployments
- RESIZE_ORIGIN: process.env.RESIZE_ORIGIN,
-
- ASSET_BASE_URL:
- process.env.ASSET_BASE_URL ??
- process.env.ASSET_CDN_URL ??
- process.env.ASSET_PUBLIC_PATH ??
- getCdnUrlFromS3() ??
- "/",
+ IMAGE_BASE_URL: serverEnv.IMAGE_BASE_URL,
+ ASSET_BASE_URL: serverEnv.ASSET_BASE_URL,
} as const;
export default env;
diff --git a/apps/builder/app/env/env.server.ts b/apps/builder/app/env/env.server.ts
index 05ac3acb54..f708db0cfb 100644
--- a/apps/builder/app/env/env.server.ts
+++ b/apps/builder/app/env/env.server.ts
@@ -34,6 +34,27 @@ const env = {
// Assets
MAX_UPLOAD_SIZE: process.env.MAX_UPLOAD_SIZE,
MAX_ASSETS_PER_PROJECT: process.env.MAX_ASSETS_PER_PROJECT,
+ /**
+ * Base url ir base path for images with ending slash.
+ * Possible values are
+ * /asset/image/
+ * https://image-transform.wstd.io/cdn-cgi/image/
+ * https://webstudio.is/cdn-cgi/image/
+ */
+ IMAGE_BASE_URL: process.env.IMAGE_BASE_URL ?? "/asset/image/",
+ /**
+ * Base url or base path for any asset with ending slash.
+ * Possible values are
+ * /s/uploads/
+ * /asset/file/
+ * https://assets-dev.webstudio.is/
+ * https://assets.webstudio.is/
+ */
+ ASSET_BASE_URL:
+ process.env.ASSET_BASE_URL ??
+ process.env.ASSET_CDN_URL ??
+ process.env.ASSET_PUBLIC_PATH ??
+ "/",
// Local assets
FILE_UPLOAD_PATH: process.env.FILE_UPLOAD_PATH,
@@ -45,7 +66,11 @@ const env = {
S3_SECRET_ACCESS_KEY: process.env.S3_SECRET_ACCESS_KEY,
S3_BUCKET: process.env.S3_BUCKET,
S3_ACL: process.env.S3_ACL,
- ASSET_CDN_URL: process.env.ASSET_CDN_URL,
+ /**
+ * Origin of service implementing /cdn-cgi/image/ cloudflare endpoint
+ * without ending slash
+ */
+ RESIZE_ORIGIN: process.env.RESIZE_ORIGIN,
};
export type ServerEnv = typeof env;
diff --git a/apps/builder/app/routes/$.tsx b/apps/builder/app/routes/$.tsx
index 003a9a99ab..48e6f36950 100644
--- a/apps/builder/app/routes/$.tsx
+++ b/apps/builder/app/routes/$.tsx
@@ -30,13 +30,10 @@ export const loader = async ({ request }: LoaderArgs) => {
}
const params: Params = {
+ imageBaseUrl: env.IMAGE_BASE_URL,
assetBaseUrl: env.ASSET_BASE_URL,
};
- if (env.RESIZE_ORIGIN != null) {
- params.resizeOrigin = env.RESIZE_ORIGIN;
- }
-
return { params };
};
diff --git a/apps/builder/app/routes/asset.image.$name.ts b/apps/builder/app/routes/asset.image.$name.ts
new file mode 100644
index 0000000000..7125f50ef0
--- /dev/null
+++ b/apps/builder/app/routes/asset.image.$name.ts
@@ -0,0 +1,36 @@
+import { createReadStream } from "node:fs";
+import { join } from "node:path";
+import { type LoaderArgs, Response } from "@remix-run/node";
+import env from "~/env/env.server";
+
+// this route used as proxy for images to cloudflare endpoint
+// https://developers.cloudflare.com/fundamentals/get-started/reference/cdn-cgi-endpoint/
+
+export const loader = async ({ params, request }: LoaderArgs) => {
+ const { name } = params;
+ if (name === undefined) {
+ throw Error("Name is undefined");
+ }
+
+ const url = new URL(request.url);
+ const width = url.searchParams.get("width");
+ const quality = url.searchParams.get("quality");
+ const format = url.searchParams.get("format");
+ if (width === null || quality === null || format === null) {
+ throw Error("Options are invalid");
+ }
+ const options = `width=${width},quality=${quality},format=${format}`;
+
+ if (env.RESIZE_ORIGIN !== undefined) {
+ const assetUrl = `${env.ASSET_BASE_URL}${name}`;
+ // @todo add secret ti avoid exploiting our server
+ return fetch(`${env.RESIZE_ORIGIN}/cdn-cgi/image/${options}/${assetUrl}`);
+ }
+
+ if (env.FILE_UPLOAD_PATH === undefined) {
+ throw Error("FILE_UPLOAD_PATH is not provided");
+ }
+ const fileUploadPath = env.FILE_UPLOAD_PATH;
+ const filePath = join(process.cwd(), fileUploadPath, name);
+ return new Response(createReadStream(filePath));
+};
diff --git a/packages/image/src/image-dev.stories.tsx b/packages/image/src/image-dev.stories.tsx
index f281d857a9..814c5cc167 100644
--- a/packages/image/src/image-dev.stories.tsx
+++ b/packages/image/src/image-dev.stories.tsx
@@ -2,7 +2,7 @@
import type * as React from "react";
import type { ComponentMeta, ComponentStory } from "@storybook/react";
-import { Image as ImagePrimitive, loaders } from "./";
+import { Image as ImagePrimitive, createImageLoader } from "./";
// to not allow include local assets everywhere, just enable it for this file
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
@@ -28,9 +28,11 @@ const imageSrc = USE_CLOUDFLARE_IMAGE_TRANSFORM
? REMOTE_SELF_DOMAIN_IMAGE
: localLogoImage;
-const imageLoader = USE_CLOUDFLARE_IMAGE_TRANSFORM
- ? loaders.cloudflareImageLoader({ resizeOrigin: "https://webstudio.is" })
- : loaders.localImageLoader({ publicPath: "" });
+const imageLoader = createImageLoader({
+ imageBaseUrl: USE_CLOUDFLARE_IMAGE_TRANSFORM
+ ? "https://webstudio.is/cdn-cgi/image/"
+ : "",
+});
const ImageBase: ComponentStory<
React.ForwardRefExoticComponent<
diff --git a/packages/image/src/image-loaders.ts b/packages/image/src/image-loaders.ts
index da649ecc19..2520b8656b 100644
--- a/packages/image/src/image-loaders.ts
+++ b/packages/image/src/image-loaders.ts
@@ -1,19 +1,16 @@
import warnOnce from "warn-once";
import { allSizes, type ImageLoader } from "./image-optimize";
-export type CloudflareImageLoaderOptions = {
- // origin of transformation wrapper
- resizeOrigin?: string | null;
- // origin of cdn serving image
- cdnUrl?: string;
+export type ImageLoaderOptions = {
+ imageBaseUrl: string;
};
/**
* Default image loader in case of no loader provided
* https://developers.cloudflare.com/images/image-resizing/url-format/
**/
-export const cloudflareImageLoader =
- (loaderOptions: CloudflareImageLoaderOptions | null): ImageLoader =>
+export const createImageLoader =
+ (loaderOptions: ImageLoaderOptions): ImageLoader =>
({ width, src, quality }) => {
if (process.env.NODE_ENV !== "production") {
warnOnce(
@@ -21,36 +18,12 @@ export const cloudflareImageLoader =
"Width must be only from allowed values"
);
}
+ const { imageBaseUrl } = loaderOptions;
+ const searchParams = new URLSearchParams();
+ searchParams.set("width", width.toString());
+ searchParams.set("quality", quality.toString());
+ searchParams.set("format", "auto");
- const cdnUrl = loaderOptions?.cdnUrl ?? "/";
- const imageUrl = `${cdnUrl}${src}`;
-
- const options = `width=${width},quality=${quality},format=auto`;
// Cloudflare docs say that we don't need to urlencode the path params
- const pathname = `/cdn-cgi/image/${options}/${imageUrl}`;
-
- if (loaderOptions?.resizeOrigin != null) {
- const url = new URL(pathname, loaderOptions.resizeOrigin);
- return url.href;
- } else {
- return pathname;
- }
- };
-
-type LocalImageLoaderOptions = {
- publicPath?: string;
-};
-
-/**
- * Fake pseudo loader for local testing purposes
- **/
-export const localImageLoader =
- (options: LocalImageLoaderOptions): ImageLoader =>
- ({ width, src, quality }) => {
- const { publicPath = "/" } = options;
- // Just emulate like we really resize the image
- const params = new URLSearchParams();
- params.set("width", `${width}`);
- params.set("quality", `${quality}`);
- return `${publicPath}${src}?${params.toString()}`;
+ return `${imageBaseUrl}${src}?${searchParams.toString()}`;
};
diff --git a/packages/image/src/image-optimize.test.ts b/packages/image/src/image-optimize.test.ts
index 6cdaea4ad1..67b6dca3be 100644
--- a/packages/image/src/image-optimize.test.ts
+++ b/packages/image/src/image-optimize.test.ts
@@ -1,6 +1,6 @@
import { describe, test, expect } from "@jest/globals";
import { getImageAttributes } from "./image-optimize";
-import { cloudflareImageLoader } from "./image-loaders";
+import { createImageLoader } from "./image-loaders";
describe("Image optimizations applied", () => {
test("width is number, create pixel density descriptor 'x'", () => {
@@ -11,17 +11,14 @@ describe("Image optimizations applied", () => {
srcSet: undefined,
sizes: undefined,
quality: 100,
- loader: cloudflareImageLoader({
- resizeOrigin: null,
- cdnUrl: "https://webstudio.is/",
- }),
+ loader: createImageLoader({ imageBaseUrl: "/asset/image/" }),
});
expect(imgAttr).toMatchInlineSnapshot(`
{
"sizes": undefined,
- "src": "/cdn-cgi/image/width=256,quality=100,format=auto/https://webstudio.is/logo.webp",
- "srcSet": "/cdn-cgi/image/width=128,quality=100,format=auto/https://webstudio.is/logo.webp 1x, /cdn-cgi/image/width=256,quality=100,format=auto/https://webstudio.is/logo.webp 2x",
+ "src": "/asset/image/logo.webp?width=256&quality=100&format=auto",
+ "srcSet": "/asset/image/logo.webp?width=128&quality=100&format=auto 1x, /asset/image/logo.webp?width=256&quality=100&format=auto 2x",
}
`);
});
@@ -34,17 +31,14 @@ describe("Image optimizations applied", () => {
srcSet: undefined,
sizes: undefined,
quality: 90,
- loader: cloudflareImageLoader({
- resizeOrigin: null,
- cdnUrl: "https://webstudio.is/",
- }),
+ loader: createImageLoader({ imageBaseUrl: "/asset/image/" }),
});
expect(imgAttr).toMatchInlineSnapshot(`
{
"sizes": "(min-width: 1280px) 50vw, 100vw",
- "src": "/cdn-cgi/image/width=3840,quality=90,format=auto/https://webstudio.is/logo.webp",
- "srcSet": "/cdn-cgi/image/width=384,quality=90,format=auto/https://webstudio.is/logo.webp 384w, /cdn-cgi/image/width=640,quality=90,format=auto/https://webstudio.is/logo.webp 640w, /cdn-cgi/image/width=750,quality=90,format=auto/https://webstudio.is/logo.webp 750w, /cdn-cgi/image/width=828,quality=90,format=auto/https://webstudio.is/logo.webp 828w, /cdn-cgi/image/width=1080,quality=90,format=auto/https://webstudio.is/logo.webp 1080w, /cdn-cgi/image/width=1200,quality=90,format=auto/https://webstudio.is/logo.webp 1200w, /cdn-cgi/image/width=1920,quality=90,format=auto/https://webstudio.is/logo.webp 1920w, /cdn-cgi/image/width=2048,quality=90,format=auto/https://webstudio.is/logo.webp 2048w, /cdn-cgi/image/width=3840,quality=90,format=auto/https://webstudio.is/logo.webp 3840w",
+ "src": "/asset/image/logo.webp?width=3840&quality=90&format=auto",
+ "srcSet": "/asset/image/logo.webp?width=384&quality=90&format=auto 384w, /asset/image/logo.webp?width=640&quality=90&format=auto 640w, /asset/image/logo.webp?width=750&quality=90&format=auto 750w, /asset/image/logo.webp?width=828&quality=90&format=auto 828w, /asset/image/logo.webp?width=1080&quality=90&format=auto 1080w, /asset/image/logo.webp?width=1200&quality=90&format=auto 1200w, /asset/image/logo.webp?width=1920&quality=90&format=auto 1920w, /asset/image/logo.webp?width=2048&quality=90&format=auto 2048w, /asset/image/logo.webp?width=3840&quality=90&format=auto 3840w",
}
`);
});
@@ -57,17 +51,14 @@ describe("Image optimizations applied", () => {
srcSet: undefined,
sizes: "100vw",
quality: 70,
- loader: cloudflareImageLoader({
- resizeOrigin: null,
- cdnUrl: "https://webstudio.is/",
- }),
+ loader: createImageLoader({ imageBaseUrl: "/asset/image/" }),
});
expect(imgAttr).toMatchInlineSnapshot(`
{
"sizes": "100vw",
- "src": "/cdn-cgi/image/width=3840,quality=70,format=auto/https://webstudio.is/logo.webp",
- "srcSet": "/cdn-cgi/image/width=640,quality=70,format=auto/https://webstudio.is/logo.webp 640w, /cdn-cgi/image/width=750,quality=70,format=auto/https://webstudio.is/logo.webp 750w, /cdn-cgi/image/width=828,quality=70,format=auto/https://webstudio.is/logo.webp 828w, /cdn-cgi/image/width=1080,quality=70,format=auto/https://webstudio.is/logo.webp 1080w, /cdn-cgi/image/width=1200,quality=70,format=auto/https://webstudio.is/logo.webp 1200w, /cdn-cgi/image/width=1920,quality=70,format=auto/https://webstudio.is/logo.webp 1920w, /cdn-cgi/image/width=2048,quality=70,format=auto/https://webstudio.is/logo.webp 2048w, /cdn-cgi/image/width=3840,quality=70,format=auto/https://webstudio.is/logo.webp 3840w",
+ "src": "/asset/image/logo.webp?width=3840&quality=70&format=auto",
+ "srcSet": "/asset/image/logo.webp?width=640&quality=70&format=auto 640w, /asset/image/logo.webp?width=750&quality=70&format=auto 750w, /asset/image/logo.webp?width=828&quality=70&format=auto 828w, /asset/image/logo.webp?width=1080&quality=70&format=auto 1080w, /asset/image/logo.webp?width=1200&quality=70&format=auto 1200w, /asset/image/logo.webp?width=1920&quality=70&format=auto 1920w, /asset/image/logo.webp?width=2048&quality=70&format=auto 2048w, /asset/image/logo.webp?width=3840&quality=70&format=auto 3840w",
}
`);
});
@@ -80,17 +71,16 @@ describe("Image optimizations applied", () => {
srcSet: undefined,
sizes: "100vw",
quality: 70,
- loader: cloudflareImageLoader({
- resizeOrigin: "https://resize-origin.is",
- cdnUrl: "https://webstudio.is/",
+ loader: createImageLoader({
+ imageBaseUrl: "https://resize-origin.is/asset/image/",
}),
});
expect(imgAttr).toMatchInlineSnapshot(`
{
"sizes": "100vw",
- "src": "https://resize-origin.is/cdn-cgi/image/width=3840,quality=70,format=auto/https://webstudio.is/logo.webp",
- "srcSet": "https://resize-origin.is/cdn-cgi/image/width=640,quality=70,format=auto/https://webstudio.is/logo.webp 640w, https://resize-origin.is/cdn-cgi/image/width=750,quality=70,format=auto/https://webstudio.is/logo.webp 750w, https://resize-origin.is/cdn-cgi/image/width=828,quality=70,format=auto/https://webstudio.is/logo.webp 828w, https://resize-origin.is/cdn-cgi/image/width=1080,quality=70,format=auto/https://webstudio.is/logo.webp 1080w, https://resize-origin.is/cdn-cgi/image/width=1200,quality=70,format=auto/https://webstudio.is/logo.webp 1200w, https://resize-origin.is/cdn-cgi/image/width=1920,quality=70,format=auto/https://webstudio.is/logo.webp 1920w, https://resize-origin.is/cdn-cgi/image/width=2048,quality=70,format=auto/https://webstudio.is/logo.webp 2048w, https://resize-origin.is/cdn-cgi/image/width=3840,quality=70,format=auto/https://webstudio.is/logo.webp 3840w",
+ "src": "https://resize-origin.is/asset/image/logo.webp?width=3840&quality=70&format=auto",
+ "srcSet": "https://resize-origin.is/asset/image/logo.webp?width=640&quality=70&format=auto 640w, https://resize-origin.is/asset/image/logo.webp?width=750&quality=70&format=auto 750w, https://resize-origin.is/asset/image/logo.webp?width=828&quality=70&format=auto 828w, https://resize-origin.is/asset/image/logo.webp?width=1080&quality=70&format=auto 1080w, https://resize-origin.is/asset/image/logo.webp?width=1200&quality=70&format=auto 1200w, https://resize-origin.is/asset/image/logo.webp?width=1920&quality=70&format=auto 1920w, https://resize-origin.is/asset/image/logo.webp?width=2048&quality=70&format=auto 2048w, https://resize-origin.is/asset/image/logo.webp?width=3840&quality=70&format=auto 3840w",
}
`);
});
@@ -126,7 +116,7 @@ describe("Image optimizations not applied", () => {
srcSet: undefined,
sizes: undefined,
quality: 100,
- loader: cloudflareImageLoader({ resizeOrigin: null }),
+ loader: createImageLoader({ imageBaseUrl: "/asset/image/" }),
});
expect(imgAttr).toMatchInlineSnapshot(`
@@ -144,7 +134,7 @@ describe("Image optimizations not applied", () => {
srcSet: "user-defined-srcset",
sizes: undefined,
quality: 100,
- loader: cloudflareImageLoader({ resizeOrigin: null }),
+ loader: createImageLoader({ imageBaseUrl: "/asset/image/" }),
});
expect(imgAttr).toMatchInlineSnapshot(`
@@ -163,7 +153,7 @@ describe("Image optimizations not applied", () => {
srcSet: undefined,
sizes: undefined,
quality: 100,
- loader: cloudflareImageLoader({ resizeOrigin: null }),
+ loader: createImageLoader({ imageBaseUrl: "/asset/image/" }),
});
expect(imgAttr).toMatchInlineSnapshot(`null`);
@@ -177,7 +167,7 @@ describe("Image optimizations not applied", () => {
srcSet: undefined,
sizes: undefined,
quality: 100,
- loader: cloudflareImageLoader({ resizeOrigin: null }),
+ loader: createImageLoader({ imageBaseUrl: "/asset/image/" }),
});
expect(imgAttr).toMatchInlineSnapshot(`null`);
diff --git a/packages/image/src/index.ts b/packages/image/src/index.ts
index cfa0aa4235..af63c97824 100644
--- a/packages/image/src/index.ts
+++ b/packages/image/src/index.ts
@@ -1,7 +1,7 @@
import type { PropMeta } from "@webstudio-is/generate-arg-types";
export { Image } from "./image";
export type { ImageLoader } from "./image-optimize";
-export * as loaders from "./image-loaders";
+export * from "./image-loaders";
import { props } from "./__generated__/image.props";
// "loader" is our internal prop not intended to show up in the props panel
diff --git a/packages/react-sdk/src/app/custom-components/image.tsx b/packages/react-sdk/src/app/custom-components/image.tsx
index d582ea2954..127b2f29b1 100644
--- a/packages/react-sdk/src/app/custom-components/image.tsx
+++ b/packages/react-sdk/src/app/custom-components/image.tsx
@@ -4,7 +4,10 @@ import {
type ComponentPropsWithoutRef,
type ElementRef,
} from "react";
-import { Image as WebstudioImage, loaders } from "@webstudio-is/image";
+import {
+ Image as WebstudioImage,
+ createImageLoader,
+} from "@webstudio-is/image";
import { Image as SdkImage } from "../../components/image";
import { usePropAsset, getInstanceIdFromComponentProps } from "../../props";
import { getParams } from "../params";
@@ -16,20 +19,11 @@ type Props = ComponentPropsWithoutRef<typeof WebstudioImage>;
export const Image = forwardRef<ElementRef<typeof defaultTag>, Props>(
(props, ref) => {
const asset = usePropAsset(getInstanceIdFromComponentProps(props), "src");
- const params = getParams();
const loader = useMemo(() => {
- if (asset === undefined) {
- return null;
- }
- if (asset.location === "REMOTE") {
- return loaders.cloudflareImageLoader({
- resizeOrigin: params.resizeOrigin,
- cdnUrl: params.assetBaseUrl,
- });
- }
- return loaders.localImageLoader({ publicPath: params.assetBaseUrl });
- }, [asset, params]);
+ const params = getParams();
+ return createImageLoader({ imageBaseUrl: params.imageBaseUrl });
+ }, []);
const src = asset?.name ?? props.src;
diff --git a/packages/react-sdk/src/app/params.ts b/packages/react-sdk/src/app/params.ts
index 8d42d64725..26189b733f 100644
--- a/packages/react-sdk/src/app/params.ts
+++ b/packages/react-sdk/src/app/params.ts
@@ -1,11 +1,33 @@
export type Params = {
- resizeOrigin?: string;
+ /**
+ * Base url ir base path for images with ending slash.
+ * Used for configuring image with different sizes.
+ * Concatinated with "name?width=&quality=&format=".
+ *
+ * For example
+ * /asset/image/ used by default in builder
+ * https://image-transform.wstd.io/cdn-cgi/image/
+ * https://webstudio.is/cdn-cgi/image/
+ */
+ imageBaseUrl: string;
+ /**
+ * Base url or base path for any asset with ending slash.
+ * Used to load assets like fonts or images in styles
+ * Concatinated with "name".
+ *
+ * For example
+ * /s/uploads/
+ * /asset/file/
+ * https://assets-dev.webstudio.is/
+ * https://assets.webstudio.is/
+ */
assetBaseUrl: string;
};
let params: undefined | Params;
const emptyParams: Params = {
+ imageBaseUrl: "/",
assetBaseUrl: "/",
};