webstudio 0.298.0 → 0.300.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webstudio",
-  "version": "0.298.0",
+  "version": "0.300.0",
   "description": "Webstudio CLI",
   "author": "Webstudio <github@webstudio.is>",
   "homepage": "https://webstudio.is",
@@ -53,9 +53,9 @@
     "which": "^5.0.0",
     "yargs": "^17.7.2",
     "zod": "^4.4.3",
-    "@webstudio-is/http-client": "0.298.0",
-    "@webstudio-is/project-migrations": "0.298.0",
-    "@webstudio-is/protocol": "0.298.0",
+    "@webstudio-is/http-client": "0.300.0",
+    "@webstudio-is/protocol": "0.300.0",
+    "@webstudio-is/project-migrations": "0.300.0",
     "@webstudio-is/sync-client": "0.0.0"
   },
   "devDependencies": {
@@ -99,24 +99,24 @@
     "vite": "^6.3.4",
     "vitest": "^3.1.2",
     "wrangler": "4.130.0",
-    "@webstudio-is/css-engine": "0.298.0",
-    "@webstudio-is/content-engine": "0.298.0",
-    "@webstudio-is/fonts": "0.298.0",
-    "@webstudio-is/expression": "0.298.0",
-    "@webstudio-is/image": "0.298.0",
+    "@webstudio-is/expression": "0.300.0",
+    "@webstudio-is/fonts": "0.300.0",
+    "@webstudio-is/image": "0.300.0",
     "@webstudio-is/project-build": "0.0.0",
-    "@webstudio-is/query-builder": "0.298.0",
-    "@webstudio-is/react-sdk": "0.298.0",
-    "@webstudio-is/sdk": "0.298.0",
-    "@webstudio-is/sdk-components-animation": "0.298.0",
-    "@webstudio-is/sdk-components-react-remix": "0.298.0",
-    "@webstudio-is/sdk-components-react-radix": "0.298.0",
-    "@webstudio-is/sdk-components-react-router": "0.298.0",
-    "@webstudio-is/sdk-components-react": "0.298.0",
-    "@webstudio-is/sdk-components-registry": "0.298.0",
+    "@webstudio-is/query-builder": "0.300.0",
+    "@webstudio-is/css-engine": "0.300.0",
+    "@webstudio-is/sdk-components-animation": "0.300.0",
+    "@webstudio-is/react-sdk": "0.300.0",
+    "@webstudio-is/sdk": "0.300.0",
+    "@webstudio-is/sdk-components-react": "0.300.0",
+    "@webstudio-is/content-engine": "0.300.0",
+    "@webstudio-is/sdk-components-react-radix": "0.300.0",
+    "@webstudio-is/sdk-components-react-router": "0.300.0",
     "@webstudio-is/tsconfig": "1.0.7",
-    "@webstudio-is/vision": "0.0.0",
-    "@webstudio-is/wsauth": "0.298.0"
+    "@webstudio-is/sdk-components-registry": "0.300.0",
+    "@webstudio-is/wsauth": "0.300.0",
+    "@webstudio-is/sdk-components-react-remix": "0.300.0",
+    "@webstudio-is/vision": "0.0.0"
   },
   "scripts": {
     "typecheck": "tsc --noEmit",

package/templates/cloudflare/package.json

@@ -12,7 +12,7 @@
     "build-cf-types": "wrangler types"
   },
   "dependencies": {
-    "@webstudio-is/wsauth": "0.298.0",
+    "@webstudio-is/wsauth": "0.300.0",
     "@remix-run/cloudflare": "2.16.5",
     "@remix-run/cloudflare-pages": "2.16.5"
   },

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

@@ -46,6 +46,7 @@ import css from "__CSS__?url";
 import { sitemap } from "__SITEMAP__";
 import { authRoutes } from "__AUTH__";
 import { createGeneratedAssetResourceFetch } from "__ASSET_QUERY_RUNTIME__";
