webstudio 0.139.0 → 0.141.0

package/lib/cli.js

@@ -581,6 +581,8 @@ var prebuild = async (options) => {
       "createPageMeta",
       "PageData",
       "Asset",
+      "ProjectMeta",
+      "System",
       "fontAssets",
       "pageData",
       "user",
@@ -630,29 +632,18 @@ var prebuild = async (options) => {
     const props = new Map(pageData.build.props);
     const dataSources = new Map(pageData.build.dataSources);
     const resources = new Map(pageData.build.resources);
-    const utilsExport = generateUtilsExport({
-      pages: siteData.build.pages,
-      props
-    });
-    const pathParamsDataSourceId = pageData.page.pathParamsDataSourceId ?? "pathParamsDataSourceId";
-    if (pageData.page.pathParamsDataSourceId === void 0) {
-      dataSources.set(pathParamsDataSourceId, {
-        id: pathParamsDataSourceId,
-        name: "Path Params",
-        type: "parameter"
-      });
-    }
+    const utilsExport = generateUtilsExport({ props });
     const pageComponent = generateWebstudioComponent({
       scope,
       name: "Page",
       rootInstanceId,
       parameters: [
         {
-          id: `params`,
+          id: `system`,
           instanceId: "",
-          name: "params",
+          name: "system",
           type: "parameter",
-          value: pathParamsDataSourceId
+          value: pageData.page.systemDataSourceId ?? ""
         }
       ],
       instances,
@@ -669,7 +660,7 @@ var prebuild = async (options) => {
 /* This is a auto generated file for building the project */ 
 
 import { Fragment, useState } from "react";
-import type { Asset, FontAsset, ImageAsset, ProjectMeta } from "@webstudio-is/sdk";
+import type { Asset, FontAsset, ImageAsset, ProjectMeta, System } from "@webstudio-is/sdk";
 import { useResource } from "@webstudio-is/react-sdk";
 import type { PageMeta } from "@webstudio-is/react-sdk";
 ${componentImports}
@@ -927,7 +918,7 @@ import makeCLI from "yargs";
 // package.json
 var package_default = {
   name: "webstudio",
-  version: "0.139.0",
+  version: "0.141.0",
   description: "Webstudio CLI",
   author: "Webstudio <github@webstudio.is>",
   homepage: "https://webstudio.is",
@@ -968,7 +959,7 @@ var package_default = {
     "strip-indent": "^4.0.0",
     "title-case": "^4.1.0",
     yargs: "^17.7.2",
-    zod: "^3.21.4"
+    zod: "^3.22.4"
   },
   devDependencies: {
     "@types/node": "^18.17.1",

package/package.json

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

package/templates/defaults/__templates__/route-template.tsx

@@ -17,7 +17,6 @@ import {
   pageData,
   user,
   projectId,
-  pagesPaths,
   formsProperties,
   Page,
   imageAssets,
@@ -36,8 +35,12 @@ export type PageData = {
 
 export const loader = async (arg: LoaderArgs) => {
   const params = getRemixParams(arg.params);
-  const resources = await loadResources({ params });
-  const pageMeta = getPageMeta({ params, resources });
+  const system = {
+    params,
+    search: {},
+  };
+  const resources = await loadResources({ system });
+  const pageMeta = getPageMeta({ system, resources });
 
   if (pageMeta.redirect) {
     const status =
@@ -64,7 +67,7 @@ export const loader = async (arg: LoaderArgs) => {
       host,
       url: url.href,
       excludeFromSearch: arg.context.EXCLUDE_FROM_SEARCH,
-      params,
+      system,
       resources,
       pageMeta,
     },
@@ -317,18 +320,17 @@ export const action = async ({ request, context }: ActionArgs) => {
 };
 
 const Outlet = () => {
-  const { params, resources } = useLoaderData<typeof loader>();
+  const { system, resources } = useLoaderData<typeof loader>();
   return (
     <ReactSdkContext.Provider
       value={{
         imageLoader,
         assetBaseUrl,
         imageBaseUrl,
-        pagesPaths,
         resources,
       }}
     >
-      <Page params={params} />
+      <Page system={system} />
     </ReactSdkContext.Provider>
   );
 };

package/templates/defaults/package.json

@@ -10,13 +10,13 @@
     "@remix-run/react": "^1.19.2",
     "@remix-run/server-runtime": "^1.19.2",
     "@remix-run/node": "^1.19.2",
-    "@webstudio-is/react-sdk": "0.139.0",
-    "@webstudio-is/sdk-components-react-radix": "0.139.0",
-    "@webstudio-is/sdk-components-react-remix": "0.139.0",
-    "@webstudio-is/sdk-components-react": "0.139.0",
-    "@webstudio-is/form-handlers": "0.139.0",
-    "@webstudio-is/image": "0.139.0",
-    "@webstudio-is/sdk": "0.139.0",
+    "@webstudio-is/react-sdk": "0.141.0",
+    "@webstudio-is/sdk-components-react-radix": "0.141.0",
+    "@webstudio-is/sdk-components-react-remix": "0.141.0",
+    "@webstudio-is/sdk-components-react": "0.141.0",
+    "@webstudio-is/form-handlers": "0.141.0",
+    "@webstudio-is/image": "0.141.0",
+    "@webstudio-is/sdk": "0.141.0",
     "isbot": "^3.6.8",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"