webstudio 0.128.0 → 0.129.0

package/lib/cli.js

@@ -260,7 +260,7 @@ import merge from "deepmerge";
 import {
   generateCss,
   generateUtilsExport,
-  generatePageComponent,
+  generateWebstudioComponent,
   getIndexesWithinAncestors,
   namespaceMeta,
   normalizeProps,
@@ -334,18 +334,22 @@ var isCliTemplate = async (template) => {
   }
   return false;
 };
-var copyTemplates = async (template = "defaults") => {
+var getTemplatePath = async (template) => {
   const currentPath = fileURLToPath(new URL(import.meta.url));
-  const templatesPath = await isCliTemplate(template) ? normalize(join4(dirname2(currentPath), "..", "templates", template)) : template;
-  await cp(templatesPath, cwd3(), {
+  const templatePath = await isCliTemplate(template) ? normalize(join4(dirname2(currentPath), "..", "templates", template)) : template;
+  return templatePath;
+};
+var copyTemplates = async (template = "defaults") => {
+  const templatePath = await getTemplatePath(template);
+  await cp(templatePath, cwd3(), {
     recursive: true,
     filter: (source) => {
       return basename(source) !== "package.json";
     }
   });
-  if (await isFileExists(join4(templatesPath, "package.json")) === true) {
+  if (await isFileExists(join4(templatePath, "package.json")) === true) {
     await mergeJsonFiles(
-      join4(templatesPath, "package.json"),
+      join4(templatePath, "package.json"),
       join4(cwd3(), "package.json")
     );
   }
@@ -526,17 +530,11 @@ var prebuild = async (options) => {
   );
   await ensureFileInPath(join4(generatedDir, "index.css"), cssText);
   spinner.text = "Generating routes and pages";
-  const routeFileTemplate = await readFile4(
-    normalize(
-      join4(
-        dirname2(fileURLToPath(new URL(import.meta.url))),
-        "..",
-        "templates",
-        "route-template.tsx"
-      )
-    ),
-    "utf8"
+  const routeTemplatePath = normalize(
+    join4(cwd3(), "__templates__", "route-template.tsx")
   );
+  const routeFileTemplate = await readFile4(routeTemplatePath, "utf8");
+  await rm(dirname2(routeTemplatePath), { recursive: true });
   for (const [pageId, pageComponents] of Object.entries(componentsByPage)) {
     const scope = createScope([
       // manually maintained list of occupied identifiers
@@ -597,9 +595,27 @@ var prebuild = async (options) => {
       pages: siteData.build.pages,
       props
     });
-    const pageComponent = generatePageComponent({
+    const pathVariableId = pageData.page.pathVariableId ?? "pathVariableId";
+    if (pageData.page.pathVariableId === void 0) {
+      dataSources.set(pathVariableId, {
+        id: pathVariableId,
+        name: "Page Params",
+        type: "parameter"
+      });
+    }
+    const pageComponent = generateWebstudioComponent({
       scope,
-      page: pageData.page,
+      name: "Page",
+      rootInstanceId: pageData.page.rootInstanceId,
+      parameters: [
+        {
+          id: `params`,
+          instanceId: "",
+          name: "params",
+          type: "parameter",
+          value: pathVariableId
+        }
+      ],
       instances,
       props,
       dataSources,
@@ -637,9 +653,12 @@ ${utilsExport}
     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"',
-      `../__generated__/${remixRoute}.server"`
+    const routeFileContent = routeFileTemplate.replace(
+      /".*\/__generated__\/_index"/,
+      `"../__generated__/${remixRoute}"`
+    ).replace(
+      /".*\/__generated__\/_index.server"/,
+      `"../__generated__/${remixRoute}.server"`
     );
     await ensureFileInPath(join4(routesDir, fileName), routeFileContent);
     await ensureFileInPath(join4(generatedDir, fileName), pageExports);
@@ -841,7 +860,7 @@ import makeCLI from "yargs";
 // package.json
 var package_default = {
   name: "webstudio",
-  version: "0.128.0",
+  version: "0.129.0",
   description: "Webstudio CLI",
   author: "Webstudio <github@webstudio.is>",
   homepage: "https://webstudio.is",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webstudio",
-  "version": "0.128.0",
+  "version": "0.129.0",
   "description": "Webstudio CLI",
   "author": "Webstudio <github@webstudio.is>",
   "homepage": "https://webstudio.is",
@@ -28,20 +28,20 @@
     "title-case": "^4.1.0",
     "yargs": "^17.7.2",
     "zod": "^3.21.4",
-    "@webstudio-is/http-client": "0.128.0",
-    "@webstudio-is/react-sdk": "0.128.0",
-    "@webstudio-is/image": "0.128.0",
-    "@webstudio-is/sdk": "0.128.0",
-    "@webstudio-is/sdk-components-react": "0.128.0",
-    "@webstudio-is/sdk-components-react-radix": "0.128.0",
-    "@webstudio-is/sdk-components-react-remix": "0.128.0"
+    "@webstudio-is/http-client": "0.129.0",
+    "@webstudio-is/react-sdk": "0.129.0",
+    "@webstudio-is/sdk": "0.129.0",
+    "@webstudio-is/image": "0.129.0",
+    "@webstudio-is/sdk-components-react": "0.129.0",
+    "@webstudio-is/sdk-components-react-remix": "0.129.0",
+    "@webstudio-is/sdk-components-react-radix": "0.129.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.128.0",
+    "@webstudio-is/form-handlers": "0.129.0",
     "@webstudio-is/tsconfig": "1.0.7"
   },
   "scripts": {

package/templates/{route-template.tsx → defaults/__templates__/route-template.tsx}

@@ -21,8 +21,8 @@ import {
   Page,
   imageAssets,
   getRemixParams,
-} from "../__generated__/index";
-import { loadResources } from "../__generated__/index.server";
+} from "../../../__generated__/_index";
+import { loadResources } from "../../../__generated__/_index.server";
 import css from "../__generated__/index.css";
 import { assetBaseUrl, imageBaseUrl, imageLoader } from "~/constants.mjs";
 

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.123.0",
-    "@webstudio-is/sdk-components-react-radix": "0.123.0",
-    "@webstudio-is/sdk-components-react-remix": "0.123.0",
-    "@webstudio-is/sdk-components-react": "0.123.0",
-    "@webstudio-is/form-handlers": "0.123.0",
-    "@webstudio-is/image": "0.123.0",
-    "@webstudio-is/sdk": "0.123.0",
+    "@webstudio-is/react-sdk": "0.129.0",
+    "@webstudio-is/sdk-components-react-radix": "0.129.0",
+    "@webstudio-is/sdk-components-react-remix": "0.129.0",
+    "@webstudio-is/sdk-components-react": "0.129.0",
+    "@webstudio-is/form-handlers": "0.129.0",
+    "@webstudio-is/image": "0.129.0",
+    "@webstudio-is/sdk": "0.129.0",
     "isbot": "^3.6.8",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"