webstudio 0.179.0 → 0.182.0

package/lib/cli.js

@@ -130,7 +130,7 @@ import { readFile as readFile2, writeFile as writeFile2 } from "node:fs/promises
 import { cancel, isCancel, log, text } from "@clack/prompts";
 import { parseBuilderUrl } from "@webstudio-is/http-client";
 var parseShareLink = (value) => {
-  const url = new URL(value);
+  const url = new URL(value.replaceAll("'", ""));
   const token = url.searchParams.get("authToken");
   let { projectId, sourceOrigin } = parseBuilderUrl(url.href);
   if (projectId === void 0) {
@@ -272,7 +272,7 @@ var sync = async (options) => {
       });
     } catch (error) {
       syncing.stop(error.message, 2);
-      return;
+      throw error;
     }
   }
   project;
@@ -820,16 +820,17 @@ Please check webstudio --help for more details`
     backgroundImageAssetsByPage[page.id] = backgroundImageAssets;
   }
   const assetsToDownload = [];
-  const appDomain = options.preview ? "wstd.work" : "wstd.io";
-  const domain = siteData.build.deployment?.destination === "static" ? siteData.build.deployment?.assetsDomain : siteData.build.deployment?.projectDomain;
-  if (domain === void 0) {
-    throw new Error(`Project domain is missing from the project data`);
-  }
-  const assetBuildUrl = `https://${domain}.${appDomain}/cgi/asset/`;
-  const imageLoader = createImageLoader({
-    imageBaseUrl: assetBuildUrl
-  });
   if (options.assets === true) {
+    const appDomain = options.preview ? "wstd.work" : "wstd.io";
+    const domain = siteData.build.deployment?.assetsDomain ?? // fallback to project domain should not be used since 2025-01-01 (for now is used for backward compatibility)
+    (siteData.build.deployment?.destination !== "static" ? siteData.build.deployment?.projectDomain : void 0);
+    if (domain === void 0) {
+      throw new Error(`Project domain is missing from the project data`);
+    }
+    const assetBuildUrl = `https://${domain}.${appDomain}/cgi/asset/`;
+    const imageLoader = createImageLoader({
+      imageBaseUrl: assetBuildUrl
+    });
     for (const asset of siteData.assets) {
       if (asset.type === "image") {
         const imageSrc = imageLoader({
@@ -1112,6 +1113,24 @@ Please check webstudio --help for more details`
   log2.step("Build finished");
 };
 
+// src/build-utils.ts
+var mapToTemplatesFromOptions = (values) => {
+  const templates = [];
+  for (const value of values) {
+    const template = PROJECT_TEMPLATES.find((item) => item.value === value) ?? INTERNAL_TEMPLATES.find((item) => item.value === value);
+    if (template == null) {
+      templates.push(value);
+      continue;
+    }
+    if ("expand" in template && template.expand != null) {
+      templates.push(...template.expand);
+      continue;
+    }
+    templates.push(value);
+  }
+  return templates;
+};
+
 // src/commands/build.ts
 var buildOptions = (yargs) => yargs.option("assets", {
   type: "boolean",
@@ -1125,22 +1144,7 @@ var buildOptions = (yargs) => yargs.option("assets", {
   type: "array",
   string: true,
   default: [],
-  coerce: (values) => {
-    const templates = [];
-    for (const value of values) {
-      const template = PROJECT_TEMPLATES.find((item) => item.value === value) ?? INTERNAL_TEMPLATES.find((item) => item.value === value);
-      if (template == null) {
-        templates.push(value);
-        continue;
-      }
-      if ("expand" in template && template.expand != null) {
-        templates.push(...template.expand);
-        continue;
-      }
-      templates.push(value);
-    }
-    return templates;
-  },
+  coerce: mapToTemplatesFromOptions,
   describe: `Template to use for the build [choices: ${PROJECT_TEMPLATES.map(
     (item) => item.value
   ).join(", ")}]`
@@ -1238,7 +1242,9 @@ var initFlow = async (options) => {
   await sync({ buildId: void 0, origin: void 0, authToken: void 0 });
   await build({
     ...options,
-    ...projectTemplate && { template: [projectTemplate] }
+    ...projectTemplate && {
+      template: mapToTemplatesFromOptions([projectTemplate])
+    }
   });
   if (shouldInstallDeps === true) {
     const install = spinner3();
@@ -1281,7 +1287,7 @@ import makeCLI from "yargs";
 // package.json
 var package_default = {
   name: "webstudio",
-  version: "0.179.0",
+  version: "0.182.0",
   description: "Webstudio CLI",
   author: "Webstudio <github@webstudio.is>",
   homepage: "https://webstudio.is",
@@ -1341,7 +1347,7 @@ var package_default = {
     "@remix-run/node": "^2.11.0",
     "@remix-run/react": "^2.11.0",
     "@remix-run/server-runtime": "^2.11.0",
-    "@types/node": "^20.12.7",
+    "@types/node": "^22.6.1",
     "@types/react": "^18.2.70",
     "@types/react-dom": "^18.2.25",
     "@types/yargs": "^17.0.32",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webstudio",
-  "version": "0.179.0",
+  "version": "0.182.0",
   "description": "Webstudio CLI",
   "author": "Webstudio <github@webstudio.is>",
   "homepage": "https://webstudio.is",
@@ -37,13 +37,13 @@
     "strip-indent": "^4.0.0",
     "yargs": "^17.7.2",
     "zod": "^3.22.4",
-    "@webstudio-is/http-client": "0.179.0",
-    "@webstudio-is/image": "0.179.0",
-    "@webstudio-is/sdk": "0.179.0",
-    "@webstudio-is/sdk-components-react": "0.179.0",
-    "@webstudio-is/react-sdk": "0.179.0",
-    "@webstudio-is/sdk-components-react-radix": "0.179.0",
-    "@webstudio-is/sdk-components-react-remix": "0.179.0"
+    "@webstudio-is/http-client": "0.182.0",
+    "@webstudio-is/image": "0.182.0",
+    "@webstudio-is/react-sdk": "0.182.0",
+    "@webstudio-is/sdk": "0.182.0",
+    "@webstudio-is/sdk-components-react": "0.182.0",
+    "@webstudio-is/sdk-components-react-radix": "0.182.0",
+    "@webstudio-is/sdk-components-react-remix": "0.182.0"
   },
   "devDependencies": {
     "@jest/globals": "^29.7.0",
@@ -55,7 +55,7 @@
     "@remix-run/node": "^2.11.0",
     "@remix-run/react": "^2.11.0",
     "@remix-run/server-runtime": "^2.11.0",
-    "@types/node": "^20.12.7",
+    "@types/node": "^22.6.1",
     "@types/react": "^18.2.70",
     "@types/react-dom": "^18.2.25",
     "@types/yargs": "^17.0.32",

package/templates/defaults/package.json

@@ -11,12 +11,12 @@
     "@remix-run/node": "2.11.0",
     "@remix-run/react": "2.11.0",
     "@remix-run/server-runtime": "2.11.0",
-    "@webstudio-is/react-sdk": "0.179.0",
-    "@webstudio-is/sdk-components-react-radix": "0.179.0",
-    "@webstudio-is/sdk-components-react-remix": "0.179.0",
-    "@webstudio-is/sdk-components-react": "0.179.0",
-    "@webstudio-is/image": "0.179.0",
-    "@webstudio-is/sdk": "0.179.0",
+    "@webstudio-is/react-sdk": "0.182.0",
+    "@webstudio-is/sdk-components-react-radix": "0.182.0",
+    "@webstudio-is/sdk-components-react-remix": "0.182.0",
+    "@webstudio-is/sdk-components-react": "0.182.0",
+    "@webstudio-is/image": "0.182.0",
+    "@webstudio-is/sdk": "0.182.0",
     "isbot": "^5.1.17",
     "react": "18.3.0-canary-14898b6a9-20240318",
     "react-dom": "18.3.0-canary-14898b6a9-20240318"

package/templates/ssg/app/constants.mjs

@@ -2,6 +2,8 @@
  * We use mjs extension as constants in this file is shared with the build script
  * and we use `node --eval` to extract the constants.
  */
+import { UrlCanParse } from "@webstudio-is/image";
+
 export const assetBaseUrl = "/assets/";
 export const imageBaseUrl = "/assets/";
 
@@ -9,7 +11,7 @@ export const imageBaseUrl = "/assets/";
  * @type {import("@webstudio-is/image").ImageLoader}
  */
 export const imageLoader = ({ src }) => {
-  if (URL.canParse(src)) {
+  if (UrlCanParse(src)) {
     return src;
   }
 

package/templates/ssg/package.json

@@ -8,11 +8,11 @@
     "typecheck": "tsc"
   },
   "dependencies": {
-    "@webstudio-is/react-sdk": "0.179.0",
-    "@webstudio-is/sdk-components-react-radix": "0.179.0",
-    "@webstudio-is/sdk-components-react": "0.179.0",
-    "@webstudio-is/image": "0.179.0",
-    "@webstudio-is/sdk": "0.179.0",
+    "@webstudio-is/react-sdk": "0.182.0",
+    "@webstudio-is/sdk-components-react-radix": "0.182.0",
+    "@webstudio-is/sdk-components-react": "0.182.0",
+    "@webstudio-is/image": "0.182.0",
+    "@webstudio-is/sdk": "0.182.0",
     "react": "18.3.0-canary-14898b6a9-20240318",
     "react-dom": "18.3.0-canary-14898b6a9-20240318",
     "vike": "^0.4.182"

package/templates/ssg-netlify/app/constants.mjs

@@ -2,6 +2,8 @@
  * We use mjs extension as constants in this file is shared with the build script
  * and we use `node --eval` to extract the constants.
  */
+import { UrlCanParse } from "@webstudio-is/image";
+
 export const assetBaseUrl = "/assets/";
 export const imageBaseUrl = "/assets/";
 
@@ -9,7 +11,7 @@ export const imageBaseUrl = "/assets/";
  * @type {import("@webstudio-is/image").ImageLoader}
  */
 export const imageLoader = (props) => {
-  if (URL.canParse(props.src)) {
+  if (UrlCanParse(props.src)) {
     return props.src;
   }
 

package/templates/ssg-vercel/app/constants.mjs

@@ -2,6 +2,8 @@
  * We use mjs extension as constants in this file is shared with the build script
  * and we use `node --eval` to extract the constants.
  */
+import { UrlCanParse } from "@webstudio-is/image";
+
 export const assetBaseUrl = "/assets/";
 export const imageBaseUrl = "/assets/";
 
@@ -9,7 +11,7 @@ export const imageBaseUrl = "/assets/";
  * @type {import("@webstudio-is/image").ImageLoader}
  */
 export const imageLoader = (props) => {
-  if (URL.canParse(props.src)) {
+  if (UrlCanParse(props.src)) {
     return props.src;
   }