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: Partially revert server only imports (#3053)
Ivan Starkovbe64337d9361
diff --git a/fixtures/webstudio-custom-template/app/__generated__/[script-test]._index.server.tsx b/fixtures/webstudio-custom-template/app/__generated__/[script-test]._index.server.tsxindex 097e8cff06..f77003fa19 100644--- a/fixtures/webstudio-custom-template/app/__generated__/[script-test]._index.server.tsx+++ b/fixtures/webstudio-custom-template/app/__generated__/[script-test]._index.server.tsx@@ -1,12 +1,7 @@/* eslint-disable *//* This is a auto generated file for building the project */-import type {- ImageAsset,- FontAsset,- ProjectMeta,- PageMeta,-} from "@webstudio-is/sdk";+import type { ImageAsset, ProjectMeta, PageMeta } from "@webstudio-is/sdk";import { loadResource, type System } from "@webstudio-is/sdk";export const loadResources = async (_props: { system: System }) => {return {} as Record<string, unknown>;@@ -65,8 +60,3 @@ export const imageAssets: ImageAsset[] = [meta: { width: 16, height: 16 },},];--// Font assets on current page (can be preloaded)-export const pageFontAssets: FontAsset[] = [];--export const pageBackgroundImageAssets: ImageAsset[] = [];diff --git a/fixtures/webstudio-custom-template/app/__generated__/[script-test]._index.tsx b/fixtures/webstudio-custom-template/app/__generated__/[script-test]._index.tsxindex 7f5bd357ce..63282aa03d 100644--- a/fixtures/webstudio-custom-template/app/__generated__/[script-test]._index.tsx+++ b/fixtures/webstudio-custom-template/app/__generated__/[script-test]._index.tsx@@ -2,6 +2,7 @@/* This is a auto generated file for building the project */import { Fragment, useState } from "react";+import type { FontAsset, ImageAsset } from "@webstudio-is/sdk";import { useResource } from "@webstudio-is/react-sdk";import {Body as Body,@@ -9,6 +10,23 @@ import {} from "@webstudio-is/sdk-components-react-remix";import { Heading as Heading } from "@webstudio-is/sdk-components-react";+export const favIconAsset: ImageAsset | undefined = {+ id: "cd1e9fad-8df1-45c6-800f-05fda2d2469f",+ name: "home_wsKvRSqvkajPPBeycZ-C8.svg",+ description: null,+ projectId: "0d856812-61d8-4014-a20a-82e01c0eb8ee",+ size: 3350,+ type: "image",+ format: "svg",+ createdAt: "2023-10-30T20:35:47.113Z",+ meta: { width: 16, height: 16 },+};++// Font assets on current page (can be preloaded)+export const pageFontAssets: FontAsset[] = [];++export const pageBackgroundImageAssets: ImageAsset[] = [];+const Page = ({}: { system: any }) => {return (<Bodydiff --git a/fixtures/webstudio-custom-template/app/__generated__/[world]._index.server.tsx b/fixtures/webstudio-custom-template/app/__generated__/[world]._index.server.tsxindex d21fc4313c..ca34f175b3 100644--- a/fixtures/webstudio-custom-template/app/__generated__/[world]._index.server.tsx+++ b/fixtures/webstudio-custom-template/app/__generated__/[world]._index.server.tsx@@ -1,12 +1,7 @@/* eslint-disable *//* This is a auto generated file for building the project */-import type {- ImageAsset,- FontAsset,- ProjectMeta,- PageMeta,-} from "@webstudio-is/sdk";+import type { ImageAsset, ProjectMeta, PageMeta } from "@webstudio-is/sdk";import { loadResource, type System } from "@webstudio-is/sdk";export const loadResources = async (_props: { system: System }) => {return {} as Record<string, unknown>;@@ -65,8 +60,3 @@ export const imageAssets: ImageAsset[] = [meta: { width: 16, height: 16 },},];--// Font assets on current page (can be preloaded)-export const pageFontAssets: FontAsset[] = [];--export const pageBackgroundImageAssets: ImageAsset[] = [];diff --git a/fixtures/webstudio-custom-template/app/__generated__/[world]._index.tsx b/fixtures/webstudio-custom-template/app/__generated__/[world]._index.tsxindex 784aec0aaf..dd82417e79 100644--- a/fixtures/webstudio-custom-template/app/__generated__/[world]._index.tsx+++ b/fixtures/webstudio-custom-template/app/__generated__/[world]._index.tsx@@ -2,10 +2,28 @@/* This is a auto generated file for building the project */import { Fragment, useState } from "react";+import type { FontAsset, ImageAsset } from "@webstudio-is/sdk";import { useResource } from "@webstudio-is/react-sdk";import { Body as Body } from "@webstudio-is/sdk-components-react-remix";import { Heading as Heading } from "@webstudio-is/sdk-components-react";+export const favIconAsset: ImageAsset | undefined = {+ id: "cd1e9fad-8df1-45c6-800f-05fda2d2469f",+ name: "home_wsKvRSqvkajPPBeycZ-C8.svg",+ description: null,+ projectId: "0d856812-61d8-4014-a20a-82e01c0eb8ee",+ size: 3350,+ type: "image",+ format: "svg",+ createdAt: "2023-10-30T20:35:47.113Z",+ meta: { width: 16, height: 16 },+};++// Font assets on current page (can be preloaded)+export const pageFontAssets: FontAsset[] = [];++export const pageBackgroundImageAssets: ImageAsset[] = [];+const Page = ({}: { system: any }) => {return (<Body data-ws-id="jDb2FuSK2-azIZxkH5XNv" data-ws-component="Body">diff --git a/fixtures/webstudio-custom-template/app/__generated__/_index.server.tsx b/fixtures/webstudio-custom-template/app/__generated__/_index.server.tsxindex 86e197a2eb..9986179382 100644--- a/fixtures/webstudio-custom-template/app/__generated__/_index.server.tsx+++ b/fixtures/webstudio-custom-template/app/__generated__/_index.server.tsx@@ -1,12 +1,7 @@/* eslint-disable *//* This is a auto generated file for building the project */-import type {- ImageAsset,- FontAsset,- ProjectMeta,- PageMeta,-} from "@webstudio-is/sdk";+import type { ImageAsset, ProjectMeta, PageMeta } from "@webstudio-is/sdk";import { loadResource, type System } from "@webstudio-is/sdk";export const loadResources = async (_props: { system: System }) => {return {} as Record<string, unknown>;@@ -65,32 +60,3 @@ export const imageAssets: ImageAsset[] = [meta: { width: 16, height: 16 },},];--// Font assets on current page (can be preloaded)-export const pageFontAssets: FontAsset[] = [- {- id: "a8fb692a-5970-4014-ad4d-45c6f1edea36",- name: "CormorantGaramond-Medium_-nWJ-OtHncaW9xDHQ9hSA_CBl88Oo59QKH_z9pCWva2.woff2",- description: null,- projectId: "0d856812-61d8-4014-a20a-82e01c0eb8ee",- size: 156212,- type: "font",- createdAt: "2024-02-22T05:36:52.004Z",- format: "woff2",- meta: { family: "Cormorant Garamond", style: "normal", weight: 500 },- },-];--export const pageBackgroundImageAssets: ImageAsset[] = [- {- id: "cd1e9fad-8df1-45c6-800f-05fda2d2469f",- name: "home_wsKvRSqvkajPPBeycZ-C8.svg",- description: null,- projectId: "0d856812-61d8-4014-a20a-82e01c0eb8ee",- size: 3350,- type: "image",- format: "svg",- createdAt: "2023-10-30T20:35:47.113Z",- meta: { width: 16, height: 16 },- },-];diff --git a/fixtures/webstudio-custom-template/app/__generated__/_index.tsx b/fixtures/webstudio-custom-template/app/__generated__/_index.tsxindex 3c1f83fcc4..5bec6fe5eb 100644--- a/fixtures/webstudio-custom-template/app/__generated__/_index.tsx+++ b/fixtures/webstudio-custom-template/app/__generated__/_index.tsx@@ -2,6 +2,7 @@/* This is a auto generated file for building the project */import { Fragment, useState } from "react";+import type { FontAsset, ImageAsset } from "@webstudio-is/sdk";import { useResource } from "@webstudio-is/react-sdk";import {Body as Body,@@ -17,6 +18,47 @@ import {VimeoSpinner as VimeoSpinner,} from "@webstudio-is/sdk-components-react";+export const favIconAsset: ImageAsset | undefined = {+ id: "cd1e9fad-8df1-45c6-800f-05fda2d2469f",+ name: "home_wsKvRSqvkajPPBeycZ-C8.svg",+ description: null,+ projectId: "0d856812-61d8-4014-a20a-82e01c0eb8ee",+ size: 3350,+ type: "image",+ format: "svg",+ createdAt: "2023-10-30T20:35:47.113Z",+ meta: { width: 16, height: 16 },+};++// Font assets on current page (can be preloaded)+export const pageFontAssets: FontAsset[] = [+ {+ id: "a8fb692a-5970-4014-ad4d-45c6f1edea36",+ name: "CormorantGaramond-Medium_-nWJ-OtHncaW9xDHQ9hSA_CBl88Oo59QKH_z9pCWva2.woff2",+ description: null,+ projectId: "0d856812-61d8-4014-a20a-82e01c0eb8ee",+ size: 156212,+ type: "font",+ createdAt: "2024-02-22T05:36:52.004Z",+ format: "woff2",+ meta: { family: "Cormorant Garamond", style: "normal", weight: 500 },+ },+];++export const pageBackgroundImageAssets: ImageAsset[] = [+ {+ id: "cd1e9fad-8df1-45c6-800f-05fda2d2469f",+ name: "home_wsKvRSqvkajPPBeycZ-C8.svg",+ description: null,+ projectId: "0d856812-61d8-4014-a20a-82e01c0eb8ee",+ size: 3350,+ type: "image",+ format: "svg",+ createdAt: "2023-10-30T20:35:47.113Z",+ meta: { width: 16, height: 16 },+ },+];+const Page = ({}: { system: any }) => {return (<Bodydiff --git a/fixtures/webstudio-custom-template/app/routes/[script-test]._index.tsx b/fixtures/webstudio-custom-template/app/routes/[script-test]._index.tsxindex 71540785d7..53f9ac6ab6 100644--- a/fixtures/webstudio-custom-template/app/routes/[script-test]._index.tsx+++ b/fixtures/webstudio-custom-template/app/routes/[script-test]._index.tsx@@ -12,7 +12,12 @@ import {import { useLoaderData } from "@remix-run/react";import { ReactSdkContext } from "@webstudio-is/react-sdk";import { n8nHandler, getFormId } from "@webstudio-is/form-handlers";-import { Page } from "../__generated__/[script-test]._index";+import {+ Page,+ favIconAsset,+ pageFontAssets,+ pageBackgroundImageAssets,+} from "../__generated__/[script-test]._index";import {formsProperties,loadResources,@@ -22,9 +27,8 @@ import {user,projectMeta,imageAssets,- pageFontAssets,- pageBackgroundImageAssets,} from "../__generated__/[script-test]._index.server";+import css from "../__generated__/index.css";import { assetBaseUrl, imageBaseUrl, imageLoader } from "~/constants.mjs";@@ -180,22 +184,17 @@ export const links: LinksFunction = () => {href: css,});- if (projectMeta?.faviconAssetId) {- const faviconAssetId = projectMeta?.faviconAssetId;- const imageAsset = imageAssets.find((asset) => asset.id === faviconAssetId);-- if (imageAsset) {- result.push({- rel: "icon",- href: imageLoader({- src: imageAsset.name,- width: 128,- quality: 100,- format: "auto",- }),- type: undefined,- });- }+ if (favIconAsset) {+ result.push({+ rel: "icon",+ href: imageLoader({+ src: favIconAsset.name,+ width: 128,+ quality: 100,+ format: "auto",+ }),+ type: undefined,+ });} else {result.push({rel: "icon",diff --git a/fixtures/webstudio-custom-template/app/routes/[world]._index.tsx b/fixtures/webstudio-custom-template/app/routes/[world]._index.tsxindex 6f9ab2d9ac..987c5efc9e 100644--- a/fixtures/webstudio-custom-template/app/routes/[world]._index.tsx+++ b/fixtures/webstudio-custom-template/app/routes/[world]._index.tsx@@ -12,7 +12,12 @@ import {import { useLoaderData } from "@remix-run/react";import { ReactSdkContext } from "@webstudio-is/react-sdk";import { n8nHandler, getFormId } from "@webstudio-is/form-handlers";-import { Page } from "../__generated__/[world]._index";+import {+ Page,+ favIconAsset,+ pageFontAssets,+ pageBackgroundImageAssets,+} from "../__generated__/[world]._index";import {formsProperties,loadResources,@@ -22,9 +27,8 @@ import {user,projectMeta,imageAssets,- pageFontAssets,- pageBackgroundImageAssets,} from "../__generated__/[world]._index.server";+import css from "../__generated__/index.css";import { assetBaseUrl, imageBaseUrl, imageLoader } from "~/constants.mjs";@@ -180,22 +184,17 @@ export const links: LinksFunction = () => {href: css,});- if (projectMeta?.faviconAssetId) {- const faviconAssetId = projectMeta?.faviconAssetId;- const imageAsset = imageAssets.find((asset) => asset.id === faviconAssetId);-- if (imageAsset) {- result.push({- rel: "icon",- href: imageLoader({- src: imageAsset.name,- width: 128,- quality: 100,- format: "auto",- }),- type: undefined,- });- }+ if (favIconAsset) {+ result.push({+ rel: "icon",+ href: imageLoader({+ src: favIconAsset.name,+ width: 128,+ quality: 100,+ format: "auto",+ }),+ type: undefined,+ });} else {result.push({rel: "icon",diff --git a/fixtures/webstudio-custom-template/app/routes/_index.tsx b/fixtures/webstudio-custom-template/app/routes/_index.tsxindex 946c484562..522783bf19 100644--- a/fixtures/webstudio-custom-template/app/routes/_index.tsx+++ b/fixtures/webstudio-custom-template/app/routes/_index.tsx@@ -12,7 +12,12 @@ import {import { useLoaderData } from "@remix-run/react";import { ReactSdkContext } from "@webstudio-is/react-sdk";import { n8nHandler, getFormId } from "@webstudio-is/form-handlers";-import { Page } from "../__generated__/_index";+import {+ Page,+ favIconAsset,+ pageFontAssets,+ pageBackgroundImageAssets,+} from "../__generated__/_index";import {formsProperties,loadResources,@@ -22,9 +27,8 @@ import {user,projectMeta,imageAssets,- pageFontAssets,- pageBackgroundImageAssets,} from "../__generated__/_index.server";+import css from "../__generated__/index.css";import { assetBaseUrl, imageBaseUrl, imageLoader } from "~/constants.mjs";@@ -180,22 +184,17 @@ export const links: LinksFunction = () => {href: css,});- if (projectMeta?.faviconAssetId) {- const faviconAssetId = projectMeta?.faviconAssetId;- const imageAsset = imageAssets.find((asset) => asset.id === faviconAssetId);-- if (imageAsset) {- result.push({- rel: "icon",- href: imageLoader({- src: imageAsset.name,- width: 128,- quality: 100,- format: "auto",- }),- type: undefined,- });- }+ if (favIconAsset) {+ result.push({+ rel: "icon",+ href: imageLoader({+ src: favIconAsset.name,+ width: 128,+ quality: 100,+ format: "auto",+ }),+ type: undefined,+ });} else {result.push({rel: "icon",diff --git a/fixtures/webstudio-remix-netlify-edge-functions/app/__generated__/_index.server.tsx b/fixtures/webstudio-remix-netlify-edge-functions/app/__generated__/_index.server.tsxindex 2d7ee6a929..ebb18b3259 100644--- a/fixtures/webstudio-remix-netlify-edge-functions/app/__generated__/_index.server.tsx+++ b/fixtures/webstudio-remix-netlify-edge-functions/app/__generated__/_index.server.tsx@@ -1,12 +1,7 @@/* eslint-disable *//* This is a auto generated file for building the project */-import type {- ImageAsset,- FontAsset,- ProjectMeta,- PageMeta,-} from "@webstudio-is/sdk";+import type { ImageAsset, ProjectMeta, PageMeta } from "@webstudio-is/sdk";import { loadResource, type System } from "@webstudio-is/sdk";export const loadResources = async (_props: { system: System }) => {return {} as Record<string, unknown>;@@ -53,8 +48,3 @@ export const projectMeta: ProjectMeta = {};export const imageAssets: ImageAsset[] = [];--// Font assets on current page (can be preloaded)-export const pageFontAssets: FontAsset[] = [];--export const pageBackgroundImageAssets: ImageAsset[] = [];diff --git a/fixtures/webstudio-remix-netlify-edge-functions/app/__generated__/_index.tsx b/fixtures/webstudio-remix-netlify-edge-functions/app/__generated__/_index.tsxindex 751b9aaa94..d9170ec2c5 100644--- a/fixtures/webstudio-remix-netlify-edge-functions/app/__generated__/_index.tsx+++ b/fixtures/webstudio-remix-netlify-edge-functions/app/__generated__/_index.tsx@@ -2,6 +2,7 @@/* This is a auto generated file for building the project */import { Fragment, useState } from "react";+import type { FontAsset, ImageAsset } from "@webstudio-is/sdk";import { useResource } from "@webstudio-is/react-sdk";import { Body as Body } from "@webstudio-is/sdk-components-react-remix";import {@@ -9,6 +10,13 @@ import {Text as Text,} from "@webstudio-is/sdk-components-react";+export const favIconAsset: ImageAsset | undefined = undefined;++// Font assets on current page (can be preloaded)+export const pageFontAssets: FontAsset[] = [];++export const pageBackgroundImageAssets: ImageAsset[] = [];+const Page = ({}: { system: any }) => {return (<Bodydiff --git a/fixtures/webstudio-remix-netlify-edge-functions/app/routes/_index.tsx b/fixtures/webstudio-remix-netlify-edge-functions/app/routes/_index.tsxindex 946c484562..522783bf19 100644--- a/fixtures/webstudio-remix-netlify-edge-functions/app/routes/_index.tsx+++ b/fixtures/webstudio-remix-netlify-edge-functions/app/routes/_index.tsx@@ -12,7 +12,12 @@ import {import { useLoaderData } from "@remix-run/react";import { ReactSdkContext } from "@webstudio-is/react-sdk";import { n8nHandler, getFormId } from "@webstudio-is/form-handlers";-import { Page } from "../__generated__/_index";+import {+ Page,+ favIconAsset,+ pageFontAssets,+ pageBackgroundImageAssets,+} from "../__generated__/_index";import {formsProperties,loadResources,@@ -22,9 +27,8 @@ import {user,projectMeta,imageAssets,- pageFontAssets,- pageBackgroundImageAssets,} from "../__generated__/_index.server";+import css from "../__generated__/index.css";import { assetBaseUrl, imageBaseUrl, imageLoader } from "~/constants.mjs";@@ -180,22 +184,17 @@ export const links: LinksFunction = () => {href: css,});- if (projectMeta?.faviconAssetId) {- const faviconAssetId = projectMeta?.faviconAssetId;- const imageAsset = imageAssets.find((asset) => asset.id === faviconAssetId);-- if (imageAsset) {- result.push({- rel: "icon",- href: imageLoader({- src: imageAsset.name,- width: 128,- quality: 100,- format: "auto",- }),- type: undefined,- });- }+ if (favIconAsset) {+ result.push({+ rel: "icon",+ href: imageLoader({+ src: favIconAsset.name,+ width: 128,+ quality: 100,+ format: "auto",+ }),+ type: undefined,+ });} else {result.push({rel: "icon",diff --git a/fixtures/webstudio-remix-netlify-functions/app/__generated__/_index.server.tsx b/fixtures/webstudio-remix-netlify-functions/app/__generated__/_index.server.tsxindex 2d7ee6a929..ebb18b3259 100644--- a/fixtures/webstudio-remix-netlify-functions/app/__generated__/_index.server.tsx+++ b/fixtures/webstudio-remix-netlify-functions/app/__generated__/_index.server.tsx@@ -1,12 +1,7 @@/* eslint-disable *//* This is a auto generated file for building the project */-import type {- ImageAsset,- FontAsset,- ProjectMeta,- PageMeta,-} from "@webstudio-is/sdk";+import type { ImageAsset, ProjectMeta, PageMeta } from "@webstudio-is/sdk";import { loadResource, type System } from "@webstudio-is/sdk";export const loadResources = async (_props: { system: System }) => {return {} as Record<string, unknown>;@@ -53,8 +48,3 @@ export const projectMeta: ProjectMeta = {};export const imageAssets: ImageAsset[] = [];--// Font assets on current page (can be preloaded)-export const pageFontAssets: FontAsset[] = [];--export const pageBackgroundImageAssets: ImageAsset[] = [];diff --git a/fixtures/webstudio-remix-netlify-functions/app/__generated__/_index.tsx b/fixtures/webstudio-remix-netlify-functions/app/__generated__/_index.tsxindex 751b9aaa94..d9170ec2c5 100644--- a/fixtures/webstudio-remix-netlify-functions/app/__generated__/_index.tsx+++ b/fixtures/webstudio-remix-netlify-functions/app/__generated__/_index.tsx@@ -2,6 +2,7 @@/* This is a auto generated file for building the project */import { Fragment, useState } from "react";+import type { FontAsset, ImageAsset } from "@webstudio-is/sdk";import { useResource } from "@webstudio-is/react-sdk";import { Body as Body } from "@webstudio-is/sdk-components-react-remix";import {@@ -9,6 +10,13 @@ import {Text as Text,} from "@webstudio-is/sdk-components-react";+export const favIconAsset: ImageAsset | undefined = undefined;++// Font assets on current page (can be preloaded)+export const pageFontAssets: FontAsset[] = [];++export const pageBackgroundImageAssets: ImageAsset[] = [];+const Page = ({}: { system: any }) => {return (<Bodydiff --git a/fixtures/webstudio-remix-netlify-functions/app/routes/_index.tsx b/fixtures/webstudio-remix-netlify-functions/app/routes/_index.tsxindex 946c484562..522783bf19 100644--- a/fixtures/webstudio-remix-netlify-functions/app/routes/_index.tsx+++ b/fixtures/webstudio-remix-netlify-functions/app/routes/_index.tsx@@ -12,7 +12,12 @@ import {import { useLoaderData } from "@remix-run/react";import { ReactSdkContext } from "@webstudio-is/react-sdk";import { n8nHandler, getFormId } from "@webstudio-is/form-handlers";-import { Page } from "../__generated__/_index";+import {+ Page,+ favIconAsset,+ pageFontAssets,+ pageBackgroundImageAssets,+} from "../__generated__/_index";import {formsProperties,loadResources,@@ -22,9 +27,8 @@ import {user,projectMeta,imageAssets,- pageFontAssets,- pageBackgroundImageAssets,} from "../__generated__/_index.server";+import css from "../__generated__/index.css";import { assetBaseUrl, imageBaseUrl, imageLoader } from "~/constants.mjs";@@ -180,22 +184,17 @@ export const links: LinksFunction = () => {href: css,});- if (projectMeta?.faviconAssetId) {- const faviconAssetId = projectMeta?.faviconAssetId;- const imageAsset = imageAssets.find((asset) => asset.id === faviconAssetId);-- if (imageAsset) {- result.push({- rel: "icon",- href: imageLoader({- src: imageAsset.name,- width: 128,- quality: 100,- format: "auto",- }),- type: undefined,- });- }+ if (favIconAsset) {+ result.push({+ rel: "icon",+ href: imageLoader({+ src: favIconAsset.name,+ width: 128,+ quality: 100,+ format: "auto",+ }),+ type: undefined,+ });} else {result.push({rel: "icon",diff --git a/fixtures/webstudio-remix-vercel/app/__generated__/[_route_with_symbols_]._index.server.tsx b/fixtures/webstudio-remix-vercel/app/__generated__/[_route_with_symbols_]._index.server.tsxindex 7305de9a2f..ee392d6347 100644--- a/fixtures/webstudio-remix-vercel/app/__generated__/[_route_with_symbols_]._index.server.tsx+++ b/fixtures/webstudio-remix-vercel/app/__generated__/[_route_with_symbols_]._index.server.tsx@@ -1,12 +1,7 @@/* eslint-disable *//* This is a auto generated file for building the project */-import type {- ImageAsset,- FontAsset,- ProjectMeta,- PageMeta,-} from "@webstudio-is/sdk";+import type { ImageAsset, ProjectMeta, PageMeta } from "@webstudio-is/sdk";import { loadResource, type System } from "@webstudio-is/sdk";export const loadResources = async (_props: { system: System }) => {return {} as Record<string, unknown>;@@ -87,8 +82,3 @@ export const imageAssets: ImageAsset[] = [meta: { width: 1024, height: 1024 },},];--// Font assets on current page (can be preloaded)-export const pageFontAssets: FontAsset[] = [];--export const pageBackgroundImageAssets: ImageAsset[] = [];diff --git a/fixtures/webstudio-remix-vercel/app/__generated__/[_route_with_symbols_]._index.tsx b/fixtures/webstudio-remix-vercel/app/__generated__/[_route_with_symbols_]._index.tsxindex 4812001cc4..10f3392fd9 100644--- a/fixtures/webstudio-remix-vercel/app/__generated__/[_route_with_symbols_]._index.tsx+++ b/fixtures/webstudio-remix-vercel/app/__generated__/[_route_with_symbols_]._index.tsx@@ -2,10 +2,28 @@/* This is a auto generated file for building the project */import { Fragment, useState } from "react";+import type { FontAsset, ImageAsset } from "@webstudio-is/sdk";import { useResource } from "@webstudio-is/react-sdk";import { Body as Body } from "@webstudio-is/sdk-components-react-remix";import { Image as Image } from "@webstudio-is/sdk-components-react";+export const favIconAsset: ImageAsset | undefined = {+ id: "88d5e2ff-b8f2-4899-aaf8-dde4ade6da10",+ name: "DALL_E_2023-10-30_12.39.46_-_Photo_logo_with_a_bold_cat_silhouette_centered_on_a_contrasting_background_designed_for_clarity_at_small_32x32_favicon_resolution_00h6cEA8u2pJRvVJv7hRe.png",+ description: null,+ projectId: "cddc1d44-af37-4cb6-a430-d300cf6f932d",+ size: 268326,+ type: "image",+ format: "png",+ createdAt: "2023-10-30T13:51:08.416Z",+ meta: { width: 790, height: 786 },+};++// Font assets on current page (can be preloaded)+export const pageFontAssets: FontAsset[] = [];++export const pageBackgroundImageAssets: ImageAsset[] = [];+const Page = ({}: { system: any }) => {return (<Body data-ws-id="EDEfpMPRqDejthtwkH7ws" data-ws-component="Body">diff --git a/fixtures/webstudio-remix-vercel/app/__generated__/[form]._index.server.tsx b/fixtures/webstudio-remix-vercel/app/__generated__/[form]._index.server.tsxindex 978cb3f7d6..6695cf7dfc 100644--- a/fixtures/webstudio-remix-vercel/app/__generated__/[form]._index.server.tsx+++ b/fixtures/webstudio-remix-vercel/app/__generated__/[form]._index.server.tsx@@ -1,12 +1,7 @@/* eslint-disable *//* This is a auto generated file for building the project */-import type {- ImageAsset,- FontAsset,- ProjectMeta,- PageMeta,-} from "@webstudio-is/sdk";+import type { ImageAsset, ProjectMeta, PageMeta } from "@webstudio-is/sdk";import { loadResource, type System } from "@webstudio-is/sdk";export const loadResources = async (_props: { system: System }) => {return {} as Record<string, unknown>;@@ -89,8 +84,3 @@ export const imageAssets: ImageAsset[] = [meta: { width: 1024, height: 1024 },},];--// Font assets on current page (can be preloaded)-export const pageFontAssets: FontAsset[] = [];--export const pageBackgroundImageAssets: ImageAsset[] = [];diff --git a/fixtures/webstudio-remix-vercel/app/__generated__/[form]._index.tsx b/fixtures/webstudio-remix-vercel/app/__generated__/[form]._index.tsxindex 2b938d3f7a..e061c018df 100644--- a/fixtures/webstudio-remix-vercel/app/__generated__/[form]._index.tsx+++ b/fixtures/webstudio-remix-vercel/app/__generated__/[form]._index.tsx@@ -2,6 +2,7 @@/* This is a auto generated file for building the project */import { Fragment, useState } from "react";+import type { FontAsset, ImageAsset } from "@webstudio-is/sdk";import { useResource } from "@webstudio-is/react-sdk";import {Body as Body,@@ -15,6 +16,23 @@ import {Heading as Heading,} from "@webstudio-is/sdk-components-react";+export const favIconAsset: ImageAsset | undefined = {+ id: "88d5e2ff-b8f2-4899-aaf8-dde4ade6da10",+ name: "DALL_E_2023-10-30_12.39.46_-_Photo_logo_with_a_bold_cat_silhouette_centered_on_a_contrasting_background_designed_for_clarity_at_small_32x32_favicon_resolution_00h6cEA8u2pJRvVJv7hRe.png",+ description: null,+ projectId: "cddc1d44-af37-4cb6-a430-d300cf6f932d",+ size: 268326,+ type: "image",+ format: "png",+ createdAt: "2023-10-30T13:51:08.416Z",+ meta: { width: 790, height: 786 },+};++// Font assets on current page (can be preloaded)+export const pageFontAssets: FontAsset[] = [];++export const pageBackgroundImageAssets: ImageAsset[] = [];+const Page = ({}: { system: any }) => {let [formState, set$formState] = useState<any>("initial");let [formState_1, set$formState_1] = useState<any>("initial");diff --git a/fixtures/webstudio-remix-vercel/app/__generated__/[heading-with-id]._index.server.tsx b/fixtures/webstudio-remix-vercel/app/__generated__/[heading-with-id]._index.server.tsxindex ac93dfa6b5..e8520f2259 100644--- a/fixtures/webstudio-remix-vercel/app/__generated__/[heading-with-id]._index.server.tsx+++ b/fixtures/webstudio-remix-vercel/app/__generated__/[heading-with-id]._index.server.tsx@@ -1,12 +1,7 @@/* eslint-disable *//* This is a auto generated file for building the project */-import type {- ImageAsset,- FontAsset,- ProjectMeta,- PageMeta,-} from "@webstudio-is/sdk";+import type { ImageAsset, ProjectMeta, PageMeta } from "@webstudio-is/sdk";import { loadResource, type System } from "@webstudio-is/sdk";export const loadResources = async (_props: { system: System }) => {return {} as Record<string, unknown>;@@ -87,8 +82,3 @@ export const imageAssets: ImageAsset[] = [meta: { width: 1024, height: 1024 },},];--// Font assets on current page (can be preloaded)-export const pageFontAssets: FontAsset[] = [];--export const pageBackgroundImageAssets: ImageAsset[] = [];diff --git a/fixtures/webstudio-remix-vercel/app/__generated__/[heading-with-id]._index.tsx b/fixtures/webstudio-remix-vercel/app/__generated__/[heading-with-id]._index.tsxindex 237c382a92..eec3741267 100644--- a/fixtures/webstudio-remix-vercel/app/__generated__/[heading-with-id]._index.tsx+++ b/fixtures/webstudio-remix-vercel/app/__generated__/[heading-with-id]._index.tsx@@ -2,10 +2,28 @@/* This is a auto generated file for building the project */import { Fragment, useState } from "react";+import type { FontAsset, ImageAsset } from "@webstudio-is/sdk";import { useResource } from "@webstudio-is/react-sdk";import { Body as Body } from "@webstudio-is/sdk-components-react-remix";import { Heading as Heading } from "@webstudio-is/sdk-components-react";+export const favIconAsset: ImageAsset | undefined = {+ id: "88d5e2ff-b8f2-4899-aaf8-dde4ade6da10",+ name: "DALL_E_2023-10-30_12.39.46_-_Photo_logo_with_a_bold_cat_silhouette_centered_on_a_contrasting_background_designed_for_clarity_at_small_32x32_favicon_resolution_00h6cEA8u2pJRvVJv7hRe.png",+ description: null,+ projectId: "cddc1d44-af37-4cb6-a430-d300cf6f932d",+ size: 268326,+ type: "image",+ format: "png",+ createdAt: "2023-10-30T13:51:08.416Z",+ meta: { width: 790, height: 786 },+};++// Font assets on current page (can be preloaded)+export const pageFontAssets: FontAsset[] = [];++export const pageBackgroundImageAssets: ImageAsset[] = [];+const Page = ({}: { system: any }) => {return (<Body data-ws-id="O-ljaGZQ0iRNTlEshMkgE" data-ws-component="Body">diff --git a/fixtures/webstudio-remix-vercel/app/__generated__/[nested].[nested-page]._index.server.tsx b/fixtures/webstudio-remix-vercel/app/__generated__/[nested].[nested-page]._index.server.tsxindex 74bf3adeba..001f7dcd90 100644--- a/fixtures/webstudio-remix-vercel/app/__generated__/[nested].[nested-page]._index.server.tsx+++ b/fixtures/webstudio-remix-vercel/app/__generated__/[nested].[nested-page]._index.server.tsx@@ -1,12 +1,7 @@/* eslint-disable *//* This is a auto generated file for building the project */-import type {- ImageAsset,- FontAsset,- ProjectMeta,- PageMeta,-} from "@webstudio-is/sdk";+import type { ImageAsset, ProjectMeta, PageMeta } from "@webstudio-is/sdk";import { loadResource, type System } from "@webstudio-is/sdk";export const loadResources = async (_props: { system: System }) => {return {} as Record<string, unknown>;@@ -87,8 +82,3 @@ export const imageAssets: ImageAsset[] = [meta: { width: 1024, height: 1024 },},];--// Font assets on current page (can be preloaded)-export const pageFontAssets: FontAsset[] = [];--export const pageBackgroundImageAssets: ImageAsset[] = [];diff --git a/fixtures/webstudio-remix-vercel/app/__generated__/[nested].[nested-page]._index.tsx b/fixtures/webstudio-remix-vercel/app/__generated__/[nested].[nested-page]._index.tsxindex 0c665bf054..02356ba926 100644--- a/fixtures/webstudio-remix-vercel/app/__generated__/[nested].[nested-page]._index.tsx+++ b/fixtures/webstudio-remix-vercel/app/__generated__/[nested].[nested-page]._index.tsx@@ -2,10 +2,28 @@/* This is a auto generated file for building the project */import { Fragment, useState } from "react";+import type { FontAsset, ImageAsset } from "@webstudio-is/sdk";import { useResource } from "@webstudio-is/react-sdk";import { Body as Body } from "@webstudio-is/sdk-components-react-remix";import { Heading as Heading } from "@webstudio-is/sdk-components-react";+export const favIconAsset: ImageAsset | undefined = {+ id: "88d5e2ff-b8f2-4899-aaf8-dde4ade6da10",+ name: "DALL_E_2023-10-30_12.39.46_-_Photo_logo_with_a_bold_cat_silhouette_centered_on_a_contrasting_background_designed_for_clarity_at_small_32x32_favicon_resolution_00h6cEA8u2pJRvVJv7hRe.png",+ description: null,+ projectId: "cddc1d44-af37-4cb6-a430-d300cf6f932d",+ size: 268326,+ type: "image",+ format: "png",+ createdAt: "2023-10-30T13:51:08.416Z",+ meta: { width: 790, height: 786 },+};++// Font assets on current page (can be preloaded)+export const pageFontAssets: FontAsset[] = [];++export const pageBackgroundImageAssets: ImageAsset[] = [];+const Page = ({}: { system: any }) => {return (<Body data-ws-id="L0ZXd5F9xk9Rsl9ORzIkJ" data-ws-component="Body">diff --git a/fixtures/webstudio-remix-vercel/app/__generated__/[radix]._index.server.tsx b/fixtures/webstudio-remix-vercel/app/__generated__/[radix]._index.server.tsxindex a997be7591..08e48bad26 100644--- a/fixtures/webstudio-remix-vercel/app/__generated__/[radix]._index.server.tsx+++ b/fixtures/webstudio-remix-vercel/app/__generated__/[radix]._index.server.tsx@@ -1,12 +1,7 @@/* eslint-disable *//* This is a auto generated file for building the project */-import type {- ImageAsset,- FontAsset,- ProjectMeta,- PageMeta,-} from "@webstudio-is/sdk";+import type { ImageAsset, ProjectMeta, PageMeta } from "@webstudio-is/sdk";import { loadResource, type System } from "@webstudio-is/sdk";export const loadResources = async (_props: { system: System }) => {return {} as Record<string, unknown>;@@ -88,8 +83,3 @@ export const imageAssets: ImageAsset[] = [meta: { width: 1024, height: 1024 },},];--// Font assets on current page (can be preloaded)-export const pageFontAssets: FontAsset[] = [];--export const pageBackgroundImageAssets: ImageAsset[] = [];diff --git a/fixtures/webstudio-remix-vercel/app/__generated__/[radix]._index.tsx b/fixtures/webstudio-remix-vercel/app/__generated__/[radix]._index.tsxindex a6123b31f5..d3538b2cee 100644--- a/fixtures/webstudio-remix-vercel/app/__generated__/[radix]._index.tsx+++ b/fixtures/webstudio-remix-vercel/app/__generated__/[radix]._index.tsx@@ -2,6 +2,7 @@/* This is a auto generated file for building the project */import { Fragment, useState } from "react";+import type { FontAsset, ImageAsset } from "@webstudio-is/sdk";import { useResource } from "@webstudio-is/react-sdk";import { Body as Body } from "@webstudio-is/sdk-components-react-remix";import {@@ -17,6 +18,23 @@ import {HtmlEmbed as HtmlEmbed,} from "@webstudio-is/sdk-components-react";+export const favIconAsset: ImageAsset | undefined = {+ id: "88d5e2ff-b8f2-4899-aaf8-dde4ade6da10",+ name: "DALL_E_2023-10-30_12.39.46_-_Photo_logo_with_a_bold_cat_silhouette_centered_on_a_contrasting_background_designed_for_clarity_at_small_32x32_favicon_resolution_00h6cEA8u2pJRvVJv7hRe.png",+ description: null,+ projectId: "cddc1d44-af37-4cb6-a430-d300cf6f932d",+ size: 268326,+ type: "image",+ format: "png",+ createdAt: "2023-10-30T13:51:08.416Z",+ meta: { width: 790, height: 786 },+};++// Font assets on current page (can be preloaded)+export const pageFontAssets: FontAsset[] = [];++export const pageBackgroundImageAssets: ImageAsset[] = [];+const Page = ({}: { system: any }) => {let [accordionValue, set$accordionValue] = useState<any>("0");return (diff --git a/fixtures/webstudio-remix-vercel/app/__generated__/[resources]._index.server.tsx b/fixtures/webstudio-remix-vercel/app/__generated__/[resources]._index.server.tsxindex 85584533a0..a69b8bf10a 100644--- a/fixtures/webstudio-remix-vercel/app/__generated__/[resources]._index.server.tsx+++ b/fixtures/webstudio-remix-vercel/app/__generated__/[resources]._index.server.tsx@@ -1,12 +1,7 @@/* eslint-disable *//* This is a auto generated file for building the project */-import type {- ImageAsset,- FontAsset,- ProjectMeta,- PageMeta,-} from "@webstudio-is/sdk";+import type { ImageAsset, ProjectMeta, PageMeta } from "@webstudio-is/sdk";import { loadResource, type System } from "@webstudio-is/sdk";export const loadResources = async (_props: { system: System }) => {const [list_1] = await Promise.all([@@ -98,8 +93,3 @@ export const imageAssets: ImageAsset[] = [meta: { width: 1024, height: 1024 },},];--// Font assets on current page (can be preloaded)-export const pageFontAssets: FontAsset[] = [];--export const pageBackgroundImageAssets: ImageAsset[] = [];diff --git a/fixtures/webstudio-remix-vercel/app/__generated__/[resources]._index.tsx b/fixtures/webstudio-remix-vercel/app/__generated__/[resources]._index.tsxindex 479cd19ddc..6c5632bbea 100644--- a/fixtures/webstudio-remix-vercel/app/__generated__/[resources]._index.tsx+++ b/fixtures/webstudio-remix-vercel/app/__generated__/[resources]._index.tsx@@ -2,6 +2,7 @@/* This is a auto generated file for building the project */import { Fragment, useState } from "react";+import type { FontAsset, ImageAsset } from "@webstudio-is/sdk";import { useResource } from "@webstudio-is/react-sdk";import { Body as Body } from "@webstudio-is/sdk-components-react-remix";import {@@ -9,6 +10,23 @@ import {HtmlEmbed as HtmlEmbed,} from "@webstudio-is/sdk-components-react";+export const favIconAsset: ImageAsset | undefined = {+ id: "88d5e2ff-b8f2-4899-aaf8-dde4ade6da10",+ name: "DALL_E_2023-10-30_12.39.46_-_Photo_logo_with_a_bold_cat_silhouette_centered_on_a_contrasting_background_designed_for_clarity_at_small_32x32_favicon_resolution_00h6cEA8u2pJRvVJv7hRe.png",+ description: null,+ projectId: "cddc1d44-af37-4cb6-a430-d300cf6f932d",+ size: 268326,+ type: "image",+ format: "png",+ createdAt: "2023-10-30T13:51:08.416Z",+ meta: { width: 790, height: 786 },+};++// Font assets on current page (can be preloaded)+export const pageFontAssets: FontAsset[] = [];++export const pageBackgroundImageAssets: ImageAsset[] = [];+const Page = ({}: { system: any }) => {let list = useResource("list_1");return (diff --git a/fixtures/webstudio-remix-vercel/app/__generated__/_index.server.tsx b/fixtures/webstudio-remix-vercel/app/__generated__/_index.server.tsxindex 3a1cd8df16..36acd72b0a 100644--- a/fixtures/webstudio-remix-vercel/app/__generated__/_index.server.tsx+++ b/fixtures/webstudio-remix-vercel/app/__generated__/_index.server.tsx@@ -1,12 +1,7 @@/* eslint-disable *//* This is a auto generated file for building the project */-import type {- ImageAsset,- FontAsset,- ProjectMeta,- PageMeta,-} from "@webstudio-is/sdk";+import type { ImageAsset, ProjectMeta, PageMeta } from "@webstudio-is/sdk";import { loadResource, type System } from "@webstudio-is/sdk";export const loadResources = async (_props: { system: System }) => {return {} as Record<string, unknown>;@@ -93,8 +88,3 @@ export const imageAssets: ImageAsset[] = [meta: { width: 1024, height: 1024 },},];--// Font assets on current page (can be preloaded)-export const pageFontAssets: FontAsset[] = [];--export const pageBackgroundImageAssets: ImageAsset[] = [];diff --git a/fixtures/webstudio-remix-vercel/app/__generated__/_index.tsx b/fixtures/webstudio-remix-vercel/app/__generated__/_index.tsxindex 197a4b654d..bf388f27f9 100644--- a/fixtures/webstudio-remix-vercel/app/__generated__/_index.tsx+++ b/fixtures/webstudio-remix-vercel/app/__generated__/_index.tsx@@ -2,6 +2,7 @@/* This is a auto generated file for building the project */import { Fragment, useState } from "react";+import type { FontAsset, ImageAsset } from "@webstudio-is/sdk";import { useResource } from "@webstudio-is/react-sdk";import {Body as Body,@@ -15,6 +16,23 @@ import {Text as Text,} from "@webstudio-is/sdk-components-react";+export const favIconAsset: ImageAsset | undefined = {+ id: "88d5e2ff-b8f2-4899-aaf8-dde4ade6da10",+ name: "DALL_E_2023-10-30_12.39.46_-_Photo_logo_with_a_bold_cat_silhouette_centered_on_a_contrasting_background_designed_for_clarity_at_small_32x32_favicon_resolution_00h6cEA8u2pJRvVJv7hRe.png",+ description: null,+ projectId: "cddc1d44-af37-4cb6-a430-d300cf6f932d",+ size: 268326,+ type: "image",+ format: "png",+ createdAt: "2023-10-30T13:51:08.416Z",+ meta: { width: 790, height: 786 },+};++// Font assets on current page (can be preloaded)+export const pageFontAssets: FontAsset[] = [];++export const pageBackgroundImageAssets: ImageAsset[] = [];+const Page = ({}: { system: any }) => {return (<Bodydiff --git a/fixtures/webstudio-remix-vercel/app/routes/[_route_with_symbols_]._index.tsx b/fixtures/webstudio-remix-vercel/app/routes/[_route_with_symbols_]._index.tsxindex 5e76e03b9e..e73b66aa2e 100644--- a/fixtures/webstudio-remix-vercel/app/routes/[_route_with_symbols_]._index.tsx+++ b/fixtures/webstudio-remix-vercel/app/routes/[_route_with_symbols_]._index.tsx@@ -12,7 +12,12 @@ import {import { useLoaderData } from "@remix-run/react";import { ReactSdkContext } from "@webstudio-is/react-sdk";import { n8nHandler, getFormId } from "@webstudio-is/form-handlers";-import { Page } from "../__generated__/[_route_with_symbols_]._index";+import {+ Page,+ favIconAsset,+ pageFontAssets,+ pageBackgroundImageAssets,+} from "../__generated__/[_route_with_symbols_]._index";import {formsProperties,loadResources,@@ -22,9 +27,8 @@ import {user,projectMeta,imageAssets,- pageFontAssets,- pageBackgroundImageAssets,} from "../__generated__/[_route_with_symbols_]._index.server";+import css from "../__generated__/index.css";import { assetBaseUrl, imageBaseUrl, imageLoader } from "~/constants.mjs";@@ -180,22 +184,17 @@ export const links: LinksFunction = () => {href: css,});- if (projectMeta?.faviconAssetId) {- const faviconAssetId = projectMeta?.faviconAssetId;- const imageAsset = imageAssets.find((asset) => asset.id === faviconAssetId);-- if (imageAsset) {- result.push({- rel: "icon",- href: imageLoader({- src: imageAsset.name,- width: 128,- quality: 100,- format: "auto",- }),- type: undefined,- });- }+ if (favIconAsset) {+ result.push({+ rel: "icon",+ href: imageLoader({+ src: favIconAsset.name,+ width: 128,+ quality: 100,+ format: "auto",+ }),+ type: undefined,+ });} else {result.push({rel: "icon",diff --git a/fixtures/webstudio-remix-vercel/app/routes/[form]._index.tsx b/fixtures/webstudio-remix-vercel/app/routes/[form]._index.tsxindex c184f2961c..610c402baf 100644--- a/fixtures/webstudio-remix-vercel/app/routes/[form]._index.tsx+++ b/fixtures/webstudio-remix-vercel/app/routes/[form]._index.tsx@@ -12,7 +12,12 @@ import {import { useLoaderData } from "@remix-run/react";import { ReactSdkContext } from "@webstudio-is/react-sdk";import { n8nHandler, getFormId } from "@webstudio-is/form-handlers";-import { Page } from "../__generated__/[form]._index";+import {+ Page,+ favIconAsset,+ pageFontAssets,+ pageBackgroundImageAssets,+} from "../__generated__/[form]._index";import {formsProperties,loadResources,@@ -22,9 +27,8 @@ import {user,projectMeta,imageAssets,- pageFontAssets,- pageBackgroundImageAssets,} from "../__generated__/[form]._index.server";+import css from "../__generated__/index.css";import { assetBaseUrl, imageBaseUrl, imageLoader } from "~/constants.mjs";@@ -180,22 +184,17 @@ export const links: LinksFunction = () => {href: css,});- if (projectMeta?.faviconAssetId) {- const faviconAssetId = projectMeta?.faviconAssetId;- const imageAsset = imageAssets.find((asset) => asset.id === faviconAssetId);-- if (imageAsset) {- result.push({- rel: "icon",- href: imageLoader({- src: imageAsset.name,- width: 128,- quality: 100,- format: "auto",- }),- type: undefined,- });- }+ if (favIconAsset) {+ result.push({+ rel: "icon",+ href: imageLoader({+ src: favIconAsset.name,+ width: 128,+ quality: 100,+ format: "auto",+ }),+ type: undefined,+ });} else {result.push({rel: "icon",diff --git a/fixtures/webstudio-remix-vercel/app/routes/[heading-with-id]._index.tsx b/fixtures/webstudio-remix-vercel/app/routes/[heading-with-id]._index.tsxindex 370cd2c99b..6ec4e5c7e8 100644--- a/fixtures/webstudio-remix-vercel/app/routes/[heading-with-id]._index.tsx+++ b/fixtures/webstudio-remix-vercel/app/routes/[heading-with-id]._index.tsx@@ -12,7 +12,12 @@ import {import { useLoaderData } from "@remix-run/react";import { ReactSdkContext } from "@webstudio-is/react-sdk";import { n8nHandler, getFormId } from "@webstudio-is/form-handlers";-import { Page } from "../__generated__/[heading-with-id]._index";+import {+ Page,+ favIconAsset,+ pageFontAssets,+ pageBackgroundImageAssets,+} from "../__generated__/[heading-with-id]._index";import {formsProperties,loadResources,@@ -22,9 +27,8 @@ import {user,projectMeta,imageAssets,- pageFontAssets,- pageBackgroundImageAssets,} from "../__generated__/[heading-with-id]._index.server";+import css from "../__generated__/index.css";import { assetBaseUrl, imageBaseUrl, imageLoader } from "~/constants.mjs";@@ -180,22 +184,17 @@ export const links: LinksFunction = () => {href: css,});- if (projectMeta?.faviconAssetId) {- const faviconAssetId = projectMeta?.faviconAssetId;- const imageAsset = imageAssets.find((asset) => asset.id === faviconAssetId);-- if (imageAsset) {- result.push({- rel: "icon",- href: imageLoader({- src: imageAsset.name,- width: 128,- quality: 100,- format: "auto",- }),- type: undefined,- });- }+ if (favIconAsset) {+ result.push({+ rel: "icon",+ href: imageLoader({+ src: favIconAsset.name,+ width: 128,+ quality: 100,+ format: "auto",+ }),+ type: undefined,+ });} else {result.push({rel: "icon",diff --git a/fixtures/webstudio-remix-vercel/app/routes/[nested].[nested-page]._index.tsx b/fixtures/webstudio-remix-vercel/app/routes/[nested].[nested-page]._index.tsxindex 3127885b4f..dc6a1251bb 100644--- a/fixtures/webstudio-remix-vercel/app/routes/[nested].[nested-page]._index.tsx+++ b/fixtures/webstudio-remix-vercel/app/routes/[nested].[nested-page]._index.tsx@@ -12,7 +12,12 @@ import {import { useLoaderData } from "@remix-run/react";import { ReactSdkContext } from "@webstudio-is/react-sdk";import { n8nHandler, getFormId } from "@webstudio-is/form-handlers";-import { Page } from "../__generated__/[nested].[nested-page]._index";+import {+ Page,+ favIconAsset,+ pageFontAssets,+ pageBackgroundImageAssets,+} from "../__generated__/[nested].[nested-page]._index";import {formsProperties,loadResources,@@ -22,9 +27,8 @@ import {user,projectMeta,imageAssets,- pageFontAssets,- pageBackgroundImageAssets,} from "../__generated__/[nested].[nested-page]._index.server";+import css from "../__generated__/index.css";import { assetBaseUrl, imageBaseUrl, imageLoader } from "~/constants.mjs";@@ -180,22 +184,17 @@ export const links: LinksFunction = () => {href: css,});- if (projectMeta?.faviconAssetId) {- const faviconAssetId = projectMeta?.faviconAssetId;- const imageAsset = imageAssets.find((asset) => asset.id === faviconAssetId);-- if (imageAsset) {- result.push({- rel: "icon",- href: imageLoader({- src: imageAsset.name,- width: 128,- quality: 100,- format: "auto",- }),- type: undefined,- });- }+ if (favIconAsset) {+ result.push({+ rel: "icon",+ href: imageLoader({+ src: favIconAsset.name,+ width: 128,+ quality: 100,+ format: "auto",+ }),+ type: undefined,+ });} else {result.push({rel: "icon",diff --git a/fixtures/webstudio-remix-vercel/app/routes/[radix]._index.tsx b/fixtures/webstudio-remix-vercel/app/routes/[radix]._index.tsxindex 46a0330c8f..4c03bd23e7 100644--- a/fixtures/webstudio-remix-vercel/app/routes/[radix]._index.tsx+++ b/fixtures/webstudio-remix-vercel/app/routes/[radix]._index.tsx@@ -12,7 +12,12 @@ import {import { useLoaderData } from "@remix-run/react";import { ReactSdkContext } from "@webstudio-is/react-sdk";import { n8nHandler, getFormId } from "@webstudio-is/form-handlers";-import { Page } from "../__generated__/[radix]._index";+import {+ Page,+ favIconAsset,+ pageFontAssets,+ pageBackgroundImageAssets,+} from "../__generated__/[radix]._index";import {formsProperties,loadResources,@@ -22,9 +27,8 @@ import {user,projectMeta,imageAssets,- pageFontAssets,- pageBackgroundImageAssets,} from "../__generated__/[radix]._index.server";+import css from "../__generated__/index.css";import { assetBaseUrl, imageBaseUrl, imageLoader } from "~/constants.mjs";@@ -180,22 +184,17 @@ export const links: LinksFunction = () => {href: css,});- if (projectMeta?.faviconAssetId) {- const faviconAssetId = projectMeta?.faviconAssetId;- const imageAsset = imageAssets.find((asset) => asset.id === faviconAssetId);-- if (imageAsset) {- result.push({- rel: "icon",- href: imageLoader({- src: imageAsset.name,- width: 128,- quality: 100,- format: "auto",- }),- type: undefined,- });- }+ if (favIconAsset) {+ result.push({+ rel: "icon",+ href: imageLoader({+ src: favIconAsset.name,+ width: 128,+ quality: 100,+ format: "auto",+ }),+ type: undefined,+ });} else {result.push({rel: "icon",diff --git a/fixtures/webstudio-remix-vercel/app/routes/[resources]._index.tsx b/fixtures/webstudio-remix-vercel/app/routes/[resources]._index.tsxindex 87f20ff34d..38c156d53b 100644--- a/fixtures/webstudio-remix-vercel/app/routes/[resources]._index.tsx+++ b/fixtures/webstudio-remix-vercel/app/routes/[resources]._index.tsx@@ -12,7 +12,12 @@ import {import { useLoaderData } from "@remix-run/react";import { ReactSdkContext } from "@webstudio-is/react-sdk";import { n8nHandler, getFormId } from "@webstudio-is/form-handlers";-import { Page } from "../__generated__/[resources]._index";+import {+ Page,+ favIconAsset,+ pageFontAssets,+ pageBackgroundImageAssets,+} from "../__generated__/[resources]._index";import {formsProperties,loadResources,@@ -22,9 +27,8 @@ import {user,projectMeta,imageAssets,- pageFontAssets,- pageBackgroundImageAssets,} from "../__generated__/[resources]._index.server";+import css from "../__generated__/index.css";import { assetBaseUrl, imageBaseUrl, imageLoader } from "~/constants.mjs";@@ -180,22 +184,17 @@ export const links: LinksFunction = () => {href: css,});- if (projectMeta?.faviconAssetId) {- const faviconAssetId = projectMeta?.faviconAssetId;- const imageAsset = imageAssets.find((asset) => asset.id === faviconAssetId);-- if (imageAsset) {- result.push({- rel: "icon",- href: imageLoader({- src: imageAsset.name,- width: 128,- quality: 100,- format: "auto",- }),- type: undefined,- });- }+ if (favIconAsset) {+ result.push({+ rel: "icon",+ href: imageLoader({+ src: favIconAsset.name,+ width: 128,+ quality: 100,+ format: "auto",+ }),+ type: undefined,+ });} else {result.push({rel: "icon",diff --git a/fixtures/webstudio-remix-vercel/app/routes/_index.tsx b/fixtures/webstudio-remix-vercel/app/routes/_index.tsxindex 946c484562..522783bf19 100644--- a/fixtures/webstudio-remix-vercel/app/routes/_index.tsx+++ b/fixtures/webstudio-remix-vercel/app/routes/_index.tsx@@ -12,7 +12,12 @@ import {import { useLoaderData } from "@remix-run/react";import { ReactSdkContext } from "@webstudio-is/react-sdk";import { n8nHandler, getFormId } from "@webstudio-is/form-handlers";-import { Page } from "../__generated__/_index";+import {+ Page,+ favIconAsset,+ pageFontAssets,+ pageBackgroundImageAssets,+} from "../__generated__/_index";import {formsProperties,loadResources,@@ -22,9 +27,8 @@ import {user,projectMeta,imageAssets,- pageFontAssets,- pageBackgroundImageAssets,} from "../__generated__/_index.server";+import css from "../__generated__/index.css";import { assetBaseUrl, imageBaseUrl, imageLoader } from "~/constants.mjs";@@ -180,22 +184,17 @@ export const links: LinksFunction = () => {href: css,});- if (projectMeta?.faviconAssetId) {- const faviconAssetId = projectMeta?.faviconAssetId;- const imageAsset = imageAssets.find((asset) => asset.id === faviconAssetId);-- if (imageAsset) {- result.push({- rel: "icon",- href: imageLoader({- src: imageAsset.name,- width: 128,- quality: 100,- format: "auto",- }),- type: undefined,- });- }+ if (favIconAsset) {+ result.push({+ rel: "icon",+ href: imageLoader({+ src: favIconAsset.name,+ width: 128,+ quality: 100,+ format: "auto",+ }),+ type: undefined,+ });} else {result.push({rel: "icon",diff --git a/packages/cli/__generated__/_index.server.tsx b/packages/cli/__generated__/_index.server.tsxindex db541ef06b..241bb4e33c 100644--- a/packages/cli/__generated__/_index.server.tsx+++ b/packages/cli/__generated__/_index.server.tsx@@ -3,7 +3,6 @@**/import type {ImageAsset,- FontAsset,ProjectMeta,PageMeta,System,@@ -47,7 +46,3 @@ export const projectMeta: undefined | ProjectMeta = {};export const imageAssets: ImageAsset[] = [];--export const pageFontAssets: FontAsset[] = [];--export const pageBackgroundImageAssets: ImageAsset[] = [];diff --git a/packages/cli/__generated__/_index.tsx b/packages/cli/__generated__/_index.tsxindex fefbb24d64..2ef7dcee64 100644--- a/packages/cli/__generated__/_index.tsx+++ b/packages/cli/__generated__/_index.tsx@@ -1,6 +1,16 @@/*** The only intent of this file is to support typings inside ../templates/route-template for easier development.**/++import type { FontAsset, ImageAsset } from "@webstudio-is/sdk";++export const favIconAsset: ImageAsset | undefined = undefined;++// Font assets on current page (can be preloaded)+export const pageFontAssets: FontAsset[] = [];++export const pageBackgroundImageAssets: ImageAsset[] = [];+const Page = (_props: { system: any }) => {return <></>;};diff --git a/packages/cli/src/prebuild.ts b/packages/cli/src/prebuild.tsindex fa5f19dad9..3414bb2110 100644--- a/packages/cli/src/prebuild.ts+++ b/packages/cli/src/prebuild.ts@@ -591,12 +591,28 @@ export const prebuild = async (options: {),});+ const favIconAsset = imageAssets.find(+ (asset) => asset.id === siteData.build.pages.meta?.faviconAssetId+ );const pageExports = `/* eslint-disable *//* This is a auto generated file for building the project */ \nimport { Fragment, useState } from "react";+import type { FontAsset, ImageAsset } from "@webstudio-is/sdk";import { useResource } from "@webstudio-is/react-sdk";${componentImports}+export const favIconAsset: ImageAsset | undefined = ${+ favIconAsset ? JSON.stringify(favIconAsset) : "undefined"+ };++// Font assets on current page (can be preloaded)+export const pageFontAssets: FontAsset[] = ${JSON.stringify(pageFontAssets)}++export const pageBackgroundImageAssets: ImageAsset[] = ${JSON.stringify(+ pageBackgroundImageAssets+ )}++${pageComponent}@@ -605,7 +621,7 @@ export { Page }const serverExports = `/* eslint-disable *//* This is a auto generated file for building the project */ \n-import type { ImageAsset, FontAsset, ProjectMeta, PageMeta } from "@webstudio-is/sdk";+import type { ImageAsset, ProjectMeta, PageMeta } from "@webstudio-is/sdk";${generateResourcesLoader({scope,page: pageData.page,@@ -635,13 +651,6 @@ export const projectMeta: ProjectMeta = ${JSON.stringify(export const imageAssets: ImageAsset[] = ${JSON.stringify(imageAssets)}-// Font assets on current page (can be preloaded)-export const pageFontAssets: FontAsset[] = ${JSON.stringify(pageFontAssets)}--export const pageBackgroundImageAssets: ImageAsset[] = ${JSON.stringify(- pageBackgroundImageAssets- )}-`;/*diff --git a/packages/cli/templates/defaults/__templates__/route-template.tsx b/packages/cli/templates/defaults/__templates__/route-template.tsxindex ac3481355f..1714d8eaa3 100644--- a/packages/cli/templates/defaults/__templates__/route-template.tsx+++ b/packages/cli/templates/defaults/__templates__/route-template.tsx@@ -12,7 +12,12 @@ import {import { useLoaderData } from "@remix-run/react";import { ReactSdkContext } from "@webstudio-is/react-sdk";import { n8nHandler, getFormId } from "@webstudio-is/form-handlers";-import { Page } from "../../../__generated__/_index";+import {+ Page,+ favIconAsset,+ pageFontAssets,+ pageBackgroundImageAssets,+} from "../../../__generated__/_index";import {formsProperties,loadResources,@@ -22,9 +27,8 @@ import {user,projectMeta,imageAssets,- pageFontAssets,- pageBackgroundImageAssets,} from "../../../__generated__/_index.server";+import css from "../__generated__/index.css";import { assetBaseUrl, imageBaseUrl, imageLoader } from "~/constants.mjs";@@ -180,22 +184,17 @@ export const links: LinksFunction = () => {href: css,});- if (projectMeta?.faviconAssetId) {- const faviconAssetId = projectMeta?.faviconAssetId;- const imageAsset = imageAssets.find((asset) => asset.id === faviconAssetId);-- if (imageAsset) {- result.push({- rel: "icon",- href: imageLoader({- src: imageAsset.name,- width: 128,- quality: 100,- format: "auto",- }),- type: undefined,- });- }+ if (favIconAsset) {+ result.push({+ rel: "icon",+ href: imageLoader({+ src: favIconAsset.name,+ width: 128,+ quality: 100,+ format: "auto",+ }),+ type: undefined,+ });} else {result.push({rel: "icon",