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
experimental: switch to system variable for params in builder (#3005)
Bogdan Chadkinc9db576826e6
diff --git a/apps/builder/app/builder/features/address-bar.tsx b/apps/builder/app/builder/features/address-bar.tsxindex 666368f256..910506e506 100644--- a/apps/builder/app/builder/features/address-bar.tsx+++ b/apps/builder/app/builder/features/address-bar.tsx@@ -61,18 +61,26 @@ const $selectedPagePath = computed([$selectedPage, $pages], (page, pages) => {.replace(/\/+/g, "/");});-type PathParams = Record<string, string>;+export type System = {+ params: Record<string, string>;+ search: Record<string, string>;+};++const initialSystem: System = {+ params: {},+ search: {},+};const $selectedPagePathParams = computed([$selectedPage, $dataSourceVariables],(selectedPage, dataSourceVariables) => {- if (selectedPage?.pathParamsDataSourceId === undefined) {+ if (selectedPage?.systemDataSourceId === undefined) {return {};}- const pathParams = dataSourceVariables.get(- selectedPage?.pathParamsDataSourceId- ) as undefined | PathParams;- return pathParams;+ const system = dataSourceVariables.get(selectedPage.systemDataSourceId) as+ | undefined+ | System;+ return system?.params;});@@ -81,7 +89,7 @@ const updatePathParam = (name: string, value: string) => {const path = $selectedPagePath.get();const tokens = tokenizePathnamePattern(path);// delete stale fields- const newParams: PathParams = {};+ const newParams: Record<string, string> = {};for (const token of tokens) {if (token.type === "param") {newParams[token.name] = pathParams?.[token.name] ?? "";@@ -89,9 +97,17 @@ const updatePathParam = (name: string, value: string) => {}newParams[name] = value;const page = $selectedPage.get();- if (page?.pathParamsDataSourceId) {+ if (page?.systemDataSourceId) {const dataSourceVariables = new Map($dataSourceVariables.get());- dataSourceVariables.set(page.pathParamsDataSourceId, newParams);+ const system = dataSourceVariables.get(page.systemDataSourceId) as+ | undefined+ | System;+ const newSystem: System = {+ ...initialSystem,+ ...system,+ params: newParams,+ };+ dataSourceVariables.set(page.systemDataSourceId, newSystem);$dataSourceVariables.set(dataSourceVariables);}};diff --git a/apps/builder/app/builder/features/settings-panel/resource-panel.tsx b/apps/builder/app/builder/features/settings-panel/resource-panel.tsxindex f393865e9d..a255acec74 100644--- a/apps/builder/app/builder/features/settings-panel/resource-panel.tsx+++ b/apps/builder/app/builder/features/settings-panel/resource-panel.tsx@@ -264,8 +264,8 @@ const $hiddenDataSourceIds = computed(}if (pages) {for (const page of pages.pages) {- if (page.pathParamsDataSourceId) {- dataSourceIds.delete(page.pathParamsDataSourceId);+ if (page.systemDataSourceId) {+ dataSourceIds.delete(page.systemDataSourceId);}}}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 3edc1dc935..97f300ce1e 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@@ -90,7 +90,7 @@ import {duplicatePage,} from "./page-utils";import { Form } from "./form";-import { $publishedOrigin } from "~/builder/features/address-bar";+import { type System, $publishedOrigin } from "~/builder/features/address-bar";import { $userPlanFeatures } from "~/builder/shared/nano-states";import type { UserPlanFeatures } from "~/shared/db/user-plan-features.server";@@ -545,10 +545,7 @@ const LanguageField = ({);};-const usePageUrl = (- values: Values,- pathParamsDataSourceId?: DataSource["id"]-) => {+const usePageUrl = (values: Values, systemDataSourceId?: DataSource["id"]) => {const pages = useStore($pages);const foldersPath =pages === undefined ? "" : getPagePath(values.parentFolderId, pages);@@ -558,14 +555,11 @@ const usePageUrl = (.replace(/\/+/g, "/");const dataSourceVariables = useStore($dataSourceVariables);- const storedParams =- pathParamsDataSourceId === undefined+ const storedSystem =+ systemDataSourceId === undefined? undefined- : (dataSourceVariables.get(pathParamsDataSourceId) as Record<- string,- string- >);- const pathParams = storedParams ?? {};+ : (dataSourceVariables.get(systemDataSourceId) as System);+ const pathParams = storedSystem?.params ?? {};const publishedOrigin = useStore($publishedOrigin);const tokens = tokenizePathnamePattern(path);@@ -574,13 +568,13 @@ const usePageUrl = (};const FormFields = ({- pathParamsDataSourceId,+ systemDataSourceId,autoSelect,errors,values,onChange,}: {- pathParamsDataSourceId?: DataSource["id"];+ systemDataSourceId?: DataSource["id"];autoSelect?: boolean;errors: Errors;values: Values;@@ -599,7 +593,7 @@ const FormFields = ({const { allowDynamicData } = useStore($userPlanFeatures);const { variableValues, scope, aliases } = useStore($pageRootScope);- const pageUrl = usePageUrl(values, pathParamsDataSourceId);+ const pageUrl = usePageUrl(values, systemDataSourceId);if (pages === undefined) {return;@@ -1285,58 +1279,38 @@ const updatePage = (pageId: Page["id"], values: Partial<Values>) => {}};- serverSyncStore.createTransaction(- [$pages, $dataSources],- (pages, dataSources) => {- if (pages === undefined) {- return;- }-- // swap home page- if (values.isHomePage && pages.homePage.id !== pageId) {- const newHomePageIndex = pages.pages.findIndex(- (page) => page.id === pageId- );- if (newHomePageIndex === -1) {- throw new Error(`Page with id ${pageId} not found`);- }+ serverSyncStore.createTransaction([$pages], (pages) => {+ if (pages === undefined) {+ return;+ }- const tmp = pages.homePage;- pages.homePage = pages.pages[newHomePageIndex];+ // swap home page+ if (values.isHomePage && pages.homePage.id !== pageId) {+ const newHomePageIndex = pages.pages.findIndex(+ (page) => page.id === pageId+ );+ if (newHomePageIndex === -1) {+ throw new Error(`Page with id ${pageId} not found`);+ }- pages.homePage.path = "";- pages.pages[newHomePageIndex] = tmp;+ const tmp = pages.homePage;+ pages.homePage = pages.pages[newHomePageIndex];- tmp.path = nameToPath(pages, tmp.name);- }+ pages.homePage.path = "";+ pages.pages[newHomePageIndex] = tmp;- if (pages.homePage.id === pageId) {- updatePageMutable(pages.homePage, values, pages.folders);- }+ tmp.path = nameToPath(pages, tmp.name);+ }- for (const page of pages.pages) {- if (page.id === pageId) {- // mutate page before working with path params- updatePageMutable(page, values, pages.folders);- // create "Path Params" variable when pattern is specified in path-- if (- isPathnamePattern(page.path) &&- page.pathParamsDataSourceId === undefined- ) {- page.pathParamsDataSourceId = nanoid();- dataSources.set(page.pathParamsDataSourceId, {- id: page.pathParamsDataSourceId,- // scope new variable to page root- scopeInstanceId: page.rootInstanceId,- type: "parameter",- name: "Path Params",- });- }- }+ if (pages.homePage.id === pageId) {+ updatePageMutable(pages.homePage, values, pages.folders);+ }+ for (const page of pages.pages) {+ if (page.id === pageId) {+ updatePageMutable(page, values, pages.folders);}}- );+ });};export const PageSettings = ({@@ -1432,7 +1406,7 @@ export const PageSettings = ({}}><FormFields- pathParamsDataSourceId={page.pathParamsDataSourceId}+ systemDataSourceId={page.systemDataSourceId}errors={errors}values={values}onChange={handleChange}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 5b57003dcd..f168a2aa2f 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@@ -819,49 +819,6 @@ describe("duplicate page", () => {systemDataSourceId: expect.not.stringMatching("system"),});});-- test("replace path params variable", () => {- $instances.set(- toMap([{ type: "instance", id: "body", component: "Body", children: [] }])- );- $dataSources.set(- toMap([- {- id: "pathParamsId",- scopeInstanceId: "body",- name: "Path Params",- type: "parameter",- },- ])- );- $pages.set({- homePage: {- id: "pageId",- name: "My Name",- path: "/",- title: `"My Title"`,- meta: {},- rootInstanceId: "body",- pathParamsDataSourceId: "pathParamsId",- systemDataSourceId: "system",- },- pages: [],- folders: [],- });- duplicatePage("pageId");- const [_oldDataSource, newDataSource] = $dataSources.get().values();- expect(newDataSource.id).not.toEqual("pathParamsId");- expect($pages.get()?.pages[0]).toEqual({- id: expect.not.stringMatching("pageId"),- name: "My Name (1)",- path: "/copy-1",- title: `"My Title"`,- meta: {},- rootInstanceId: expect.not.stringMatching("body"),- pathParamsDataSourceId: newDataSource.id,- systemDataSourceId: expect.not.stringMatching("system"),- });- });});test("page root scope should rely on editing page", () => {@@ -953,3 +910,44 @@ test("page root scope should use variable and resource values", () => {]),});});++test("page root scope should prefill default system variable value", () => {+ $pages.set(+ createDefaultPages({+ rootInstanceId: "homeRootId",+ homePageId: "homePageId",+ systemDataSourceId: "systemId",+ })+ );+ $editingPagesItemId.set("homePageId");+ $dataSources.set(+ toMap([+ {+ id: "systemId",+ scopeInstanceId: "homeRootId",+ name: "system",+ type: "parameter",+ },+ ])+ );+ expect($pageRootScope.get()).toEqual({+ aliases: new Map([["$ws$dataSource$systemId", "system"]]),+ scope: {+ $ws$dataSource$systemId: { params: {}, search: {} },+ },+ variableValues: new Map([["systemId", { params: {}, search: {} }]]),+ });++ $dataSourceVariables.set(+ new Map([["systemId", { params: { slug: "my-post" }, search: {} }]])+ );+ expect($pageRootScope.get()).toEqual({+ aliases: new Map([["$ws$dataSource$systemId", "system"]]),+ scope: {+ $ws$dataSource$systemId: { params: { slug: "my-post" }, search: {} },+ },+ variableValues: new Map([+ ["systemId", { params: { slug: "my-post" }, search: {} }],+ ]),+ });+});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 683b6c8503..b5d1d2755a 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@@ -327,6 +327,12 @@ const $pageRootVariableValues = computed(if (variable.type === "parameter") {const value = dataSourceVariables.get(variable.id);variableValues.set(variable.id, value);+ if (variable.id === page.systemDataSourceId && value === undefined) {+ variableValues.set(variable.id, {+ params: {},+ search: {},+ });+ }}if (variable.type === "resource") {const value = resourceValues.get(variable.resourceId);@@ -428,10 +434,6 @@ export const duplicatePage = (pageId: Page["id"]) => {availableDataSources: new Set(),});const newRootInstanceId = newInstanceIds.get(page.rootInstanceId);- const newPathParamsDataSourceId =- page.pathParamsDataSourceId === undefined- ? undefined- : newDataSourceIds.get(page.pathParamsDataSourceId);// @todo simplify after releasing migration with system variableconst newSystemDataSourceId =page.systemDataSourceId === undefined@@ -445,7 +447,6 @@ export const duplicatePage = (pageId: Page["id"]) => {...page,id: newPageId,rootInstanceId: newRootInstanceId,- pathParamsDataSourceId: newPathParamsDataSourceId,systemDataSourceId: newSystemDataSourceId,// @todo create new data sourcename: newName,diff --git a/apps/builder/app/shared/nano-states/props.test.ts b/apps/builder/app/shared/nano-states/props.test.tsindex 84db49d3a1..1e732b3768 100644--- a/apps/builder/app/shared/nano-states/props.test.ts+++ b/apps/builder/app/shared/nano-states/props.test.ts@@ -1,5 +1,7 @@import { beforeEach, expect, test } from "@jest/globals";import { cleanStores } from "nanostores";+import { createDefaultPages } from "@webstudio-is/project-build";+import { setEnv } from "@webstudio-is/feature-flags";import type { Instance } from "@webstudio-is/sdk";import {collectionComponent,@@ -21,7 +23,8 @@ import {$resources,} from "./nano-states";import { $params } from "~/canvas/stores";-import { createDefaultPages } from "@webstudio-is/project-build";++setEnv("*");const getIdValuePair = <T extends { id: string }>(item: T) =>[item.id, item] as const;@@ -40,7 +43,7 @@ const selectPageRoot = (rootInstanceId: Instance["id"]) => {homePageId: "pageId",homePagePath: "/my-page",rootInstanceId,- systemDataSourceId: "system",+ systemDataSourceId: "systemId",});$pages.set(defaultPages);$selectedPageId.set(defaultPages.homePage.id);@@ -881,6 +884,55 @@ test("compute parameter and resource variables without values to make it availabcleanStores($variableValuesByInstanceSelector);});+test("prefill default system variable value", () => {+ $instances.set(+ toMap([+ {+ id: "body",+ type: "instance",+ component: "Body",+ children: [],+ },+ ])+ );+ selectPageRoot("body");+ $dataSources.set(+ toMap([+ {+ id: "systemId",+ scopeInstanceId: "body",+ name: "system",+ type: "parameter",+ },+ ])+ );+ $props.set(new Map());+ expect($variableValuesByInstanceSelector.get()).toEqual(+ new Map([+ [+ JSON.stringify(["body"]),+ new Map<string, unknown>([["systemId", { params: {}, search: {} }]]),+ ],+ ])+ );++ $dataSourceVariables.set(+ new Map([["systemId", { params: { slug: "my-post" }, search: {} }]])+ );+ expect($variableValuesByInstanceSelector.get()).toEqual(+ new Map([+ [+ JSON.stringify(["body"]),+ new Map<string, unknown>([+ ["systemId", { params: { slug: "my-post" }, search: {} }],+ ]),+ ],+ ])+ );++ cleanStores($variableValuesByInstanceSelector);+});+test("compute expression when invalid syntax", () => {expect(computeExpression("https://github.com", new Map())).toEqual(undefined);});diff --git a/apps/builder/app/shared/nano-states/props.ts b/apps/builder/app/shared/nano-states/props.tsindex 280d0b6c13..cd105052ff 100644--- a/apps/builder/app/shared/nano-states/props.ts+++ b/apps/builder/app/shared/nano-states/props.ts@@ -358,6 +358,15 @@ export const $variableValuesByInstanceSelector = computed(if (variable.type === "parameter") {const value = dataSourceVariables.get(variable.id);variableValues.set(variable.id, value);+ if (+ variable.id === page.systemDataSourceId &&+ value === undefined+ ) {+ variableValues.set(variable.id, {+ params: {},+ search: {},+ });+ }}if (variable.type === "resource") {const value = resourceValues.get(variable.resourceId);diff --git a/fixtures/webstudio-custom-template/.webstudio/data.json b/fixtures/webstudio-custom-template/.webstudio/data.jsonindex 8354ffe6a0..31869a848a 100644--- a/fixtures/webstudio-custom-template/.webstudio/data.json+++ b/fixtures/webstudio-custom-template/.webstudio/data.json@@ -26,7 +26,8 @@"description": "\"Page description f511c297-b44f-4e4b-96bd-d013da06bada\""},"rootInstanceId": "ibXgMoi9_ipHx1gVrvii0",- "path": ""+ "path": "",+ "systemDataSourceId": "gzU1wxmnHwY-x5jPet-3Y"},"pages": [{@@ -45,7 +46,8 @@]},"rootInstanceId": "LW98_-srDnnagkR10lsk4",- "path": "/script-test"+ "path": "/script-test",+ "systemDataSourceId": "pCHIauvdC2bIuiCOAhV9Z"},{"id": "lyz5sZaJ7WzLt71cX3VJ2",@@ -61,7 +63,8 @@"custom": []},"rootInstanceId": "jDb2FuSK2-azIZxkH5XNv",- "path": "/world"+ "path": "/world",+ "systemDataSourceId": "E2nbgH6ec91fv6I4xF7DR"}],"folders": [@@ -515,7 +518,35 @@}]],- "dataSources": [],+ "dataSources": [+ [+ "gzU1wxmnHwY-x5jPet-3Y",+ {+ "id": "gzU1wxmnHwY-x5jPet-3Y",+ "scopeInstanceId": "ibXgMoi9_ipHx1gVrvii0",+ "name": "system",+ "type": "parameter"+ }+ ],+ [+ "pCHIauvdC2bIuiCOAhV9Z",+ {+ "id": "pCHIauvdC2bIuiCOAhV9Z",+ "scopeInstanceId": "LW98_-srDnnagkR10lsk4",+ "name": "system",+ "type": "parameter"+ }+ ],+ [+ "E2nbgH6ec91fv6I4xF7DR",+ {+ "id": "E2nbgH6ec91fv6I4xF7DR",+ "scopeInstanceId": "jDb2FuSK2-azIZxkH5XNv",+ "name": "system",+ "type": "parameter"+ }+ ]+ ],"resources": [],"instances": [[@@ -653,7 +684,8 @@"description": "\"Page description f511c297-b44f-4e4b-96bd-d013da06bada\""},"rootInstanceId": "ibXgMoi9_ipHx1gVrvii0",- "path": ""+ "path": "",+ "systemDataSourceId": "gzU1wxmnHwY-x5jPet-3Y"},"pages": [{@@ -664,7 +696,8 @@"description": "\"Page description f511c297-b44f-4e4b-96bd-d013da06bada\""},"rootInstanceId": "ibXgMoi9_ipHx1gVrvii0",- "path": ""+ "path": "",+ "systemDataSourceId": "gzU1wxmnHwY-x5jPet-3Y"},{"id": "xT46WZKzCBTvUCIObMELW",@@ -682,7 +715,8 @@]},"rootInstanceId": "LW98_-srDnnagkR10lsk4",- "path": "/script-test"+ "path": "/script-test",+ "systemDataSourceId": "pCHIauvdC2bIuiCOAhV9Z"},{"id": "lyz5sZaJ7WzLt71cX3VJ2",@@ -698,7 +732,8 @@"custom": []},"rootInstanceId": "jDb2FuSK2-azIZxkH5XNv",- "path": "/world"+ "path": "/world",+ "systemDataSourceId": "E2nbgH6ec91fv6I4xF7DR"}],"assets": [diff --git a/fixtures/webstudio-remix-netlify-edge-functions/.webstudio/data.json b/fixtures/webstudio-remix-netlify-edge-functions/.webstudio/data.jsonindex 714ce1b10f..bb2309af90 100644--- a/fixtures/webstudio-remix-netlify-edge-functions/.webstudio/data.json+++ b/fixtures/webstudio-remix-netlify-edge-functions/.webstudio/data.json@@ -20,7 +20,8 @@"title": "\"Home\"","meta": {},"rootInstanceId": "MMimeobf_zi4ZkRGXapju",- "path": ""+ "path": "",+ "systemDataSourceId": "HdKSzlJZasGmZlW8b-va0"},"pages": [],"folders": [@@ -134,7 +135,17 @@]],"props": [],- "dataSources": [],+ "dataSources": [+ [+ "HdKSzlJZasGmZlW8b-va0",+ {+ "id": "HdKSzlJZasGmZlW8b-va0",+ "scopeInstanceId": "MMimeobf_zi4ZkRGXapju",+ "name": "system",+ "type": "parameter"+ }+ ]+ ],"resources": [],"instances": [[@@ -196,7 +207,8 @@"title": "\"Home\"","meta": {},"rootInstanceId": "MMimeobf_zi4ZkRGXapju",- "path": ""+ "path": "",+ "systemDataSourceId": "HdKSzlJZasGmZlW8b-va0"},"pages": [{@@ -205,7 +217,8 @@"title": "\"Home\"","meta": {},"rootInstanceId": "MMimeobf_zi4ZkRGXapju",- "path": ""+ "path": "",+ "systemDataSourceId": "HdKSzlJZasGmZlW8b-va0"}],"assets": [],diff --git a/fixtures/webstudio-remix-netlify-functions/.webstudio/data.json b/fixtures/webstudio-remix-netlify-functions/.webstudio/data.jsonindex 714ce1b10f..bb2309af90 100644--- a/fixtures/webstudio-remix-netlify-functions/.webstudio/data.json+++ b/fixtures/webstudio-remix-netlify-functions/.webstudio/data.json@@ -20,7 +20,8 @@"title": "\"Home\"","meta": {},"rootInstanceId": "MMimeobf_zi4ZkRGXapju",- "path": ""+ "path": "",+ "systemDataSourceId": "HdKSzlJZasGmZlW8b-va0"},"pages": [],"folders": [@@ -134,7 +135,17 @@]],"props": [],- "dataSources": [],+ "dataSources": [+ [+ "HdKSzlJZasGmZlW8b-va0",+ {+ "id": "HdKSzlJZasGmZlW8b-va0",+ "scopeInstanceId": "MMimeobf_zi4ZkRGXapju",+ "name": "system",+ "type": "parameter"+ }+ ]+ ],"resources": [],"instances": [[@@ -196,7 +207,8 @@"title": "\"Home\"","meta": {},"rootInstanceId": "MMimeobf_zi4ZkRGXapju",- "path": ""+ "path": "",+ "systemDataSourceId": "HdKSzlJZasGmZlW8b-va0"},"pages": [{@@ -205,7 +217,8 @@"title": "\"Home\"","meta": {},"rootInstanceId": "MMimeobf_zi4ZkRGXapju",- "path": ""+ "path": "",+ "systemDataSourceId": "HdKSzlJZasGmZlW8b-va0"}],"assets": [],diff --git a/fixtures/webstudio-remix-vercel/.webstudio/data.json b/fixtures/webstudio-remix-vercel/.webstudio/data.jsonindex 34fec5bd9c..44b60d4a47 100644--- a/fixtures/webstudio-remix-vercel/.webstudio/data.json+++ b/fixtures/webstudio-remix-vercel/.webstudio/data.json@@ -29,7 +29,8 @@]},"rootInstanceId": "On9cvWCxr5rdZtY9O1Bv0",- "path": ""+ "path": "",+ "systemDataSourceId": "ram6PSGTMg41lcfdoUGrV"},"pages": [{@@ -42,7 +43,8 @@"socialImageAssetId": "88d5e2ff-b8f2-4899-aaf8-dde4ade6da10"},"rootInstanceId": "uKWGyE9JY3cPwY-xI9vk6",- "path": "/radix"+ "path": "/radix",+ "systemDataSourceId": "WihU_iOb3p4rS3nJD6NvB"},{"id": "szYLvBduHPmbtqQKCDY0b",@@ -52,7 +54,8 @@"description": "\"\""},"rootInstanceId": "EDEfpMPRqDejthtwkH7ws",- "path": "/_route_with_symbols_"+ "path": "/_route_with_symbols_",+ "systemDataSourceId": "_8Ok9oPHB3wlwjhX7Mlai"},{"id": "U1tRJl2ERr8_OFe0g9cN_",@@ -62,7 +65,8 @@"description": "\"\""},"rootInstanceId": "a-4nDFkaWy4px1fn38XWJ",- "path": "/form"+ "path": "/form",+ "systemDataSourceId": "FNmfYcbf2VF3yudEbZwzx"},{"id": "-J9I4Oo6mONfQlf_3-OqG",@@ -72,7 +76,8 @@"description": "\"\""},"rootInstanceId": "O-ljaGZQ0iRNTlEshMkgE",- "path": "/heading-with-id"+ "path": "/heading-with-id",+ "systemDataSourceId": "YR7MLRg2bNHQqYgUhm27J"},{"id": "TS39WeBd0Qr3QgbSlzdf2",@@ -90,7 +95,8 @@]},"rootInstanceId": "AWY2qZfpbykoiWELeJhse",- "path": "/resources"+ "path": "/resources",+ "systemDataSourceId": "wTJbVXFa4Mul6Qg5ZcooO"},{"id": "Pnz-BxUm6XmvFygk_XdEy",@@ -108,7 +114,8 @@]},"rootInstanceId": "L0ZXd5F9xk9Rsl9ORzIkJ",- "path": "/nested-page"+ "path": "/nested-page",+ "systemDataSourceId": "X05l8b5NS4KvFRiiloGqF"}],"folders": [@@ -2224,6 +2231,69 @@"scopeInstanceId": "WGSZGPAhyIuWhM1DJ7HbZ","name": "collectionItem"}+ ],+ [+ "ram6PSGTMg41lcfdoUGrV",+ {+ "id": "ram6PSGTMg41lcfdoUGrV",+ "scopeInstanceId": "On9cvWCxr5rdZtY9O1Bv0",+ "name": "system",+ "type": "parameter"+ }+ ],+ [+ "WihU_iOb3p4rS3nJD6NvB",+ {+ "id": "WihU_iOb3p4rS3nJD6NvB",+ "scopeInstanceId": "uKWGyE9JY3cPwY-xI9vk6",+ "name": "system",+ "type": "parameter"+ }+ ],+ [+ "_8Ok9oPHB3wlwjhX7Mlai",+ {+ "id": "_8Ok9oPHB3wlwjhX7Mlai",+ "scopeInstanceId": "EDEfpMPRqDejthtwkH7ws",+ "name": "system",+ "type": "parameter"+ }+ ],+ [+ "FNmfYcbf2VF3yudEbZwzx",+ {+ "id": "FNmfYcbf2VF3yudEbZwzx",+ "scopeInstanceId": "a-4nDFkaWy4px1fn38XWJ",+ "name": "system",+ "type": "parameter"+ }+ ],+ [+ "YR7MLRg2bNHQqYgUhm27J",+ {+ "id": "YR7MLRg2bNHQqYgUhm27J",+ "scopeInstanceId": "O-ljaGZQ0iRNTlEshMkgE",+ "name": "system",+ "type": "parameter"+ }+ ],+ [+ "wTJbVXFa4Mul6Qg5ZcooO",+ {+ "id": "wTJbVXFa4Mul6Qg5ZcooO",+ "scopeInstanceId": "AWY2qZfpbykoiWELeJhse",+ "name": "system",+ "type": "parameter"+ }+ ],+ [+ "X05l8b5NS4KvFRiiloGqF",+ {+ "id": "X05l8b5NS4KvFRiiloGqF",+ "scopeInstanceId": "L0ZXd5F9xk9Rsl9ORzIkJ",+ "name": "system",+ "type": "parameter"+ }]],"resources": [@@ -3302,7 +3372,8 @@]},"rootInstanceId": "On9cvWCxr5rdZtY9O1Bv0",- "path": ""+ "path": "",+ "systemDataSourceId": "ram6PSGTMg41lcfdoUGrV"},"pages": [{@@ -3320,7 +3391,8 @@]},"rootInstanceId": "On9cvWCxr5rdZtY9O1Bv0",- "path": ""+ "path": "",+ "systemDataSourceId": "ram6PSGTMg41lcfdoUGrV"},{"id": "xfvB4UThQXmQ_OubPYrkg",@@ -3332,7 +3404,8 @@"socialImageAssetId": "88d5e2ff-b8f2-4899-aaf8-dde4ade6da10"},"rootInstanceId": "uKWGyE9JY3cPwY-xI9vk6",- "path": "/radix"+ "path": "/radix",+ "systemDataSourceId": "WihU_iOb3p4rS3nJD6NvB"},{"id": "szYLvBduHPmbtqQKCDY0b",@@ -3342,7 +3415,8 @@"description": "\"\""},"rootInstanceId": "EDEfpMPRqDejthtwkH7ws",- "path": "/_route_with_symbols_"+ "path": "/_route_with_symbols_",+ "systemDataSourceId": "_8Ok9oPHB3wlwjhX7Mlai"},{"id": "U1tRJl2ERr8_OFe0g9cN_",@@ -3352,7 +3426,8 @@"description": "\"\""},"rootInstanceId": "a-4nDFkaWy4px1fn38XWJ",- "path": "/form"+ "path": "/form",+ "systemDataSourceId": "FNmfYcbf2VF3yudEbZwzx"},{"id": "-J9I4Oo6mONfQlf_3-OqG",@@ -3362,7 +3437,8 @@"description": "\"\""},"rootInstanceId": "O-ljaGZQ0iRNTlEshMkgE",- "path": "/heading-with-id"+ "path": "/heading-with-id",+ "systemDataSourceId": "YR7MLRg2bNHQqYgUhm27J"},{"id": "TS39WeBd0Qr3QgbSlzdf2",@@ -3380,7 +3456,8 @@]},"rootInstanceId": "AWY2qZfpbykoiWELeJhse",- "path": "/resources"+ "path": "/resources",+ "systemDataSourceId": "wTJbVXFa4Mul6Qg5ZcooO"},{"id": "Pnz-BxUm6XmvFygk_XdEy",@@ -3398,7 +3475,8 @@]},"rootInstanceId": "L0ZXd5F9xk9Rsl9ORzIkJ",- "path": "/nested-page"+ "path": "/nested-page",+ "systemDataSourceId": "X05l8b5NS4KvFRiiloGqF"}],"assets": [