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: support page path params in site compiler (#2682)
Bogdan Chadkin7fe4b770d676
diff --git a/fixtures/webstudio-custom-template/app/__generated__/_index.tsx b/fixtures/webstudio-custom-template/app/__generated__/_index.tsxindex 890e45899d..1c70d805b3 100644--- a/fixtures/webstudio-custom-template/app/__generated__/_index.tsx+++ b/fixtures/webstudio-custom-template/app/__generated__/_index.tsx@@ -43,7 +43,8 @@ export const user: { email: string | null } | undefined = {};export const projectId = "0d856812-61d8-4014-a20a-82e01c0eb8ee";-const Page = () => {+type Params = Record<string, string | undefined>;+const Page = (_props: { params: Params }) => {return (<Body data-ws-id="ibXgMoi9_ipHx1gVrvii0" data-ws-component="Body"><Heading data-ws-id="7pwqBSgrfuuOfk1JblWcL" data-ws-component="Heading">@@ -55,6 +56,10 @@ const Page = () => {export { Page };+export const getRemixParams = ({ ...params }: Params): Params => {+ return params;+};+export const pagesPaths = new Set([""]);export const formsProperties = new Map<diff --git a/fixtures/webstudio-custom-template/app/routes/_index.tsx b/fixtures/webstudio-custom-template/app/routes/_index.tsxindex e672abcbc3..33bde30f9a 100644--- a/fixtures/webstudio-custom-template/app/routes/_index.tsx+++ b/fixtures/webstudio-custom-template/app/routes/_index.tsx@@ -7,6 +7,7 @@ import {type LoaderArgs,json,} from "@remix-run/server-runtime";+import { useLoaderData } from "@remix-run/react";import type { Page as PageType, SiteMeta } from "@webstudio-is/sdk";import { ReactSdkContext } from "@webstudio-is/react-sdk";import { n8nHandler, getFormId } from "@webstudio-is/form-handlers";@@ -19,6 +20,7 @@ import {formsProperties,Page,imageAssets,+ getRemixParams,} from "../__generated__/_index.tsx";import css from "../__generated__/index.css";import { assetBaseUrl, imageBaseUrl, imageLoader } from "~/constants.mjs";@@ -29,6 +31,8 @@ export type PageData = {};export const loader = async (arg: LoaderArgs) => {+ const params = getRemixParams(arg.params);+const host =arg.request.headers.get("x-forwarded-host") ||arg.request.headers.get("host") ||@@ -46,6 +50,7 @@ export const loader = async (arg: LoaderArgs) => {host,url: url.href,excludeFromSearch: arg.context.EXCLUDE_FROM_SEARCH,+ params,},// No way for current information to change, so add cache for 10 minutes// In case of CRM Data, this should be set to 0@@ -282,6 +287,7 @@ export const action = async ({ request, context }: ActionArgs) => {};const Outlet = () => {+ const { params } = useLoaderData();return (<ReactSdkContext.Providervalue={{@@ -291,7 +297,7 @@ const Outlet = () => {pagesPaths,}}>- <Page />+ <Page params={params} /></ReactSdkContext.Provider>);};diff --git a/fixtures/webstudio-remix-netlify-edge-functions/app/__generated__/_index.tsx b/fixtures/webstudio-remix-netlify-edge-functions/app/__generated__/_index.tsxindex 152cb5a2f6..34a8e2f7a1 100644--- a/fixtures/webstudio-remix-netlify-edge-functions/app/__generated__/_index.tsx+++ b/fixtures/webstudio-remix-netlify-edge-functions/app/__generated__/_index.tsx@@ -27,7 +27,8 @@ export const user: { email: string | null } | undefined = {};export const projectId = "d845c167-ea07-4875-b08d-83e97c09dcce";-const Page = () => {+type Params = Record<string, string | undefined>;+const Page = (_props: { params: Params }) => {return (<Body data-ws-id="MMimeobf_zi4ZkRGXapju" data-ws-component="Body"><Heading data-ws-id="MYDt0guk1-vzc7yzqyN6A" data-ws-component="Heading">@@ -42,6 +43,10 @@ const Page = () => {export { Page };+export const getRemixParams = ({ ...params }: Params): Params => {+ return params;+};+export const pagesPaths = new Set([""]);export const formsProperties = new Map<diff --git a/fixtures/webstudio-remix-netlify-edge-functions/app/routes/_index.tsx b/fixtures/webstudio-remix-netlify-edge-functions/app/routes/_index.tsxindex e672abcbc3..33bde30f9a 100644--- a/fixtures/webstudio-remix-netlify-edge-functions/app/routes/_index.tsx+++ b/fixtures/webstudio-remix-netlify-edge-functions/app/routes/_index.tsx@@ -7,6 +7,7 @@ import {type LoaderArgs,json,} from "@remix-run/server-runtime";+import { useLoaderData } from "@remix-run/react";import type { Page as PageType, SiteMeta } from "@webstudio-is/sdk";import { ReactSdkContext } from "@webstudio-is/react-sdk";import { n8nHandler, getFormId } from "@webstudio-is/form-handlers";@@ -19,6 +20,7 @@ import {formsProperties,Page,imageAssets,+ getRemixParams,} from "../__generated__/_index.tsx";import css from "../__generated__/index.css";import { assetBaseUrl, imageBaseUrl, imageLoader } from "~/constants.mjs";@@ -29,6 +31,8 @@ export type PageData = {};export const loader = async (arg: LoaderArgs) => {+ const params = getRemixParams(arg.params);+const host =arg.request.headers.get("x-forwarded-host") ||arg.request.headers.get("host") ||@@ -46,6 +50,7 @@ export const loader = async (arg: LoaderArgs) => {host,url: url.href,excludeFromSearch: arg.context.EXCLUDE_FROM_SEARCH,+ params,},// No way for current information to change, so add cache for 10 minutes// In case of CRM Data, this should be set to 0@@ -282,6 +287,7 @@ export const action = async ({ request, context }: ActionArgs) => {};const Outlet = () => {+ const { params } = useLoaderData();return (<ReactSdkContext.Providervalue={{@@ -291,7 +297,7 @@ const Outlet = () => {pagesPaths,}}>- <Page />+ <Page params={params} /></ReactSdkContext.Provider>);};diff --git a/fixtures/webstudio-remix-netlify-functions/app/__generated__/_index.tsx b/fixtures/webstudio-remix-netlify-functions/app/__generated__/_index.tsxindex 152cb5a2f6..34a8e2f7a1 100644--- a/fixtures/webstudio-remix-netlify-functions/app/__generated__/_index.tsx+++ b/fixtures/webstudio-remix-netlify-functions/app/__generated__/_index.tsx@@ -27,7 +27,8 @@ export const user: { email: string | null } | undefined = {};export const projectId = "d845c167-ea07-4875-b08d-83e97c09dcce";-const Page = () => {+type Params = Record<string, string | undefined>;+const Page = (_props: { params: Params }) => {return (<Body data-ws-id="MMimeobf_zi4ZkRGXapju" data-ws-component="Body"><Heading data-ws-id="MYDt0guk1-vzc7yzqyN6A" data-ws-component="Heading">@@ -42,6 +43,10 @@ const Page = () => {export { Page };+export const getRemixParams = ({ ...params }: Params): Params => {+ return params;+};+export const pagesPaths = new Set([""]);export const formsProperties = new Map<diff --git a/fixtures/webstudio-remix-netlify-functions/app/routes/_index.tsx b/fixtures/webstudio-remix-netlify-functions/app/routes/_index.tsxindex e672abcbc3..33bde30f9a 100644--- a/fixtures/webstudio-remix-netlify-functions/app/routes/_index.tsx+++ b/fixtures/webstudio-remix-netlify-functions/app/routes/_index.tsx@@ -7,6 +7,7 @@ import {type LoaderArgs,json,} from "@remix-run/server-runtime";+import { useLoaderData } from "@remix-run/react";import type { Page as PageType, SiteMeta } from "@webstudio-is/sdk";import { ReactSdkContext } from "@webstudio-is/react-sdk";import { n8nHandler, getFormId } from "@webstudio-is/form-handlers";@@ -19,6 +20,7 @@ import {formsProperties,Page,imageAssets,+ getRemixParams,} from "../__generated__/_index.tsx";import css from "../__generated__/index.css";import { assetBaseUrl, imageBaseUrl, imageLoader } from "~/constants.mjs";@@ -29,6 +31,8 @@ export type PageData = {};export const loader = async (arg: LoaderArgs) => {+ const params = getRemixParams(arg.params);+const host =arg.request.headers.get("x-forwarded-host") ||arg.request.headers.get("host") ||@@ -46,6 +50,7 @@ export const loader = async (arg: LoaderArgs) => {host,url: url.href,excludeFromSearch: arg.context.EXCLUDE_FROM_SEARCH,+ params,},// No way for current information to change, so add cache for 10 minutes// In case of CRM Data, this should be set to 0@@ -282,6 +287,7 @@ export const action = async ({ request, context }: ActionArgs) => {};const Outlet = () => {+ const { params } = useLoaderData();return (<ReactSdkContext.Providervalue={{@@ -291,7 +297,7 @@ const Outlet = () => {pagesPaths,}}>- <Page />+ <Page params={params} /></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 91caec93bb..cd0144d87a 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@@ -63,7 +63,8 @@ export const user: { email: string | null } | undefined = {};export const projectId = "cddc1d44-af37-4cb6-a430-d300cf6f932d";-const Page = () => {+type Params = Record<string, string | undefined>;+const Page = (_props: { params: Params }) => {return (<Body data-ws-id="EDEfpMPRqDejthtwkH7ws" data-ws-component="Body"><Image@@ -77,6 +78,10 @@ const Page = () => {export { Page };+export const getRemixParams = ({ ...params }: Params): Params => {+ return params;+};+export const pagesPaths = new Set(["","/radix",diff --git a/fixtures/webstudio-remix-vercel/app/__generated__/[form]._index.tsx b/fixtures/webstudio-remix-vercel/app/__generated__/[form]._index.tsxindex 49e8c50d35..d7a9715013 100644--- a/fixtures/webstudio-remix-vercel/app/__generated__/[form]._index.tsx+++ b/fixtures/webstudio-remix-vercel/app/__generated__/[form]._index.tsx@@ -72,7 +72,8 @@ export const user: { email: string | null } | undefined = {};export const projectId = "cddc1d44-af37-4cb6-a430-d300cf6f932d";-const Page = () => {+type Params = Record<string, string | undefined>;+const Page = (_props: { params: Params }) => {let [formState, set$formState] = useState<any>("initial");let [formState_1, set$formState_1] = useState<any>("initial");let onStateChange = (state: any) => {@@ -193,6 +194,10 @@ const Page = () => {export { Page };+export const getRemixParams = ({ ...params }: Params): Params => {+ return params;+};+export const pagesPaths = new Set(["","/radix",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 9ca4a9c50f..9404945a48 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@@ -63,7 +63,8 @@ export const user: { email: string | null } | undefined = {};export const projectId = "cddc1d44-af37-4cb6-a430-d300cf6f932d";-const Page = () => {+type Params = Record<string, string | undefined>;+const Page = (_props: { params: Params }) => {return (<Body data-ws-id="O-ljaGZQ0iRNTlEshMkgE" data-ws-component="Body"><Heading@@ -79,6 +80,10 @@ const Page = () => {export { Page };+export const getRemixParams = ({ ...params }: Params): Params => {+ return params;+};+export const pagesPaths = new Set(["","/radix",diff --git a/fixtures/webstudio-remix-vercel/app/__generated__/[radix]._index.tsx b/fixtures/webstudio-remix-vercel/app/__generated__/[radix]._index.tsxindex 3b78515a80..46f8625f06 100644--- a/fixtures/webstudio-remix-vercel/app/__generated__/[radix]._index.tsx+++ b/fixtures/webstudio-remix-vercel/app/__generated__/[radix]._index.tsx@@ -79,7 +79,8 @@ export const user: { email: string | null } | undefined = {};export const projectId = "cddc1d44-af37-4cb6-a430-d300cf6f932d";-const Page = () => {+type Params = Record<string, string | undefined>;+const Page = (_props: { params: Params }) => {let [accordionValue, set$accordionValue] = useState<any>("0");let onValueChange = (value: any) => {accordionValue = value;@@ -207,6 +208,10 @@ const Page = () => {export { Page };+export const getRemixParams = ({ ...params }: Params): Params => {+ return params;+};+export const pagesPaths = new Set(["","/radix",diff --git a/fixtures/webstudio-remix-vercel/app/__generated__/_index.tsx b/fixtures/webstudio-remix-vercel/app/__generated__/_index.tsxindex d78f4c8d4a..b02c7dc150 100644--- a/fixtures/webstudio-remix-vercel/app/__generated__/_index.tsx+++ b/fixtures/webstudio-remix-vercel/app/__generated__/_index.tsx@@ -77,7 +77,8 @@ export const user: { email: string | null } | undefined = {};export const projectId = "cddc1d44-af37-4cb6-a430-d300cf6f932d";-const Page = () => {+type Params = Record<string, string | undefined>;+const Page = (_props: { params: Params }) => {return (<Body data-ws-id="On9cvWCxr5rdZtY9O1Bv0" data-ws-component="Body"><Heading data-ws-id="nVMWvMsaLCcb0o1wuNQgg" data-ws-component="Heading">@@ -152,6 +153,10 @@ const Page = () => {export { Page };+export const getRemixParams = ({ ...params }: Params): Params => {+ return params;+};+export const pagesPaths = new Set(["","/radix",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 2b46605b28..319e65c09e 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@@ -7,6 +7,7 @@ import {type LoaderArgs,json,} from "@remix-run/server-runtime";+import { useLoaderData } from "@remix-run/react";import type { Page as PageType, SiteMeta } from "@webstudio-is/sdk";import { ReactSdkContext } from "@webstudio-is/react-sdk";import { n8nHandler, getFormId } from "@webstudio-is/form-handlers";@@ -19,6 +20,7 @@ import {formsProperties,Page,imageAssets,+ getRemixParams,} from "../__generated__/[_route_with_symbols_]._index.tsx";import css from "../__generated__/index.css";import { assetBaseUrl, imageBaseUrl, imageLoader } from "~/constants.mjs";@@ -29,6 +31,8 @@ export type PageData = {};export const loader = async (arg: LoaderArgs) => {+ const params = getRemixParams(arg.params);+const host =arg.request.headers.get("x-forwarded-host") ||arg.request.headers.get("host") ||@@ -46,6 +50,7 @@ export const loader = async (arg: LoaderArgs) => {host,url: url.href,excludeFromSearch: arg.context.EXCLUDE_FROM_SEARCH,+ params,},// No way for current information to change, so add cache for 10 minutes// In case of CRM Data, this should be set to 0@@ -282,6 +287,7 @@ export const action = async ({ request, context }: ActionArgs) => {};const Outlet = () => {+ const { params } = useLoaderData();return (<ReactSdkContext.Providervalue={{@@ -291,7 +297,7 @@ const Outlet = () => {pagesPaths,}}>- <Page />+ <Page params={params} /></ReactSdkContext.Provider>);};diff --git a/fixtures/webstudio-remix-vercel/app/routes/[form]._index.tsx b/fixtures/webstudio-remix-vercel/app/routes/[form]._index.tsxindex 3572a137dc..126010839d 100644--- a/fixtures/webstudio-remix-vercel/app/routes/[form]._index.tsx+++ b/fixtures/webstudio-remix-vercel/app/routes/[form]._index.tsx@@ -7,6 +7,7 @@ import {type LoaderArgs,json,} from "@remix-run/server-runtime";+import { useLoaderData } from "@remix-run/react";import type { Page as PageType, SiteMeta } from "@webstudio-is/sdk";import { ReactSdkContext } from "@webstudio-is/react-sdk";import { n8nHandler, getFormId } from "@webstudio-is/form-handlers";@@ -19,6 +20,7 @@ import {formsProperties,Page,imageAssets,+ getRemixParams,} from "../__generated__/[form]._index.tsx";import css from "../__generated__/index.css";import { assetBaseUrl, imageBaseUrl, imageLoader } from "~/constants.mjs";@@ -29,6 +31,8 @@ export type PageData = {};export const loader = async (arg: LoaderArgs) => {+ const params = getRemixParams(arg.params);+const host =arg.request.headers.get("x-forwarded-host") ||arg.request.headers.get("host") ||@@ -46,6 +50,7 @@ export const loader = async (arg: LoaderArgs) => {host,url: url.href,excludeFromSearch: arg.context.EXCLUDE_FROM_SEARCH,+ params,},// No way for current information to change, so add cache for 10 minutes// In case of CRM Data, this should be set to 0@@ -282,6 +287,7 @@ export const action = async ({ request, context }: ActionArgs) => {};const Outlet = () => {+ const { params } = useLoaderData();return (<ReactSdkContext.Providervalue={{@@ -291,7 +297,7 @@ const Outlet = () => {pagesPaths,}}>- <Page />+ <Page params={params} /></ReactSdkContext.Provider>);};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 223b464106..4844d85fa2 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@@ -7,6 +7,7 @@ import {type LoaderArgs,json,} from "@remix-run/server-runtime";+import { useLoaderData } from "@remix-run/react";import type { Page as PageType, SiteMeta } from "@webstudio-is/sdk";import { ReactSdkContext } from "@webstudio-is/react-sdk";import { n8nHandler, getFormId } from "@webstudio-is/form-handlers";@@ -19,6 +20,7 @@ import {formsProperties,Page,imageAssets,+ getRemixParams,} from "../__generated__/[heading-with-id]._index.tsx";import css from "../__generated__/index.css";import { assetBaseUrl, imageBaseUrl, imageLoader } from "~/constants.mjs";@@ -29,6 +31,8 @@ export type PageData = {};export const loader = async (arg: LoaderArgs) => {+ const params = getRemixParams(arg.params);+const host =arg.request.headers.get("x-forwarded-host") ||arg.request.headers.get("host") ||@@ -46,6 +50,7 @@ export const loader = async (arg: LoaderArgs) => {host,url: url.href,excludeFromSearch: arg.context.EXCLUDE_FROM_SEARCH,+ params,},// No way for current information to change, so add cache for 10 minutes// In case of CRM Data, this should be set to 0@@ -282,6 +287,7 @@ export const action = async ({ request, context }: ActionArgs) => {};const Outlet = () => {+ const { params } = useLoaderData();return (<ReactSdkContext.Providervalue={{@@ -291,7 +297,7 @@ const Outlet = () => {pagesPaths,}}>- <Page />+ <Page params={params} /></ReactSdkContext.Provider>);};diff --git a/fixtures/webstudio-remix-vercel/app/routes/[radix]._index.tsx b/fixtures/webstudio-remix-vercel/app/routes/[radix]._index.tsxindex 21d4eb5573..23146b52fc 100644--- a/fixtures/webstudio-remix-vercel/app/routes/[radix]._index.tsx+++ b/fixtures/webstudio-remix-vercel/app/routes/[radix]._index.tsx@@ -7,6 +7,7 @@ import {type LoaderArgs,json,} from "@remix-run/server-runtime";+import { useLoaderData } from "@remix-run/react";import type { Page as PageType, SiteMeta } from "@webstudio-is/sdk";import { ReactSdkContext } from "@webstudio-is/react-sdk";import { n8nHandler, getFormId } from "@webstudio-is/form-handlers";@@ -19,6 +20,7 @@ import {formsProperties,Page,imageAssets,+ getRemixParams,} from "../__generated__/[radix]._index.tsx";import css from "../__generated__/index.css";import { assetBaseUrl, imageBaseUrl, imageLoader } from "~/constants.mjs";@@ -29,6 +31,8 @@ export type PageData = {};export const loader = async (arg: LoaderArgs) => {+ const params = getRemixParams(arg.params);+const host =arg.request.headers.get("x-forwarded-host") ||arg.request.headers.get("host") ||@@ -46,6 +50,7 @@ export const loader = async (arg: LoaderArgs) => {host,url: url.href,excludeFromSearch: arg.context.EXCLUDE_FROM_SEARCH,+ params,},// No way for current information to change, so add cache for 10 minutes// In case of CRM Data, this should be set to 0@@ -282,6 +287,7 @@ export const action = async ({ request, context }: ActionArgs) => {};const Outlet = () => {+ const { params } = useLoaderData();return (<ReactSdkContext.Providervalue={{@@ -291,7 +297,7 @@ const Outlet = () => {pagesPaths,}}>- <Page />+ <Page params={params} /></ReactSdkContext.Provider>);};diff --git a/fixtures/webstudio-remix-vercel/app/routes/_index.tsx b/fixtures/webstudio-remix-vercel/app/routes/_index.tsxindex e672abcbc3..33bde30f9a 100644--- a/fixtures/webstudio-remix-vercel/app/routes/_index.tsx+++ b/fixtures/webstudio-remix-vercel/app/routes/_index.tsx@@ -7,6 +7,7 @@ import {type LoaderArgs,json,} from "@remix-run/server-runtime";+import { useLoaderData } from "@remix-run/react";import type { Page as PageType, SiteMeta } from "@webstudio-is/sdk";import { ReactSdkContext } from "@webstudio-is/react-sdk";import { n8nHandler, getFormId } from "@webstudio-is/form-handlers";@@ -19,6 +20,7 @@ import {formsProperties,Page,imageAssets,+ getRemixParams,} from "../__generated__/_index.tsx";import css from "../__generated__/index.css";import { assetBaseUrl, imageBaseUrl, imageLoader } from "~/constants.mjs";@@ -29,6 +31,8 @@ export type PageData = {};export const loader = async (arg: LoaderArgs) => {+ const params = getRemixParams(arg.params);+const host =arg.request.headers.get("x-forwarded-host") ||arg.request.headers.get("host") ||@@ -46,6 +50,7 @@ export const loader = async (arg: LoaderArgs) => {host,url: url.href,excludeFromSearch: arg.context.EXCLUDE_FROM_SEARCH,+ params,},// No way for current information to change, so add cache for 10 minutes// In case of CRM Data, this should be set to 0@@ -282,6 +287,7 @@ export const action = async ({ request, context }: ActionArgs) => {};const Outlet = () => {+ const { params } = useLoaderData();return (<ReactSdkContext.Providervalue={{@@ -291,7 +297,7 @@ const Outlet = () => {pagesPaths,}}>- <Page />+ <Page params={params} /></ReactSdkContext.Provider>);};diff --git a/packages/cli/__generated__/index.tsx b/packages/cli/__generated__/index.tsxindex 2a6be1aa13..4a07e23482 100644--- a/packages/cli/__generated__/index.tsx+++ b/packages/cli/__generated__/index.tsx@@ -28,12 +28,17 @@ export const user: { email: string | null } | undefined = {};export const projectId = "project-id";-const Page = () => {+type Params = Record<string, string | undefined>;+const Page = (_props: { params: Params }) => {return <></>;};export { Page };+export const getRemixParams = ({ ...params }: Params): Params => {+ return params;+};+export const pagesPaths = new Set<string>();export const formsProperties = new Map<diff --git a/packages/cli/src/prebuild.ts b/packages/cli/src/prebuild.tsindex 1cf382fdb3..bf56feb80a 100644--- a/packages/cli/src/prebuild.ts+++ b/packages/cli/src/prebuild.ts@@ -24,6 +24,8 @@ import {type Params,type WsComponentMeta,normalizeProps,+ generateRemixRoute,+ generateRemixParams,} from "@webstudio-is/react-sdk";import type {Instance,@@ -76,13 +78,6 @@ type SiteDataByPage = {};};-type RemixRoutes = {- routes: Array<{- path: string;- file: string;- }>;-};-export const downloadAsset = async (url: string,name: string,@@ -255,10 +250,6 @@ export const prebuild = async (options: {throw new Error(`Project domain is missing from the site data`);}- const remixRoutes: RemixRoutes = {- routes: [],- };-const radixComponentNamespacedMetas = Object.entries(radixComponentMetas).reduce(@@ -287,16 +278,6 @@ export const prebuild = async (options: {const siteDataByPage: SiteDataByPage = {};for (const page of Object.values(siteData.pages)) {- const originPath = page.path;- const path = originPath === "" ? "index" : originPath.replace("/", "");-- if (path !== "index") {- remixRoutes.routes.push({- path: originPath === "" ? "/" : originPath,- file: `routes/${path}.tsx`,- });- }-const instanceMap = new Map(siteData.build.instances);const pageInstanceSet = findTreeInstanceIds(instanceMap,@@ -330,7 +311,7 @@ export const prebuild = async (options: {}}- siteDataByPage[path] = {+ siteDataByPage[page.path] = {build: {props,instances,@@ -341,10 +322,10 @@ export const prebuild = async (options: {assets: siteData.assets,};- componentsByPage[path] = new Set();+ componentsByPage[page.path] = new Set();for (const [_instanceId, instance] of instances) {if (instance.component) {- componentsByPage[path].add(instance.component);+ componentsByPage[page.path].add(instance.component);const meta = metas.get(instance.component);if (meta) {projectMetas.set(instance.component, meta);@@ -412,7 +393,7 @@ export const prebuild = async (options: {"utf8");- for (const [pathName, pageComponents] of Object.entries(componentsByPage)) {+ for (const [pathname, pageComponents] of Object.entries(componentsByPage)) {const scope = createScope([// manually maintained list of occupied identifiers"useState",@@ -425,7 +406,7 @@ export const prebuild = async (options: {"projectId","formsProperties","Page",- "props",+ "_props",]);const namespaces = new Map<string,@@ -468,7 +449,7 @@ export const prebuild = async (options: {componentImports += `import { ${specifiers} } from "${namespace}";\n`;}- const pageData = siteDataByPage[pathName];+ const pageData = siteDataByPage[pathname];// serialize data only used in runtimeconst renderedPageData: PageData = {site: siteData.build.pages.meta,@@ -485,7 +466,7 @@ export const prebuild = async (options: {});const pageComponent = generatePageComponent({scope,- rootInstanceId,+ page: pageData.page,instances,props,dataSources,@@ -514,6 +495,8 @@ ${pageComponent}export { Page }+${generateRemixParams(pathname)}+${utilsExport}`;@@ -529,13 +512,7 @@ ${utilsExport}https://remix.run/docs/en/main/file-conventions/route-files-v2#nested-urls-without-layout-nesting*/- const fileName =- pathName === "main" || pathName === "index"- ? "_index.tsx"- : `${pathName- .split("/")- .map((route) => `[${route}]`)- .join(".")}._index.tsx`;+ const fileName = generateRemixRoute(pathname);const routeFileContent = routeFileTemplate.replace("../__generated__/index",diff --git a/packages/cli/templates/route-template.tsx b/packages/cli/templates/route-template.tsxindex 28602055ff..8f3055be46 100644--- a/packages/cli/templates/route-template.tsx+++ b/packages/cli/templates/route-template.tsx@@ -7,6 +7,7 @@ import {type LoaderArgs,json,} from "@remix-run/server-runtime";+import { useLoaderData } from "@remix-run/react";import type { Page as PageType, SiteMeta } from "@webstudio-is/sdk";import { ReactSdkContext } from "@webstudio-is/react-sdk";import { n8nHandler, getFormId } from "@webstudio-is/form-handlers";@@ -19,6 +20,7 @@ import {formsProperties,Page,imageAssets,+ getRemixParams,} from "../__generated__/index";import css from "../__generated__/index.css";import { assetBaseUrl, imageBaseUrl, imageLoader } from "~/constants.mjs";@@ -29,6 +31,8 @@ export type PageData = {};export const loader = async (arg: LoaderArgs) => {+ const params = getRemixParams(arg.params);+const host =arg.request.headers.get("x-forwarded-host") ||arg.request.headers.get("host") ||@@ -46,6 +50,7 @@ export const loader = async (arg: LoaderArgs) => {host,url: url.href,excludeFromSearch: arg.context.EXCLUDE_FROM_SEARCH,+ params,},// No way for current information to change, so add cache for 10 minutes// In case of CRM Data, this should be set to 0@@ -282,6 +287,7 @@ export const action = async ({ request, context }: ActionArgs) => {};const Outlet = () => {+ const { params } = useLoaderData();return (<ReactSdkContext.Providervalue={{@@ -291,7 +297,7 @@ const Outlet = () => {pagesPaths,}}>- <Page />+ <Page params={params} /></ReactSdkContext.Provider>);};diff --git a/packages/react-sdk/src/component-generator.test.ts b/packages/react-sdk/src/component-generator.test.tsindex f4d5deb2a7..5b560884bc 100644--- a/packages/react-sdk/src/component-generator.test.ts+++ b/packages/react-sdk/src/component-generator.test.ts@@ -4,6 +4,7 @@ import {createScope,type DataSource,type Instance,+ type Page,type Prop,} from "@webstudio-is/sdk";import { showAttribute } from "./props";@@ -560,7 +561,7 @@ test("generate page component with variables and actions", () => {expect(generatePageComponent({scope: createScope(),- rootInstanceId: "body",+ page: { rootInstanceId: "body" } as Page,instances: new Map([createInstancePair("body", "Body", [{ type: "id", value: "input" }]),createInstancePair("input", "Input", []),@@ -599,7 +600,8 @@ test("generate page component with variables and actions", () => {})).toEqual(clear(`- const Page = () => {+ type Params = Record<string, string | undefined>+ const Page = (_props: { params: Params }) => {let [variableName, set$variableName] = useState<any>("initial")let onChange = (value: any) => {variableName = value@@ -624,7 +626,7 @@ test("avoid generating collection parameter variable as state", () => {expect(generatePageComponent({scope: createScope(),- rootInstanceId: "body",+ page: { rootInstanceId: "body" } as Page,instances: new Map([createInstancePair("body", "Body", [{ type: "id", value: "list" }]),createInstancePair("list", collectionComponent, []),@@ -664,7 +666,8 @@ test("avoid generating collection parameter variable as state", () => {})).toEqual(clear(`- const Page = () => {+ type Params = Record<string, string | undefined>+ const Page = (_props: { params: Params }) => {let [data, set$data] = useState<any>(["apple","orange","mango"])return <Bodydata-ws-id="body"@@ -678,3 +681,42 @@ test("avoid generating collection parameter variable as state", () => {`));});++test("generate params variable when present", () => {+ expect(+ generatePageComponent({+ scope: createScope(["params"]),+ page: { rootInstanceId: "body", pathVariableId: "pathParamsId" } as Page,+ instances: new Map([createInstancePair("body", "Body", [])]),+ dataSources: new Map([+ createDataSourcePair({+ id: "pathParamsId",+ scopeInstanceId: "body",+ type: "parameter",+ name: "params",+ }),+ ]),+ props: new Map([+ createPropPair({+ id: "paramPropId",+ instanceId: "body",+ name: "data-slug",+ type: "expression",+ value: "$ws$dataSource$pathParamsId.slug",+ }),+ ]),+ indexesWithinAncestors: new Map(),+ })+ ).toEqual(+ clear(`+ type Params = Record<string, string | undefined>+ const Page = (_props: { params: Params }) => {+ let params_1 = _props.params+ return <Body+ data-ws-id="body"+ data-ws-component="Body"+ data-slug={params_1?.slug} />+ }+ `)+ );+});diff --git a/packages/react-sdk/src/component-generator.ts b/packages/react-sdk/src/component-generator.tsindex 7e2bc37df4..ffd9699b53 100644--- a/packages/react-sdk/src/component-generator.ts+++ b/packages/react-sdk/src/component-generator.ts@@ -5,6 +5,7 @@ import type {Scope,DataSources,Prop,+ Page,} from "@webstudio-is/sdk";import { parseComponentName } from "@webstudio-is/sdk";import {@@ -231,34 +232,49 @@ export const generateJsxChildren = ({export const generatePageComponent = ({scope,- rootInstanceId,+ page,instances,props,dataSources,indexesWithinAncestors,}: {scope: Scope;- rootInstanceId: Instance["id"];+ page: Page;instances: Instances;props: Props;dataSources: DataSources;indexesWithinAncestors: IndexesWithinAncestors;}) => {- const instance = instances.get(rootInstanceId);+ const instance = instances.get(page.rootInstanceId);if (instance === undefined) {return "";}- const { variables, body: dataSourcesBody } = generateDataSources({+ const { body: dataSourcesBody } = generateDataSources({typed: true,scope,dataSources,props,});let generatedDataSources = "";- for (const { valueName, setterName, initialValue } of variables.values()) {- const initialValueString = JSON.stringify(initialValue);- generatedDataSources += `let [${valueName}, ${setterName}] = useState<any>(${initialValueString})\n`;+ for (const dataSource of dataSources.values()) {+ if (dataSource.type === "variable") {+ const valueName = scope.getName(dataSource.id, dataSource.name);+ const setterName = scope.getName(+ `set$${dataSource.id}`,+ `set$${dataSource.name}`+ );+ const initialValue = dataSource.value.value;+ const initialValueString = JSON.stringify(initialValue);+ generatedDataSources += `let [${valueName}, ${setterName}] = useState<any>(${initialValueString})\n`;+ }+ if (dataSource.type === "parameter") {+ if (dataSource.id === page.pathVariableId) {+ const valueName = scope.getName(dataSource.id, dataSource.name);+ generatedDataSources += `let ${valueName} = _props.params\n`;+ }+ }}+generatedDataSources += dataSourcesBody;const generatedJsx = generateJsxElement({@@ -278,7 +294,8 @@ export const generatePageComponent = ({});let generatedComponent = "";- generatedComponent += `const Page = () => {\n`;+ generatedComponent += `type Params = Record<string, string | undefined>\n`;+ generatedComponent += `const Page = (_props: { params: Params }) => {\n`;generatedComponent += `${generatedDataSources}`;generatedComponent += `return ${generatedJsx}`;generatedComponent += `}\n`;diff --git a/packages/react-sdk/src/index.ts b/packages/react-sdk/src/index.tsindex 63678ae0ec..4bc1d47782 100644--- a/packages/react-sdk/src/index.ts+++ b/packages/react-sdk/src/index.ts@@ -1,3 +1,4 @@+export * from "./remix";export * from "./css/index";export * from "./tree/index";export * from "./app/index";diff --git a/packages/react-sdk/src/remix.test.ts b/packages/react-sdk/src/remix.test.tsnew file mode 100644index 0000000000..82c69ed413--- /dev/null+++ b/packages/react-sdk/src/remix.test.ts@@ -0,0 +1,62 @@+import { expect, test } from "@jest/globals";+import { generateRemixParams, generateRemixRoute } from "./remix";++test("convert home page to remix route", () => {+ expect(generateRemixRoute("")).toEqual("_index.tsx");+ expect(generateRemixRoute("/")).toEqual("_index.tsx");+});++test("convert path to remix route", () => {+ expect(generateRemixRoute("/blog")).toEqual("[blog]._index.tsx");+ expect(generateRemixRoute("/blog/my-introduction")).toEqual(+ "[blog].[my-introduction]._index.tsx"+ );+});++test("convert wildcard to remix route", () => {+ expect(generateRemixRoute("/blog/*")).toEqual("[blog].$.tsx");+});++test("convert named group with * modifier to remix route", () => {+ expect(generateRemixRoute("/blog/:slug*")).toEqual("[blog].$.tsx");+});++test("convert named group with ? modifier to remix route", () => {+ expect(generateRemixRoute("/:id?/:slug?")).toEqual(+ "($id).($slug)._index.tsx"+ );+});++test("convert named groups to remix route", () => {+ expect(generateRemixRoute("/blog/:id/:date")).toEqual(+ "[blog].$id.$date._index.tsx"+ );+});++test("generate remix params for static pathname", () => {+ expect("\n" + generateRemixParams("/blog/my-post")).toEqual(`+export const getRemixParams = ({ ...params }: Params): Params => {+ return params+}+`);+});++test("generate remix params converter with wildcard", () => {+ expect("\n" + generateRemixParams("/blog/*")).toEqual(`+export const getRemixParams = ({ ...params }: Params): Params => {+ params[0] = params["*"]+ delete params["*"]+ return params+}+`);+});++test("generate remix params converter with named group and * modifier", () => {+ expect("\n" + generateRemixParams("/blog/:name*")).toEqual(`+export const getRemixParams = ({ ...params }: Params): Params => {+ params["name"] = params["*"]+ delete params["*"]+ return params+}+`);+});diff --git a/packages/react-sdk/src/remix.ts b/packages/react-sdk/src/remix.tsnew file mode 100644index 0000000000..2137168904--- /dev/null+++ b/packages/react-sdk/src/remix.ts@@ -0,0 +1,69 @@+const getRemixSegment = (segment: string) => {+ if (segment === "*") {+ return "$";+ }+ // matches following examples+ // :name+ // :name?+ // :name*+ const match = segment.match(/^:(?<name>\w+)(?<modifier>\*|\?)?$/);+ const name = match?.groups?.name;+ const modifier = match?.groups?.modifier;+ if (name) {+ if (modifier === "*") {+ return "$";+ }+ if (modifier === "?") {+ return `($${name})`;+ }+ return `$${name}`;+ }+ return `[${segment}]`;+};++/**+ * transforms url pattern subset to remix route format+ *+ * /:name/ -> .$name. - named dynamic segment+ * /:name?/ -> .($name). - optional dynamic segment+ * /* -> .$ - splat in the end of pattern+ * /:name* -> .$ - named splat which gets specified name at runtime+ *+ */+export const generateRemixRoute = (pathname: string) => {+ if (pathname.startsWith("/")) {+ pathname = pathname.slice(1);+ }+ if (pathname === "") {+ return `_index.tsx`;+ }+ const base = pathname.split("/").map(getRemixSegment).join(".");+ const tail = pathname.endsWith("*") ? "" : "._index";+ return `${base}${tail}.tsx`;+};++/**+ * generates a function to convert remix params to compatible with url pattern groups+ *+ * for /:name* pattern+ * params["*"] is replaced with params["name"]+ *+ * for /* pattern+ * params["*"] is replaced with params[0]+ */+export const generateRemixParams = (pathname: string) => {+ const name = pathname.match(/:(?<name>\w+)\*$/)?.groups?.name;+ let generated = "";+ generated += `export const getRemixParams = ({ ...params }: Params): Params => {\n`;+ if (name) {+ generated += ` params["${name}"] = params["*"]\n`;+ generated += ` delete params["*"]\n`;+ }+ if (pathname.endsWith("/*")) {+ generated += ` params[0] = params["*"]\n`;+ generated += ` delete params["*"]\n`;+ }+ generated += ` return params\n`;+ generated += `}\n`;+ return generated;+};diff --git a/packages/sdk-cli/src/generate-stories.ts b/packages/sdk-cli/src/generate-stories.tsindex ea9c3d4945..053b3677fa 100644--- a/packages/sdk-cli/src/generate-stories.ts+++ b/packages/sdk-cli/src/generate-stories.ts@@ -8,6 +8,7 @@ import {createScope,parseComponentName,getStyleDeclKey,+ type Page,} from "@webstudio-is/sdk";import {type WsComponentMeta,@@ -85,7 +86,7 @@ const Story = {${css}\`}</style>- <Page />+ <Page params={{}} /></>}}@@ -160,7 +161,7 @@ export const generateStories = async () => {content += `\n`;content += generatePageComponent({scope,- rootInstanceId,+ page: { rootInstanceId } as Page,instances,props: new Map(data.props.map((prop) => [prop.id, prop])),dataSources: new Map(data.dataSources.map((prop) => [prop.id, prop])),diff --git a/packages/sdk-components-react-radix/src/__generated__/accordion.stories.tsx b/packages/sdk-components-react-radix/src/__generated__/accordion.stories.tsxindex b72af3eabc..09f968185c 100644--- a/packages/sdk-components-react-radix/src/__generated__/accordion.stories.tsx+++ b/packages/sdk-components-react-radix/src/__generated__/accordion.stories.tsx@@ -12,7 +12,8 @@ import {AccordionContent as AccordionContent,} from "../components";-const Page = () => {+type Params = Record<string, string | undefined>;+const Page = (_props: { params: Params }) => {let [accordionValue, set$accordionValue] = useState<any>("0");let onValueChange = (value: any) => {accordionValue = value;@@ -437,7 +438,7 @@ html {margin: 0; display: grid; min-height: 100%}}`}</style>- <Page />+ <Page params={{}} /></>);},diff --git a/packages/sdk-components-react-radix/src/__generated__/checkbox.stories.tsx b/packages/sdk-components-react-radix/src/__generated__/checkbox.stories.tsxindex 7bc4012b34..06703ea890 100644--- a/packages/sdk-components-react-radix/src/__generated__/checkbox.stories.tsx+++ b/packages/sdk-components-react-radix/src/__generated__/checkbox.stories.tsx@@ -10,7 +10,8 @@ import {CheckboxIndicator as CheckboxIndicator,} from "../components";-const Page = () => {+type Params = Record<string, string | undefined>;+const Page = (_props: { params: Params }) => {let [checkboxChecked, set$checkboxChecked] = useState<any>(false);let onCheckedChange = (checked: any) => {checkboxChecked = checked;@@ -261,7 +262,7 @@ html {margin: 0; display: grid; min-height: 100%}}`}</style>- <Page />+ <Page params={{}} /></>);},diff --git a/packages/sdk-components-react-radix/src/__generated__/collapsible.stories.tsx b/packages/sdk-components-react-radix/src/__generated__/collapsible.stories.tsxindex 27bc1d712b..d803e9e626 100644--- a/packages/sdk-components-react-radix/src/__generated__/collapsible.stories.tsx+++ b/packages/sdk-components-react-radix/src/__generated__/collapsible.stories.tsx@@ -10,7 +10,8 @@ import {CollapsibleContent as CollapsibleContent,} from "../components";-const Page = () => {+type Params = Record<string, string | undefined>;+const Page = (_props: { params: Params }) => {let [collapsibleOpen, set$collapsibleOpen] = useState<any>(false);let onOpenChange = (open: any) => {collapsibleOpen = open;@@ -243,7 +244,7 @@ html {margin: 0; display: grid; min-height: 100%}}`}</style>- <Page />+ <Page params={{}} /></>);},diff --git a/packages/sdk-components-react-radix/src/__generated__/dialog.stories.tsx b/packages/sdk-components-react-radix/src/__generated__/dialog.stories.tsxindex d23f5a1b5b..75657f6ec0 100644--- a/packages/sdk-components-react-radix/src/__generated__/dialog.stories.tsx+++ b/packages/sdk-components-react-radix/src/__generated__/dialog.stories.tsx@@ -15,7 +15,8 @@ import {DialogClose as DialogClose,} from "../components";-const Page = () => {+type Params = Record<string, string | undefined>;+const Page = (_props: { params: Params }) => {let [dialogOpen, set$dialogOpen] = useState<any>(false);let onOpenChange = (open: any) => {dialogOpen = open;@@ -411,7 +412,7 @@ html {margin: 0; display: grid; min-height: 100%}}`}</style>- <Page />+ <Page params={{}} /></>);},diff --git a/packages/sdk-components-react-radix/src/__generated__/label.stories.tsx b/packages/sdk-components-react-radix/src/__generated__/label.stories.tsxindex a92d7f0218..36b7525309 100644--- a/packages/sdk-components-react-radix/src/__generated__/label.stories.tsx+++ b/packages/sdk-components-react-radix/src/__generated__/label.stories.tsx@@ -1,7 +1,8 @@import { Box as Box } from "@webstudio-is/sdk-components-react";import { Label as Label } from "../components";-const Page = () => {+type Params = Record<string, string | undefined>;+const Page = (_props: { params: Params }) => {return (<Box data-ws-id="root" data-ws-component="Box"><Label data-ws-id="1" data-ws-component="Label">@@ -137,7 +138,7 @@ html {margin: 0; display: grid; min-height: 100%}}`}</style>- <Page />+ <Page params={{}} /></>);},diff --git a/packages/sdk-components-react-radix/src/__generated__/navigation-menu.stories.tsx b/packages/sdk-components-react-radix/src/__generated__/navigation-menu.stories.tsxindex 00a8b87aab..ebc4c801f7 100644--- a/packages/sdk-components-react-radix/src/__generated__/navigation-menu.stories.tsx+++ b/packages/sdk-components-react-radix/src/__generated__/navigation-menu.stories.tsx@@ -17,7 +17,8 @@ import {NavigationMenuViewport as NavigationMenuViewport,} from "../components";-const Page = () => {+type Params = Record<string, string | undefined>;+const Page = (_props: { params: Params }) => {let [menuValue, set$menuValue] = useState<any>("");let onValueChange = (value: any) => {menuValue = value;@@ -1236,7 +1237,7 @@ html {margin: 0; display: grid; min-height: 100%}}`}</style>- <Page />+ <Page params={{}} /></>);},diff --git a/packages/sdk-components-react-radix/src/__generated__/popover.stories.tsx b/packages/sdk-components-react-radix/src/__generated__/popover.stories.tsxindex c3640bb7e4..65b824a2b6 100644--- a/packages/sdk-components-react-radix/src/__generated__/popover.stories.tsx+++ b/packages/sdk-components-react-radix/src/__generated__/popover.stories.tsx@@ -10,7 +10,8 @@ import {PopoverContent as PopoverContent,} from "../components";-const Page = () => {+type Params = Record<string, string | undefined>;+const Page = (_props: { params: Params }) => {let [popoverOpen, set$popoverOpen] = useState<any>(false);let onOpenChange = (open: any) => {popoverOpen = open;@@ -260,7 +261,7 @@ html {margin: 0; display: grid; min-height: 100%}}`}</style>- <Page />+ <Page params={{}} /></>);},diff --git a/packages/sdk-components-react-radix/src/__generated__/radio-group.stories.tsx b/packages/sdk-components-react-radix/src/__generated__/radio-group.stories.tsxindex 187c559d9d..988c50fe8f 100644--- a/packages/sdk-components-react-radix/src/__generated__/radio-group.stories.tsx+++ b/packages/sdk-components-react-radix/src/__generated__/radio-group.stories.tsx@@ -11,7 +11,8 @@ import {RadioGroupIndicator as RadioGroupIndicator,} from "../components";-const Page = () => {+type Params = Record<string, string | undefined>;+const Page = (_props: { params: Params }) => {let [radioGroupValue, set$radioGroupValue] = useState<any>("");let onValueChange = (value: any) => {radioGroupValue = value;@@ -397,7 +398,7 @@ html {margin: 0; display: grid; min-height: 100%}}`}</style>- <Page />+ <Page params={{}} /></>);},diff --git a/packages/sdk-components-react-radix/src/__generated__/select.stories.tsx b/packages/sdk-components-react-radix/src/__generated__/select.stories.tsxindex 3e8fd33ff7..6bf100a1e1 100644--- a/packages/sdk-components-react-radix/src/__generated__/select.stories.tsx+++ b/packages/sdk-components-react-radix/src/__generated__/select.stories.tsx@@ -14,7 +14,8 @@ import {SelectItemText as SelectItemText,} from "../components";-const Page = () => {+type Params = Record<string, string | undefined>;+const Page = (_props: { params: Params }) => {let [selectValue, set$selectValue] = useState<any>("");let [selectOpen, set$selectOpen] = useState<any>(false);let onValueChange = (value: any) => {@@ -494,7 +495,7 @@ html {margin: 0; display: grid; min-height: 100%}}`}</style>- <Page />+ <Page params={{}} /></>);},diff --git a/packages/sdk-components-react-radix/src/__generated__/sheet.stories.tsx b/packages/sdk-components-react-radix/src/__generated__/sheet.stories.tsxindex ce16ca53f6..2cab3e32b3 100644--- a/packages/sdk-components-react-radix/src/__generated__/sheet.stories.tsx+++ b/packages/sdk-components-react-radix/src/__generated__/sheet.stories.tsx@@ -15,7 +15,8 @@ import {DialogClose as DialogClose,} from "../components";-const Page = () => {+type Params = Record<string, string | undefined>;+const Page = (_props: { params: Params }) => {let [sheetOpen, set$sheetOpen] = useState<any>(false);let onOpenChange = (open: any) => {sheetOpen = open;@@ -420,7 +421,7 @@ html {margin: 0; display: grid; min-height: 100%}}`}</style>- <Page />+ <Page params={{}} /></>);},diff --git a/packages/sdk-components-react-radix/src/__generated__/switch.stories.tsx b/packages/sdk-components-react-radix/src/__generated__/switch.stories.tsxindex 66b39ae704..4b5fb22d4c 100644--- a/packages/sdk-components-react-radix/src/__generated__/switch.stories.tsx+++ b/packages/sdk-components-react-radix/src/__generated__/switch.stories.tsx@@ -2,7 +2,8 @@ import { useState } from "react";import { Box as Box } from "@webstudio-is/sdk-components-react";import { Switch as Switch, SwitchThumb as SwitchThumb } from "../components";-const Page = () => {+type Params = Record<string, string | undefined>;+const Page = (_props: { params: Params }) => {let [switchChecked, set$switchChecked] = useState<any>(false);let onCheckedChange = (checked: any) => {switchChecked = checked;@@ -237,7 +238,7 @@ html {margin: 0; display: grid; min-height: 100%}}`}</style>- <Page />+ <Page params={{}} /></>);},diff --git a/packages/sdk-components-react-radix/src/__generated__/tabs.stories.tsx b/packages/sdk-components-react-radix/src/__generated__/tabs.stories.tsxindex 30f055f98e..069e808184 100644--- a/packages/sdk-components-react-radix/src/__generated__/tabs.stories.tsx+++ b/packages/sdk-components-react-radix/src/__generated__/tabs.stories.tsx@@ -7,7 +7,8 @@ import {TabsContent as TabsContent,} from "../components";-const Page = () => {+type Params = Record<string, string | undefined>;+const Page = (_props: { params: Params }) => {let [tabsValue, set$tabsValue] = useState<any>("0");let onValueChange = (value: any) => {tabsValue = value;@@ -330,7 +331,7 @@ html {margin: 0; display: grid; min-height: 100%}}`}</style>- <Page />+ <Page params={{}} /></>);},diff --git a/packages/sdk-components-react-radix/src/__generated__/tooltip.stories.tsx b/packages/sdk-components-react-radix/src/__generated__/tooltip.stories.tsxindex d43498c84b..1698911c58 100644--- a/packages/sdk-components-react-radix/src/__generated__/tooltip.stories.tsx+++ b/packages/sdk-components-react-radix/src/__generated__/tooltip.stories.tsx@@ -10,7 +10,8 @@ import {TooltipContent as TooltipContent,} from "../components";-const Page = () => {+type Params = Record<string, string | undefined>;+const Page = (_props: { params: Params }) => {let [tooltipOpen, set$tooltipOpen] = useState<any>(false);let onOpenChange = (open: any) => {tooltipOpen = open;@@ -258,7 +259,7 @@ html {margin: 0; display: grid; min-height: 100%}}`}</style>- <Page />+ <Page params={{}} /></>);},