webstudio 0.135.0 → 0.137.0

package/lib/cli.js

@@ -364,12 +364,20 @@ var prebuild = async (options) => {
  Please check webstudio --help for more details`
     );
   }
-  if (options.template !== "vanilla" && await isCliTemplate(options.template) === false && options.template.startsWith(".") === false) {
-    throw Error(
-      `
+  for (const template of options.template) {
+    if (template === "vanilla") {
+      continue;
+    }
+    if (template.startsWith(".")) {
+      continue;
+    }
+    if (await isCliTemplate(template) === false) {
+      throw Error(
+        `
  Template ${options.template} is not available 
  Please check webstudio --help for more details`
-    );
+      );
+    }
   }
   const spinner = ora2("Scaffolding the project files");
   spinner.start();
@@ -380,8 +388,11 @@ var prebuild = async (options) => {
   const routesDir = join4(appRoot, "routes");
   await rm(routesDir, { recursive: true, force: true });
   await copyTemplates();
-  if (options.template !== "vanilla") {
-    await copyTemplates(options.template);
+  for (const template of options.template) {
+    if (template === "vanilla") {
+      continue;
+    }
+    await copyTemplates(template);
   }
   const constants2 = await import(pathToFileURL(join4(cwd3(), "app/constants.mjs")).href);
   const { assetBaseUrl } = constants2;
@@ -733,8 +744,10 @@ ${utilsExport}
     for (const redirect of redirects) {
       const redirectPagePath = generateRemixRoute(redirect.old);
       const redirectFileName = `${redirectPagePath}.ts`;
-      const content = `export const loader = () => {
-  return Response.redirect("${redirect.new}", ${redirect.status ?? 301});
+      const content = `import { type LoaderArgs, redirect } from "@remix-run/server-runtime";
+
+export const loader = (arg: LoaderArgs) => {
+  return redirect("${redirect.new}", ${redirect.status ?? 301});
 };
 `;
       await ensureFileInPath(join4(routesDir, redirectFileName), content);
@@ -755,7 +768,8 @@ var buildOptions = (yargs) => yargs.option("assets", {
   default: false,
   describe: "[Experimental] Use preview version of the project"
 }).option("template", {
-  type: "string",
+  type: "array",
+  string: true,
   describe: `Template to use for the build [choices: ${PROJECT_TEMPALTES.join(
     ", "
   )}]`
@@ -870,7 +884,7 @@ var initFlow = async (options) => {
   }
   await build({
     ...options,
-    ...projectTemplate && { template: projectTemplate }
+    ...projectTemplate && { template: [projectTemplate] }
   });
   if (shouldInstallDeps === true) {
     const spinner = ora3().start();
@@ -913,7 +927,7 @@ import makeCLI from "yargs";
 // package.json
 var package_default = {
   name: "webstudio",
-  version: "0.135.0",
+  version: "0.137.0",
   description: "Webstudio CLI",
   author: "Webstudio <github@webstudio.is>",
   homepage: "https://webstudio.is",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webstudio",
-  "version": "0.135.0",
+  "version": "0.137.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.135.0",
-    "@webstudio-is/react-sdk": "0.135.0",
-    "@webstudio-is/sdk": "0.135.0",
-    "@webstudio-is/sdk-components-react-radix": "0.135.0",
-    "@webstudio-is/sdk-components-react-remix": "0.135.0",
-    "@webstudio-is/sdk-components-react": "0.135.0",
-    "@webstudio-is/image": "0.135.0"
+    "@webstudio-is/http-client": "0.137.0",
+    "@webstudio-is/image": "0.137.0",
+    "@webstudio-is/sdk": "0.137.0",
+    "@webstudio-is/react-sdk": "0.137.0",
+    "@webstudio-is/sdk-components-react": "0.137.0",
+    "@webstudio-is/sdk-components-react-remix": "0.137.0",
+    "@webstudio-is/sdk-components-react-radix": "0.137.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.135.0",
+    "@webstudio-is/form-handlers": "0.137.0",
     "@webstudio-is/tsconfig": "1.0.7"
   },
   "scripts": {

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

@@ -5,7 +5,9 @@ import {
   type LinkDescriptor,
   type ActionArgs,
   type LoaderArgs,
+  type HeadersArgs,
   json,
+  redirect,
 } from "@remix-run/server-runtime";
 import { useLoaderData } from "@remix-run/react";
 import type { ProjectMeta } from "@webstudio-is/sdk";
@@ -42,7 +44,7 @@ export const loader = async (arg: LoaderArgs) => {
       pageMeta.status === 301 || pageMeta.status === 302
         ? pageMeta.status
         : 302;
-    return Response.redirect(pageMeta.redirect, status);
+    return redirect(pageMeta.redirect, status);
   }
 
   const host =
@@ -70,14 +72,18 @@ export const loader = async (arg: LoaderArgs) => {
     // In case of CRM Data, this should be set to 0
     {
       status: pageMeta.status,
-      headers: { "Cache-Control": "public, max-age=600" },
+      headers: {
+        "Cache-Control": "public, max-age=600",
+        "x-ws-language": pageMeta.language ?? "en",
+      },
     }
   );
 };
 
-export const headers = () => {
+export const headers = ({ loaderHeaders }: HeadersArgs) => {
   return {
     "Cache-Control": "public, max-age=0, must-revalidate",
+    "x-ws-language": loaderHeaders.get("x-ws-language"),
   };
 };
 

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