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: Nested routes compiler (#2766)
Oleg Isonen65d0df82134c
diff --git a/apps/builder/app/builder/features/sidebar-left/panels/pages/folder-settings.tsx b/apps/builder/app/builder/features/sidebar-left/panels/pages/folder-settings.tsxindex 7174f76efe..850627af79 100644--- a/apps/builder/app/builder/features/sidebar-left/panels/pages/folder-settings.tsx+++ b/apps/builder/app/builder/features/sidebar-left/panels/pages/folder-settings.tsx@@ -37,7 +37,7 @@ import {isSlugUsed,registerFolderChildMutable,} from "./page-utils";-import { ROOT_FOLDER_ID, createRootFolder } from "@webstudio-is/project-build";+import { ROOT_FOLDER_ID } from "@webstudio-is/project-build";const Values = Folder.pick({ name: true, slug: true }).extend({parentFolderId: z.string(),@@ -54,7 +54,7 @@ type Errors = {const fieldDefaultValues = {name: "Untitled",slug: "untitled",- parentFolderId: createRootFolder().id,+ parentFolderId: ROOT_FOLDER_ID,} satisfies Values;const fieldNames = Object.keys(fieldDefaultValues) as Array<FieldName>;diff --git a/apps/builder/app/builder/features/sidebar-left/panels/pages/page-settings.tsx b/apps/builder/app/builder/features/sidebar-left/panels/pages/page-settings.tsxindex 163024f6ca..c4d23fbab4 100644--- a/apps/builder/app/builder/features/sidebar-left/panels/pages/page-settings.tsx+++ b/apps/builder/app/builder/features/sidebar-left/panels/pages/page-settings.tsx@@ -14,10 +14,10 @@ import {PagePath,DataSource,Folder,+ getPagePath,} from "@webstudio-is/sdk";import {ROOT_FOLDER_ID,- createRootFolder,findPageByIdOrPath,} from "@webstudio-is/project-build";import {@@ -82,14 +82,13 @@ import {} from "./url-pattern";import {cleanupChildRefsMutable,- compileSlugPath,findParentFolderByChildId,registerFolderChildMutable,} from "./page-utils";const fieldDefaultValues = {name: "Untitled",- parentFolderId: createRootFolder().id,+ parentFolderId: ROOT_FOLDER_ID,path: "/untitled",title: "Untitled",description: "",@@ -325,10 +324,10 @@ const FormFields = ({? (dataSourceVariables.get(pathVariableId) as Record<string, string>): undefined;- const compiledPath = compilePathnamePattern(values.path ?? "", params ?? {});- const slug = compileSlugPath(pages.folders, values.parentFolderId);+ const foldersPath = getPagePath(values.parentFolderId, pages);+ const pagePath = compilePathnamePattern(values.path ?? "", params ?? {});- const pageDomainAndPath = [publishedUrl.host, slug, compiledPath]+ const pageDomainAndPath = [publishedUrl.host, foldersPath, pagePath].filter(Boolean).join("/").replace(/\/+/g, "/");diff --git a/apps/builder/app/builder/features/sidebar-left/panels/pages/page-utils.test.ts b/apps/builder/app/builder/features/sidebar-left/panels/pages/page-utils.test.tsindex bbe98ea538..c270795bc2 100644--- a/apps/builder/app/builder/features/sidebar-left/panels/pages/page-utils.test.ts+++ b/apps/builder/app/builder/features/sidebar-left/panels/pages/page-utils.test.ts@@ -1,7 +1,6 @@import { describe, expect, test } from "@jest/globals";import {cleanupChildRefsMutable,- compileSlugPath,findParentFolderByChildId,isRoot,isSlugUsed,@@ -396,50 +395,3 @@ describe("registerFolderChildMutable", () => {expect(folder.children).toEqual(["folderId2"]);});});--describe("compileSlugPath", () => {- const { folders } = createDefaultPages({- rootInstanceId: "rootInstanceId",- homePageId: "homePageId",- });- folders.push({- id: "folderId-1",- name: "Folder 1",- slug: "folder-1",- children: ["folderId-1-1"],- });- const rootFolder = folders.find(isRoot);- rootFolder?.children.push("folderId-1");- folders.push({- id: "folderId-1-1",- name: "Folder 1-1",- slug: "folder-1-1",- children: ["folderId-1-1-1"],- });- folders.push({- id: "folderId-1-1-1",- name: "Folder 1-1-1",- slug: "folder-1-1-1",- children: [],- });-- test("nesting level 0", () => {- expect(compileSlugPath(folders, "root")).toEqual("");- });-- test("nesting level 1", () => {- expect(compileSlugPath(folders, "folderId-1")).toEqual("/folder-1");- });-- test("nesting level 2", () => {- expect(compileSlugPath(folders, "folderId-1-1")).toEqual(- "/folder-1/folder-1-1"- );- });-- test("nesting level 3", () => {- expect(compileSlugPath(folders, "folderId-1-1-1")).toEqual(- "/folder-1/folder-1-1/folder-1-1-1"- );- });-});diff --git a/apps/builder/app/builder/features/sidebar-left/panels/pages/page-utils.ts b/apps/builder/app/builder/features/sidebar-left/panels/pages/page-utils.tsindex 4f31613ac7..1856e1b7e0 100644--- a/apps/builder/app/builder/features/sidebar-left/panels/pages/page-utils.ts+++ b/apps/builder/app/builder/features/sidebar-left/panels/pages/page-utils.ts@@ -190,31 +190,3 @@ export const registerFolderChildMutable = (cleanupChildRefsMutable(id, folders);parentFolder?.children.push(id);};--/**- * Get a path from all folder slugs from root to the current folder.- */-export const compileSlugPath = (- folders: Array<Folder>,- folderId: Folder["id"]-) => {- const foldersMap = new Map<Folder["id"], Folder>();- const childParentMap = new Map<Folder["id"], Folder["id"]>();- for (const folder of folders) {- foldersMap.set(folder.id, folder);- for (const childId of folder.children) {- childParentMap.set(childId, folder.id);- }- }- const slugs = [];- let currentFolderId: undefined | string = folderId;- while (currentFolderId) {- const folder = foldersMap.get(currentFolderId);- if (folder === undefined) {- break;- }- slugs.push(folder.slug);- currentFolderId = childParentMap.get(currentFolderId);- }- return slugs.reverse().join("/");-};diff --git a/apps/builder/app/builder/features/sidebar-left/panels/pages/pages.tsx b/apps/builder/app/builder/features/sidebar-left/panels/pages/pages.tsxindex aa961fc24e..00bd51a8f4 100644--- a/apps/builder/app/builder/features/sidebar-left/panels/pages/pages.tsx+++ b/apps/builder/app/builder/features/sidebar-left/panels/pages/pages.tsx@@ -282,7 +282,7 @@ const PageEditor = ({onDelete={() => {setEditingPageId(undefined);if (editingPageId === currentPageId) {- switchPage();+ switchPage(currentPageId);}}}onDuplicate={(newPageId) => {diff --git a/apps/builder/app/shared/pages/use-switch-page.ts b/apps/builder/app/shared/pages/use-switch-page.tsindex c3e1a92dbf..8e200e44d5 100644--- a/apps/builder/app/shared/pages/use-switch-page.ts+++ b/apps/builder/app/shared/pages/use-switch-page.ts@@ -16,28 +16,34 @@ import {} from "~/shared/nano-states";import { builderPath } from "~/shared/router-utils";-export const switchPage = (pageId?: Page["id"], pageHash?: string) => {+export const switchPage = (pageId: Page["id"], pageHash: string = "") => {const pages = $pages.get();if (pages === undefined) {return;}- const page = findPageByIdOrPath(pages, pageId ?? "");+ const page = findPageByIdOrPath(pages, pageId);- $selectedPageHash.set(pageHash ?? "");- $selectedPageId.set(page?.id ?? pages.homePage.id);+ if (page === undefined) {+ return;+ }++ $selectedPageHash.set(pageHash);+ $selectedPageId.set(page.id);$selectedInstanceSelector.set([- page?.rootInstanceId ?? pages.homePage.rootInstanceId,+ page.rootInstanceId ?? pages.homePage.rootInstanceId,]);};const setPageStateFromUrl = () => {const searchParams = new URLSearchParams(window.location.search);const pages = $pages.get();-- const pageId = searchParams.get("pageId") ?? pages?.homePage.id;- const pageHash = searchParams.get("pageHash") ?? "";+ if (pages === undefined) {+ return;+ }+ const pageId = searchParams.get("pageId") ?? pages.homePage.id;+ const pageHash = searchParams.get("pageHash") ?? undefined;$isPreviewMode.set(searchParams.get("mode") === "preview");diff --git a/fixtures/webstudio-remix-vercel/.webstudio/data.json b/fixtures/webstudio-remix-vercel/.webstudio/data.jsonindex 3b2006ad4e..aec8934240 100644--- a/fixtures/webstudio-remix-vercel/.webstudio/data.json+++ b/fixtures/webstudio-remix-vercel/.webstudio/data.json@@ -1,10 +1,10 @@{"build": {- "id": "28fd3af0-111a-4afa-9ed3-1978744b7fe6",+ "id": "8e12b4c3-7022-4c95-b671-ec8fd55d674f","projectId": "cddc1d44-af37-4cb6-a430-d300cf6f932d",- "version": 231,- "createdAt": "2024-01-08T07:22:37.579Z",- "updatedAt": "2024-01-08T07:22:37.579Z",+ "version": 236,+ "createdAt": "2024-01-16T08:40:45.476Z",+ "updatedAt": "2024-01-16T08:40:45.476Z","pages": {"meta": {"siteName": "KittyGuardedZone",@@ -91,6 +91,24 @@},"rootInstanceId": "AWY2qZfpbykoiWELeJhse","path": "/resources"+ },+ {+ "id": "Pnz-BxUm6XmvFygk_XdEy",+ "name": "Nested Page",+ "title": "Nested Page",+ "meta": {+ "description": "",+ "excludePageFromSearch": false,+ "socialImageAssetId": "",+ "custom": [+ {+ "property": "",+ "content": ""+ }+ ]+ },+ "rootInstanceId": "L0ZXd5F9xk9Rsl9ORzIkJ",+ "path": "/nested-page"}],"folders": [@@ -104,8 +122,15 @@"szYLvBduHPmbtqQKCDY0b","U1tRJl2ERr8_OFe0g9cN_","-J9I4Oo6mONfQlf_3-OqG",- "TS39WeBd0Qr3QgbSlzdf2"+ "TS39WeBd0Qr3QgbSlzdf2",+ "42cWhASQ3tTtKDnsvzhUF"]+ },+ {+ "id": "42cWhASQ3tTtKDnsvzhUF",+ "name": "Nested",+ "slug": "nested",+ "children": ["Pnz-BxUm6XmvFygk_XdEy"]}]},@@ -3226,6 +3251,34 @@"component": "HtmlEmbed","children": []}+ ],+ [+ "L0ZXd5F9xk9Rsl9ORzIkJ",+ {+ "type": "instance",+ "id": "L0ZXd5F9xk9Rsl9ORzIkJ",+ "component": "Body",+ "children": [+ {+ "type": "id",+ "value": "VFPjLwt6Caq4l9PPJSiyI"+ }+ ]+ }+ ],+ [+ "VFPjLwt6Caq4l9PPJSiyI",+ {+ "type": "instance",+ "id": "VFPjLwt6Caq4l9PPJSiyI",+ "component": "Heading",+ "children": [+ {+ "type": "text",+ "value": "Nested page"+ }+ ]+ }]],"deployment": {@@ -3327,6 +3380,24 @@},"rootInstanceId": "AWY2qZfpbykoiWELeJhse","path": "/resources"+ },+ {+ "id": "Pnz-BxUm6XmvFygk_XdEy",+ "name": "Nested Page",+ "title": "Nested Page",+ "meta": {+ "description": "",+ "excludePageFromSearch": false,+ "socialImageAssetId": "",+ "custom": [+ {+ "property": "",+ "content": ""+ }+ ]+ },+ "rootInstanceId": "L0ZXd5F9xk9Rsl9ORzIkJ",+ "path": "/nested-page"}],"assets": [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 ef32e77201..92c3db08c5 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@@ -91,6 +91,7 @@ export const pagesPaths = new Set(["/form","/heading-with-id","/resources",+ "/nested/nested-page",]);export const formsProperties = new Map<diff --git a/fixtures/webstudio-remix-vercel/app/__generated__/[form]._index.tsx b/fixtures/webstudio-remix-vercel/app/__generated__/[form]._index.tsxindex 7e1bbbb16f..063e1e390e 100644--- a/fixtures/webstudio-remix-vercel/app/__generated__/[form]._index.tsx+++ b/fixtures/webstudio-remix-vercel/app/__generated__/[form]._index.tsx@@ -206,6 +206,7 @@ export const pagesPaths = new Set(["/form","/heading-with-id","/resources",+ "/nested/nested-page",]);export const formsProperties = new Map<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 2bd0f61145..0f3cacb253 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@@ -92,6 +92,7 @@ export const pagesPaths = new Set(["/form","/heading-with-id","/resources",+ "/nested/nested-page",]);export const formsProperties = new Map<diff --git a/fixtures/webstudio-remix-vercel/app/__generated__/[nested].[nested-page]._index.server.tsx b/fixtures/webstudio-remix-vercel/app/__generated__/[nested].[nested-page]._index.server.tsxnew file mode 100644index 0000000000..05e605bec5--- /dev/null+++ b/fixtures/webstudio-remix-vercel/app/__generated__/[nested].[nested-page]._index.server.tsx@@ -0,0 +1,4 @@+type Params = Record<string, string | undefined>;+export const loadResources = async (_props: { params: Params }) => {+ return {} as Record<string, unknown>;+};diff --git a/fixtures/webstudio-remix-vercel/app/__generated__/[nested].[nested-page]._index.tsx b/fixtures/webstudio-remix-vercel/app/__generated__/[nested].[nested-page]._index.tsxnew file mode 100644index 0000000000..0a63ef38cb--- /dev/null+++ b/fixtures/webstudio-remix-vercel/app/__generated__/[nested].[nested-page]._index.tsx@@ -0,0 +1,102 @@+/* eslint-disable */+/* This is a auto generated file for building the project */++import { Fragment, useState } from "react";+import type { PageData } from "~/routes/_index";+import type { Asset, ImageAsset, ProjectMeta } from "@webstudio-is/sdk";+import { Body as Body } from "@webstudio-is/sdk-components-react-remix";+import { Heading as Heading } from "@webstudio-is/sdk-components-react";++export const fontAssets: Asset[] = [];+export const imageAssets: ImageAsset[] = [+ {+ id: "88d5e2ff-b8f2-4899-aaf8-dde4ade6da10",+ name: "DALL_E_2023-10-30_12.39.46_-_Photo_logo_with_a_bold_cat_silhouette_centered_on_a_contrasting_background_designed_for_clarity_at_small_32x32_favicon_resolution_00h6cEA8u2pJRvVJv7hRe.png",+ description: null,+ projectId: "cddc1d44-af37-4cb6-a430-d300cf6f932d",+ size: 268326,+ type: "image",+ format: "png",+ createdAt: "2023-10-30T13:51:08.416Z",+ meta: { width: 790, height: 786 },+ },+ {+ id: "9a8bc926-7804-4d3f-af81-69196b1d2ed8",+ name: "small-avif-kitty_FnabJsioMWpBtXZSGf4DR.webp",+ description: null,+ projectId: "cddc1d44-af37-4cb6-a430-d300cf6f932d",+ size: 2906,+ type: "image",+ format: "webp",+ createdAt: "2023-09-12T09:44:22.120Z",+ meta: { width: 100, height: 100 },+ },+ {+ id: "cd939c56-bcdd-4e64-bd9c-567a9bccd3da",+ name: "_937084ed-a798-49fe-8664-df93a2af605e_uiBk3o6UWdqolyakMvQJ9.jpeg",+ description: null,+ projectId: "cddc1d44-af37-4cb6-a430-d300cf6f932d",+ size: 210614,+ type: "image",+ format: "jpeg",+ createdAt: "2023-09-06T11:28:43.031Z",+ meta: { width: 1024, height: 1024 },+ },+];+export const pageData: PageData = {+ project: {+ siteName: "KittyGuardedZone",+ faviconAssetId: "88d5e2ff-b8f2-4899-aaf8-dde4ade6da10",+ code: "<script>console.log('KittyGuardedZone')</script>\n",+ },+ page: {+ id: "Pnz-BxUm6XmvFygk_XdEy",+ name: "Nested Page",+ title: "Nested Page",+ meta: {+ description: "",+ excludePageFromSearch: false,+ socialImageAssetId: "",+ custom: [{ property: "", content: "" }],+ },+ rootInstanceId: "L0ZXd5F9xk9Rsl9ORzIkJ",+ path: "/nested-page",+ },+};+export const user: { email: string | null } | undefined = {+ email: "[email protected]",+};+export const projectId = "cddc1d44-af37-4cb6-a430-d300cf6f932d";++type Params = Record<string, string | undefined>;+type Resources = Record<string, unknown>;+const Page = (_props: { params: Params; resources: Resources }) => {+ return (+ <Body data-ws-id="L0ZXd5F9xk9Rsl9ORzIkJ" data-ws-component="Body">+ <Heading data-ws-id="VFPjLwt6Caq4l9PPJSiyI" data-ws-component="Heading">+ {"Nested page"}+ </Heading>+ </Body>+ );+};++export { Page };++export const getRemixParams = ({ ...params }: Params): Params => {+ return params;+};++export const pagesPaths = new Set([+ "",+ "/radix",+ "/_route_with_symbols_",+ "/form",+ "/heading-with-id",+ "/resources",+ "/nested/nested-page",+]);++export const formsProperties = new Map<+ string,+ { method?: string; action?: string }+>([]);diff --git a/fixtures/webstudio-remix-vercel/app/__generated__/[radix]._index.tsx b/fixtures/webstudio-remix-vercel/app/__generated__/[radix]._index.tsxindex bf138140c1..2ef5e6fa20 100644--- a/fixtures/webstudio-remix-vercel/app/__generated__/[radix]._index.tsx+++ b/fixtures/webstudio-remix-vercel/app/__generated__/[radix]._index.tsx@@ -244,6 +244,7 @@ export const pagesPaths = new Set(["/form","/heading-with-id","/resources",+ "/nested/nested-page",]);export const formsProperties = new Map<diff --git a/fixtures/webstudio-remix-vercel/app/__generated__/[resources]._index.tsx b/fixtures/webstudio-remix-vercel/app/__generated__/[resources]._index.tsxindex ec6304e1e6..fa9f3c46e7 100644--- a/fixtures/webstudio-remix-vercel/app/__generated__/[resources]._index.tsx+++ b/fixtures/webstudio-remix-vercel/app/__generated__/[resources]._index.tsx@@ -105,6 +105,7 @@ export const pagesPaths = new Set(["/form","/heading-with-id","/resources",+ "/nested/nested-page",]);export const formsProperties = new Map<diff --git a/fixtures/webstudio-remix-vercel/app/__generated__/[sitemap.xml].ts b/fixtures/webstudio-remix-vercel/app/__generated__/[sitemap.xml].tsindex d6c347bff4..a57b9785db 100644--- a/fixtures/webstudio-remix-vercel/app/__generated__/[sitemap.xml].ts+++ b/fixtures/webstudio-remix-vercel/app/__generated__/[sitemap.xml].ts@@ -2,23 +2,27 @@ export const sitemap = {pages: [{path: "",- lastModified: "2024-01-08T07:22:37.579Z",+ lastModified: "2024-01-16T08:40:45.476Z",},{path: "/_route_with_symbols_",- lastModified: "2024-01-08T07:22:37.579Z",+ lastModified: "2024-01-16T08:40:45.476Z",},{path: "/form",- lastModified: "2024-01-08T07:22:37.579Z",+ lastModified: "2024-01-16T08:40:45.476Z",},{path: "/heading-with-id",- lastModified: "2024-01-08T07:22:37.579Z",+ lastModified: "2024-01-16T08:40:45.476Z",},{path: "/resources",- lastModified: "2024-01-08T07:22:37.579Z",+ lastModified: "2024-01-16T08:40:45.476Z",+ },+ {+ path: "/nested-page",+ lastModified: "2024-01-16T08:40:45.476Z",},],};diff --git a/fixtures/webstudio-remix-vercel/app/__generated__/_index.tsx b/fixtures/webstudio-remix-vercel/app/__generated__/_index.tsxindex 9197f7cbe4..18c839c5ff 100644--- a/fixtures/webstudio-remix-vercel/app/__generated__/_index.tsx+++ b/fixtures/webstudio-remix-vercel/app/__generated__/_index.tsx@@ -188,6 +188,7 @@ export const pagesPaths = new Set(["/form","/heading-with-id","/resources",+ "/nested/nested-page",]);export const formsProperties = new Map<diff --git a/fixtures/webstudio-remix-vercel/app/routes/[nested].[nested-page]._index.tsx b/fixtures/webstudio-remix-vercel/app/routes/[nested].[nested-page]._index.tsxnew file mode 100644index 0000000000..004aee5151--- /dev/null+++ b/fixtures/webstudio-remix-vercel/app/routes/[nested].[nested-page]._index.tsx@@ -0,0 +1,308 @@+/* eslint-disable camelcase */+import {+ type V2_ServerRuntimeMetaFunction,+ type LinksFunction,+ type LinkDescriptor,+ type ActionArgs,+ type LoaderArgs,+ json,+} from "@remix-run/server-runtime";+import { useLoaderData } from "@remix-run/react";+import type { Page as PageType, ProjectMeta } from "@webstudio-is/sdk";+import { ReactSdkContext } from "@webstudio-is/react-sdk";+import { n8nHandler, getFormId } from "@webstudio-is/form-handlers";+import {+ fontAssets,+ pageData,+ user,+ projectId,+ pagesPaths,+ formsProperties,+ Page,+ imageAssets,+ getRemixParams,+} from "../__generated__/[nested].[nested-page]._index";+import { loadResources } from "../__generated__/[nested].[nested-page]._index.server";+import css from "../__generated__/index.css";+import { assetBaseUrl, imageBaseUrl, imageLoader } from "~/constants.mjs";++export type PageData = {+ project?: ProjectMeta;+ page: PageType;+};++export const loader = async (arg: LoaderArgs) => {+ const params = getRemixParams(arg.params);+ const resources = await loadResources({ params });++ const host =+ arg.request.headers.get("x-forwarded-host") ||+ arg.request.headers.get("host") ||+ "";++ const url = new URL(arg.request.url);+ url.host = host;+ url.protocol = "https";++ // typecheck+ arg.context.EXCLUDE_FROM_SEARCH satisfies boolean;++ return json(+ {+ host,+ url: url.href,+ excludeFromSearch: arg.context.EXCLUDE_FROM_SEARCH,+ params,+ resources,+ },+ // No way for current information to change, so add cache for 10 minutes+ // In case of CRM Data, this should be set to 0+ { headers: { "Cache-Control": "public, max-age=600" } }+ );+};++export const headers = () => {+ return {+ "Cache-Control": "public, max-age=0, must-revalidate",+ };+};++export const meta: V2_ServerRuntimeMetaFunction<typeof loader> = ({ data }) => {+ const { page, project } = pageData;++ const metas: ReturnType<V2_ServerRuntimeMetaFunction> = [];++ if (data?.url) {+ metas.push({+ property: "og:url",+ content: data.url,+ });+ }++ if (page.title) {+ metas.push({ title: page.title });++ metas.push({+ property: "og:title",+ content: page.title,+ });+ }++ metas.push({ property: "og:type", content: "website" });++ const origin = `https://${data?.host}`;++ if (project?.siteName) {+ metas.push({+ property: "og:site_name",+ content: project.siteName,+ });+ metas.push({+ "script:ld+json": {+ "@context": "https://schema.org",+ "@type": "WebSite",+ name: project.siteName,+ url: origin,+ },+ });+ }++ if (page.meta.excludePageFromSearch || data?.excludeFromSearch) {+ metas.push({+ name: "robots",+ content: "noindex, nofollow",+ });+ }++ if (page.meta.description) {+ metas.push({+ name: "description",+ content: page.meta.description,+ });+ metas.push({+ property: "og:description",+ content: page.meta.description,+ });+ }++ if (page.meta.socialImageAssetId) {+ const imageAsset = imageAssets.find(+ (asset) => asset.id === page.meta.socialImageAssetId+ );++ if (imageAsset) {+ metas.push({+ property: "og:image",+ content: `https://${data?.host}${imageLoader({+ src: imageAsset.name,+ // Do not transform social image (not enough information do we need to do this)+ format: "raw",+ })}`,+ });+ }+ }++ for (const customMeta of page.meta.custom ?? []) {+ if (customMeta.property.trim().length === 0) {+ continue;+ }+ metas.push(customMeta);+ }++ return metas;+};++export const links: LinksFunction = () => {+ const result: LinkDescriptor[] = [];++ result.push({+ rel: "stylesheet",+ href: css,+ });++ const { project } = pageData;++ if (project?.faviconAssetId) {+ const imageAsset = imageAssets.find(+ (asset) => asset.id === project.faviconAssetId+ );++ if (imageAsset) {+ result.push({+ rel: "icon",+ href: imageLoader({+ src: imageAsset.name,+ width: 128,+ quality: 100,+ format: "auto",+ }),+ type: undefined,+ });+ }+ } else {+ result.push({+ rel: "icon",+ href: "/favicon.ico",+ type: "image/x-icon",+ });++ result.push({+ rel: "shortcut icon",+ href: "/favicon.ico",+ type: "image/x-icon",+ });+ }++ for (const asset of fontAssets) {+ if (asset.type === "font") {+ result.push({+ rel: "preload",+ href: assetBaseUrl + asset.name,+ as: "font",+ crossOrigin: "anonymous",+ // @todo add mimeType+ // type: asset.mimeType,+ });+ }+ }++ return result;+};++const getRequestHost = (request: Request): string =>+ request.headers.get("x-forwarded-host") || request.headers.get("host") || "";++const getMethod = (value: string | undefined) => {+ if (value === undefined) {+ return "post";+ }++ switch (value.toLowerCase()) {+ case "get":+ return "get";+ default:+ return "post";+ }+};++export const action = async ({ request, context }: ActionArgs) => {+ const formData = await request.formData();++ const formId = getFormId(formData);+ if (formId === undefined) {+ // We're throwing rather than returning { success: false }+ // because this isn't supposed to happen normally: bug or malicious user+ throw json("Form not found", { status: 404 });+ }++ const formProperties = formsProperties.get(formId);++ // form properties are not defined when defaults are used+ const { action, method } = formProperties ?? {};++ const email = user?.email;++ if (email == null) {+ return { success: false };+ }++ // wrapped in try/catch just in cases new URL() throws+ // (should not happen)+ let pageUrl: URL;+ try {+ pageUrl = new URL(request.url);+ pageUrl.host = getRequestHost(request);+ } catch {+ return { success: false };+ }++ if (action !== undefined) {+ try {+ // Test that action is full URL+ new URL(action);+ } catch {+ return json(+ {+ success: false,+ error: "Invalid action URL, must be valid http/https protocol",+ },+ { status: 200 }+ );+ }+ }++ const formInfo = {+ formData,+ projectId,+ action: action ?? null,+ method: getMethod(method),+ pageUrl: pageUrl.toString(),+ toEmail: email,+ fromEmail: pageUrl.hostname + "@webstudio.email",+ } as const;++ const result = await n8nHandler({+ formInfo,+ hookUrl: context.N8N_FORM_EMAIL_HOOK,+ });++ return result;+};++const Outlet = () => {+ const { params, resources } = useLoaderData<typeof loader>();+ return (+ <ReactSdkContext.Provider+ value={{+ imageLoader,+ assetBaseUrl,+ imageBaseUrl,+ pagesPaths,+ }}+ >+ <Page params={params} resources={resources} />+ </ReactSdkContext.Provider>+ );+};++export default Outlet;diff --git a/packages/cli/src/prebuild.ts b/packages/cli/src/prebuild.tsindex 0266b76bc1..1519dec6ad 100644--- a/packages/cli/src/prebuild.ts+++ b/packages/cli/src/prebuild.ts@@ -43,6 +43,7 @@ import type {import {createScope,findTreeInstanceIds,+ getPagePath,parseComponentName,} from "@webstudio-is/sdk";import type { Data } from "@webstudio-is/http-client";@@ -63,11 +64,11 @@ import type { PageData } from "../templates/route-template";const limit = pLimit(10);type ComponentsByPage = {- [path: string]: Set<string>;+ [id: Page["id"]]: Set<string>;};type SiteDataByPage = {- [path: string]: {+ [id: Page["id"]]: {page: Page;build: {props: [Prop["id"], Prop][];@@ -326,7 +327,7 @@ export const prebuild = async (options: {}}- siteDataByPage[page.path] = {+ siteDataByPage[page.id] = {build: {props,instances,@@ -338,12 +339,12 @@ export const prebuild = async (options: {assets: siteData.assets,};- componentsByPage[page.path] = new Set();+ componentsByPage[page.id] = new Set();for (const [_instanceId, instance] of instances) {if (instance.component === collectionComponent) {continue;}- componentsByPage[page.path].add(instance.component);+ componentsByPage[page.id].add(instance.component);const meta = metas.get(instance.component);if (meta) {projectMetas.set(instance.component, meta);@@ -429,7 +430,7 @@ export const prebuild = async (options: {"utf8");- for (const [pathname, pageComponents] of Object.entries(componentsByPage)) {+ for (const [pageId, pageComponents] of Object.entries(componentsByPage)) {const scope = createScope([// manually maintained list of occupied identifiers"useState",@@ -485,7 +486,7 @@ export const prebuild = async (options: {componentImports += `import { ${specifiers} } from "${namespace}";\n`;}- const pageData = siteDataByPage[pathname];+ const pageData = siteDataByPage[pageId];// serialize data only used in runtimeconst renderedPageData: PageData = {project: siteData.build.pages.meta,@@ -533,7 +534,7 @@ ${pageComponent}export { Page }-${generateRemixParams(pathname)}+${generateRemixParams(pageData.page.path)}${utilsExport}`;@@ -550,7 +551,8 @@ ${utilsExport}https://remix.run/docs/en/main/file-conventions/route-files-v2#nested-urls-without-layout-nesting*/- const remixRoute = generateRemixRoute(pathname);+ const path = getPagePath(pageData.page.id, siteData.build.pages);+ const remixRoute = generateRemixRoute(path);const fileName = `${remixRoute}.tsx`;const routeFileContent = routeFileTemplatediff --git a/packages/project-build/src/shared/pages-utils.ts b/packages/project-build/src/shared/pages-utils.tsindex 72c5cbfca4..6ce1427875 100644--- a/packages/project-build/src/shared/pages-utils.ts+++ b/packages/project-build/src/shared/pages-utils.ts@@ -1,6 +1,7 @@import type { Pages, Page, Folder } from "@webstudio-is/sdk";import { nanoid } from "nanoid";+// @todo path needs to support folders nowexport const findPageByIdOrPath = (pages: Pages,idOrPath: stringdiff --git a/packages/react-sdk/src/generator.test.ts b/packages/react-sdk/src/generator.test.tsindex b9cb2a50c2..774585b8ce 100644--- a/packages/react-sdk/src/generator.test.ts+++ b/packages/react-sdk/src/generator.test.ts@@ -2,7 +2,7 @@ import { expect, test } from "@jest/globals";import { generateUtilsExport } from "./generator";const createPage = (path: string) => ({- id: "",+ id: path,path,name: "",title: "",@@ -16,7 +16,7 @@ const pages = {folders: [{id: "root",- name: "",+ name: "Root",slug: "",children: [],},diff --git a/packages/react-sdk/src/generator.ts b/packages/react-sdk/src/generator.tsindex 9c6c71f362..e3c219a83a 100644--- a/packages/react-sdk/src/generator.ts+++ b/packages/react-sdk/src/generator.ts@@ -1,4 +1,4 @@-import type { Pages, Props } from "@webstudio-is/sdk";+import { getPagePath, type Pages, type Props } from "@webstudio-is/sdk";type PageData = {pages: Pages;@@ -13,8 +13,10 @@ export const generateUtilsExport = (siteData: PageData) => {// for ui routesconst pagesPaths: string[] = [siteData.pages.homePage.path];for (const page of siteData.pages.pages) {- pagesPaths.push(page.path);+ const path = getPagePath(page.id, siteData.pages);+ pagesPaths.push(path);}+const generatedPagesPaths = `export const pagesPaths = new Set(${JSON.stringify(pagesPaths)})`;diff --git a/packages/sdk/src/index.ts b/packages/sdk/src/index.tsindex 82faa124a5..e274b5816d 100644--- a/packages/sdk/src/index.ts+++ b/packages/sdk/src/index.ts@@ -11,5 +11,6 @@ export * from "./schema/styles";export * from "./schema/deployment";export * from "./instances-utils";+export * from "./page-utils";export * from "./scope";export * from "./resource-loader";diff --git a/packages/sdk/src/page-utils.ts b/packages/sdk/src/page-utils.tsnew file mode 100644index 0000000000..bba4cd3a3d--- /dev/null+++ b/packages/sdk/src/page-utils.ts@@ -0,0 +1,38 @@+import type { Folder, Page, Pages } from "./schema/pages";++/**+ * Get a path from all folder slugs from root to the current folder or page.+ */+export const getPagePath = (id: Folder["id"] | Page["id"], pages: Pages) => {+ const foldersMap = new Map<Folder["id"], Folder>();+ const childParentMap = new Map<Folder["id"] | Page["id"], Folder["id"]>();+ for (const folder of pages.folders) {+ foldersMap.set(folder.id, folder);+ for (const childId of folder.children) {+ childParentMap.set(childId, folder.id);+ }+ }++ const paths = [];+ let currentId: undefined | string = id;++ // In case id is a page id+ for (const page of pages.pages) {+ if (page.id === id) {+ paths.push(page.path);+ currentId = childParentMap.get(page.id);+ break;+ }+ }++ while (currentId) {+ const folder = foldersMap.get(currentId);+ if (folder === undefined) {+ break;+ }+ paths.push(folder.slug);+ currentId = childParentMap.get(currentId);+ }++ return paths.reverse().join("/").replace(/\/+/g, "/");+};diff --git a/packages/sdk/src/page-utilts.test.ts b/packages/sdk/src/page-utilts.test.tsnew file mode 100644index 0000000000..e164ebd232--- /dev/null+++ b/packages/sdk/src/page-utilts.test.ts@@ -0,0 +1,77 @@+import { describe, expect, test } from "@jest/globals";+import type { Pages } from "./schema/pages";+import { getPagePath } from "./page-utils";++describe("getPagePath", () => {+ const pages = {+ meta: {},+ homePage: {+ id: "home",+ path: "/",+ name: "Home",+ title: "Home",+ rootInstanceId: "rootInstanceId",+ meta: {},+ },+ pages: [+ {+ id: "page-1",+ path: "/page-1",+ name: "Page",+ title: "Page",+ rootInstanceId: "rootInstanceId",+ meta: {},+ },+ ],+ folders: [+ {+ id: "root",+ name: "Root",+ slug: "",+ children: ["folderId-1"],+ },+ {+ id: "folderId-1",+ name: "Folder 1",+ slug: "folder-1",+ children: ["folderId-1-1"],+ },+ {+ id: "folderId-1-1",+ name: "Folder 1-1",+ slug: "folder-1-1",+ children: ["folderId-1-1-1"],+ },+ {+ id: "folderId-1-1-1",+ name: "Folder 1-1-1",+ slug: "folder-1-1-1",+ children: ["page-1"],+ },+ ],+ } satisfies Pages;++ test("nesting level 0", () => {+ expect(getPagePath("root", pages)).toEqual("");+ });++ test("nesting level 1", () => {+ expect(getPagePath("folderId-1", pages)).toEqual("/folder-1");+ });++ test("nesting level 2", () => {+ expect(getPagePath("folderId-1-1", pages)).toEqual("/folder-1/folder-1-1");+ });++ test("nesting level 3", () => {+ expect(getPagePath("folderId-1-1-1", pages)).toEqual(+ "/folder-1/folder-1-1/folder-1-1-1"+ );+ });++ test("page inside folder nesting level 3", () => {+ expect(getPagePath("page-1", pages)).toEqual(+ "/folder-1/folder-1-1/folder-1-1-1/page-1"+ );+ });+});