webstudio 0.125.0 → 0.126.0

package/lib/cli.js

@@ -272,6 +272,7 @@ import {
 import {
   createScope,
   findTreeInstanceIds,
+  getPagePath,
   parseComponentName
 } from "@webstudio-is/sdk";
 import { createImageLoader } from "@webstudio-is/image";
@@ -424,7 +425,7 @@ var prebuild = async (options) => {
       props: siteData.build.props.map(([_id, prop]) => prop),
       assetBaseUrl,
       assets: new Map(siteData.assets.map((asset) => [asset.id, asset])),
-      pages: new Map(siteData.pages.map((page2) => [page2.id, page2]))
+      pages: siteData.build.pages
     });
     const props = [];
     for (const prop of normalizedProps) {
@@ -447,7 +448,7 @@ var prebuild = async (options) => {
         resources.push([resourceId, resource]);
       }
     }
-    siteDataByPage[page.path] = {
+    siteDataByPage[page.id] = {
       build: {
         props,
         instances,
@@ -458,12 +459,12 @@ var prebuild = async (options) => {
       page,
       assets: siteData.assets
     };
-    componentsByPage[page.path] = /* @__PURE__ */ new Set();
+    componentsByPage[page.id] = /* @__PURE__ */ 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);
@@ -536,11 +537,12 @@ var 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",
       "Fragment",
+      "useResource",
       "PageData",
       "Asset",
       "fontAssets",
@@ -581,7 +583,7 @@ var prebuild = async (options) => {
       componentImports += `import { ${specifiers} } from "${namespace}";
 `;
     }
-    const pageData = siteDataByPage[pathname];
+    const pageData = siteDataByPage[pageId];
     const renderedPageData = {
       project: siteData.build.pages.meta,
       page: pageData.page
@@ -612,9 +614,10 @@ var prebuild = async (options) => {
 /* 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 { useResource } from "@webstudio-is/react-sdk";
 ${componentImports}
+import type { PageData } from "~/routes/_index";
 export const fontAssets: Asset[] = ${JSON.stringify(fontAssets)}
 export const imageAssets: ImageAsset[] = ${JSON.stringify(imageAssets)}
 export const pageData: PageData = ${JSON.stringify(renderedPageData)};
@@ -627,11 +630,12 @@ ${pageComponent}
 
 export { Page }
 
-${generateRemixParams(pathname)}
+${generateRemixParams(pageData.page.path)}
 
 ${utilsExport}
 `;
-    const remixRoute = generateRemixRoute(pathname);
+    const path = getPagePath(pageData.page.id, siteData.build.pages);
+    const remixRoute = generateRemixRoute(path);
     const fileName = `${remixRoute}.tsx`;
     const routeFileContent = routeFileTemplate.replace('../__generated__/index"', `../__generated__/${remixRoute}"`).replace(
       '../__generated__/index.server"',
@@ -837,7 +841,7 @@ import makeCLI from "yargs";
 // package.json
 var package_default = {
   name: "webstudio",
-  version: "0.125.0",
+  version: "0.126.0",
   description: "Webstudio CLI",
   author: "Webstudio <github@webstudio.is>",
   homepage: "https://webstudio.is",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webstudio",
-  "version": "0.125.0",
+  "version": "0.126.0",
   "description": "Webstudio CLI",
   "author": "Webstudio <github@webstudio.is>",
   "homepage": "https://webstudio.is",
@@ -28,21 +28,21 @@
     "title-case": "^4.1.0",
     "yargs": "^17.7.2",
     "zod": "^3.21.4",
-    "@webstudio-is/http-client": "0.125.0",
-    "@webstudio-is/image": "0.125.0",
-    "@webstudio-is/sdk": "0.125.0",
-    "@webstudio-is/sdk-components-react": "0.125.0",
-    "@webstudio-is/sdk-components-react-radix": "0.125.0",
-    "@webstudio-is/react-sdk": "0.125.0",
-    "@webstudio-is/sdk-components-react-remix": "0.125.0"
+    "@webstudio-is/http-client": "0.126.0",
+    "@webstudio-is/image": "0.126.0",
+    "@webstudio-is/sdk": "0.126.0",
+    "@webstudio-is/react-sdk": "0.126.0",
+    "@webstudio-is/sdk-components-react": "0.126.0",
+    "@webstudio-is/sdk-components-react-radix": "0.126.0",
+    "@webstudio-is/sdk-components-react-remix": "0.126.0"
   },
   "devDependencies": {
     "@types/node": "^18.17.1",
     "@types/prompts": "^2.4.5",
     "tsx": "^3.12.8",
     "typescript": "5.2.2",
-    "@webstudio-is/tsconfig": "1.0.7",
-    "@webstudio-is/form-handlers": "0.125.0"
+    "@webstudio-is/form-handlers": "0.126.0",
+    "@webstudio-is/tsconfig": "1.0.7"
   },
   "scripts": {
     "typecheck": "tsc",

package/templates/route-template.tsx

@@ -298,9 +298,10 @@ const Outlet = () => {
         assetBaseUrl,
         imageBaseUrl,
         pagesPaths,
+        resources,
       }}
     >
-      <Page params={params} resources={resources} />
+      <Page params={params} />
     </ReactSdkContext.Provider>
   );
 };