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
feat: switch CLI to jsx component generator (#2330)
Bogdan Chadkinfd19a3fac2ba
diff --git a/fixtures/webstudio-custom-template/app/__generated__/_index.tsx b/fixtures/webstudio-custom-template/app/__generated__/_index.tsxindex d5c18e6b38..fec1239952 100644--- a/fixtures/webstudio-custom-template/app/__generated__/_index.tsx+++ b/fixtures/webstudio-custom-template/app/__generated__/_index.tsx@@ -1,48 +1,17 @@/* eslint-disable *//* This is a auto generated file for building the project */+import { type ReactNode, useState } from "react";import type { PageData } from "~/routes/_index";-import type { Components } from "@webstudio-is/react-sdk";import type { Asset } from "@webstudio-is/sdk";import {Body as Body,Heading as Heading,} from "@webstudio-is/sdk-components-react";-export const components = new Map(- Object.entries({ Body: Body, Heading: Heading })-) as Components;export const fontAssets: Asset[] = [];export const pageData: PageData = {- build: {- props: [],- instances: [- [- "ibXgMoi9_ipHx1gVrvii0",- {- type: "instance",- id: "ibXgMoi9_ipHx1gVrvii0",- component: "Body",- children: [{ type: "id", value: "7pwqBSgrfuuOfk1JblWcL" }],- },- ],- [- "7pwqBSgrfuuOfk1JblWcL",- {- type: "instance",- id: "7pwqBSgrfuuOfk1JblWcL",- component: "Heading",- children: [- {- type: "text",- value: "DO NOT TOUCH THIS PROJECT, IT'S USED FOR FIXTURES",- },- ],- },- ],- ],- dataSources: [],- },+ build: { props: [] },pages: [{id: "nfzls_SkTc9jKYyxcZ8Lw",@@ -72,26 +41,20 @@ export const user: { email: string | null } | undefined = {};export const projectId = "0d856812-61d8-4014-a20a-82e01c0eb8ee";-/* eslint-disable */--const indexesWithinAncestors = new Map<string, number>([]);--const getDataSourcesLogic = (- _getVariable: (id: string) => unknown,- _setVariable: (id: string, value: unknown) => void-) => {- let _output = new Map();- return _output;+const Page = (props: { scripts?: ReactNode }) => {+ return (+ <Body data-ws-id="ibXgMoi9_ipHx1gVrvii0" data-ws-component="Body">+ <Heading data-ws-id="7pwqBSgrfuuOfk1JblWcL" data-ws-component="Heading">+ {"DO NOT TOUCH THIS PROJECT, IT'S USED FOR FIXTURES"}+ </Heading>+ {props.scripts}+ </Body>+ );};+export { Page };+export const formsProperties = new Map<string,{ method?: string; action?: string }>([]);--export const utils = {- indexesWithinAncestors,- getDataSourcesLogic,-};--/* eslint-enable */diff --git a/fixtures/webstudio-custom-template/app/routes/_index.tsx b/fixtures/webstudio-custom-template/app/routes/_index.tsxindex 48bca9f9e1..1695eb2578 100644--- a/fixtures/webstudio-custom-template/app/routes/_index.tsx+++ b/fixtures/webstudio-custom-template/app/routes/_index.tsx@@ -6,29 +6,24 @@ import {type ActionArgs,json,} from "@remix-run/server-runtime";--import {- InstanceRoot,- type RootPropsData,- type Params,-} from "@webstudio-is/react-sdk";+import { atom } from "nanostores";+import { ReactSdkContext, getPropsByInstanceId } from "@webstudio-is/react-sdk";import { n8nHandler, getFormId } from "@webstudio-is/form-handlers";import { Scripts, ScrollRestoration } from "@remix-run/react";import {fontAssets,- components,pageData,user,projectId,- utils,formsProperties,+ Page,} from "../__generated__/_index.tsx";import css from "../__generated__/index.css";import type { Data } from "@webstudio-is/http-client";import { assetBaseUrl, imageBaseUrl, imageLoader } from "~/constants.mjs";export type PageData = Omit<Data, "build"> & {- build: Pick<Data["build"], "props" | "instances" | "dataSources">;+ build: Pick<Data["build"], "props">;};export const meta: V2_ServerRuntimeMetaFunction = () => {@@ -159,9 +154,7 @@ export const action = async ({ request, context }: ActionArgs) => {};const Outlet = () => {- const pagesCanvasData: PageData = pageData;-- const page = pagesCanvasData.page;+ const page = pageData.page;if (page === undefined) {throw json("Page not found", {@@ -169,32 +162,34 @@ const Outlet = () => {});}- const params: Params = {- assetBaseUrl,- imageBaseUrl,- };-- const data: RootPropsData = {- build: pagesCanvasData.build,- assets: pagesCanvasData.assets,- page,- pages: pagesCanvasData.pages,- params,- };-return (- <InstanceRoot- imageLoader={imageLoader}- data={data}- components={components}- utils={utils}- scripts={- <>- <Scripts />- <ScrollRestoration />- </>- }- />+ <ReactSdkContext.Provider+ value={{+ propsByInstanceIdStore: atom(+ getPropsByInstanceId(new Map(pageData.build.props))+ ),+ assetsStore: atom(+ new Map(pageData.assets.map((asset) => [asset.id, asset]))+ ),+ pagesStore: atom(+ new Map(pageData.pages.map((page) => [page.id, page]))+ ),+ dataSourcesLogicStore: atom(new Map()),+ imageLoader,+ assetBaseUrl,+ imageBaseUrl,+ indexesWithinAncestors: new Map(),+ }}+ >+ <Page+ scripts={+ <>+ <Scripts />+ <ScrollRestoration />+ </>+ }+ />+ </ReactSdkContext.Provider>);};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 479b8e9210..bce0b509c0 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@@ -1,17 +1,14 @@/* eslint-disable *//* This is a auto generated file for building the project */+import { type ReactNode, useState } from "react";import type { PageData } from "~/routes/_index";-import type { Components } from "@webstudio-is/react-sdk";import type { Asset } from "@webstudio-is/sdk";import {Body as Body,Image as Image,} from "@webstudio-is/sdk-components-react";-export const components = new Map(- Object.entries({ Body: Body, Image: Image })-) as Components;export const fontAssets: Asset[] = [];export const pageData: PageData = {build: {@@ -27,28 +24,6 @@ export const pageData: PageData = {},],],- instances: [- [- "EDEfpMPRqDejthtwkH7ws",- {- type: "instance",- id: "EDEfpMPRqDejthtwkH7ws",- component: "Body",- children: [{ type: "id", value: "AdXSAYCx4QDo5QN6nLoGs" }],- },- ],- [- "AdXSAYCx4QDo5QN6nLoGs",- {- type: "instance",- id: "AdXSAYCx4QDo5QN6nLoGs",- component: "Image",- label: "webp image, used to test raw image uploads",- children: [],- },- ],- ],- dataSources: [],},pages: [{@@ -122,26 +97,18 @@ export const user: { email: string | null } | undefined = {};export const projectId = "cddc1d44-af37-4cb6-a430-d300cf6f932d";-/* eslint-disable */--const indexesWithinAncestors = new Map<string, number>([]);--const getDataSourcesLogic = (- _getVariable: (id: string) => unknown,- _setVariable: (id: string, value: unknown) => void-) => {- let _output = new Map();- return _output;+const Page = (props: { scripts?: ReactNode }) => {+ return (+ <Body data-ws-id="EDEfpMPRqDejthtwkH7ws" data-ws-component="Body">+ <Image data-ws-id="AdXSAYCx4QDo5QN6nLoGs" data-ws-component="Image" />+ {props.scripts}+ </Body>+ );};+export { Page };+export const formsProperties = new Map<string,{ method?: string; action?: string }>([]);--export const utils = {- indexesWithinAncestors,- getDataSourcesLogic,-};--/* eslint-enable */diff --git a/fixtures/webstudio-remix-vercel/app/__generated__/[form]._index.tsx b/fixtures/webstudio-remix-vercel/app/__generated__/[form]._index.tsxindex d0a6f4b4b7..0db48613ca 100644--- a/fixtures/webstudio-remix-vercel/app/__generated__/[form]._index.tsx+++ b/fixtures/webstudio-remix-vercel/app/__generated__/[form]._index.tsx@@ -1,8 +1,8 @@/* eslint-disable *//* This is a auto generated file for building the project */+import { type ReactNode, useState } from "react";import type { PageData } from "~/routes/_index";-import type { Components } from "@webstudio-is/react-sdk";import type { Asset } from "@webstudio-is/sdk";import {Body as Body,@@ -14,17 +14,6 @@ import {} from "@webstudio-is/sdk-components-react";import { Form as Form } from "@webstudio-is/sdk-components-react-remix";-export const components = new Map(- Object.entries({- Body: Body,- Box: Box,- Label: Label,- Input: Input,- Button: Button,- Heading: Heading,- Form: Form,- })-) as Components;export const fontAssets: Asset[] = [];export const pageData: PageData = {build: {@@ -222,318 +211,6 @@ export const pageData: PageData = {},],],- instances: [- [- "a-4nDFkaWy4px1fn38XWJ",- {- type: "instance",- id: "a-4nDFkaWy4px1fn38XWJ",- component: "Body",- children: [- { type: "id", value: "-1RvizaBcVpHsjvnYxn1c" },- { type: "id", value: "isNSM3wXcnHFikwNPlEOL" },- ],- },- ],- [- "isNSM3wXcnHFikwNPlEOL",- {- type: "instance",- id: "isNSM3wXcnHFikwNPlEOL",- component: "Form",- label: "Form with custom props",- children: [- { type: "id", value: "a5YPRc19IJyhTrjjasA_R" },- { type: "id", value: "Gw-ta0R4FNFAGBTVRWKep" },- { type: "id", value: "ewk_WKpu4syHLPABMmvUz" },- ],- },- ],- [- "a5YPRc19IJyhTrjjasA_R",- {- type: "instance",- id: "a5YPRc19IJyhTrjjasA_R",- component: "Box",- label: "Form Content",- children: [- { type: "id", value: "y4pceTmziuBRIDgUBQNLD" },- { type: "id", value: "_gLjS0enBOV8KW9Ykz_es" },- { type: "id", value: "ydR5B_9uMS4PXFS76TmBh" },- { type: "id", value: "8RU1FyL2QRyqhNUKELGrb" },- { type: "id", value: "TsqGP49hjgEW41ReCwrpZ" },- { type: "id", value: "5GWjwVdapuGdn443GIKDW" },- ],- },- ],- [- "_gLjS0enBOV8KW9Ykz_es",- {- type: "instance",- id: "_gLjS0enBOV8KW9Ykz_es",- component: "Label",- children: [{ type: "text", value: "Name" }],- },- ],- [- "ydR5B_9uMS4PXFS76TmBh",- {- type: "instance",- id: "ydR5B_9uMS4PXFS76TmBh",- component: "Input",- children: [],- },- ],- [- "8RU1FyL2QRyqhNUKELGrb",- {- type: "instance",- id: "8RU1FyL2QRyqhNUKELGrb",- component: "Label",- children: [{ type: "text", value: "Email" }],- },- ],- [- "TsqGP49hjgEW41ReCwrpZ",- {- type: "instance",- id: "TsqGP49hjgEW41ReCwrpZ",- component: "Input",- children: [],- },- ],- [- "5GWjwVdapuGdn443GIKDW",- {- type: "instance",- id: "5GWjwVdapuGdn443GIKDW",- component: "Button",- children: [{ type: "text", value: "Submit" }],- },- ],- [- "Gw-ta0R4FNFAGBTVRWKep",- {- type: "instance",- id: "Gw-ta0R4FNFAGBTVRWKep",- component: "Box",- label: "Success Message",- children: [- { type: "text", value: "Thank you for getting in touch!" },- ],- },- ],- [- "ewk_WKpu4syHLPABMmvUz",- {- type: "instance",- id: "ewk_WKpu4syHLPABMmvUz",- component: "Box",- label: "Error Message",- children: [{ type: "text", value: "Sorry, something went wrong." }],- },- ],- [- "-1RvizaBcVpHsjvnYxn1c",- {- type: "instance",- id: "-1RvizaBcVpHsjvnYxn1c",- component: "Form",- label: "Default form",- children: [- { type: "id", value: "qhnVrmYGlyrMZi3UzqSQA" },- { type: "id", value: "966cjxuqP_T99N27-mqWE" },- { type: "id", value: "SYG5hhOz31xFJUN_v9zq6" },- ],- },- ],- [- "qhnVrmYGlyrMZi3UzqSQA",- {- type: "instance",- id: "qhnVrmYGlyrMZi3UzqSQA",- component: "Box",- label: "Form Content",- children: [- { type: "id", value: "YdHHf4u3jrdbRIWpB_VfH" },- { type: "id", value: "A0RNI1WVwOGGDbwYnoZia" },- { type: "id", value: "e035xi9fcwYtrn9La49Eh" },- { type: "id", value: "LImtuVzw5R9yQsG4faiGV" },- { type: "id", value: "dcHjdeW_HXPkyQlx3ZiL7" },- { type: "id", value: "ZAtG6JgK4sbTnOAZlp2rU" },- ],- },- ],- [- "A0RNI1WVwOGGDbwYnoZia",- {- type: "instance",- id: "A0RNI1WVwOGGDbwYnoZia",- component: "Label",- children: [{ type: "text", value: "Name" }],- },- ],- [- "e035xi9fcwYtrn9La49Eh",- {- type: "instance",- id: "e035xi9fcwYtrn9La49Eh",- component: "Input",- children: [],- },- ],- [- "LImtuVzw5R9yQsG4faiGV",- {- type: "instance",- id: "LImtuVzw5R9yQsG4faiGV",- component: "Label",- children: [{ type: "text", value: "Email" }],- },- ],- [- "dcHjdeW_HXPkyQlx3ZiL7",- {- type: "instance",- id: "dcHjdeW_HXPkyQlx3ZiL7",- component: "Input",- children: [],- },- ],- [- "ZAtG6JgK4sbTnOAZlp2rU",- {- type: "instance",- id: "ZAtG6JgK4sbTnOAZlp2rU",- component: "Button",- children: [{ type: "text", value: "Submit" }],- },- ],- [- "966cjxuqP_T99N27-mqWE",- {- type: "instance",- id: "966cjxuqP_T99N27-mqWE",- component: "Box",- label: "Success Message",- children: [- { type: "text", value: "Thank you for getting in touch!" },- ],- },- ],- [- "SYG5hhOz31xFJUN_v9zq6",- {- type: "instance",- id: "SYG5hhOz31xFJUN_v9zq6",- component: "Box",- label: "Error Message",- children: [{ type: "text", value: "Sorry, something went wrong." }],- },- ],- [- "y4pceTmziuBRIDgUBQNLD",- {- type: "instance",- id: "y4pceTmziuBRIDgUBQNLD",- component: "Heading",- children: [- { type: "text", value: "Form with custom action and method" },- ],- },- ],- [- "YdHHf4u3jrdbRIWpB_VfH",- {- type: "instance",- id: "YdHHf4u3jrdbRIWpB_VfH",- component: "Heading",- children: [{ type: "text", value: "Default form" }],- },- ],- ],- dataSources: [- [- "KvfuNNCNslj7nAGsD69Fl",- {- type: "variable",- id: "KvfuNNCNslj7nAGsD69Fl",- scopeInstanceId: "isNSM3wXcnHFikwNPlEOL",- name: "formState",- value: { type: "string", value: "initial" },- },- ],- [- "ezyBm7JGcDokMP8DZVzrD",- {- type: "expression",- id: "ezyBm7JGcDokMP8DZVzrD",- scopeInstanceId: "a5YPRc19IJyhTrjjasA_R",- name: "formInitial",- code: "$ws$dataSource$KvfuNNCNslj7nAGsD69Fl === 'initial' || $ws$dataSource$KvfuNNCNslj7nAGsD69Fl === 'error'",- },- ],- [- "_NmOL-v4PZhCcmj2vaDy_",- {- type: "expression",- id: "_NmOL-v4PZhCcmj2vaDy_",- scopeInstanceId: "Gw-ta0R4FNFAGBTVRWKep",- name: "formSuccess",- code: "$ws$dataSource$KvfuNNCNslj7nAGsD69Fl === 'success'",- },- ],- [- "VeQ-Tiya3whVhWHbJVHID",- {- type: "expression",- id: "VeQ-Tiya3whVhWHbJVHID",- scopeInstanceId: "ewk_WKpu4syHLPABMmvUz",- name: "formError",- code: "$ws$dataSource$KvfuNNCNslj7nAGsD69Fl === 'error'",- },- ],- [- "Ip0FRY7L24QrIMdtuMN5j",- {- type: "variable",- id: "Ip0FRY7L24QrIMdtuMN5j",- scopeInstanceId: "-1RvizaBcVpHsjvnYxn1c",- name: "formState",- value: { type: "string", value: "initial" },- },- ],- [- "DUDDZM-QmYH_zBgbIODiu",- {- type: "expression",- id: "DUDDZM-QmYH_zBgbIODiu",- scopeInstanceId: "qhnVrmYGlyrMZi3UzqSQA",- name: "formInitial",- code: "$ws$dataSource$Ip0FRY7L24QrIMdtuMN5j === 'initial' || $ws$dataSource$Ip0FRY7L24QrIMdtuMN5j === 'error'",- },- ],- [- "F72Gu_6DnbW9CGp_747xa",- {- type: "expression",- id: "F72Gu_6DnbW9CGp_747xa",- scopeInstanceId: "966cjxuqP_T99N27-mqWE",- name: "formSuccess",- code: "$ws$dataSource$Ip0FRY7L24QrIMdtuMN5j === 'success'",- },- ],- [- "XhDObB85P8I_uDZ_CzGDt",- {- type: "expression",- id: "XhDObB85P8I_uDZ_CzGDt",- scopeInstanceId: "SYG5hhOz31xFJUN_v9zq6",- name: "formError",- code: "$ws$dataSource$Ip0FRY7L24QrIMdtuMN5j === 'error'",- },- ],- ],},pages: [{@@ -607,20 +284,9 @@ export const user: { email: string | null } | undefined = {};export const projectId = "cddc1d44-af37-4cb6-a430-d300cf6f932d";-/* eslint-disable */--const indexesWithinAncestors = new Map<string, number>([]);--const getDataSourcesLogic = (- _getVariable: (id: string) => unknown,- _setVariable: (id: string, value: unknown) => void-) => {- let formState = _getVariable("KvfuNNCNslj7nAGsD69Fl") ?? "initial";- let set$formState = (value: unknown) =>- _setVariable("KvfuNNCNslj7nAGsD69Fl", value);- let formState_1 = _getVariable("Ip0FRY7L24QrIMdtuMN5j") ?? "initial";- let set$formState_1 = (value: unknown) =>- _setVariable("Ip0FRY7L24QrIMdtuMN5j", value);+const Page = (props: { scripts?: ReactNode }) => {+ let [formState, set$formState] = useState<any>("initial");+ let [formState_1, set$formState_1] = useState<any>("initial");let formInitial = formState === "initial" || formState === "error";let formSuccess = formState === "success";let formError = formState === "error";@@ -635,28 +301,118 @@ const getDataSourcesLogic = (formState_1 = state;set$formState_1(formState_1);};- let _output = new Map();- _output.set("KvfuNNCNslj7nAGsD69Fl", formState);- _output.set("ezyBm7JGcDokMP8DZVzrD", formInitial);- _output.set("_NmOL-v4PZhCcmj2vaDy_", formSuccess);- _output.set("VeQ-Tiya3whVhWHbJVHID", formError);- _output.set("Ip0FRY7L24QrIMdtuMN5j", formState_1);- _output.set("DUDDZM-QmYH_zBgbIODiu", formInitial_1);- _output.set("F72Gu_6DnbW9CGp_747xa", formSuccess_1);- _output.set("XhDObB85P8I_uDZ_CzGDt", formError_1);- _output.set("RHHw5ACTgdDO751J8CgWB", onStateChange);- _output.set("E2n44qWixMBKO6m8kg1wp", onStateChange_1);- return _output;+ return (+ <Body data-ws-id="a-4nDFkaWy4px1fn38XWJ" data-ws-component="Body">+ <Form+ data-ws-id="-1RvizaBcVpHsjvnYxn1c"+ data-ws-component="Form"+ state={formState_1}+ onStateChange={onStateChange_1}+ >+ {formInitial_1 && (+ <Box data-ws-id="qhnVrmYGlyrMZi3UzqSQA" data-ws-component="Box">+ <Heading+ data-ws-id="YdHHf4u3jrdbRIWpB_VfH"+ data-ws-component="Heading"+ tag={"h3"}+ >+ {"Default form"}+ </Heading>+ <Label data-ws-id="A0RNI1WVwOGGDbwYnoZia" data-ws-component="Label">+ {"Name"}+ </Label>+ <Input+ data-ws-id="e035xi9fcwYtrn9La49Eh"+ data-ws-component="Input"+ name={"name"}+ />+ <Label data-ws-id="LImtuVzw5R9yQsG4faiGV" data-ws-component="Label">+ {"Email"}+ </Label>+ <Input+ data-ws-id="dcHjdeW_HXPkyQlx3ZiL7"+ data-ws-component="Input"+ name={"email"}+ />+ <Button+ data-ws-id="ZAtG6JgK4sbTnOAZlp2rU"+ data-ws-component="Button"+ >+ {"Submit"}+ </Button>+ </Box>+ )}+ {formSuccess_1 && (+ <Box data-ws-id="966cjxuqP_T99N27-mqWE" data-ws-component="Box">+ {"Thank you for getting in touch!"}+ </Box>+ )}+ {formError_1 && (+ <Box data-ws-id="SYG5hhOz31xFJUN_v9zq6" data-ws-component="Box">+ {"Sorry, something went wrong."}+ </Box>+ )}+ </Form>+ <Form+ data-ws-id="isNSM3wXcnHFikwNPlEOL"+ data-ws-component="Form"+ state={formState}+ onStateChange={onStateChange}+ method={"get"}+ action={"/custom"}+ >+ {formInitial && (+ <Box data-ws-id="a5YPRc19IJyhTrjjasA_R" data-ws-component="Box">+ <Heading+ data-ws-id="y4pceTmziuBRIDgUBQNLD"+ data-ws-component="Heading"+ tag={"h3"}+ >+ {"Form with custom action and method"}+ </Heading>+ <Label data-ws-id="_gLjS0enBOV8KW9Ykz_es" data-ws-component="Label">+ {"Name"}+ </Label>+ <Input+ data-ws-id="ydR5B_9uMS4PXFS76TmBh"+ data-ws-component="Input"+ name={"name"}+ />+ <Label data-ws-id="8RU1FyL2QRyqhNUKELGrb" data-ws-component="Label">+ {"Email"}+ </Label>+ <Input+ data-ws-id="TsqGP49hjgEW41ReCwrpZ"+ data-ws-component="Input"+ name={"email"}+ />+ <Button+ data-ws-id="5GWjwVdapuGdn443GIKDW"+ data-ws-component="Button"+ >+ {"Submit"}+ </Button>+ </Box>+ )}+ {formSuccess && (+ <Box data-ws-id="Gw-ta0R4FNFAGBTVRWKep" data-ws-component="Box">+ {"Thank you for getting in touch!"}+ </Box>+ )}+ {formError && (+ <Box data-ws-id="ewk_WKpu4syHLPABMmvUz" data-ws-component="Box">+ {"Sorry, something went wrong."}+ </Box>+ )}+ </Form>+ {props.scripts}+ </Body>+ );};+export { Page };+export const formsProperties = new Map<string,{ method?: string; action?: string }>([["isNSM3wXcnHFikwNPlEOL", { method: "get", action: "/custom" }]]);--export const utils = {- indexesWithinAncestors,- getDataSourcesLogic,-};--/* eslint-enable */diff --git a/fixtures/webstudio-remix-vercel/app/__generated__/[radix]._index.tsx b/fixtures/webstudio-remix-vercel/app/__generated__/[radix]._index.tsxindex 97d73d853e..7e865a5bd3 100644--- a/fixtures/webstudio-remix-vercel/app/__generated__/[radix]._index.tsx+++ b/fixtures/webstudio-remix-vercel/app/__generated__/[radix]._index.tsx@@ -1,8 +1,8 @@/* eslint-disable *//* This is a auto generated file for building the project */+import { type ReactNode, useState } from "react";import type { PageData } from "~/routes/_index";-import type { Components } from "@webstudio-is/react-sdk";import type { Asset } from "@webstudio-is/sdk";import {Body as Body,@@ -18,21 +18,6 @@ import {AccordionContent as AccordionContent,} from "@webstudio-is/sdk-components-react-radix";-export const components = new Map(- Object.entries({- Body: Body,- Text: Text,- Box: Box,- HtmlEmbed: HtmlEmbed,- "@webstudio-is/sdk-components-react-radix:Accordion": Accordion,- "@webstudio-is/sdk-components-react-radix:AccordionItem": AccordionItem,- "@webstudio-is/sdk-components-react-radix:AccordionHeader": AccordionHeader,- "@webstudio-is/sdk-components-react-radix:AccordionTrigger":- AccordionTrigger,- "@webstudio-is/sdk-components-react-radix:AccordionContent":- AccordionContent,- })-) as Components;export const fontAssets: Asset[] = [];export const pageData: PageData = {build: {@@ -107,278 +92,6 @@ export const pageData: PageData = {},],],- instances: [- [- "uKWGyE9JY3cPwY-xI9vk6",- {- type: "instance",- id: "uKWGyE9JY3cPwY-xI9vk6",- component: "Body",- children: [{ type: "id", value: "AM9fD6dv2Ftc3Xjcsd7Uc" }],- },- ],- [- "AM9fD6dv2Ftc3Xjcsd7Uc",- {- type: "instance",- id: "AM9fD6dv2Ftc3Xjcsd7Uc",- component: "@webstudio-is/sdk-components-react-radix:Accordion",- children: [- { type: "id", value: "zJ927zk9txwUbYycKB7QA" },- { type: "id", value: "C838wkvIcA1BQu30Xu2G8" },- { type: "id", value: "65djoTmSBGemZ2L5izQ5M" },- ],- },- ],- [- "zJ927zk9txwUbYycKB7QA",- {- type: "instance",- id: "zJ927zk9txwUbYycKB7QA",- component: "@webstudio-is/sdk-components-react-radix:AccordionItem",- children: [- { type: "id", value: "sMxg7xT1hwYt05hbOvoPL" },- { type: "id", value: "IUftdfjK-ilSzfOTdIx1u" },- ],- },- ],- [- "sMxg7xT1hwYt05hbOvoPL",- {- type: "instance",- id: "sMxg7xT1hwYt05hbOvoPL",- component: "@webstudio-is/sdk-components-react-radix:AccordionHeader",- children: [{ type: "id", value: "qQSA4NoyKC88O68mBiQe2" }],- },- ],- [- "qQSA4NoyKC88O68mBiQe2",- {- type: "instance",- id: "qQSA4NoyKC88O68mBiQe2",- component:- "@webstudio-is/sdk-components-react-radix:AccordionTrigger",- children: [- { type: "id", value: "q-DVI4YTNrQ1LizmEyJHI" },- { type: "id", value: "RSk81lLj2IGXgchTuXF7V" },- ],- },- ],- [- "q-DVI4YTNrQ1LizmEyJHI",- {- type: "instance",- id: "q-DVI4YTNrQ1LizmEyJHI",- component: "Text",- children: [{ type: "text", value: "Is it accessible?" }],- },- ],- [- "RSk81lLj2IGXgchTuXF7V",- {- type: "instance",- id: "RSk81lLj2IGXgchTuXF7V",- component: "Box",- label: "Icon Container",- children: [{ type: "id", value: "d0sd_G-kHirxgjq6s6Uq1" }],- },- ],- [- "d0sd_G-kHirxgjq6s6Uq1",- {- type: "instance",- id: "d0sd_G-kHirxgjq6s6Uq1",- component: "HtmlEmbed",- label: "Chevron Icon",- children: [],- },- ],- [- "IUftdfjK-ilSzfOTdIx1u",- {- type: "instance",- id: "IUftdfjK-ilSzfOTdIx1u",- component:- "@webstudio-is/sdk-components-react-radix:AccordionContent",- children: [- {- type: "text",- value: "Yes. It adheres to the WAI-ARIA design pattern.",- },- ],- },- ],- [- "C838wkvIcA1BQu30Xu2G8",- {- type: "instance",- id: "C838wkvIcA1BQu30Xu2G8",- component: "@webstudio-is/sdk-components-react-radix:AccordionItem",- children: [- { type: "id", value: "fYUOB_brm6s0Ky68lzMfU" },- { type: "id", value: "wNRVuu0L5E8TVufKdswp1" },- ],- },- ],- [- "fYUOB_brm6s0Ky68lzMfU",- {- type: "instance",- id: "fYUOB_brm6s0Ky68lzMfU",- component: "@webstudio-is/sdk-components-react-radix:AccordionHeader",- children: [{ type: "id", value: "dfd4gonev_AX6BpuCsxjb" }],- },- ],- [- "dfd4gonev_AX6BpuCsxjb",- {- type: "instance",- id: "dfd4gonev_AX6BpuCsxjb",- component:- "@webstudio-is/sdk-components-react-radix:AccordionTrigger",- children: [- { type: "id", value: "lZ7sI6Kw_0VZkURriKscB" },- { type: "id", value: "wRw75kuvFzl5NWD8IGJoI" },- ],- },- ],- [- "lZ7sI6Kw_0VZkURriKscB",- {- type: "instance",- id: "lZ7sI6Kw_0VZkURriKscB",- component: "Text",- children: [{ type: "text", value: "Is it styled?" }],- },- ],- [- "wRw75kuvFzl5NWD8IGJoI",- {- type: "instance",- id: "wRw75kuvFzl5NWD8IGJoI",- component: "Box",- label: "Icon Container",- children: [{ type: "id", value: "StPslEr81nfBISqBE2R-Y" }],- },- ],- [- "StPslEr81nfBISqBE2R-Y",- {- type: "instance",- id: "StPslEr81nfBISqBE2R-Y",- component: "HtmlEmbed",- label: "Chevron Icon",- children: [],- },- ],- [- "wNRVuu0L5E8TVufKdswp1",- {- type: "instance",- id: "wNRVuu0L5E8TVufKdswp1",- component:- "@webstudio-is/sdk-components-react-radix:AccordionContent",- children: [- {- type: "text",- value:- "Yes. It comes with default styles that matches the other components' aesthetic.",- },- ],- },- ],- [- "65djoTmSBGemZ2L5izQ5M",- {- type: "instance",- id: "65djoTmSBGemZ2L5izQ5M",- component: "@webstudio-is/sdk-components-react-radix:AccordionItem",- children: [- { type: "id", value: "UJYfe6kH7HqhH0YYeJwe7" },- { type: "id", value: "mOVPnIrlt6IwVAzI_i2Fc" },- ],- },- ],- [- "UJYfe6kH7HqhH0YYeJwe7",- {- type: "instance",- id: "UJYfe6kH7HqhH0YYeJwe7",- component: "@webstudio-is/sdk-components-react-radix:AccordionHeader",- children: [{ type: "id", value: "600nGddaNxGGdsuGgpxJR" }],- },- ],- [- "600nGddaNxGGdsuGgpxJR",- {- type: "instance",- id: "600nGddaNxGGdsuGgpxJR",- component:- "@webstudio-is/sdk-components-react-radix:AccordionTrigger",- children: [- { type: "id", value: "1iNKIMG91n83PzJnEdxq9" },- { type: "id", value: "Ta70VqUb_fGJXBT_zsnxQ" },- ],- },- ],- [- "1iNKIMG91n83PzJnEdxq9",- {- type: "instance",- id: "1iNKIMG91n83PzJnEdxq9",- component: "Text",- children: [{ type: "text", value: "Is it animated?" }],- },- ],- [- "Ta70VqUb_fGJXBT_zsnxQ",- {- type: "instance",- id: "Ta70VqUb_fGJXBT_zsnxQ",- component: "Box",- label: "Icon Container",- children: [{ type: "id", value: "sO80m5u4f87jVGG91t6u8" }],- },- ],- [- "sO80m5u4f87jVGG91t6u8",- {- type: "instance",- id: "sO80m5u4f87jVGG91t6u8",- component: "HtmlEmbed",- label: "Chevron Icon",- children: [],- },- ],- [- "mOVPnIrlt6IwVAzI_i2Fc",- {- type: "instance",- id: "mOVPnIrlt6IwVAzI_i2Fc",- component:- "@webstudio-is/sdk-components-react-radix:AccordionContent",- children: [- {- type: "text",- value:- "Yes. It's animated by default, but you can disable it if you prefer.",- },- ],- },- ],- ],- dataSources: [- [- "RR_FthRebEUcAKUJIXl0j",- {- type: "variable",- id: "RR_FthRebEUcAKUJIXl0j",- scopeInstanceId: "AM9fD6dv2Ftc3Xjcsd7Uc",- name: "accordionValue",- value: { type: "string", value: "0" },- },- ],- ],},pages: [{@@ -452,39 +165,136 @@ export const user: { email: string | null } | undefined = {};export const projectId = "cddc1d44-af37-4cb6-a430-d300cf6f932d";-/* eslint-disable */--const indexesWithinAncestors = new Map<string, number>([- ["zJ927zk9txwUbYycKB7QA", 0],- ["C838wkvIcA1BQu30Xu2G8", 1],- ["65djoTmSBGemZ2L5izQ5M", 2],-]);--const getDataSourcesLogic = (- _getVariable: (id: string) => unknown,- _setVariable: (id: string, value: unknown) => void-) => {- let accordionValue = _getVariable("RR_FthRebEUcAKUJIXl0j") ?? "0";- let set$accordionValue = (value: unknown) =>- _setVariable("RR_FthRebEUcAKUJIXl0j", value);+const Page = (props: { scripts?: ReactNode }) => {+ let [accordionValue, set$accordionValue] = useState<any>("0");let onValueChange = (value: any) => {accordionValue = value;set$accordionValue(accordionValue);};- let _output = new Map();- _output.set("RR_FthRebEUcAKUJIXl0j", accordionValue);- _output.set("UZg-1PcrNODgUo94IvnGC", onValueChange);- return _output;+ return (+ <Body data-ws-id="uKWGyE9JY3cPwY-xI9vk6" data-ws-component="Body">+ <Accordion+ data-ws-id="AM9fD6dv2Ftc3Xjcsd7Uc"+ data-ws-component="@webstudio-is/sdk-components-react-radix:Accordion"+ collapsible={true}+ value={accordionValue}+ onValueChange={onValueChange}+ >+ <AccordionItem+ data-ws-id="zJ927zk9txwUbYycKB7QA"+ data-ws-component="@webstudio-is/sdk-components-react-radix:AccordionItem"+ data-ws-index="0"+ >+ <AccordionHeader+ data-ws-id="sMxg7xT1hwYt05hbOvoPL"+ data-ws-component="@webstudio-is/sdk-components-react-radix:AccordionHeader"+ >+ <AccordionTrigger+ data-ws-id="qQSA4NoyKC88O68mBiQe2"+ data-ws-component="@webstudio-is/sdk-components-react-radix:AccordionTrigger"+ >+ <Text data-ws-id="q-DVI4YTNrQ1LizmEyJHI" data-ws-component="Text">+ {"Is it accessible?"}+ </Text>+ <Box data-ws-id="RSk81lLj2IGXgchTuXF7V" data-ws-component="Box">+ <HtmlEmbed+ data-ws-id="d0sd_G-kHirxgjq6s6Uq1"+ data-ws-component="HtmlEmbed"+ code={+ '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" fill="currentColor" width="100%" height="100%" style="display: block;"><path d="M4.04 6.284a.65.65 0 0 1 .92.001L8 9.335l3.04-3.05a.65.65 0 1 1 .921.918l-3.5 3.512a.65.65 0 0 1-.921 0L4.039 7.203a.65.65 0 0 1 .001-.92Z"/></svg>'+ }+ />+ </Box>+ </AccordionTrigger>+ </AccordionHeader>+ <AccordionContent+ data-ws-id="IUftdfjK-ilSzfOTdIx1u"+ data-ws-component="@webstudio-is/sdk-components-react-radix:AccordionContent"+ >+ {"Yes. It adheres to the WAI-ARIA design pattern."}+ </AccordionContent>+ </AccordionItem>+ <AccordionItem+ data-ws-id="C838wkvIcA1BQu30Xu2G8"+ data-ws-component="@webstudio-is/sdk-components-react-radix:AccordionItem"+ data-ws-index="1"+ >+ <AccordionHeader+ data-ws-id="fYUOB_brm6s0Ky68lzMfU"+ data-ws-component="@webstudio-is/sdk-components-react-radix:AccordionHeader"+ >+ <AccordionTrigger+ data-ws-id="dfd4gonev_AX6BpuCsxjb"+ data-ws-component="@webstudio-is/sdk-components-react-radix:AccordionTrigger"+ >+ <Text data-ws-id="lZ7sI6Kw_0VZkURriKscB" data-ws-component="Text">+ {"Is it styled?"}+ </Text>+ <Box data-ws-id="wRw75kuvFzl5NWD8IGJoI" data-ws-component="Box">+ <HtmlEmbed+ data-ws-id="StPslEr81nfBISqBE2R-Y"+ data-ws-component="HtmlEmbed"+ code={+ '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" fill="currentColor" width="100%" height="100%" style="display: block;"><path d="M4.04 6.284a.65.65 0 0 1 .92.001L8 9.335l3.04-3.05a.65.65 0 1 1 .921.918l-3.5 3.512a.65.65 0 0 1-.921 0L4.039 7.203a.65.65 0 0 1 .001-.92Z"/></svg>'+ }+ />+ </Box>+ </AccordionTrigger>+ </AccordionHeader>+ <AccordionContent+ data-ws-id="wNRVuu0L5E8TVufKdswp1"+ data-ws-component="@webstudio-is/sdk-components-react-radix:AccordionContent"+ >+ {+ "Yes. It comes with default styles that matches the other components' aesthetic."+ }+ </AccordionContent>+ </AccordionItem>+ <AccordionItem+ data-ws-id="65djoTmSBGemZ2L5izQ5M"+ data-ws-component="@webstudio-is/sdk-components-react-radix:AccordionItem"+ data-ws-index="2"+ >+ <AccordionHeader+ data-ws-id="UJYfe6kH7HqhH0YYeJwe7"+ data-ws-component="@webstudio-is/sdk-components-react-radix:AccordionHeader"+ >+ <AccordionTrigger+ data-ws-id="600nGddaNxGGdsuGgpxJR"+ data-ws-component="@webstudio-is/sdk-components-react-radix:AccordionTrigger"+ >+ <Text data-ws-id="1iNKIMG91n83PzJnEdxq9" data-ws-component="Text">+ {"Is it animated?"}+ </Text>+ <Box data-ws-id="Ta70VqUb_fGJXBT_zsnxQ" data-ws-component="Box">+ <HtmlEmbed+ data-ws-id="sO80m5u4f87jVGG91t6u8"+ data-ws-component="HtmlEmbed"+ code={+ '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" fill="currentColor" width="100%" height="100%" style="display: block;"><path d="M4.04 6.284a.65.65 0 0 1 .92.001L8 9.335l3.04-3.05a.65.65 0 1 1 .921.918l-3.5 3.512a.65.65 0 0 1-.921 0L4.039 7.203a.65.65 0 0 1 .001-.92Z"/></svg>'+ }+ />+ </Box>+ </AccordionTrigger>+ </AccordionHeader>+ <AccordionContent+ data-ws-id="mOVPnIrlt6IwVAzI_i2Fc"+ data-ws-component="@webstudio-is/sdk-components-react-radix:AccordionContent"+ >+ {+ "Yes. It's animated by default, but you can disable it if you prefer."+ }+ </AccordionContent>+ </AccordionItem>+ </Accordion>+ {props.scripts}+ </Body>+ );};+export { Page };+export const formsProperties = new Map<string,{ method?: string; action?: string }>([]);--export const utils = {- indexesWithinAncestors,- getDataSourcesLogic,-};--/* eslint-enable */diff --git a/fixtures/webstudio-remix-vercel/app/__generated__/_index.tsx b/fixtures/webstudio-remix-vercel/app/__generated__/_index.tsxindex 91c025d33d..eec853e6c4 100644--- a/fixtures/webstudio-remix-vercel/app/__generated__/_index.tsx+++ b/fixtures/webstudio-remix-vercel/app/__generated__/_index.tsx@@ -1,8 +1,8 @@/* eslint-disable *//* This is a auto generated file for building the project */+import { type ReactNode, useState } from "react";import type { PageData } from "~/routes/_index";-import type { Components } from "@webstudio-is/react-sdk";import type { Asset } from "@webstudio-is/sdk";import {Body as Body,@@ -13,16 +13,6 @@ import {} from "@webstudio-is/sdk-components-react";import { Link as Link } from "@webstudio-is/sdk-components-react-remix";-export const components = new Map(- Object.entries({- Body: Body,- Heading: Heading,- Box: Box,- Paragraph: Paragraph,- Image: Image,- Link: Link,- })-) as Components;export const fontAssets: Asset[] = [];export const pageData: PageData = {build: {@@ -58,133 +48,6 @@ export const pageData: PageData = {},],],- instances: [- [- "On9cvWCxr5rdZtY9O1Bv0",- {- type: "instance",- id: "On9cvWCxr5rdZtY9O1Bv0",- component: "Body",- children: [- { type: "id", value: "nVMWvMsaLCcb0o1wuNQgg" },- { type: "id", value: "f0kF-WmL7DQg7MSyRvqY1" },- ],- },- ],- [- "nVMWvMsaLCcb0o1wuNQgg",- {- type: "instance",- id: "nVMWvMsaLCcb0o1wuNQgg",- component: "Heading",- children: [- {- type: "text",- value: "DO NOT TOUCH THIS PROJECT, IT'S USED FOR FIXTURES",- },- ],- },- ],- [- "f0kF-WmL7DQg7MSyRvqY1",- {- type: "instance",- id: "f0kF-WmL7DQg7MSyRvqY1",- component: "Box",- children: [- { type: "id", value: "5XDbqPrZDeCwq4YJ3CHsc" },- { type: "id", value: "qPnkiFGDj8dITWb1kmpGl" },- ],- },- ],- [- "5XDbqPrZDeCwq4YJ3CHsc",- {- type: "instance",- id: "5XDbqPrZDeCwq4YJ3CHsc",- component: "Box",- children: [- { type: "id", value: "oLXYe1UQiVMhVnZGvJSMr" },- { type: "id", value: "p34JHWcU6UNrd9FVnY80Q" },- { type: "id", value: "l9AI_pShC-BH4ibxK6kNT" },- { type: "id", value: "82HYqzxZeahPxSDFNWem5" },- { type: "id", value: "9I4GRU1sev48hREkQcKQ-" },- ],- },- ],- [- "qPnkiFGDj8dITWb1kmpGl",- {- type: "instance",- id: "qPnkiFGDj8dITWb1kmpGl",- component: "Box",- children: [{ type: "id", value: "pX1ovPI7NdC0HRjkw6Kpw" }],- },- ],- [- "oLXYe1UQiVMhVnZGvJSMr",- {- type: "instance",- id: "oLXYe1UQiVMhVnZGvJSMr",- component: "Heading",- children: [{ type: "text", value: "Heading" }],- },- ],- [- "p34JHWcU6UNrd9FVnY80Q",- {- type: "instance",- id: "p34JHWcU6UNrd9FVnY80Q",- component: "Paragraph",- children: [- {- type: "text",- value:- "a little kitten painted in black and white gouache with a thick brush",- },- ],- },- ],- [- "pX1ovPI7NdC0HRjkw6Kpw",- {- type: "instance",- id: "pX1ovPI7NdC0HRjkw6Kpw",- component: "Image",- children: [],- },- ],- [- "l9AI_pShC-BH4ibxK6kNT",- {- type: "instance",- id: "l9AI_pShC-BH4ibxK6kNT",- component: "Link",- children: [- { type: "text", value: "Click here to adore more kittens" },- ],- },- ],- [- "9I4GRU1sev48hREkQcKQ-",- {- type: "instance",- id: "9I4GRU1sev48hREkQcKQ-",- component: "Link",- children: [{ type: "text", value: "Symbols in path" }],- },- ],- [- "82HYqzxZeahPxSDFNWem5",- {- type: "instance",- id: "82HYqzxZeahPxSDFNWem5",- component: "Box",- children: [],- },- ],- ],- dataSources: [],},pages: [{@@ -258,26 +121,52 @@ export const user: { email: string | null } | undefined = {};export const projectId = "cddc1d44-af37-4cb6-a430-d300cf6f932d";-/* eslint-disable */--const indexesWithinAncestors = new Map<string, number>([]);--const getDataSourcesLogic = (- _getVariable: (id: string) => unknown,- _setVariable: (id: string, value: unknown) => void-) => {- let _output = new Map();- return _output;+const Page = (props: { scripts?: ReactNode }) => {+ return (+ <Body data-ws-id="On9cvWCxr5rdZtY9O1Bv0" data-ws-component="Body">+ <Heading data-ws-id="nVMWvMsaLCcb0o1wuNQgg" data-ws-component="Heading">+ {"DO NOT TOUCH THIS PROJECT, IT'S USED FOR FIXTURES"}+ </Heading>+ <Box data-ws-id="f0kF-WmL7DQg7MSyRvqY1" data-ws-component="Box">+ <Box data-ws-id="5XDbqPrZDeCwq4YJ3CHsc" data-ws-component="Box">+ <Heading+ data-ws-id="oLXYe1UQiVMhVnZGvJSMr"+ data-ws-component="Heading"+ >+ {"Heading"}+ </Heading>+ <Paragraph+ data-ws-id="p34JHWcU6UNrd9FVnY80Q"+ data-ws-component="Paragraph"+ >+ {+ "a little kitten painted in black and white gouache with a thick brush"+ }+ </Paragraph>+ <Link+ data-ws-id="l9AI_pShC-BH4ibxK6kNT"+ data-ws-component="Link"+ href={"https://github.com/"}+ >+ {"Click here to adore more kittens"}+ </Link>+ <Box data-ws-id="82HYqzxZeahPxSDFNWem5" data-ws-component="Box" />+ <Link data-ws-id="9I4GRU1sev48hREkQcKQ-" data-ws-component="Link">+ {"Symbols in path"}+ </Link>+ </Box>+ <Box data-ws-id="qPnkiFGDj8dITWb1kmpGl" data-ws-component="Box">+ <Image data-ws-id="pX1ovPI7NdC0HRjkw6Kpw" data-ws-component="Image" />+ </Box>+ </Box>+ {props.scripts}+ </Body>+ );};+export { Page };+export const formsProperties = new Map<string,{ method?: string; action?: string }>([]);--export const utils = {- indexesWithinAncestors,- getDataSourcesLogic,-};--/* eslint-enable */diff --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 a9ff4f40e3..704286f6dd 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@@ -6,29 +6,24 @@ import {type ActionArgs,json,} from "@remix-run/server-runtime";--import {- InstanceRoot,- type RootPropsData,- type Params,-} from "@webstudio-is/react-sdk";+import { atom } from "nanostores";+import { ReactSdkContext, getPropsByInstanceId } from "@webstudio-is/react-sdk";import { n8nHandler, getFormId } from "@webstudio-is/form-handlers";import { Scripts, ScrollRestoration } from "@remix-run/react";import {fontAssets,- components,pageData,user,projectId,- utils,formsProperties,+ Page,} from "../__generated__/[_route_with_symbols_]._index.tsx";import css from "../__generated__/index.css";import type { Data } from "@webstudio-is/http-client";import { assetBaseUrl, imageBaseUrl, imageLoader } from "~/constants.mjs";export type PageData = Omit<Data, "build"> & {- build: Pick<Data["build"], "props" | "instances" | "dataSources">;+ build: Pick<Data["build"], "props">;};export const meta: V2_ServerRuntimeMetaFunction = () => {@@ -159,9 +154,7 @@ export const action = async ({ request, context }: ActionArgs) => {};const Outlet = () => {- const pagesCanvasData: PageData = pageData;-- const page = pagesCanvasData.page;+ const page = pageData.page;if (page === undefined) {throw json("Page not found", {@@ -169,32 +162,34 @@ const Outlet = () => {});}- const params: Params = {- assetBaseUrl,- imageBaseUrl,- };-- const data: RootPropsData = {- build: pagesCanvasData.build,- assets: pagesCanvasData.assets,- page,- pages: pagesCanvasData.pages,- params,- };-return (- <InstanceRoot- imageLoader={imageLoader}- data={data}- components={components}- utils={utils}- scripts={- <>- <Scripts />- <ScrollRestoration />- </>- }- />+ <ReactSdkContext.Provider+ value={{+ propsByInstanceIdStore: atom(+ getPropsByInstanceId(new Map(pageData.build.props))+ ),+ assetsStore: atom(+ new Map(pageData.assets.map((asset) => [asset.id, asset]))+ ),+ pagesStore: atom(+ new Map(pageData.pages.map((page) => [page.id, page]))+ ),+ dataSourcesLogicStore: atom(new Map()),+ imageLoader,+ assetBaseUrl,+ imageBaseUrl,+ indexesWithinAncestors: new Map(),+ }}+ >+ <Page+ scripts={+ <>+ <Scripts />+ <ScrollRestoration />+ </>+ }+ />+ </ReactSdkContext.Provider>);};diff --git a/fixtures/webstudio-remix-vercel/app/routes/[form]._index.tsx b/fixtures/webstudio-remix-vercel/app/routes/[form]._index.tsxindex f3669f93a1..ba57a8840c 100644--- a/fixtures/webstudio-remix-vercel/app/routes/[form]._index.tsx+++ b/fixtures/webstudio-remix-vercel/app/routes/[form]._index.tsx@@ -6,29 +6,24 @@ import {type ActionArgs,json,} from "@remix-run/server-runtime";--import {- InstanceRoot,- type RootPropsData,- type Params,-} from "@webstudio-is/react-sdk";+import { atom } from "nanostores";+import { ReactSdkContext, getPropsByInstanceId } from "@webstudio-is/react-sdk";import { n8nHandler, getFormId } from "@webstudio-is/form-handlers";import { Scripts, ScrollRestoration } from "@remix-run/react";import {fontAssets,- components,pageData,user,projectId,- utils,formsProperties,+ Page,} from "../__generated__/[form]._index.tsx";import css from "../__generated__/index.css";import type { Data } from "@webstudio-is/http-client";import { assetBaseUrl, imageBaseUrl, imageLoader } from "~/constants.mjs";export type PageData = Omit<Data, "build"> & {- build: Pick<Data["build"], "props" | "instances" | "dataSources">;+ build: Pick<Data["build"], "props">;};export const meta: V2_ServerRuntimeMetaFunction = () => {@@ -159,9 +154,7 @@ export const action = async ({ request, context }: ActionArgs) => {};const Outlet = () => {- const pagesCanvasData: PageData = pageData;-- const page = pagesCanvasData.page;+ const page = pageData.page;if (page === undefined) {throw json("Page not found", {@@ -169,32 +162,34 @@ const Outlet = () => {});}- const params: Params = {- assetBaseUrl,- imageBaseUrl,- };-- const data: RootPropsData = {- build: pagesCanvasData.build,- assets: pagesCanvasData.assets,- page,- pages: pagesCanvasData.pages,- params,- };-return (- <InstanceRoot- imageLoader={imageLoader}- data={data}- components={components}- utils={utils}- scripts={- <>- <Scripts />- <ScrollRestoration />- </>- }- />+ <ReactSdkContext.Provider+ value={{+ propsByInstanceIdStore: atom(+ getPropsByInstanceId(new Map(pageData.build.props))+ ),+ assetsStore: atom(+ new Map(pageData.assets.map((asset) => [asset.id, asset]))+ ),+ pagesStore: atom(+ new Map(pageData.pages.map((page) => [page.id, page]))+ ),+ dataSourcesLogicStore: atom(new Map()),+ imageLoader,+ assetBaseUrl,+ imageBaseUrl,+ indexesWithinAncestors: new Map(),+ }}+ >+ <Page+ scripts={+ <>+ <Scripts />+ <ScrollRestoration />+ </>+ }+ />+ </ReactSdkContext.Provider>);};diff --git a/fixtures/webstudio-remix-vercel/app/routes/[radix]._index.tsx b/fixtures/webstudio-remix-vercel/app/routes/[radix]._index.tsxindex 44f5a20da9..6232f6a9bf 100644--- a/fixtures/webstudio-remix-vercel/app/routes/[radix]._index.tsx+++ b/fixtures/webstudio-remix-vercel/app/routes/[radix]._index.tsx@@ -6,29 +6,24 @@ import {type ActionArgs,json,} from "@remix-run/server-runtime";--import {- InstanceRoot,- type RootPropsData,- type Params,-} from "@webstudio-is/react-sdk";+import { atom } from "nanostores";+import { ReactSdkContext, getPropsByInstanceId } from "@webstudio-is/react-sdk";import { n8nHandler, getFormId } from "@webstudio-is/form-handlers";import { Scripts, ScrollRestoration } from "@remix-run/react";import {fontAssets,- components,pageData,user,projectId,- utils,formsProperties,+ Page,} from "../__generated__/[radix]._index.tsx";import css from "../__generated__/index.css";import type { Data } from "@webstudio-is/http-client";import { assetBaseUrl, imageBaseUrl, imageLoader } from "~/constants.mjs";export type PageData = Omit<Data, "build"> & {- build: Pick<Data["build"], "props" | "instances" | "dataSources">;+ build: Pick<Data["build"], "props">;};export const meta: V2_ServerRuntimeMetaFunction = () => {@@ -159,9 +154,7 @@ export const action = async ({ request, context }: ActionArgs) => {};const Outlet = () => {- const pagesCanvasData: PageData = pageData;-- const page = pagesCanvasData.page;+ const page = pageData.page;if (page === undefined) {throw json("Page not found", {@@ -169,32 +162,34 @@ const Outlet = () => {});}- const params: Params = {- assetBaseUrl,- imageBaseUrl,- };-- const data: RootPropsData = {- build: pagesCanvasData.build,- assets: pagesCanvasData.assets,- page,- pages: pagesCanvasData.pages,- params,- };-return (- <InstanceRoot- imageLoader={imageLoader}- data={data}- components={components}- utils={utils}- scripts={- <>- <Scripts />- <ScrollRestoration />- </>- }- />+ <ReactSdkContext.Provider+ value={{+ propsByInstanceIdStore: atom(+ getPropsByInstanceId(new Map(pageData.build.props))+ ),+ assetsStore: atom(+ new Map(pageData.assets.map((asset) => [asset.id, asset]))+ ),+ pagesStore: atom(+ new Map(pageData.pages.map((page) => [page.id, page]))+ ),+ dataSourcesLogicStore: atom(new Map()),+ imageLoader,+ assetBaseUrl,+ imageBaseUrl,+ indexesWithinAncestors: new Map(),+ }}+ >+ <Page+ scripts={+ <>+ <Scripts />+ <ScrollRestoration />+ </>+ }+ />+ </ReactSdkContext.Provider>);};diff --git a/fixtures/webstudio-remix-vercel/app/routes/_index.tsx b/fixtures/webstudio-remix-vercel/app/routes/_index.tsxindex 48bca9f9e1..1695eb2578 100644--- a/fixtures/webstudio-remix-vercel/app/routes/_index.tsx+++ b/fixtures/webstudio-remix-vercel/app/routes/_index.tsx@@ -6,29 +6,24 @@ import {type ActionArgs,json,} from "@remix-run/server-runtime";--import {- InstanceRoot,- type RootPropsData,- type Params,-} from "@webstudio-is/react-sdk";+import { atom } from "nanostores";+import { ReactSdkContext, getPropsByInstanceId } from "@webstudio-is/react-sdk";import { n8nHandler, getFormId } from "@webstudio-is/form-handlers";import { Scripts, ScrollRestoration } from "@remix-run/react";import {fontAssets,- components,pageData,user,projectId,- utils,formsProperties,+ Page,} from "../__generated__/_index.tsx";import css from "../__generated__/index.css";import type { Data } from "@webstudio-is/http-client";import { assetBaseUrl, imageBaseUrl, imageLoader } from "~/constants.mjs";export type PageData = Omit<Data, "build"> & {- build: Pick<Data["build"], "props" | "instances" | "dataSources">;+ build: Pick<Data["build"], "props">;};export const meta: V2_ServerRuntimeMetaFunction = () => {@@ -159,9 +154,7 @@ export const action = async ({ request, context }: ActionArgs) => {};const Outlet = () => {- const pagesCanvasData: PageData = pageData;-- const page = pagesCanvasData.page;+ const page = pageData.page;if (page === undefined) {throw json("Page not found", {@@ -169,32 +162,34 @@ const Outlet = () => {});}- const params: Params = {- assetBaseUrl,- imageBaseUrl,- };-- const data: RootPropsData = {- build: pagesCanvasData.build,- assets: pagesCanvasData.assets,- page,- pages: pagesCanvasData.pages,- params,- };-return (- <InstanceRoot- imageLoader={imageLoader}- data={data}- components={components}- utils={utils}- scripts={- <>- <Scripts />- <ScrollRestoration />- </>- }- />+ <ReactSdkContext.Provider+ value={{+ propsByInstanceIdStore: atom(+ getPropsByInstanceId(new Map(pageData.build.props))+ ),+ assetsStore: atom(+ new Map(pageData.assets.map((asset) => [asset.id, asset]))+ ),+ pagesStore: atom(+ new Map(pageData.pages.map((page) => [page.id, page]))+ ),+ dataSourcesLogicStore: atom(new Map()),+ imageLoader,+ assetBaseUrl,+ imageBaseUrl,+ indexesWithinAncestors: new Map(),+ }}+ >+ <Page+ scripts={+ <>+ <Scripts />+ <ScrollRestoration />+ </>+ }+ />+ </ReactSdkContext.Provider>);};diff --git a/packages/cli/__generated__/index.ts b/packages/cli/__generated__/index.tsxsimilarity index 67%rename from packages/cli/__generated__/index.tsrename to packages/cli/__generated__/index.tsxindex 97b7773b43..e30d440e89 100644--- a/packages/cli/__generated__/index.ts+++ b/packages/cli/__generated__/index.tsx@@ -1,19 +1,15 @@/*** The only intent of this file is to support typings inside ../templates/route-template for easier development.**/+import type { ReactNode } from "react";import type { PageData } from "../templates/route-template";-import type { Components } from "@webstudio-is/react-sdk";import type { Asset } from "@webstudio-is/sdk";-export const components = new Map() as Components;-export const fontAssets: Asset[] = [];export const pageData: PageData = {build: {props: [],- instances: [],- dataSources: [],},pages: [],@@ -33,18 +29,13 @@ export const user: { email: string | null } | undefined = {};export const projectId = "project-id";-const indexesWithinAncestors = new Map<string, number>([]);--const getDataSourcesLogic = () => {- return new Map();+const Page = (_props: { scripts: ReactNode }) => {+ return <></>;};+export { Page };+export const formsProperties = new Map<string,{ method?: string; action?: string }>([]);--export const utils = {- indexesWithinAncestors,- getDataSourcesLogic,-};diff --git a/packages/cli/src/prebuild.ts b/packages/cli/src/prebuild.tsindex 9a8135d32e..fdc3f4302f 100644--- a/packages/cli/src/prebuild.ts+++ b/packages/cli/src/prebuild.ts@@ -13,11 +13,15 @@ import {import { pipeline } from "node:stream/promises";import { tmpdir } from "node:os";import { cwd } from "node:process";+import { fileURLToPath, pathToFileURL } from "node:url";import pLimit from "p-limit";import ora from "ora";+import merge from "deepmerge";import {generateCssText,generateUtilsExport,+ generatePageComponent,+ getIndexesWithinAncestors,namespaceMeta,type Params,type WsComponentMeta,@@ -28,23 +32,23 @@ import type {Page,DataSource,Deployment,+ Asset,+ FontAsset,} from "@webstudio-is/sdk";import {createScope,findTreeInstanceIds,parseComponentName,} from "@webstudio-is/sdk";-import type { Asset, FontAsset } from "@webstudio-is/sdk";import type { Data } from "@webstudio-is/http-client";+import { createImageLoader } from "@webstudio-is/image";import * as baseComponentMetas from "@webstudio-is/sdk-components-react/metas";import * as remixComponentMetas from "@webstudio-is/sdk-components-react-remix/metas";import * as radixComponentMetas from "@webstudio-is/sdk-components-react-radix/metas";import { LOCAL_DATA_FILE } from "./config";import { ensureFileInPath, ensureFolderExists, loadJSONFile } from "./fs-utils";-import merge from "deepmerge";-import { createImageLoader } from "@webstudio-is/image";-import { fileURLToPath, pathToFileURL } from "node:url";import type * as sharedConstants from "~/constants.mjs";+import type { PageData } from "../templates/route-template";const limit = pLimit(10);@@ -378,18 +382,17 @@ export const prebuild = async (options: {for (const [pathName, pageComponents] of Object.entries(componentsByPage)) {const scope = createScope([// manually maintained list of occupied identifiers+ "useState",+ "ReactNode","PageData",- "Components","Asset",- "components","fontAssets","pageData","user","projectId","formsProperties",- "indexesWithinAncestors",- "getDataSourcesLogic",- "utils",+ "Page",+ "props",]);const namespaces = new Map<string,@@ -422,7 +425,6 @@ export const prebuild = async (options: {}let componentImports = "";- let componentEntries = "";for (const [namespace, componentsSet] of namespaces.entries()) {const specifiers = Array.from(componentsSet).map(@@ -431,40 +433,56 @@ export const prebuild = async (options: {).join(", ");componentImports += `import { ${specifiers} } from "${namespace}";\n`;-- const fields = Array.from(componentsSet)- .map(- ([shortName, component]) =>- `"${component}": ${scope.getName(component, shortName)}`- )- .join(",");- componentEntries += `${fields},\n`;}const pageData = siteDataByPage[pathName];+ // serialize data only used in runtime+ const renderedPageData: PageData = {+ build: {+ props: pageData.build.props,+ },+ pages: pageData.pages,+ page: pageData.page,+ assets: pageData.assets,+ };+ const rootInstanceId = pageData.page.rootInstanceId;+ const instances = new Map(pageData.build.instances);+ const props = new Map(pageData.build.props);+ const dataSources = new Map(pageData.build.dataSources);const utilsExport = generateUtilsExport({- page: pageData.page,- metas: projectMetas,- instances: new Map(pageData.build.instances),props: new Map(pageData.build.props),- dataSources: new Map(pageData.build.dataSources),+ });+ const pageComponent = generatePageComponent({+ scope,+ rootInstanceId,+ instances,+ props,+ dataSources,+ indexesWithinAncestors: getIndexesWithinAncestors(+ projectMetas,+ instances,+ [rootInstanceId]+ ),});const pageExports = `/* eslint-disable *//* This is a auto generated file for building the project */ \n+import { type ReactNode, useState } from "react";import type { PageData } from "~/routes/_index";-import type { Components } from "@webstudio-is/react-sdk";import type { Asset } from "@webstudio-is/sdk";${componentImports}-export const components = new Map(Object.entries({ ${componentEntries} })) as Components;export const fontAssets: Asset[] = ${JSON.stringify(fontAssets)}-export const pageData: PageData = ${JSON.stringify(pageData)};+export const pageData: PageData = ${JSON.stringify(renderedPageData)};export const user: { email: string | null } | undefined = ${JSON.stringify(siteData.user)};export const projectId = "${siteData.build.projectId}";+${pageComponent}++export { Page }+${utilsExport}`;diff --git a/packages/cli/templates/route-template.tsx b/packages/cli/templates/route-template.tsxindex 02fe81a188..757b84a3ff 100644--- a/packages/cli/templates/route-template.tsx+++ b/packages/cli/templates/route-template.tsx@@ -6,29 +6,24 @@ import {type ActionArgs,json,} from "@remix-run/server-runtime";--import {- InstanceRoot,- type RootPropsData,- type Params,-} from "@webstudio-is/react-sdk";+import { atom } from "nanostores";+import { ReactSdkContext, getPropsByInstanceId } from "@webstudio-is/react-sdk";import { n8nHandler, getFormId } from "@webstudio-is/form-handlers";import { Scripts, ScrollRestoration } from "@remix-run/react";import {fontAssets,- components,pageData,user,projectId,- utils,formsProperties,+ Page,} from "../__generated__/index";import css from "../__generated__/index.css";import type { Data } from "@webstudio-is/http-client";import { assetBaseUrl, imageBaseUrl, imageLoader } from "~/constants.mjs";export type PageData = Omit<Data, "build"> & {- build: Pick<Data["build"], "props" | "instances" | "dataSources">;+ build: Pick<Data["build"], "props">;};export const meta: V2_ServerRuntimeMetaFunction = () => {@@ -159,9 +154,7 @@ export const action = async ({ request, context }: ActionArgs) => {};const Outlet = () => {- const pagesCanvasData: PageData = pageData;-- const page = pagesCanvasData.page;+ const page = pageData.page;if (page === undefined) {throw json("Page not found", {@@ -169,32 +162,34 @@ const Outlet = () => {});}- const params: Params = {- assetBaseUrl,- imageBaseUrl,- };-- const data: RootPropsData = {- build: pagesCanvasData.build,- assets: pagesCanvasData.assets,- page,- pages: pagesCanvasData.pages,- params,- };-return (- <InstanceRoot- imageLoader={imageLoader}- data={data}- components={components}- utils={utils}- scripts={- <>- <Scripts />- <ScrollRestoration />- </>- }- />+ <ReactSdkContext.Provider+ value={{+ propsByInstanceIdStore: atom(+ getPropsByInstanceId(new Map(pageData.build.props))+ ),+ assetsStore: atom(+ new Map(pageData.assets.map((asset) => [asset.id, asset]))+ ),+ pagesStore: atom(+ new Map(pageData.pages.map((page) => [page.id, page]))+ ),+ dataSourcesLogicStore: atom(new Map()),+ imageLoader,+ assetBaseUrl,+ imageBaseUrl,+ indexesWithinAncestors: new Map(),+ }}+ >+ <Page+ scripts={+ <>+ <Scripts />+ <ScrollRestoration />+ </>+ }+ />+ </ReactSdkContext.Provider>);};diff --git a/packages/react-sdk/src/component-generator.test.ts b/packages/react-sdk/src/component-generator.test.tsindex c3aa6c2752..b7a1ddf5b7 100644--- a/packages/react-sdk/src/component-generator.test.ts+++ b/packages/react-sdk/src/component-generator.test.ts@@ -534,7 +534,7 @@ test("generate page component with data sources", () => {).toEqual(clear(`const Page = (props: { scripts?: ReactNode }) => {- let [variableName, set$variableName] = useState("initial")+ let [variableName, set$variableName] = useState<any>("initial")let onChange = (value: any) => {variableName = valueset$variableName(variableName)diff --git a/packages/react-sdk/src/component-generator.ts b/packages/react-sdk/src/component-generator.tsindex 7b2f0fa73e..4f691d40c0 100644--- a/packages/react-sdk/src/component-generator.ts+++ b/packages/react-sdk/src/component-generator.ts@@ -206,7 +206,7 @@ export const generatePageComponent = ({let generatedDataSources = "";for (const { valueName, setterName, initialValue } of variables.values()) {const initialValueString = JSON.stringify(initialValue);- generatedDataSources += `let [${valueName}, ${setterName}] = useState(${initialValueString})\n`;+ generatedDataSources += `let [${valueName}, ${setterName}] = useState<any>(${initialValueString})\n`;}generatedDataSources += dataSourcesBody;diff --git a/packages/react-sdk/src/generator.test.ts b/packages/react-sdk/src/generator.test.tsindex 6a18953770..0c79b5348a 100644--- a/packages/react-sdk/src/generator.test.ts+++ b/packages/react-sdk/src/generator.test.ts@@ -4,89 +4,7 @@ import { generateUtilsExport } from "./generator";test("generates utils", () => {expect(generateUtilsExport({- page: {- id: "",- path: "",- name: "",- title: "",- meta: {},- rootInstanceId: "tabs",- },- metas: new Map([- ["Tabs", { type: "container", label: "", icon: "" }],- [- "TabsContent",- {- type: "container",- label: "",- icon: "",- indexWithinAncestor: "Tabs",- },- ],- ]),- instances: new Map([- [- "tabs",- {- id: "tabs",- type: "instance",- component: "Tabs",- children: [- { type: "id", value: "content1" },- { type: "id", value: "content2" },- ],- },- ],-- [- "content1",- {- id: "content1",- type: "instance",- component: "TabsContent",- children: [],- },- ],-- [- "content2",- {- id: "content2",- type: "instance",- component: "TabsContent",- children: [],- },- ],- ]),props: new Map([- [- "_open",- {- type: "dataSource",- id: "_open",- instanceId: "tabs",- name: "open",- value: "_tabsOpen",- },- ],-- [- "_onOpenChange",- {- type: "action",- id: "_onOpenChange",- instanceId: "tabs",- name: "onOpenChange",- value: [- {- type: "execute",- args: ["open"],- code: `$ws$dataSource$_tabsOpen = open`,- },- ],- },- ],-["method1Id",{@@ -120,54 +38,10 @@ test("generates utils", () => {},],]),- dataSources: new Map([- [- "_tabsOpen",- {- id: "_tabsOpen",- name: "tabsOpen",- scopeInstanceId: "tabs",- type: "variable",- value: { type: "string", value: "0" },- },- ],- ]),})).toMatchInlineSnapshot(`"- /* eslint-disable */-- const indexesWithinAncestors = new Map<string, number>([- ["content1", 0],- ["content2", 1],-- ]);-- const getDataSourcesLogic = (- _getVariable: (id: string) => unknown,- _setVariable: (id: string, value: unknown) => void- ) => {- let tabsOpen = _getVariable("_tabsOpen") ?? "0";- let set$tabsOpen = (value: unknown) => _setVariable("_tabsOpen", value);- let onOpenChange = (open: any) => {- tabsOpen = open- set$tabsOpen(tabsOpen)- }- let _output = new Map();- _output.set('_tabsOpen', tabsOpen)- _output.set('_onOpenChange', onOpenChange)- return _output- }--export const formsProperties = new Map<string, { method?: string, action?: string }>([["1",{"method":"post"}],["2",{"method":"get","action":"/index.php"}]])-- export const utils = {- indexesWithinAncestors,- getDataSourcesLogic,- };-- /* eslint-enable */"`);});diff --git a/packages/react-sdk/src/generator.ts b/packages/react-sdk/src/generator.tsindex 0f914236d7..a3568ed8a1 100644--- a/packages/react-sdk/src/generator.ts+++ b/packages/react-sdk/src/generator.ts@@ -1,24 +1,8 @@-import {- createScope,- type DataSources,- type Instance,- type Instances,- type Page,- type Props,-} from "@webstudio-is/sdk";-import type { WsComponentMeta } from "./components/component-meta";-import {- getIndexesWithinAncestors,- type IndexesWithinAncestors,-} from "./instance-utils";-import { generateDataSources } from "./expression";+import type { Props } from "@webstudio-is/sdk";+import type { IndexesWithinAncestors } from "./instance-utils";type PageData = {- page: Page;- metas: Map<Instance["component"], WsComponentMeta>;- instances: Instances;props: Props;- dataSources: DataSources;};export type GeneratedUtils = {@@ -31,52 +15,8 @@ export type GeneratedUtils = {/*** Generates data based utilities at build time- * Requires this import statement in scope- * import * as sdk from "@webstudio-is/react-sdk";*/export const generateUtilsExport = (siteData: PageData) => {- const indexesWithinAncestors = getIndexesWithinAncestors(- siteData.metas,- siteData.instances,- [siteData.page.rootInstanceId]- );- let indexesWithinAncestorsEntries = "";- for (const [key, value] of indexesWithinAncestors) {- const keyString = JSON.stringify(key);- const valueString = JSON.stringify(value);- indexesWithinAncestorsEntries += `[${keyString}, ${valueString}],\n`;- }- const generatedIndexesWithinAncestors = `- const indexesWithinAncestors = new Map<string, number>([- ${indexesWithinAncestorsEntries}- ]);- `;-- const { variables, body, output } = generateDataSources({- scope: createScope(["_getVariable", "_setVariable", "_output"]),- typed: true,- dataSources: siteData.dataSources,- props: siteData.props,- });- let generatedDataSources = "";- generatedDataSources += `const getDataSourcesLogic = (\n`;- generatedDataSources += ` _getVariable: (id: string) => unknown,\n`;- generatedDataSources += ` _setVariable: (id: string, value: unknown) => void\n`;- generatedDataSources += `) => {\n`;- for (const [dataSourceId, variable] of variables) {- const { valueName, setterName } = variable;- const initialValue = JSON.stringify(variable.initialValue);- generatedDataSources += `let ${valueName} = _getVariable("${dataSourceId}") ?? ${initialValue};\n`;- generatedDataSources += `let ${setterName} = (value: unknown) => _setVariable("${dataSourceId}", value);\n`;- }- generatedDataSources += body;- generatedDataSources += `let _output = new Map();\n`;- for (const [dataSourceId, variableName] of output) {- generatedDataSources += `_output.set('${dataSourceId}', ${variableName})\n`;- }- generatedDataSources += `return _output\n`;- generatedDataSources += `}\n`;-const formsProperties = new Map<string,{ method?: string; action?: string }@@ -98,19 +38,6 @@ export const generateUtilsExport = (siteData: PageData) => {)})`;return `- /* eslint-disable */-- ${generatedIndexesWithinAncestors.trim()}-- ${generatedDataSources}-${generatedFormsProperties}-- export const utils = {- indexesWithinAncestors,- getDataSourcesLogic,- };-- /* eslint-enable */`;};diff --git a/packages/react-sdk/src/index.ts b/packages/react-sdk/src/index.tsindex 86044a79ac..c31d9cb43f 100644--- a/packages/react-sdk/src/index.ts+++ b/packages/react-sdk/src/index.ts@@ -15,6 +15,7 @@ export {export * from "./embed-template";export {useInstanceProps,+ getPropsByInstanceId,usePropUrl,usePropAsset,getInstanceIdFromComponentProps,