+import { assetUrlsByPath } from "__ASSETS__";
 
 const authenticateProductionRequest = (request: Request) => {
   const host =
@@ -275,9 +276,10 @@ export const action = async ({
     };
 
     const resourceName = formData.get(formIdFieldName);
-    let resource =
+    const generatedResources = getResources({ system });
+    const actionResource =
       typeof resourceName === "string"
-        ? getResources({ system }).action.get(resourceName)
+        ? generatedResources.action.get(resourceName)
         : undefined;
 
     const formBotValue = formData.get(formBotFieldName);
@@ -306,25 +308,49 @@ export const action = async ({
     formData.delete(formIdFieldName);
     formData.delete(formBotFieldName);
 
-    if (resource) {
-      resource.body = Object.fromEntries(formData);
-    } else {
+    let result: Awaited<ReturnType<typeof loadResource>>;
+    if (actionResource === undefined) {
       if (contactEmail === undefined) {
         throw new Error("Contact email not found");
       }
-
-      resource = context.getDefaultActionResource?.({
+      const resource = context.getDefaultActionResource?.({
         url,
         projectId,
         contactEmail,
         formData,
       });
+      if (resource === undefined) {
+        throw Error("Resource not found");
+      }
+      result = await loadResource(fetch, resource);
+    } else {
+      const actionFetch = await createGeneratedAssetResourceFetch({
+        request,
+        context,
+        fallback: customFetch,
+      });
+      const results = await loadResources(
+        actionFetch,
+        {
+          ...generatedResources.data,
+          rootIds: [actionResource.id],
+        },
+        url,
+        {
+          requestOverrides: new Map([
+            // Mutations must reach the backend on every submission, even when
+            // the resource has caching enabled. Dependencies can stay cached.
+            [actionResource.id, { body: Object.fromEntries(formData), fetch }],
+          ]),
+        }
+      );
+      const actionResult = results[actionResource.outputName];
+      if (actionResult === undefined) {
+        throw Error("Resource not found");
+      }
+      result = actionResult as Awaited<ReturnType<typeof loadResource>>;
     }
-
-    if (resource === undefined) {
-      throw Error("Resource not found");
-    }
-    const { ok, statusText } = await loadResource(fetch, resource);
+    const { ok, statusText } = result;
     if (ok) {
       return { success: true };
     }
@@ -356,6 +382,7 @@ const Outlet = () => {
   const sdkContext = useMemo(
     () => ({
       ...constants,
+      assetUrlsByPath,
       resources,
       breakpoints,
       onError: console.error,

package/templates/defaults/package.json

@@ -13,14 +13,14 @@
     "@remix-run/node": "2.16.5",
     "@remix-run/react": "2.16.5",
     "@remix-run/server-runtime": "2.16.5",
-    "@webstudio-is/image": "0.298.0",
-    "@webstudio-is/react-sdk": "0.298.0",
-    "@webstudio-is/sdk": "0.298.0",
-    "@webstudio-is/sdk-components-react": "0.298.0",
-    "@webstudio-is/sdk-components-animation": "0.298.0",
-    "@webstudio-is/sdk-components-react-radix": "0.298.0",
-    "@webstudio-is/sdk-components-react-remix": "0.298.0",
-    "@webstudio-is/wsauth": "0.298.0",
+    "@webstudio-is/image": "0.300.0",
+    "@webstudio-is/react-sdk": "0.300.0",
+    "@webstudio-is/sdk": "0.300.0",
+    "@webstudio-is/sdk-components-react": "0.300.0",
+    "@webstudio-is/sdk-components-animation": "0.300.0",
+    "@webstudio-is/sdk-components-react-radix": "0.300.0",
+    "@webstudio-is/sdk-components-react-remix": "0.300.0",
+    "@webstudio-is/wsauth": "0.300.0",
     "isbot": "^5.1.25",
     "react": "18.3.0-canary-14898b6a9-20240318",
     "react-dom": "18.3.0-canary-14898b6a9-20240318",

package/templates/react-router/app/extension.ts

@@ -3,6 +3,7 @@ import type { ResourceRequest } from "@webstudio-is/sdk";
 declare module "react-router" {
   interface AppLoadContext {
     EXCLUDE_FROM_SEARCH: boolean;
+    WEBSTUDIO_AUTOMATION_TOKEN?: string;
     getDefaultActionResource?: (options: {
       url: URL;
       projectId: string;

package/templates/react-router/app/route-templates/html.tsx

@@ -45,6 +45,7 @@ import css from "__CSS__?url";
 import { sitemap } from "__SITEMAP__";
 import { authRoutes } from "__AUTH__";
 import { createGeneratedAssetResourceFetch } from "__ASSET_QUERY_RUNTIME__";
+import { assetUrlsByPath } from "__ASSETS__";
 
 const authenticateProductionRequest = (request: Request) => {
   const host =
@@ -274,9 +275,10 @@ export const action = async ({
     };
 
     const resourceName = formData.get(formIdFieldName);
-    let resource =
+    const generatedResources = getResources({ system });
+    const actionResource =
       typeof resourceName === "string"
-        ? getResources({ system }).action.get(resourceName)
+        ? generatedResources.action.get(resourceName)
         : undefined;
 
     const formBotValue = formData.get(formBotFieldName);
@@ -305,25 +307,49 @@ export const action = async ({
     formData.delete(formIdFieldName);
     formData.delete(formBotFieldName);
 
-    if (resource) {
-      resource.body = Object.fromEntries(formData);
-    } else {
+    let result: Awaited<ReturnType<typeof loadResource>>;
+    if (actionResource === undefined) {
       if (contactEmail === undefined) {
         throw new Error("Contact email not found");
       }
-
-      resource = context.getDefaultActionResource?.({
+      const resource = context.getDefaultActionResource?.({
         url,
         projectId,
         contactEmail,
         formData,
       });
+      if (resource === undefined) {
+        throw Error("Resource not found");
+      }
+      result = await loadResource(fetch, resource);
+    } else {
+      const actionFetch = await createGeneratedAssetResourceFetch({
+        request,
+        context,
+        fallback: customFetch,
+      });
+      const results = await loadResources(
+        actionFetch,
+        {
+          ...generatedResources.data,
+          rootIds: [actionResource.id],
+        },
+        url,
+        {
+          requestOverrides: new Map([
+            // Mutations must reach the backend on every submission, even when
+            // the resource has caching enabled. Dependencies can stay cached.
+            [actionResource.id, { body: Object.fromEntries(formData), fetch }],
+          ]),
+        }
+      );
+      const actionResult = results[actionResource.outputName];
+      if (actionResult === undefined) {
+        throw Error("Resource not found");
+      }
+      result = actionResult as Awaited<ReturnType<typeof loadResource>>;
     }
-
-    if (resource === undefined) {
-      throw Error("Resource not found");
-    }
-    const { ok, statusText } = await loadResource(fetch, resource);
+    const { ok, statusText } = result;
     if (ok) {
       return { success: true };
     }
@@ -355,6 +381,7 @@ const Outlet = () => {
   const sdkContext = useMemo(
     () => ({
       ...constants,
+      assetUrlsByPath,
       resources,
       breakpoints,
       onError: console.error,

package/templates/react-router/package.json

@@ -15,14 +15,14 @@
     "@react-router/fs-routes": "^7.5.3",
     "@react-router/node": "^7.5.3",
     "@react-router/serve": "^7.5.3",
-    "@webstudio-is/image": "0.298.0",
-    "@webstudio-is/react-sdk": "0.298.0",
-    "@webstudio-is/sdk": "0.298.0",
-    "@webstudio-is/sdk-components-animation": "0.298.0",
-    "@webstudio-is/sdk-components-react-radix": "0.298.0",
-    "@webstudio-is/sdk-components-react-router": "0.298.0",
-    "@webstudio-is/sdk-components-react": "0.298.0",
-    "@webstudio-is/wsauth": "0.298.0",
+    "@webstudio-is/image": "0.300.0",
+    "@webstudio-is/react-sdk": "0.300.0",
+    "@webstudio-is/sdk": "0.300.0",
+    "@webstudio-is/sdk-components-animation": "0.300.0",
+    "@webstudio-is/sdk-components-react-radix": "0.300.0",
+    "@webstudio-is/sdk-components-react-router": "0.300.0",
+    "@webstudio-is/sdk-components-react": "0.300.0",
+    "@webstudio-is/wsauth": "0.300.0",
     "isbot": "^5.1.25",
     "react": "18.3.0-canary-14898b6a9-20240318",
     "react-dom": "18.3.0-canary-14898b6a9-20240318",

package/templates/react-router-cloudflare/package.json

@@ -7,7 +7,7 @@
   },
   "dependencies": {
     "@cloudflare/vite-plugin": "^1.1.0",
-    "@webstudio-is/wsauth": "0.298.0",
+    "@webstudio-is/wsauth": "0.300.0",
     "wrangler": "^4.14.1"
   }
 }

package/templates/saas-helpers/wrangler.jsonc

@@ -1,6 +1,6 @@
 {
   "$schema": "node_modules/wrangler/config-schema.json",
-  // SaaS publishes Workers. This takes precedence over the Cloudflare Pages
+  // Hosted deployments publish Workers. This takes precedence over the Cloudflare Pages
   // template's wrangler.toml; publish workflows provide the name and date.
   "name": "webstudio-remix-app",
   "compatibility_date": "2024-04-05"

package/templates/ssg/app/asset-resource-fetch.ts

@@ -18,5 +18,9 @@ export const createSsgAssetResourceFetch = ({
     baseUrl: "https://webstudio.local",
     deploymentId,
     artifact,
+    automationToken:
+      typeof process === "undefined"
+        ? undefined
+        : process.env.WEBSTUDIO_AUTOMATION_TOKEN,
     runtimeAssets,
   });

package/templates/ssg/app/route-templates/html/+Page.tsx

@@ -7,6 +7,7 @@ import {
 } from "@webstudio-is/react-sdk/runtime";
 import { LinkCurrentUrlContext } from "@webstudio-is/sdk-components-react";
 import { assetBaseUrl, imageLoader } from "__CONSTANTS__";
+import { assetUrlsByPath } from "__ASSETS__";
 import { Page, breakpoints, siteName } from "__CLIENT__";
 
 const getPageKey = (url: string) => {
@@ -32,6 +33,7 @@ const PageComponent = ({ data }: { data: PageContext["data"] }) => {
     () => ({
       imageLoader,
       assetBaseUrl,
+      assetUrlsByPath,
       resources,
       breakpoints,
       onError: console.error,

package/templates/ssg/package.json

@@ -11,12 +11,12 @@
   "dependencies": {
     "@shikijs/langs": "4.4.1",
     "@shikijs/themes": "4.4.1",
-    "@webstudio-is/image": "0.298.0",
-    "@webstudio-is/react-sdk": "0.298.0",
-    "@webstudio-is/sdk": "0.298.0",
-    "@webstudio-is/sdk-components-react": "0.298.0",
-    "@webstudio-is/sdk-components-animation": "0.298.0",
-    "@webstudio-is/sdk-components-react-radix": "0.298.0",
+    "@webstudio-is/image": "0.300.0",
+    "@webstudio-is/react-sdk": "0.300.0",
+    "@webstudio-is/sdk": "0.300.0",
+    "@webstudio-is/sdk-components-react": "0.300.0",
+    "@webstudio-is/sdk-components-animation": "0.300.0",
+    "@webstudio-is/sdk-components-react-radix": "0.300.0",
     "react": "18.3.0-canary-14898b6a9-20240318",
     "react-dom": "18.3.0-canary-14898b6a9-20240318",
     "shiki": "4.4.1",