webstudio 0.173.0 → 0.174.0

package/lib/cli.js

@@ -701,10 +701,6 @@ Please check webstudio --help for more details`
       `Project data is missing, please make sure you the project is synced.`
     );
   }
-  const domain = siteData.build.deployment?.projectDomain;
-  if (domain === void 0) {
-    throw new Error(`Project domain is missing from the project data`);
-  }
   const metas = /* @__PURE__ */ new Map();
   const componentSources = /* @__PURE__ */ new Map();
   for (const entry of framework.components) {
@@ -803,6 +799,10 @@ Please check webstudio --help for more details`
   }
   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
@@ -1242,7 +1242,7 @@ import makeCLI from "yargs";
 // package.json
 var package_default = {
   name: "webstudio",
-  version: "0.173.0",
+  version: "0.174.0",
   description: "Webstudio CLI",
   author: "Webstudio <github@webstudio.is>",
   homepage: "https://webstudio.is",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webstudio",
-  "version": "0.173.0",
+  "version": "0.174.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.173.0",
-    "@webstudio-is/sdk": "0.173.0",
-    "@webstudio-is/sdk-components-react": "0.173.0",
-    "@webstudio-is/image": "0.173.0",
-    "@webstudio-is/react-sdk": "0.173.0",
-    "@webstudio-is/sdk-components-react-radix": "0.173.0",
-    "@webstudio-is/sdk-components-react-remix": "0.173.0"
+    "@webstudio-is/http-client": "0.174.0",
+    "@webstudio-is/image": "0.174.0",
+    "@webstudio-is/sdk-components-react": "0.174.0",
+    "@webstudio-is/react-sdk": "0.174.0",
+    "@webstudio-is/sdk": "0.174.0",
+    "@webstudio-is/sdk-components-react-radix": "0.174.0",
+    "@webstudio-is/sdk-components-react-remix": "0.174.0"
   },
   "devDependencies": {
     "@jest/globals": "^29.7.0",
@@ -66,7 +66,7 @@
     "vike": "^0.4.180",
     "vite": "^5.3.4",
     "wrangler": "^3.63.2",
-    "@webstudio-is/form-handlers": "0.173.0",
+    "@webstudio-is/form-handlers": "0.174.0",
     "@webstudio-is/jest-config": "1.0.7",
     "@webstudio-is/tsconfig": "1.0.7"
   },

package/templates/defaults/app/route-templates/html.tsx

@@ -263,12 +263,10 @@ export const action = async ({
     };
 
     const resourceName = formData.get(formIdFieldName);
-
-    if (resourceName == null || typeof resourceName !== "string") {
-      throw new Error("No form id in FormData");
-    }
-
-    const resource = getResources({ system }).action.get(resourceName);
+    const resource =
+      typeof resourceName === "string"
+        ? getResources({ system }).action.get(resourceName)
+        : undefined;
 
     const formBotValue = formData.get(formBotFieldName);
 
@@ -308,7 +306,7 @@ export const action = async ({
 
     const result = await n8nHandler({
       formInfo: {
-        formId: [projectId, resourceName].join("--"),
+        formId: projectId,
         formData,
         pageUrl: pageUrl.toString(),
         toEmail: contactEmail,

package/templates/defaults/package.json

@@ -11,13 +11,13 @@
     "@remix-run/node": "2.10.3",
     "@remix-run/react": "2.10.3",
     "@remix-run/server-runtime": "2.10.3",
-    "@webstudio-is/react-sdk": "0.173.0",
-    "@webstudio-is/sdk-components-react-radix": "0.173.0",
-    "@webstudio-is/sdk-components-react-remix": "0.173.0",
-    "@webstudio-is/sdk-components-react": "0.173.0",
-    "@webstudio-is/form-handlers": "0.173.0",
-    "@webstudio-is/image": "0.173.0",
-    "@webstudio-is/sdk": "0.173.0",
+    "@webstudio-is/react-sdk": "0.174.0",
+    "@webstudio-is/sdk-components-react-radix": "0.174.0",
+    "@webstudio-is/sdk-components-react-remix": "0.174.0",
+    "@webstudio-is/sdk-components-react": "0.174.0",
+    "@webstudio-is/form-handlers": "0.174.0",
+    "@webstudio-is/image": "0.174.0",
+    "@webstudio-is/sdk": "0.174.0",
     "isbot": "^5.1.13",
     "react": "18.3.0-canary-14898b6a9-20240318",
     "react-dom": "18.3.0-canary-14898b6a9-20240318"

package/templates/ssg/app/constants.mjs

@@ -9,5 +9,9 @@ export const imageBaseUrl = "/assets/";
  * @type {import("@webstudio-is/image").ImageLoader}
  */
 export const imageLoader = ({ src }) => {
+  if (URL.canParse(src)) {
+    return src;
+  }
+
   return imageBaseUrl + src;
 };

package/templates/ssg/package.json

@@ -8,12 +8,12 @@
     "typecheck": "tsc"
   },
   "dependencies": {
-    "@webstudio-is/react-sdk": "0.173.0",
-    "@webstudio-is/sdk-components-react-radix": "0.173.0",
-    "@webstudio-is/sdk-components-react": "0.173.0",
-    "@webstudio-is/form-handlers": "0.173.0",
-    "@webstudio-is/image": "0.173.0",
-    "@webstudio-is/sdk": "0.173.0",
+    "@webstudio-is/react-sdk": "0.174.0",
+    "@webstudio-is/sdk-components-react-radix": "0.174.0",
+    "@webstudio-is/sdk-components-react": "0.174.0",
+    "@webstudio-is/form-handlers": "0.174.0",
+    "@webstudio-is/image": "0.174.0",
+    "@webstudio-is/sdk": "0.174.0",
     "react": "18.3.0-canary-14898b6a9-20240318",
     "react-dom": "18.3.0-canary-14898b6a9-20240318",
     "vike": "^0.4.180"