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.
TypeScript accessibilityalternativecloudflarecloudflare-workersdesignfreefrontendopen-sourceradix-uireactremixweb-developmentwebflowwebsite-builderwebsite-developmentwebsiteswebstudio
fix: support videos in self-hosted websites (#5340)
Bogdan Chadkin49bb819ab1f7
diff --git a/apps/builder/app/canvas/canvas.tsx b/apps/builder/app/canvas/canvas.tsxindex 0db6362aba..b55cb80884 100644--- a/apps/builder/app/canvas/canvas.tsx+++ b/apps/builder/app/canvas/canvas.tsx@@ -4,7 +4,7 @@ import { useStore } from "@nanostores/react";import { type Instances, coreMetas } from "@webstudio-is/sdk";import { coreTemplates } from "@webstudio-is/sdk/core-templates";import type { Components } from "@webstudio-is/react-sdk";-import { wsImageLoader } from "@webstudio-is/image";+import { wsImageLoader, wsVideoLoader } from "@webstudio-is/image";import { ReactSdkContext } from "@webstudio-is/react-sdk/runtime";import * as baseComponents from "@webstudio-is/sdk-components-react";import * as baseComponentMetas from "@webstudio-is/sdk-components-react/metas";@@ -133,6 +133,7 @@ const useElementsTree = (components: Components, instances: Instances) => {renderer: isPreviewMode ? "preview" : "canvas",assetBaseUrl,imageLoader: wsImageLoader,+ videoLoader: wsVideoLoader,resources: {},breakpoints,// error reportingdiff --git a/fixtures/react-router-cloudflare/app/routes/[another-page]._index.tsx b/fixtures/react-router-cloudflare/app/routes/[another-page]._index.tsxindex a1ab01857d..17d3491d0b 100644--- a/fixtures/react-router-cloudflare/app/routes/[another-page]._index.tsx+++ b/fixtures/react-router-cloudflare/app/routes/[another-page]._index.tsx@@ -36,7 +36,7 @@ import {getRemixParams,contactEmail,} from "../__generated__/[another-page]._index.server";-import { assetBaseUrl, imageLoader } from "../constants.mjs";+import * as constants from "../constants.mjs";import css from "../__generated__/index.css?url";import { sitemap } from "../__generated__/$resources.sitemap.xml";@@ -150,8 +150,8 @@ export const links: LinksFunction = () => {if (favIconAsset) {result.push({rel: "icon",- href: imageLoader({- src: `${assetBaseUrl}${favIconAsset}`,+ href: constants.imageLoader({+ src: `${constants.assetBaseUrl}${favIconAsset}`,// width,height must be multiple of 48 https://developers.google.com/search/docs/appearance/favicon-in-searchwidth: 144,height: 144,@@ -166,7 +166,7 @@ export const links: LinksFunction = () => {for (const asset of pageFontAssets) {result.push({rel: "preload",- href: `${assetBaseUrl}${asset}`,+ href: `${constants.assetBaseUrl}${asset}`,as: "font",crossOrigin: "anonymous",});@@ -175,7 +175,7 @@ export const links: LinksFunction = () => {for (const backgroundImageAsset of pageBackgroundImageAssets) {result.push({rel: "preload",- href: `${assetBaseUrl}${backgroundImageAsset}`,+ href: `${constants.assetBaseUrl}${backgroundImageAsset}`,as: "image",});}@@ -270,8 +270,7 @@ const Outlet = () => {return (<ReactSdkContext.Providervalue={{- imageLoader,- assetBaseUrl,+ ...constants,resources,breakpoints,onError: console.error,@@ -284,8 +283,8 @@ const Outlet = () => {pageMeta={pageMeta}host={host}siteName={siteName}- imageLoader={imageLoader}- assetBaseUrl={assetBaseUrl}+ imageLoader={constants.imageLoader}+ assetBaseUrl={constants.assetBaseUrl}/><PageSettingsTitle>{pageMeta.title}</PageSettingsTitle></ReactSdkContext.Provider>diff --git a/fixtures/react-router-cloudflare/app/routes/_index.tsx b/fixtures/react-router-cloudflare/app/routes/_index.tsxindex c9dc7e83ff..dec09db556 100644--- a/fixtures/react-router-cloudflare/app/routes/_index.tsx+++ b/fixtures/react-router-cloudflare/app/routes/_index.tsx@@ -36,7 +36,7 @@ import {getRemixParams,contactEmail,} from "../__generated__/_index.server";-import { assetBaseUrl, imageLoader } from "../constants.mjs";+import * as constants from "../constants.mjs";import css from "../__generated__/index.css?url";import { sitemap } from "../__generated__/$resources.sitemap.xml";@@ -150,8 +150,8 @@ export const links: LinksFunction = () => {if (favIconAsset) {result.push({rel: "icon",- href: imageLoader({- src: `${assetBaseUrl}${favIconAsset}`,+ href: constants.imageLoader({+ src: `${constants.assetBaseUrl}${favIconAsset}`,// width,height must be multiple of 48 https://developers.google.com/search/docs/appearance/favicon-in-searchwidth: 144,height: 144,@@ -166,7 +166,7 @@ export const links: LinksFunction = () => {for (const asset of pageFontAssets) {result.push({rel: "preload",- href: `${assetBaseUrl}${asset}`,+ href: `${constants.assetBaseUrl}${asset}`,as: "font",crossOrigin: "anonymous",});@@ -175,7 +175,7 @@ export const links: LinksFunction = () => {for (const backgroundImageAsset of pageBackgroundImageAssets) {result.push({rel: "preload",- href: `${assetBaseUrl}${backgroundImageAsset}`,+ href: `${constants.assetBaseUrl}${backgroundImageAsset}`,as: "image",});}@@ -270,8 +270,7 @@ const Outlet = () => {return (<ReactSdkContext.Providervalue={{- imageLoader,- assetBaseUrl,+ ...constants,resources,breakpoints,onError: console.error,@@ -284,8 +283,8 @@ const Outlet = () => {pageMeta={pageMeta}host={host}siteName={siteName}- imageLoader={imageLoader}- assetBaseUrl={assetBaseUrl}+ imageLoader={constants.imageLoader}+ assetBaseUrl={constants.assetBaseUrl}/><PageSettingsTitle>{pageMeta.title}</PageSettingsTitle></ReactSdkContext.Provider>diff --git a/fixtures/react-router-docker/app/routes/[another-page]._index.tsx b/fixtures/react-router-docker/app/routes/[another-page]._index.tsxindex a1ab01857d..17d3491d0b 100644--- a/fixtures/react-router-docker/app/routes/[another-page]._index.tsx+++ b/fixtures/react-router-docker/app/routes/[another-page]._index.tsx@@ -36,7 +36,7 @@ import {getRemixParams,contactEmail,} from "../__generated__/[another-page]._index.server";-import { assetBaseUrl, imageLoader } from "../constants.mjs";+import * as constants from "../constants.mjs";import css from "../__generated__/index.css?url";import { sitemap } from "../__generated__/$resources.sitemap.xml";@@ -150,8 +150,8 @@ export const links: LinksFunction = () => {if (favIconAsset) {result.push({rel: "icon",- href: imageLoader({- src: `${assetBaseUrl}${favIconAsset}`,+ href: constants.imageLoader({+ src: `${constants.assetBaseUrl}${favIconAsset}`,// width,height must be multiple of 48 https://developers.google.com/search/docs/appearance/favicon-in-searchwidth: 144,height: 144,@@ -166,7 +166,7 @@ export const links: LinksFunction = () => {for (const asset of pageFontAssets) {result.push({rel: "preload",- href: `${assetBaseUrl}${asset}`,+ href: `${constants.assetBaseUrl}${asset}`,as: "font",crossOrigin: "anonymous",});@@ -175,7 +175,7 @@ export const links: LinksFunction = () => {for (const backgroundImageAsset of pageBackgroundImageAssets) {result.push({rel: "preload",- href: `${assetBaseUrl}${backgroundImageAsset}`,+ href: `${constants.assetBaseUrl}${backgroundImageAsset}`,as: "image",});}@@ -270,8 +270,7 @@ const Outlet = () => {return (<ReactSdkContext.Providervalue={{- imageLoader,- assetBaseUrl,+ ...constants,resources,breakpoints,onError: console.error,@@ -284,8 +283,8 @@ const Outlet = () => {pageMeta={pageMeta}host={host}siteName={siteName}- imageLoader={imageLoader}- assetBaseUrl={assetBaseUrl}+ imageLoader={constants.imageLoader}+ assetBaseUrl={constants.assetBaseUrl}/><PageSettingsTitle>{pageMeta.title}</PageSettingsTitle></ReactSdkContext.Provider>diff --git a/fixtures/react-router-docker/app/routes/_index.tsx b/fixtures/react-router-docker/app/routes/_index.tsxindex c9dc7e83ff..dec09db556 100644--- a/fixtures/react-router-docker/app/routes/_index.tsx+++ b/fixtures/react-router-docker/app/routes/_index.tsx@@ -36,7 +36,7 @@ import {getRemixParams,contactEmail,} from "../__generated__/_index.server";-import { assetBaseUrl, imageLoader } from "../constants.mjs";+import * as constants from "../constants.mjs";import css from "../__generated__/index.css?url";import { sitemap } from "../__generated__/$resources.sitemap.xml";@@ -150,8 +150,8 @@ export const links: LinksFunction = () => {if (favIconAsset) {result.push({rel: "icon",- href: imageLoader({- src: `${assetBaseUrl}${favIconAsset}`,+ href: constants.imageLoader({+ src: `${constants.assetBaseUrl}${favIconAsset}`,// width,height must be multiple of 48 https://developers.google.com/search/docs/appearance/favicon-in-searchwidth: 144,height: 144,@@ -166,7 +166,7 @@ export const links: LinksFunction = () => {for (const asset of pageFontAssets) {result.push({rel: "preload",- href: `${assetBaseUrl}${asset}`,+ href: `${constants.assetBaseUrl}${asset}`,as: "font",crossOrigin: "anonymous",});@@ -175,7 +175,7 @@ export const links: LinksFunction = () => {for (const backgroundImageAsset of pageBackgroundImageAssets) {result.push({rel: "preload",- href: `${assetBaseUrl}${backgroundImageAsset}`,+ href: `${constants.assetBaseUrl}${backgroundImageAsset}`,as: "image",});}@@ -270,8 +270,7 @@ const Outlet = () => {return (<ReactSdkContext.Providervalue={{- imageLoader,- assetBaseUrl,+ ...constants,resources,breakpoints,onError: console.error,@@ -284,8 +283,8 @@ const Outlet = () => {pageMeta={pageMeta}host={host}siteName={siteName}- imageLoader={imageLoader}- assetBaseUrl={assetBaseUrl}+ imageLoader={constants.imageLoader}+ assetBaseUrl={constants.assetBaseUrl}/><PageSettingsTitle>{pageMeta.title}</PageSettingsTitle></ReactSdkContext.Provider>diff --git a/fixtures/react-router-netlify/app/routes/[another-page]._index.tsx b/fixtures/react-router-netlify/app/routes/[another-page]._index.tsxindex a1ab01857d..17d3491d0b 100644--- a/fixtures/react-router-netlify/app/routes/[another-page]._index.tsx+++ b/fixtures/react-router-netlify/app/routes/[another-page]._index.tsx@@ -36,7 +36,7 @@ import {getRemixParams,contactEmail,} from "../__generated__/[another-page]._index.server";-import { assetBaseUrl, imageLoader } from "../constants.mjs";+import * as constants from "../constants.mjs";import css from "../__generated__/index.css?url";import { sitemap } from "../__generated__/$resources.sitemap.xml";@@ -150,8 +150,8 @@ export const links: LinksFunction = () => {if (favIconAsset) {result.push({rel: "icon",- href: imageLoader({- src: `${assetBaseUrl}${favIconAsset}`,+ href: constants.imageLoader({+ src: `${constants.assetBaseUrl}${favIconAsset}`,// width,height must be multiple of 48 https://developers.google.com/search/docs/appearance/favicon-in-searchwidth: 144,height: 144,@@ -166,7 +166,7 @@ export const links: LinksFunction = () => {for (const asset of pageFontAssets) {result.push({rel: "preload",- href: `${assetBaseUrl}${asset}`,+ href: `${constants.assetBaseUrl}${asset}`,as: "font",crossOrigin: "anonymous",});@@ -175,7 +175,7 @@ export const links: LinksFunction = () => {for (const backgroundImageAsset of pageBackgroundImageAssets) {result.push({rel: "preload",- href: `${assetBaseUrl}${backgroundImageAsset}`,+ href: `${constants.assetBaseUrl}${backgroundImageAsset}`,as: "image",});}@@ -270,8 +270,7 @@ const Outlet = () => {return (<ReactSdkContext.Providervalue={{- imageLoader,- assetBaseUrl,+ ...constants,resources,breakpoints,onError: console.error,@@ -284,8 +283,8 @@ const Outlet = () => {pageMeta={pageMeta}host={host}siteName={siteName}- imageLoader={imageLoader}- assetBaseUrl={assetBaseUrl}+ imageLoader={constants.imageLoader}+ assetBaseUrl={constants.assetBaseUrl}/><PageSettingsTitle>{pageMeta.title}</PageSettingsTitle></ReactSdkContext.Provider>diff --git a/fixtures/react-router-netlify/app/routes/_index.tsx b/fixtures/react-router-netlify/app/routes/_index.tsxindex c9dc7e83ff..dec09db556 100644--- a/fixtures/react-router-netlify/app/routes/_index.tsx+++ b/fixtures/react-router-netlify/app/routes/_index.tsx@@ -36,7 +36,7 @@ import {getRemixParams,contactEmail,} from "../__generated__/_index.server";-import { assetBaseUrl, imageLoader } from "../constants.mjs";+import * as constants from "../constants.mjs";import css from "../__generated__/index.css?url";import { sitemap } from "../__generated__/$resources.sitemap.xml";@@ -150,8 +150,8 @@ export const links: LinksFunction = () => {if (favIconAsset) {result.push({rel: "icon",- href: imageLoader({- src: `${assetBaseUrl}${favIconAsset}`,+ href: constants.imageLoader({+ src: `${constants.assetBaseUrl}${favIconAsset}`,// width,height must be multiple of 48 https://developers.google.com/search/docs/appearance/favicon-in-searchwidth: 144,height: 144,@@ -166,7 +166,7 @@ export const links: LinksFunction = () => {for (const asset of pageFontAssets) {result.push({rel: "preload",- href: `${assetBaseUrl}${asset}`,+ href: `${constants.assetBaseUrl}${asset}`,as: "font",crossOrigin: "anonymous",});@@ -175,7 +175,7 @@ export const links: LinksFunction = () => {for (const backgroundImageAsset of pageBackgroundImageAssets) {result.push({rel: "preload",- href: `${assetBaseUrl}${backgroundImageAsset}`,+ href: `${constants.assetBaseUrl}${backgroundImageAsset}`,as: "image",});}@@ -270,8 +270,7 @@ const Outlet = () => {return (<ReactSdkContext.Providervalue={{- imageLoader,- assetBaseUrl,+ ...constants,resources,breakpoints,onError: console.error,@@ -284,8 +283,8 @@ const Outlet = () => {pageMeta={pageMeta}host={host}siteName={siteName}- imageLoader={imageLoader}- assetBaseUrl={assetBaseUrl}+ imageLoader={constants.imageLoader}+ assetBaseUrl={constants.assetBaseUrl}/><PageSettingsTitle>{pageMeta.title}</PageSettingsTitle></ReactSdkContext.Provider>diff --git a/fixtures/react-router-vercel/app/routes/[another-page]._index.tsx b/fixtures/react-router-vercel/app/routes/[another-page]._index.tsxindex a1ab01857d..17d3491d0b 100644--- a/fixtures/react-router-vercel/app/routes/[another-page]._index.tsx+++ b/fixtures/react-router-vercel/app/routes/[another-page]._index.tsx@@ -36,7 +36,7 @@ import {getRemixParams,contactEmail,} from "../__generated__/[another-page]._index.server";-import { assetBaseUrl, imageLoader } from "../constants.mjs";+import * as constants from "../constants.mjs";import css from "../__generated__/index.css?url";import { sitemap } from "../__generated__/$resources.sitemap.xml";@@ -150,8 +150,8 @@ export const links: LinksFunction = () => {if (favIconAsset) {result.push({rel: "icon",- href: imageLoader({- src: `${assetBaseUrl}${favIconAsset}`,+ href: constants.imageLoader({+ src: `${constants.assetBaseUrl}${favIconAsset}`,// width,height must be multiple of 48 https://developers.google.com/search/docs/appearance/favicon-in-searchwidth: 144,height: 144,@@ -166,7 +166,7 @@ export const links: LinksFunction = () => {for (const asset of pageFontAssets) {result.push({rel: "preload",- href: `${assetBaseUrl}${asset}`,+ href: `${constants.assetBaseUrl}${asset}`,as: "font",crossOrigin: "anonymous",});@@ -175,7 +175,7 @@ export const links: LinksFunction = () => {for (const backgroundImageAsset of pageBackgroundImageAssets) {result.push({rel: "preload",- href: `${assetBaseUrl}${backgroundImageAsset}`,+ href: `${constants.assetBaseUrl}${backgroundImageAsset}`,as: "image",});}@@ -270,8 +270,7 @@ const Outlet = () => {return (<ReactSdkContext.Providervalue={{- imageLoader,- assetBaseUrl,+ ...constants,resources,breakpoints,onError: console.error,@@ -284,8 +283,8 @@ const Outlet = () => {pageMeta={pageMeta}host={host}siteName={siteName}- imageLoader={imageLoader}- assetBaseUrl={assetBaseUrl}+ imageLoader={constants.imageLoader}+ assetBaseUrl={constants.assetBaseUrl}/><PageSettingsTitle>{pageMeta.title}</PageSettingsTitle></ReactSdkContext.Provider>diff --git a/fixtures/react-router-vercel/app/routes/_index.tsx b/fixtures/react-router-vercel/app/routes/_index.tsxindex c9dc7e83ff..dec09db556 100644--- a/fixtures/react-router-vercel/app/routes/_index.tsx+++ b/fixtures/react-router-vercel/app/routes/_index.tsx@@ -36,7 +36,7 @@ import {getRemixParams,contactEmail,} from "../__generated__/_index.server";-import { assetBaseUrl, imageLoader } from "../constants.mjs";+import * as constants from "../constants.mjs";import css from "../__generated__/index.css?url";import { sitemap } from "../__generated__/$resources.sitemap.xml";@@ -150,8 +150,8 @@ export const links: LinksFunction = () => {if (favIconAsset) {result.push({rel: "icon",- href: imageLoader({- src: `${assetBaseUrl}${favIconAsset}`,+ href: constants.imageLoader({+ src: `${constants.assetBaseUrl}${favIconAsset}`,// width,height must be multiple of 48 https://developers.google.com/search/docs/appearance/favicon-in-searchwidth: 144,height: 144,@@ -166,7 +166,7 @@ export const links: LinksFunction = () => {for (const asset of pageFontAssets) {result.push({rel: "preload",- href: `${assetBaseUrl}${asset}`,+ href: `${constants.assetBaseUrl}${asset}`,as: "font",crossOrigin: "anonymous",});@@ -175,7 +175,7 @@ export const links: LinksFunction = () => {for (const backgroundImageAsset of pageBackgroundImageAssets) {result.push({rel: "preload",- href: `${assetBaseUrl}${backgroundImageAsset}`,+ href: `${constants.assetBaseUrl}${backgroundImageAsset}`,as: "image",});}@@ -270,8 +270,7 @@ const Outlet = () => {return (<ReactSdkContext.Providervalue={{- imageLoader,- assetBaseUrl,+ ...constants,resources,breakpoints,onError: console.error,@@ -284,8 +283,8 @@ const Outlet = () => {pageMeta={pageMeta}host={host}siteName={siteName}- imageLoader={imageLoader}- assetBaseUrl={assetBaseUrl}+ imageLoader={constants.imageLoader}+ assetBaseUrl={constants.assetBaseUrl}/><PageSettingsTitle>{pageMeta.title}</PageSettingsTitle></ReactSdkContext.Provider>diff --git a/fixtures/webstudio-cloudflare-template/app/routes/[another-page]._index.tsx b/fixtures/webstudio-cloudflare-template/app/routes/[another-page]._index.tsxindex ac077c8564..8b285af2d9 100644--- a/fixtures/webstudio-cloudflare-template/app/routes/[another-page]._index.tsx+++ b/fixtures/webstudio-cloudflare-template/app/routes/[another-page]._index.tsx@@ -37,7 +37,7 @@ import {getRemixParams,contactEmail,} from "../__generated__/[another-page]._index.server";-import { assetBaseUrl, imageLoader } from "../constants.mjs";+import * as constants from "../constants.mjs";import css from "../__generated__/index.css?url";import { sitemap } from "../__generated__/$resources.sitemap.xml";@@ -151,8 +151,8 @@ export const links: LinksFunction = () => {if (favIconAsset) {result.push({rel: "icon",- href: imageLoader({- src: `${assetBaseUrl}${favIconAsset}`,+ href: constants.imageLoader({+ src: `${constants.assetBaseUrl}${favIconAsset}`,// width,height must be multiple of 48 https://developers.google.com/search/docs/appearance/favicon-in-searchwidth: 144,height: 144,@@ -167,7 +167,7 @@ export const links: LinksFunction = () => {for (const asset of pageFontAssets) {result.push({rel: "preload",- href: `${assetBaseUrl}${asset}`,+ href: `${constants.assetBaseUrl}${asset}`,as: "font",crossOrigin: "anonymous",});@@ -176,7 +176,7 @@ export const links: LinksFunction = () => {for (const backgroundImageAsset of pageBackgroundImageAssets) {result.push({rel: "preload",- href: `${assetBaseUrl}${backgroundImageAsset}`,+ href: `${constants.assetBaseUrl}${backgroundImageAsset}`,as: "image",});}@@ -271,8 +271,7 @@ const Outlet = () => {return (<ReactSdkContext.Providervalue={{- imageLoader,- assetBaseUrl,+ ...constants,resources,breakpoints,onError: console.error,@@ -285,8 +284,8 @@ const Outlet = () => {pageMeta={pageMeta}host={host}siteName={siteName}- imageLoader={imageLoader}- assetBaseUrl={assetBaseUrl}+ imageLoader={constants.imageLoader}+ assetBaseUrl={constants.assetBaseUrl}/><PageSettingsTitle>{pageMeta.title}</PageSettingsTitle><PageSettingsCanonicalLink href={url} />diff --git a/fixtures/webstudio-cloudflare-template/app/routes/_index.tsx b/fixtures/webstudio-cloudflare-template/app/routes/_index.tsxindex f636f7fb56..98dfabad53 100644--- a/fixtures/webstudio-cloudflare-template/app/routes/_index.tsx+++ b/fixtures/webstudio-cloudflare-template/app/routes/_index.tsx@@ -37,7 +37,7 @@ import {getRemixParams,contactEmail,} from "../__generated__/_index.server";-import { assetBaseUrl, imageLoader } from "../constants.mjs";+import * as constants from "../constants.mjs";import css from "../__generated__/index.css?url";import { sitemap } from "../__generated__/$resources.sitemap.xml";@@ -151,8 +151,8 @@ export const links: LinksFunction = () => {if (favIconAsset) {result.push({rel: "icon",- href: imageLoader({- src: `${assetBaseUrl}${favIconAsset}`,+ href: constants.imageLoader({+ src: `${constants.assetBaseUrl}${favIconAsset}`,// width,height must be multiple of 48 https://developers.google.com/search/docs/appearance/favicon-in-searchwidth: 144,height: 144,@@ -167,7 +167,7 @@ export const links: LinksFunction = () => {for (const asset of pageFontAssets) {result.push({rel: "preload",- href: `${assetBaseUrl}${asset}`,+ href: `${constants.assetBaseUrl}${asset}`,as: "font",crossOrigin: "anonymous",});@@ -176,7 +176,7 @@ export const links: LinksFunction = () => {for (const backgroundImageAsset of pageBackgroundImageAssets) {result.push({rel: "preload",- href: `${assetBaseUrl}${backgroundImageAsset}`,+ href: `${constants.assetBaseUrl}${backgroundImageAsset}`,as: "image",});}@@ -271,8 +271,7 @@ const Outlet = () => {return (<ReactSdkContext.Providervalue={{- imageLoader,- assetBaseUrl,+ ...constants,resources,breakpoints,onError: console.error,@@ -285,8 +284,8 @@ const Outlet = () => {pageMeta={pageMeta}host={host}siteName={siteName}- imageLoader={imageLoader}- assetBaseUrl={assetBaseUrl}+ imageLoader={constants.imageLoader}+ assetBaseUrl={constants.assetBaseUrl}/><PageSettingsTitle>{pageMeta.title}</PageSettingsTitle><PageSettingsCanonicalLink href={url} />diff --git a/fixtures/webstudio-features/app/routes/[_route_with_symbols_]._index.tsx b/fixtures/webstudio-features/app/routes/[_route_with_symbols_]._index.tsxindex a7677fa869..edc9ce20a7 100644--- a/fixtures/webstudio-features/app/routes/[_route_with_symbols_]._index.tsx+++ b/fixtures/webstudio-features/app/routes/[_route_with_symbols_]._index.tsx@@ -36,7 +36,7 @@ import {getRemixParams,contactEmail,} from "../__generated__/[_route_with_symbols_]._index.server";-import { assetBaseUrl, imageLoader } from "../constants.mjs";+import * as constants from "../constants.mjs";import css from "../__generated__/index.css?url";import { sitemap } from "../__generated__/$resources.sitemap.xml";@@ -150,8 +150,8 @@ export const links: LinksFunction = () => {if (favIconAsset) {result.push({rel: "icon",- href: imageLoader({- src: `${assetBaseUrl}${favIconAsset}`,+ href: constants.imageLoader({+ src: `${constants.assetBaseUrl}${favIconAsset}`,// width,height must be multiple of 48 https://developers.google.com/search/docs/appearance/favicon-in-searchwidth: 144,height: 144,@@ -166,7 +166,7 @@ export const links: LinksFunction = () => {for (const asset of pageFontAssets) {result.push({rel: "preload",- href: `${assetBaseUrl}${asset}`,+ href: `${constants.assetBaseUrl}${asset}`,as: "font",crossOrigin: "anonymous",});@@ -175,7 +175,7 @@ export const links: LinksFunction = () => {for (const backgroundImageAsset of pageBackgroundImageAssets) {result.push({rel: "preload",- href: `${assetBaseUrl}${backgroundImageAsset}`,+ href: `${constants.assetBaseUrl}${backgroundImageAsset}`,as: "image",});}@@ -270,8 +270,7 @@ const Outlet = () => {return (<ReactSdkContext.Providervalue={{- imageLoader,- assetBaseUrl,+ ...constants,resources,breakpoints,onError: console.error,@@ -284,8 +283,8 @@ const Outlet = () => {pageMeta={pageMeta}host={host}siteName={siteName}- imageLoader={imageLoader}- assetBaseUrl={assetBaseUrl}+ imageLoader={constants.imageLoader}+ assetBaseUrl={constants.assetBaseUrl}/><PageSettingsTitle>{pageMeta.title}</PageSettingsTitle></ReactSdkContext.Provider>diff --git a/fixtures/webstudio-features/app/routes/[animations]._index.tsx b/fixtures/webstudio-features/app/routes/[animations]._index.tsxindex 89415d5ad0..e765d6ae71 100644--- a/fixtures/webstudio-features/app/routes/[animations]._index.tsx+++ b/fixtures/webstudio-features/app/routes/[animations]._index.tsx@@ -36,7 +36,7 @@ import {getRemixParams,contactEmail,} from "../__generated__/[animations]._index.server";-import { assetBaseUrl, imageLoader } from "../constants.mjs";+import * as constants from "../constants.mjs";import css from "../__generated__/index.css?url";import { sitemap } from "../__generated__/$resources.sitemap.xml";@@ -150,8 +150,8 @@ export const links: LinksFunction = () => {if (favIconAsset) {result.push({rel: "icon",- href: imageLoader({- src: `${assetBaseUrl}${favIconAsset}`,+ href: constants.imageLoader({+ src: `${constants.assetBaseUrl}${favIconAsset}`,// width,height must be multiple of 48 https://developers.google.com/search/docs/appearance/favicon-in-searchwidth: 144,height: 144,@@ -166,7 +166,7 @@ export const links: LinksFunction = () => {for (const asset of pageFontAssets) {result.push({rel: "preload",- href: `${assetBaseUrl}${asset}`,+ href: `${constants.assetBaseUrl}${asset}`,as: "font",crossOrigin: "anonymous",});@@ -175,7 +175,7 @@ export const links: LinksFunction = () => {for (const backgroundImageAsset of pageBackgroundImageAssets) {result.push({rel: "preload",- href: `${assetBaseUrl}${backgroundImageAsset}`,+ href: `${constants.assetBaseUrl}${backgroundImageAsset}`,as: "image",});}@@ -270,8 +270,7 @@ const Outlet = () => {return (<ReactSdkContext.Providervalue={{- imageLoader,- assetBaseUrl,+ ...constants,resources,breakpoints,onError: console.error,@@ -284,8 +283,8 @@ const Outlet = () => {pageMeta={pageMeta}host={host}siteName={siteName}- imageLoader={imageLoader}- assetBaseUrl={assetBaseUrl}+ imageLoader={constants.imageLoader}+ assetBaseUrl={constants.assetBaseUrl}/><PageSettingsTitle>{pageMeta.title}</PageSettingsTitle></ReactSdkContext.Provider>diff --git a/fixtures/webstudio-features/app/routes/[class-names]._index.tsx b/fixtures/webstudio-features/app/routes/[class-names]._index.tsxindex 7200178cc4..b1f500d541 100644--- a/fixtures/webstudio-features/app/routes/[class-names]._index.tsx+++ b/fixtures/webstudio-features/app/routes/[class-names]._index.tsx@@ -36,7 +36,7 @@ import {getRemixParams,contactEmail,} from "../__generated__/[class-names]._index.server";-import { assetBaseUrl, imageLoader } from "../constants.mjs";+import * as constants from "../constants.mjs";import css from "../__generated__/index.css?url";import { sitemap } from "../__generated__/$resources.sitemap.xml";@@ -150,8 +150,8 @@ export const links: LinksFunction = () => {if (favIconAsset) {result.push({rel: "icon",- href: imageLoader({- src: `${assetBaseUrl}${favIconAsset}`,+ href: constants.imageLoader({+ src: `${constants.assetBaseUrl}${favIconAsset}`,// width,height must be multiple of 48 https://developers.google.com/search/docs/appearance/favicon-in-searchwidth: 144,height: 144,@@ -166,7 +166,7 @@ export const links: LinksFunction = () => {for (const asset of pageFontAssets) {result.push({rel: "preload",- href: `${assetBaseUrl}${asset}`,+ href: `${constants.assetBaseUrl}${asset}`,as: "font",crossOrigin: "anonymous",});@@ -175,7 +175,7 @@ export const links: LinksFunction = () => {for (const backgroundImageAsset of pageBackgroundImageAssets) {result.push({rel: "preload",- href: `${assetBaseUrl}${backgroundImageAsset}`,+ href: `${constants.assetBaseUrl}${backgroundImageAsset}`,as: "image",});}@@ -270,8 +270,7 @@ const Outlet = () => {return (<ReactSdkContext.Providervalue={{- imageLoader,- assetBaseUrl,+ ...constants,resources,breakpoints,onError: console.error,@@ -284,8 +283,8 @@ const Outlet = () => {pageMeta={pageMeta}host={host}siteName={siteName}- imageLoader={imageLoader}- assetBaseUrl={assetBaseUrl}+ imageLoader={constants.imageLoader}+ assetBaseUrl={constants.assetBaseUrl}/><PageSettingsTitle>{pageMeta.title}</PageSettingsTitle></ReactSdkContext.Provider>diff --git a/fixtures/webstudio-features/app/routes/[content-block]._index.tsx b/fixtures/webstudio-features/app/routes/[content-block]._index.tsxindex 19b58fb925..4707da8caa 100644--- a/fixtures/webstudio-features/app/routes/[content-block]._index.tsx+++ b/fixtures/webstudio-features/app/routes/[content-block]._index.tsx@@ -36,7 +36,7 @@ import {getRemixParams,contactEmail,} from "../__generated__/[content-block]._index.server";-import { assetBaseUrl, imageLoader } from "../constants.mjs";+import * as constants from "../constants.mjs";import css from "../__generated__/index.css?url";import { sitemap } from "../__generated__/$resources.sitemap.xml";@@ -150,8 +150,8 @@ export const links: LinksFunction = () => {if (favIconAsset) {result.push({rel: "icon",- href: imageLoader({- src: `${assetBaseUrl}${favIconAsset}`,+ href: constants.imageLoader({+ src: `${constants.assetBaseUrl}${favIconAsset}`,// width,height must be multiple of 48 https://developers.google.com/search/docs/appearance/favicon-in-searchwidth: 144,height: 144,@@ -166,7 +166,7 @@ export const links: LinksFunction = () => {for (const asset of pageFontAssets) {result.push({rel: "preload",- href: `${assetBaseUrl}${asset}`,+ href: `${constants.assetBaseUrl}${asset}`,as: "font",crossOrigin: "anonymous",});@@ -175,7 +175,7 @@ export const links: LinksFunction = () => {for (const backgroundImageAsset of pageBackgroundImageAssets) {result.push({rel: "preload",- href: `${assetBaseUrl}${backgroundImageAsset}`,+ href: `${constants.assetBaseUrl}${backgroundImageAsset}`,as: "image",});}@@ -270,8 +270,7 @@ const Outlet = () => {return (<ReactSdkContext.Providervalue={{- imageLoader,- assetBaseUrl,+ ...constants,resources,breakpoints,onError: console.error,@@ -284,8 +283,8 @@ const Outlet = () => {pageMeta={pageMeta}host={host}siteName={siteName}- imageLoader={imageLoader}- assetBaseUrl={assetBaseUrl}+ imageLoader={constants.imageLoader}+ assetBaseUrl={constants.assetBaseUrl}/><PageSettingsTitle>{pageMeta.title}</PageSettingsTitle></ReactSdkContext.Provider>diff --git a/fixtures/webstudio-features/app/routes/[duration]._index.tsx b/fixtures/webstudio-features/app/routes/[duration]._index.tsxindex df5f72ffef..41ce6045d8 100644--- a/fixtures/webstudio-features/app/routes/[duration]._index.tsx+++ b/fixtures/webstudio-features/app/routes/[duration]._index.tsx@@ -36,7 +36,7 @@ import {getRemixParams,contactEmail,} from "../__generated__/[duration]._index.server";-import { assetBaseUrl, imageLoader } from "../constants.mjs";+import * as constants from "../constants.mjs";import css from "../__generated__/index.css?url";import { sitemap } from "../__generated__/$resources.sitemap.xml";@@ -150,8 +150,8 @@ export const links: LinksFunction = () => {if (favIconAsset) {result.push({rel: "icon",- href: imageLoader({- src: `${assetBaseUrl}${favIconAsset}`,+ href: constants.imageLoader({+ src: `${constants.assetBaseUrl}${favIconAsset}`,// width,height must be multiple of 48 https://developers.google.com/search/docs/appearance/favicon-in-searchwidth: 144,height: 144,@@ -166,7 +166,7 @@ export const links: LinksFunction = () => {for (const asset of pageFontAssets) {result.push({rel: "preload",- href: `${assetBaseUrl}${asset}`,+ href: `${constants.assetBaseUrl}${asset}`,as: "font",crossOrigin: "anonymous",});@@ -175,7 +175,7 @@ export const links: LinksFunction = () => {for (const backgroundImageAsset of pageBackgroundImageAssets) {result.push({rel: "preload",- href: `${assetBaseUrl}${backgroundImageAsset}`,+ href: `${constants.assetBaseUrl}${backgroundImageAsset}`,as: "image",});}@@ -270,8 +270,7 @@ const Outlet = () => {return (<ReactSdkContext.Providervalue={{- imageLoader,- assetBaseUrl,+ ...constants,resources,breakpoints,onError: console.error,@@ -284,8 +283,8 @@ const Outlet = () => {pageMeta={pageMeta}host={host}siteName={siteName}- imageLoader={imageLoader}- assetBaseUrl={assetBaseUrl}+ imageLoader={constants.imageLoader}+ assetBaseUrl={constants.assetBaseUrl}/><PageSettingsTitle>{pageMeta.title}</PageSettingsTitle></ReactSdkContext.Provider>diff --git a/fixtures/webstudio-features/app/routes/[expressions]._index.tsx b/fixtures/webstudio-features/app/routes/[expressions]._index.tsxindex 9f1b467052..ea8fc413a6 100644--- a/fixtures/webstudio-features/app/routes/[expressions]._index.tsx+++ b/fixtures/webstudio-features/app/routes/[expressions]._index.tsx@@ -36,7 +36,7 @@ import {getRemixParams,contactEmail,} from "../__generated__/[expressions]._index.server";-import { assetBaseUrl, imageLoader } from "../constants.mjs";+import * as constants from "../constants.mjs";import css from "../__generated__/index.css?url";import { sitemap } from "../__generated__/$resources.sitemap.xml";@@ -150,8 +150,8 @@ export const links: LinksFunction = () => {if (favIconAsset) {result.push({rel: "icon",- href: imageLoader({- src: `${assetBaseUrl}${favIconAsset}`,+ href: constants.imageLoader({+ src: `${constants.assetBaseUrl}${favIconAsset}`,// width,height must be multiple of 48 https://developers.google.com/search/docs/appearance/favicon-in-searchwidth: 144,height: 144,@@ -166,7 +166,7 @@ export const links: LinksFunction = () => {for (const asset of pageFontAssets) {result.push({rel: "preload",- href: `${assetBaseUrl}${asset}`,+ href: `${constants.assetBaseUrl}${asset}`,as: "font",crossOrigin: "anonymous",});@@ -175,7 +175,7 @@ export const links: LinksFunction = () => {for (const backgroundImageAsset of pageBackgroundImageAssets) {result.push({rel: "preload",- href: `${assetBaseUrl}${backgroundImageAsset}`,+ href: `${constants.assetBaseUrl}${backgroundImageAsset}`,as: "image",});}@@ -270,8 +270,7 @@ const Outlet = () => {return (<ReactSdkContext.Providervalue={{- imageLoader,- assetBaseUrl,+ ...constants,resources,breakpoints,onError: console.error,@@ -284,8 +283,8 @@ const Outlet = () => {pageMeta={pageMeta}host={host}siteName={siteName}- imageLoader={imageLoader}- assetBaseUrl={assetBaseUrl}+ imageLoader={constants.imageLoader}+ assetBaseUrl={constants.assetBaseUrl}/><PageSettingsTitle>{pageMeta.title}</PageSettingsTitle></ReactSdkContext.Provider>diff --git a/fixtures/webstudio-features/app/routes/[form]._index.tsx b/fixtures/webstudio-features/app/routes/[form]._index.tsxindex 74b1787cea..1b5da5bec0 100644--- a/fixtures/webstudio-features/app/routes/[form]._index.tsx+++ b/fixtures/webstudio-features/app/routes/[form]._index.tsx@@ -36,7 +36,7 @@ import {getRemixParams,contactEmail,} from "../__generated__/[form]._index.server";-import { assetBaseUrl, imageLoader } from "../constants.mjs";+import * as constants from "../constants.mjs";import css from "../__generated__/index.css?url";import { sitemap } from "../__generated__/$resources.sitemap.xml";@@ -150,8 +150,8 @@ export const links: LinksFunction = () => {if (favIconAsset) {result.push({rel: "icon",- href: imageLoader({- src: `${assetBaseUrl}${favIconAsset}`,+ href: constants.imageLoader({+ src: `${constants.assetBaseUrl}${favIconAsset}`,// width,height must be multiple of 48 https://developers.google.com/search/docs/appearance/favicon-in-searchwidth: 144,height: 144,@@ -166,7 +166,7 @@ export const links: LinksFunction = () => {for (const asset of pageFontAssets) {result.push({rel: "preload",- href: `${assetBaseUrl}${asset}`,+ href: `${constants.assetBaseUrl}${asset}`,as: "font",crossOrigin: "anonymous",});@@ -175,7 +175,7 @@ export const links: LinksFunction = () => {for (const backgroundImageAsset of pageBackgroundImageAssets) {result.push({rel: "preload",- href: `${assetBaseUrl}${backgroundImageAsset}`,+ href: `${constants.assetBaseUrl}${backgroundImageAsset}`,as: "image",});}@@ -270,8 +270,7 @@ const Outlet = () => {return (<ReactSdkContext.Providervalue={{- imageLoader,- assetBaseUrl,+ ...constants,resources,breakpoints,onError: console.error,@@ -284,8 +283,8 @@ const Outlet = () => {pageMeta={pageMeta}host={host}siteName={siteName}- imageLoader={imageLoader}- assetBaseUrl={assetBaseUrl}+ imageLoader={constants.imageLoader}+ assetBaseUrl={constants.assetBaseUrl}/><PageSettingsTitle>{pageMeta.title}</PageSettingsTitle></ReactSdkContext.Provider>diff --git a/fixtures/webstudio-features/app/routes/[head-tag]._index.tsx b/fixtures/webstudio-features/app/routes/[head-tag]._index.tsxindex ff56a506a1..18a7523107 100644--- a/fixtures/webstudio-features/app/routes/[head-tag]._index.tsx+++ b/fixtures/webstudio-features/app/routes/[head-tag]._index.tsx@@ -36,7 +36,7 @@ import {getRemixParams,contactEmail,} from "../__generated__/[head-tag]._index.server";-import { assetBaseUrl, imageLoader } from "../constants.mjs";+import * as constants from "../constants.mjs";import css from "../__generated__/index.css?url";import { sitemap } from "../__generated__/$resources.sitemap.xml";@@ -150,8 +150,8 @@ export const links: LinksFunction = () => {if (favIconAsset) {result.push({rel: "icon",- href: imageLoader({- src: `${assetBaseUrl}${favIconAsset}`,+ href: constants.imageLoader({+ src: `${constants.assetBaseUrl}${favIconAsset}`,// width,height must be multiple of 48 https://developers.google.com/search/docs/appearance/favicon-in-searchwidth: 144,height: 144,@@ -166,7 +166,7 @@ export const links: LinksFunction = () => {for (const asset of pageFontAssets) {result.push({rel: "preload",- href: `${assetBaseUrl}${asset}`,+ href: `${constants.assetBaseUrl}${asset}`,as: "font",crossOrigin: "anonymous",});@@ -175,7 +175,7 @@ export const links: LinksFunction = () => {for (const backgroundImageAsset of pageBackgroundImageAssets) {result.push({rel: "preload",- href: `${assetBaseUrl}${backgroundImageAsset}`,+ href: `${constants.assetBaseUrl}${backgroundImageAsset}`,as: "image",});}@@ -270,8 +270,7 @@ const Outlet = () => {return (<ReactSdkContext.Providervalue={{- imageLoader,- assetBaseUrl,+ ...constants,resources,breakpoints,onError: console.error,@@ -284,8 +283,8 @@ const Outlet = () => {pageMeta={pageMeta}host={host}siteName={siteName}- imageLoader={imageLoader}- assetBaseUrl={assetBaseUrl}+ imageLoader={constants.imageLoader}+ assetBaseUrl={constants.assetBaseUrl}/><PageSettingsTitle>{pageMeta.title}</PageSettingsTitle></ReactSdkContext.Provider>diff --git a/fixtures/webstudio-features/app/routes/[heading-with-id]._index.tsx b/fixtures/webstudio-features/app/routes/[heading-with-id]._index.tsxindex 4e57e41bbf..88e4ae7fb7 100644--- a/fixtures/webstudio-features/app/routes/[heading-with-id]._index.tsx+++ b/fixtures/webstudio-features/app/routes/[heading-with-id]._index.tsx@@ -36,7 +36,7 @@ import {getRemixParams,contactEmail,} from "../__generated__/[heading-with-id]._index.server";-import { assetBaseUrl, imageLoader } from "../constants.mjs";+import * as constants from "../constants.mjs";import css from "../__generated__/index.css?url";import { sitemap } from "../__generated__/$resources.sitemap.xml";@@ -150,8 +150,8 @@ export const links: LinksFunction = () => {if (favIconAsset) {result.push({rel: "icon",- href: imageLoader({- src: `${assetBaseUrl}${favIconAsset}`,+ href: constants.imageLoader({+ src: `${constants.assetBaseUrl}${favIconAsset}`,// width,height must be multiple of 48 https://developers.google.com/search/docs/appearance/favicon-in-searchwidth: 144,height: 144,@@ -166,7 +166,7 @@ export const links: LinksFunction = () => {for (const asset of pageFontAssets) {result.push({rel: "preload",- href: `${assetBaseUrl}${asset}`,+ href: `${constants.assetBaseUrl}${asset}`,as: "font",crossOrigin: "anonymous",});@@ -175,7 +175,7 @@ export const links: LinksFunction = () => {for (const backgroundImageAsset of pageBackgroundImageAssets) {result.push({rel: "preload",- href: `${assetBaseUrl}${backgroundImageAsset}`,+ href: `${constants.assetBaseUrl}${backgroundImageAsset}`,as: "image",});}@@ -270,8 +270,7 @@ const Outlet = () => {return (<ReactSdkContext.Providervalue={{- imageLoader,- assetBaseUrl,+ ...constants,resources,breakpoints,onError: console.error,@@ -284,8 +283,8 @@ const Outlet = () => {pageMeta={pageMeta}host={host}siteName={siteName}- imageLoader={imageLoader}- assetBaseUrl={assetBaseUrl}+ imageLoader={constants.imageLoader}+ assetBaseUrl={constants.assetBaseUrl}/><PageSettingsTitle>{pageMeta.title}</PageSettingsTitle></ReactSdkContext.Provider>diff --git a/fixtures/webstudio-features/app/routes/[nested].[nested-page]._index.tsx b/fixtures/webstudio-features/app/routes/[nested].[nested-page]._index.tsxindex d09961d9ea..ef970f1cdc 100644--- a/fixtures/webstudio-features/app/routes/[nested].[nested-page]._index.tsx+++ b/fixtures/webstudio-features/app/routes/[nested].[nested-page]._index.tsx@@ -36,7 +36,7 @@ import {getRemixParams,contactEmail,} from "../__generated__/[nested].[nested-page]._index.server";-import { assetBaseUrl, imageLoader } from "../constants.mjs";+import * as constants from "../constants.mjs";import css from "../__generated__/index.css?url";import { sitemap } from "../__generated__/$resources.sitemap.xml";@@ -150,8 +150,8 @@ export const links: LinksFunction = () => {if (favIconAsset) {result.push({rel: "icon",- href: imageLoader({- src: `${assetBaseUrl}${favIconAsset}`,+ href: constants.imageLoader({+ src: `${constants.assetBaseUrl}${favIconAsset}`,// width,height must be multiple of 48 https://developers.google.com/search/docs/appearance/favicon-in-searchwidth: 144,height: 144,@@ -166,7 +166,7 @@ export const links: LinksFunction = () => {for (const asset of pageFontAssets) {result.push({rel: "preload",- href: `${assetBaseUrl}${asset}`,+ href: `${constants.assetBaseUrl}${asset}`,as: "font",crossOrigin: "anonymous",});@@ -175,7 +175,7 @@ export const links: LinksFunction = () => {for (const backgroundImageAsset of pageBackgroundImageAssets) {result.push({rel: "preload",- href: `${assetBaseUrl}${backgroundImageAsset}`,+ href: `${constants.assetBaseUrl}${backgroundImageAsset}`,as: "image",});}@@ -270,8 +270,7 @@ const Outlet = () => {return (<ReactSdkContext.Providervalue={{- imageLoader,- assetBaseUrl,+ ...constants,resources,breakpoints,onError: console.error,@@ -284,8 +283,8 @@ const Outlet = () => {pageMeta={pageMeta}host={host}siteName={siteName}- imageLoader={imageLoader}- assetBaseUrl={assetBaseUrl}+ imageLoader={constants.imageLoader}+ assetBaseUrl={constants.assetBaseUrl}/><PageSettingsTitle>{pageMeta.title}</PageSettingsTitle></ReactSdkContext.Provider>diff --git a/fixtures/webstudio-features/app/routes/[radix]._index.tsx b/fixtures/webstudio-features/app/routes/[radix]._index.tsxindex 3a3e9764d4..035aa84f2d 100644--- a/fixtures/webstudio-features/app/routes/[radix]._index.tsx+++ b/fixtures/webstudio-features/app/routes/[radix]._index.tsx@@ -36,7 +36,7 @@ import {getRemixParams,contactEmail,} from "../__generated__/[radix]._index.server";-import { assetBaseUrl, imageLoader } from "../constants.mjs";+import * as constants from "../constants.mjs";import css from "../__generated__/index.css?url";import { sitemap } from "../__generated__/$resources.sitemap.xml";@@ -150,8 +150,8 @@ export const links: LinksFunction = () => {if (favIconAsset) {result.push({rel: "icon",- href: imageLoader({- src: `${assetBaseUrl}${favIconAsset}`,+ href: constants.imageLoader({+ src: `${constants.assetBaseUrl}${favIconAsset}`,// width,height must be multiple of 48 https://developers.google.com/search/docs/appearance/favicon-in-searchwidth: 144,height: 144,@@ -166,7 +166,7 @@ export const links: LinksFunction = () => {for (const asset of pageFontAssets) {result.push({rel: "preload",- href: `${assetBaseUrl}${asset}`,+ href: `${constants.assetBaseUrl}${asset}`,as: "font",crossOrigin: "anonymous",});@@ -175,7 +175,7 @@ export const links: LinksFunction = () => {for (const backgroundImageAsset of pageBackgroundImageAssets) {result.push({rel: "preload",- href: `${assetBaseUrl}${backgroundImageAsset}`,+ href: `${constants.assetBaseUrl}${backgroundImageAsset}`,as: "image",});}@@ -270,8 +270,7 @@ const Outlet = () => {return (<ReactSdkContext.Providervalue={{- imageLoader,- assetBaseUrl,+ ...constants,resources,breakpoints,onError: console.error,@@ -284,8 +283,8 @@ const Outlet = () => {pageMeta={pageMeta}host={host}siteName={siteName}- imageLoader={imageLoader}- assetBaseUrl={assetBaseUrl}+ imageLoader={constants.imageLoader}+ assetBaseUrl={constants.assetBaseUrl}/><PageSettingsTitle>{pageMeta.title}</PageSettingsTitle></ReactSdkContext.Provider>diff --git a/fixtures/webstudio-features/app/routes/[resources]._index.tsx b/fixtures/webstudio-features/app/routes/[resources]._index.tsxindex 49fbbbaf90..91664fecce 100644--- a/fixtures/webstudio-features/app/routes/[resources]._index.tsx+++ b/fixtures/webstudio-features/app/routes/[resources]._index.tsx@@ -36,7 +36,7 @@ import {getRemixParams,contactEmail,} from "../__generated__/[resources]._index.server";-import { assetBaseUrl, imageLoader } from "../constants.mjs";+import * as constants from "../constants.mjs";import css from "../__generated__/index.css?url";import { sitemap } from "../__generated__/$resources.sitemap.xml";@@ -150,8 +150,8 @@ export const links: LinksFunction = () => {if (favIconAsset) {result.push({rel: "icon",- href: imageLoader({- src: `${assetBaseUrl}${favIconAsset}`,+ href: constants.imageLoader({+ src: `${constants.assetBaseUrl}${favIconAsset}`,// width,height must be multiple of 48 https://developers.google.com/search/docs/appearance/favicon-in-searchwidth: 144,height: 144,@@ -166,7 +166,7 @@ export const links: LinksFunction = () => {for (const asset of pageFontAssets) {result.push({rel: "preload",- href: `${assetBaseUrl}${asset}`,+ href: `${constants.assetBaseUrl}${asset}`,as: "font",crossOrigin: "anonymous",});@@ -175,7 +175,7 @@ export const links: LinksFunction = () => {for (const backgroundImageAsset of pageBackgroundImageAssets) {result.push({rel: "preload",- href: `${assetBaseUrl}${backgroundImageAsset}`,+ href: `${constants.assetBaseUrl}${backgroundImageAsset}`,as: "image",});}@@ -270,8 +270,7 @@ const Outlet = () => {return (<ReactSdkContext.Providervalue={{- imageLoader,- assetBaseUrl,+ ...constants,resources,breakpoints,onError: console.error,@@ -284,8 +283,8 @@ const Outlet = () => {pageMeta={pageMeta}host={host}siteName={siteName}- imageLoader={imageLoader}- assetBaseUrl={assetBaseUrl}+ imageLoader={constants.imageLoader}+ assetBaseUrl={constants.assetBaseUrl}/><PageSettingsTitle>{pageMeta.title}</PageSettingsTitle></ReactSdkContext.Provider>diff --git a/fixtures/webstudio-features/app/routes/[text-duration]._index.tsx b/fixtures/webstudio-features/app/routes/[text-duration]._index.tsxindex bc4fb303ed..eaf7487522 100644--- a/fixtures/webstudio-features/app/routes/[text-duration]._index.tsx+++ b/fixtures/webstudio-features/app/routes/[text-duration]._index.tsx@@ -36,7 +36,7 @@ import {getRemixParams,contactEmail,} from "../__generated__/[text-duration]._index.server";-import { assetBaseUrl, imageLoader } from "../constants.mjs";+import * as constants from "../constants.mjs";import css from "../__generated__/index.css?url";import { sitemap } from "../__generated__/$resources.sitemap.xml";@@ -150,8 +150,8 @@ export const links: LinksFunction = () => {if (favIconAsset) {result.push({rel: "icon",- href: imageLoader({- src: `${assetBaseUrl}${favIconAsset}`,+ href: constants.imageLoader({+ src: `${constants.assetBaseUrl}${favIconAsset}`,// width,height must be multiple of 48 https://developers.google.com/search/docs/appearance/favicon-in-searchwidth: 144,height: 144,@@ -166,7 +166,7 @@ export const links: LinksFunction = () => {for (const asset of pageFontAssets) {result.push({rel: "preload",- href: `${assetBaseUrl}${asset}`,+ href: `${constants.assetBaseUrl}${asset}`,as: "font",crossOrigin: "anonymous",});@@ -175,7 +175,7 @@ export const links: LinksFunction = () => {for (const backgroundImageAsset of pageBackgroundImageAssets) {result.push({rel: "preload",- href: `${assetBaseUrl}${backgroundImageAsset}`,+ href: `${constants.assetBaseUrl}${backgroundImageAsset}`,as: "image",});}@@ -270,8 +270,7 @@ const Outlet = () => {return (<ReactSdkContext.Providervalue={{- imageLoader,- assetBaseUrl,+ ...constants,resources,breakpoints,onError: console.error,@@ -284,8 +283,8 @@ const Outlet = () => {pageMeta={pageMeta}host={host}siteName={siteName}- imageLoader={imageLoader}- assetBaseUrl={assetBaseUrl}+ imageLoader={constants.imageLoader}+ assetBaseUrl={constants.assetBaseUrl}/><PageSettingsTitle>{pageMeta.title}</PageSettingsTitle></ReactSdkContext.Provider>diff --git a/fixtures/webstudio-features/app/routes/_index.tsx b/fixtures/webstudio-features/app/routes/_index.tsxindex c9dc7e83ff..dec09db556 100644--- a/fixtures/webstudio-features/app/routes/_index.tsx+++ b/fixtures/webstudio-features/app/routes/_index.tsx@@ -36,7 +36,7 @@ import {getRemixParams,contactEmail,} from "../__generated__/_index.server";-import { assetBaseUrl, imageLoader } from "../constants.mjs";+import * as constants from "../constants.mjs";import css from "../__generated__/index.css?url";import { sitemap } from "../__generated__/$resources.sitemap.xml";@@ -150,8 +150,8 @@ export const links: LinksFunction = () => {if (favIconAsset) {result.push({rel: "icon",- href: imageLoader({- src: `${assetBaseUrl}${favIconAsset}`,+ href: constants.imageLoader({+ src: `${constants.assetBaseUrl}${favIconAsset}`,// width,height must be multiple of 48 https://developers.google.com/search/docs/appearance/favicon-in-searchwidth: 144,height: 144,@@ -166,7 +166,7 @@ export const links: LinksFunction = () => {for (const asset of pageFontAssets) {result.push({rel: "preload",- href: `${assetBaseUrl}${asset}`,+ href: `${constants.assetBaseUrl}${asset}`,as: "font",crossOrigin: "anonymous",});@@ -175,7 +175,7 @@ export const links: LinksFunction = () => {for (const backgroundImageAsset of pageBackgroundImageAssets) {result.push({rel: "preload",- href: `${assetBaseUrl}${backgroundImageAsset}`,+ href: `${constants.assetBaseUrl}${backgroundImageAsset}`,as: "image",});}@@ -270,8 +270,7 @@ const Outlet = () => {return (<ReactSdkContext.Providervalue={{- imageLoader,- assetBaseUrl,+ ...constants,resources,breakpoints,onError: console.error,@@ -284,8 +283,8 @@ const Outlet = () => {pageMeta={pageMeta}host={host}siteName={siteName}- imageLoader={imageLoader}- assetBaseUrl={assetBaseUrl}+ imageLoader={constants.imageLoader}+ assetBaseUrl={constants.assetBaseUrl}/><PageSettingsTitle>{pageMeta.title}</PageSettingsTitle></ReactSdkContext.Provider>diff --git a/packages/cli/templates/defaults/app/route-templates/html.tsx b/packages/cli/templates/defaults/app/route-templates/html.tsxindex 55f0e342db..12581dcc36 100644--- a/packages/cli/templates/defaults/app/route-templates/html.tsx+++ b/packages/cli/templates/defaults/app/route-templates/html.tsx@@ -37,7 +37,7 @@ import {getRemixParams,contactEmail,} from "__SERVER__";-import { assetBaseUrl, imageLoader } from "__CONSTANTS__";+import * as constants from "__CONSTANTS__";import css from "__CSS__?url";import { sitemap } from "__SITEMAP__";@@ -151,8 +151,8 @@ export const links: LinksFunction = () => {if (favIconAsset) {result.push({rel: "icon",- href: imageLoader({- src: `${assetBaseUrl}${favIconAsset}`,+ href: constants.imageLoader({+ src: `${constants.assetBaseUrl}${favIconAsset}`,// width,height must be multiple of 48 https://developers.google.com/search/docs/appearance/favicon-in-searchwidth: 144,height: 144,@@ -167,7 +167,7 @@ export const links: LinksFunction = () => {for (const asset of pageFontAssets) {result.push({rel: "preload",- href: `${assetBaseUrl}${asset}`,+ href: `${constants.assetBaseUrl}${asset}`,as: "font",crossOrigin: "anonymous",});@@ -176,7 +176,7 @@ export const links: LinksFunction = () => {for (const backgroundImageAsset of pageBackgroundImageAssets) {result.push({rel: "preload",- href: `${assetBaseUrl}${backgroundImageAsset}`,+ href: `${constants.assetBaseUrl}${backgroundImageAsset}`,as: "image",});}@@ -271,8 +271,7 @@ const Outlet = () => {return (<ReactSdkContext.Providervalue={{- imageLoader,- assetBaseUrl,+ ...constants,resources,breakpoints,onError: console.error,@@ -285,8 +284,8 @@ const Outlet = () => {pageMeta={pageMeta}host={host}siteName={siteName}- imageLoader={imageLoader}- assetBaseUrl={assetBaseUrl}+ imageLoader={constants.imageLoader}+ assetBaseUrl={constants.assetBaseUrl}/><PageSettingsTitle>{pageMeta.title}</PageSettingsTitle><PageSettingsCanonicalLink href={url} />diff --git a/packages/cli/templates/react-router/app/route-templates/html.tsx b/packages/cli/templates/react-router/app/route-templates/html.tsxindex e31c3fd6aa..b9dbbbb842 100644--- a/packages/cli/templates/react-router/app/route-templates/html.tsx+++ b/packages/cli/templates/react-router/app/route-templates/html.tsx@@ -36,7 +36,7 @@ import {getRemixParams,contactEmail,} from "__SERVER__";-import { assetBaseUrl, imageLoader } from "__CONSTANTS__";+import * as constants from "__CONSTANTS__";import css from "__CSS__?url";import { sitemap } from "__SITEMAP__";@@ -150,8 +150,8 @@ export const links: LinksFunction = () => {if (favIconAsset) {result.push({rel: "icon",- href: imageLoader({- src: `${assetBaseUrl}${favIconAsset}`,+ href: constants.imageLoader({+ src: `${constants.assetBaseUrl}${favIconAsset}`,// width,height must be multiple of 48 https://developers.google.com/search/docs/appearance/favicon-in-searchwidth: 144,height: 144,@@ -166,7 +166,7 @@ export const links: LinksFunction = () => {for (const asset of pageFontAssets) {result.push({rel: "preload",- href: `${assetBaseUrl}${asset}`,+ href: `${constants.assetBaseUrl}${asset}`,as: "font",crossOrigin: "anonymous",});@@ -175,7 +175,7 @@ export const links: LinksFunction = () => {for (const backgroundImageAsset of pageBackgroundImageAssets) {result.push({rel: "preload",- href: `${assetBaseUrl}${backgroundImageAsset}`,+ href: `${constants.assetBaseUrl}${backgroundImageAsset}`,as: "image",});}@@ -270,8 +270,7 @@ const Outlet = () => {return (<ReactSdkContext.Providervalue={{- imageLoader,- assetBaseUrl,+ ...constants,resources,breakpoints,onError: console.error,@@ -284,8 +283,8 @@ const Outlet = () => {pageMeta={pageMeta}host={host}siteName={siteName}- imageLoader={imageLoader}- assetBaseUrl={assetBaseUrl}+ imageLoader={constants.imageLoader}+ assetBaseUrl={constants.assetBaseUrl}/><PageSettingsTitle>{pageMeta.title}</PageSettingsTitle></ReactSdkContext.Provider>diff --git a/packages/image/src/image-loaders.ts b/packages/image/src/image-loaders.tsindex 555fed111a..8e614ff295 100644--- a/packages/image/src/image-loaders.ts+++ b/packages/image/src/image-loaders.ts@@ -60,3 +60,12 @@ export const wsImageLoader: ImageLoader = (props) => {// Cloudflare docs say that we don't need to urlencode the path paramsreturn resultUrl.href;};++export type VideoLoader = (options: { src: string }) => string;++export const wsVideoLoader: VideoLoader = ({ src }) => {+ if (src.startsWith("/cgi/asset/")) {+ src = src.slice("/cgi/asset/".length);+ }+ return `/cgi/video/${src}`;+};diff --git a/packages/react-sdk/placeholder.d.ts b/packages/react-sdk/placeholder.d.tsindex c49f48f75c..5cb28b269c 100644--- a/packages/react-sdk/placeholder.d.ts+++ b/packages/react-sdk/placeholder.d.ts@@ -1,7 +1,8 @@declare module "__CONSTANTS__" {- import type { ImageLoader } from "@webstudio-is/image";+ import type { ImageLoader, VideoLoader } from "@webstudio-is/image";export const assetBaseUrl: string;export const imageLoader: ImageLoader;+ export const videoLoader: undefined | VideoLoader;}declare module "__CLIENT__" {diff --git a/packages/react-sdk/src/context.tsx b/packages/react-sdk/src/context.tsxindex 9ca2d1148a..0d76036167 100644--- a/packages/react-sdk/src/context.tsx+++ b/packages/react-sdk/src/context.tsx@@ -1,5 +1,5 @@import { createContext, useContext, useMemo } from "react";-import type { ImageLoader } from "@webstudio-is/image";+import type { ImageLoader, VideoLoader } from "@webstudio-is/image";import {createJsonStringifyProxy,isPlainObject,@@ -29,6 +29,7 @@ export type Params = {export const ReactSdkContext = createContext<Params & {imageLoader: ImageLoader;+ videoLoader?: VideoLoader;// resources need to be any to support accessing unknown fields without extra checks// eslint-disable-next-line @typescript-eslint/no-explicit-anyresources: Record<string, any>;@@ -38,6 +39,7 @@ export const ReactSdkContext = createContext<>({assetBaseUrl: "/",imageLoader: ({ src }) => src,+ videoLoader: ({ src }) => src,resources: {},breakpoints: [],onError: (error) => {diff --git a/packages/sdk-components-react/src/video.tsx b/packages/sdk-components-react/src/video.tsxindex fab3d71467..41a5d933fb 100644--- a/packages/sdk-components-react/src/video.tsx+++ b/packages/sdk-components-react/src/video.tsx@@ -48,11 +48,11 @@ export const Video = forwardRef<const videoIdProps = {[videoIdAttribute]: id,};- const { assetBaseUrl } = useContext(ReactSdkContext);+ const { videoLoader } = useContext(ReactSdkContext);- const src = srcProp?.startsWith(assetBaseUrl)- ? `/cgi/video/${srcProp.slice(assetBaseUrl.length)}`- : srcProp;+ // fallback to provided src+ const src =+ srcProp && videoLoader ? videoLoader({ src: srcProp }) : undefined;useEffect(() => {if ($progress === undefined) {