webstudio 0.293.0 → 0.294.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webstudio",
-  "version": "0.293.0",
+  "version": "0.294.0",
   "description": "Webstudio CLI",
   "author": "Webstudio <github@webstudio.is>",
   "homepage": "https://webstudio.is",
@@ -48,16 +48,17 @@
     "path-key": "^4.0.0",
     "picocolors": "^1.1.1",
     "reserved-identifiers": "^1.0.0",
+    "semver": "7.7.1",
     "tinyexec": "^0.3.2",
     "tus-js-client": "^4.3.1",
     "warn-once": "^0.1.1",
     "which": "^5.0.0",
     "yargs": "^17.7.2",
     "zod": "^4.4.3",
-    "@webstudio-is/protocol": "0.293.0",
-    "@webstudio-is/sync-client": "0.0.0",
-    "@webstudio-is/project-migrations": "0.293.0",
-    "@webstudio-is/http-client": "0.293.0"
+    "@webstudio-is/http-client": "0.294.0",
+    "@webstudio-is/protocol": "0.294.0",
+    "@webstudio-is/project-migrations": "0.294.0",
+    "@webstudio-is/sync-client": "0.0.0"
   },
   "devDependencies": {
     "@cloudflare/vite-plugin": "^1.1.0",
@@ -77,6 +78,7 @@
     "@types/mdast": "^4.0.4",
     "@types/react": "^18.2.70",
     "@types/react-dom": "^18.2.25",
+    "@types/semver": "^7.7.0",
     "@types/which": "^3.0.4",
     "@types/yargs": "^17.0.33",
     "@vercel/react-router": "^1.1.0",
@@ -99,35 +101,36 @@
     "vite": "^6.3.4",
     "vitest": "^3.1.2",
     "wrangler": "^3.63.2",
-    "@webstudio-is/css-engine": "0.293.0",
-    "@webstudio-is/content-engine": "0.293.0",
-    "@webstudio-is/expression": "0.293.0",
-    "@webstudio-is/fonts": "0.293.0",
-    "@webstudio-is/image": "0.293.0",
-    "@webstudio-is/query-builder": "0.293.0",
+    "@webstudio-is/css-engine": "0.294.0",
+    "@webstudio-is/content-engine": "0.294.0",
+    "@webstudio-is/fonts": "0.294.0",
+    "@webstudio-is/expression": "0.294.0",
+    "@webstudio-is/image": "0.294.0",
     "@webstudio-is/project-build": "0.0.0",
-    "@webstudio-is/sdk": "0.293.0",
-    "@webstudio-is/sdk-components-animation": "0.293.0",
-    "@webstudio-is/sdk-components-react-radix": "0.293.0",
-    "@webstudio-is/sdk-components-react": "0.293.0",
-    "@webstudio-is/react-sdk": "0.293.0",
-    "@webstudio-is/sdk-components-react-remix": "0.293.0",
-    "@webstudio-is/sdk-components-react-router": "0.293.0",
-    "@webstudio-is/sdk-components-registry": "0.293.0",
+    "@webstudio-is/react-sdk": "0.294.0",
+    "@webstudio-is/query-builder": "0.294.0",
+    "@webstudio-is/sdk": "0.294.0",
+    "@webstudio-is/sdk-components-react": "0.294.0",
+    "@webstudio-is/sdk-components-animation": "0.294.0",
+    "@webstudio-is/sdk-components-react-radix": "0.294.0",
+    "@webstudio-is/sdk-components-registry": "0.294.0",
     "@webstudio-is/tsconfig": "1.0.7",
+    "@webstudio-is/sdk-components-react-remix": "0.294.0",
     "@webstudio-is/vision": "0.0.0",
-    "@webstudio-is/wsauth": "0.293.0"
+    "@webstudio-is/sdk-components-react-router": "0.294.0",
+    "@webstudio-is/wsauth": "0.294.0"
   },
   "scripts": {
     "typecheck": "tsc --noEmit",
     "generate-docs": "tsx scripts/generate-docs.ts && oxfmt src/docs.generated.ts",
-    "build:content-runtime": "esbuild @webstudio-is/content-engine/runtime --bundle --format=esm --platform=browser --target=es2022 --conditions=webstudio --minify --outfile=lib/content-runtime.js",
+    "build:content-runtime": "esbuild @webstudio-is/content-engine/runtime --bundle --format=esm --platform=browser --target=es2022 --conditions=webstudio,worker --minify --outfile=lib/content-runtime.js",
     "fixtures:build": "pnpm build:content-runtime",
     "build": "pnpm generate-docs && rm -rf lib && vite build && pnpm build:content-runtime",
     "pretest": "mkdir -p lib && pnpm build:content-runtime",
     "evaluations": "tsx --import ../../scripts/register-react-global.ts --conditions=webstudio evaluations/high-impact/run-local-agent.ts",
     "test": "vitest run",
     "test:ssg-package": "tsx --conditions=webstudio scripts/test-ssg-package.ts",
+    "check:published-cli-contract": "tsx --conditions=webstudio scripts/builder-contract-gate.ts",
     "test:release-smoke": "pnpm build && tsx --conditions=webstudio scripts/release-smoke.ts",
     "test:release-smoke:model": "WEBSTUDIO_RELEASE_SMOKE_MODEL_EVAL_REQUIRED=1 pnpm test:release-smoke",
     "test:release-smoke:registry": "tsx --conditions=webstudio scripts/release-smoke.ts"

package/templates/cloudflare/package.json

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

package/templates/defaults/app/redirect-url.ts

@@ -74,6 +74,35 @@ const getPathnameVariants = (pathname: string) => {
   return Array.from(new Set([pathname, decodePathname(pathname)]));
 };
 
+const preserveRequestSearch = (
+  target: string,
+  search: string,
+  requestPathname: string
+) => {
+  if (search === "") {
+    return target;
+  }
+  if (URL.canParse(target) || target.startsWith("//")) {
+    const url = new URL(target, "https://webstudio.invalid");
+    if (url.search !== "") {
+      return target;
+    }
+    url.search = search;
+    return target.startsWith("//")
+      ? url.href.slice(url.protocol.length)
+      : url.href;
+  }
+  const path = parsePath(target);
+  if (path.search !== undefined && path.search !== "") {
+    return target;
+  }
+  return createPath({
+    ...path,
+    pathname: path.pathname ?? requestPathname,
+    search,
+  });
+};
+
 const isOptionalSegmentMarker = (source: string, index: number) => {
   const nextChar = source[index + 1];
   if (nextChar !== undefined && nextChar !== "/") {
@@ -130,7 +159,11 @@ export const matchRedirect = (
     if (isRedirectPattern(source) === false) {
       if (requestPathnames.includes(source)) {
         return {
-          url: generateRedirectUrl(redirect.new, {}),
+          url: preserveRequestSearch(
+            generateRedirectUrl(redirect.new, {}),
+            url.search,
+            url.pathname
+          ),
           status: getRedirectStatus(redirect.status),
         };
       }
@@ -150,7 +183,11 @@ export const matchRedirect = (
     }
 
     return {
-      url: generateRedirectUrl(redirect.new, match.params),
+      url: preserveRequestSearch(
+        generateRedirectUrl(redirect.new, match.params),
+        url.search,
+        url.pathname
+      ),
       status: getRedirectStatus(redirect.status),
     };
   }

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

@@ -128,6 +128,15 @@ export const loader = async (arg: LoaderFunctionArgs) => {
     url,
     { signal: arg.request.signal }
   );
+  Object.assign(
+    resources,
+    await loadResources(
+      generatedFetch,
+      getResources({ system, resources }).contentData ?? new Map(),
+      url,
+      { signal: arg.request.signal }
+    )
+  );
   const pageMeta = getPageMeta({ system, resources });
 
   if (pageMeta.redirect) {

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

@@ -87,6 +87,15 @@ export const loader = async (arg: LoaderFunctionArgs) => {
     url,
     { signal: arg.request.signal }
   );
+  Object.assign(
+    resources,
+    await loadResources(
+      generatedFetch,
+      getResources({ system, resources }).contentData ?? new Map(),
+      url,
+      { signal: arg.request.signal }
+    )
+  );
   const pageMeta = getPageMeta({ system, resources });
 
   if (pageMeta.redirect) {

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

@@ -95,6 +95,15 @@ export const loader = async (arg: LoaderFunctionArgs) => {
     url,
     { signal: arg.request.signal }
   );
+  Object.assign(
+    resources,
+    await loadResources(
+      generatedFetch,
+      getResources({ system, resources }).contentData ?? new Map(),
+      url,
+      { signal: arg.request.signal }
+    )
+  );
   const pageMeta = getPageMeta({ system, resources });
 
   if (pageMeta.redirect) {

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.293.0",
-    "@webstudio-is/react-sdk": "0.293.0",
-    "@webstudio-is/sdk": "0.293.0",
-    "@webstudio-is/sdk-components-react": "0.293.0",
-    "@webstudio-is/sdk-components-animation": "0.293.0",
-    "@webstudio-is/sdk-components-react-radix": "0.293.0",
-    "@webstudio-is/sdk-components-react-remix": "0.293.0",
-    "@webstudio-is/wsauth": "0.293.0",
+    "@webstudio-is/image": "0.294.0",
+    "@webstudio-is/react-sdk": "0.294.0",
+    "@webstudio-is/sdk": "0.294.0",
+    "@webstudio-is/sdk-components-react": "0.294.0",
+    "@webstudio-is/sdk-components-animation": "0.294.0",
+    "@webstudio-is/sdk-components-react-radix": "0.294.0",
+    "@webstudio-is/sdk-components-react-remix": "0.294.0",
+    "@webstudio-is/wsauth": "0.294.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/redirect-url.ts

@@ -74,6 +74,35 @@ const getPathnameVariants = (pathname: string) => {
   return Array.from(new Set([pathname, decodePathname(pathname)]));
 };
 
+const preserveRequestSearch = (
+  target: string,
+  search: string,
+  requestPathname: string
+) => {
+  if (search === "") {
+    return target;
+  }
+  if (URL.canParse(target) || target.startsWith("//")) {
+    const url = new URL(target, "https://webstudio.invalid");
+    if (url.search !== "") {
+      return target;
+    }
+    url.search = search;
+    return target.startsWith("//")
+      ? url.href.slice(url.protocol.length)
+      : url.href;
+  }
+  const path = parsePath(target);
+  if (path.search !== undefined && path.search !== "") {
+    return target;
+  }
+  return createPath({
+    ...path,
+    pathname: path.pathname ?? requestPathname,
+    search,
+  });
+};
+
 const isOptionalSegmentMarker = (source: string, index: number) => {
   const nextChar = source[index + 1];
   if (nextChar !== undefined && nextChar !== "/") {
@@ -130,7 +159,11 @@ export const matchRedirect = (
     if (isRedirectPattern(source) === false) {
       if (requestPathnames.includes(source)) {
         return {
-          url: generateRedirectUrl(redirect.new, {}),
+          url: preserveRequestSearch(
+            generateRedirectUrl(redirect.new, {}),
+            url.search,
+            url.pathname
+          ),
           status: getRedirectStatus(redirect.status),
         };
       }
@@ -150,7 +183,11 @@ export const matchRedirect = (
     }
 
     return {
-      url: generateRedirectUrl(redirect.new, match.params),
+      url: preserveRequestSearch(
+        generateRedirectUrl(redirect.new, match.params),
+        url.search,
+        url.pathname
+      ),
       status: getRedirectStatus(redirect.status),
     };
   }

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

@@ -127,6 +127,15 @@ export const loader = async (arg: LoaderFunctionArgs) => {
     url,
     { signal: arg.request.signal }
   );
+  Object.assign(
+    resources,
+    await loadResources(
+      generatedFetch,
+      getResources({ system, resources }).contentData ?? new Map(),
+      url,
+      { signal: arg.request.signal }
+    )
+  );
   const pageMeta = getPageMeta({ system, resources });
 
   if (pageMeta.redirect) {

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

@@ -87,6 +87,15 @@ export const loader = async (arg: LoaderFunctionArgs) => {
     url,
     { signal: arg.request.signal }
   );
+  Object.assign(
+    resources,
+    await loadResources(
+      generatedFetch,
+      getResources({ system, resources }).contentData ?? new Map(),
+      url,
+      { signal: arg.request.signal }
+    )
+  );
   const pageMeta = getPageMeta({ system, resources });
 
   if (pageMeta.redirect) {

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

@@ -95,6 +95,15 @@ export const loader = async (arg: LoaderFunctionArgs) => {
     url,
     { signal: arg.request.signal }
   );
+  Object.assign(
+    resources,
+    await loadResources(
+      generatedFetch,
+      getResources({ system, resources }).contentData ?? new Map(),
+      url,
+      { signal: arg.request.signal }
+    )
+  );
   const pageMeta = getPageMeta({ system, resources });
 
   if (pageMeta.redirect) {

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.293.0",
-    "@webstudio-is/react-sdk": "0.293.0",
-    "@webstudio-is/sdk": "0.293.0",
-    "@webstudio-is/sdk-components-animation": "0.293.0",
-    "@webstudio-is/sdk-components-react-radix": "0.293.0",
-    "@webstudio-is/sdk-components-react-router": "0.293.0",
-    "@webstudio-is/sdk-components-react": "0.293.0",
-    "@webstudio-is/wsauth": "0.293.0",
+    "@webstudio-is/image": "0.294.0",
+    "@webstudio-is/react-sdk": "0.294.0",
+    "@webstudio-is/sdk": "0.294.0",
+    "@webstudio-is/sdk-components-animation": "0.294.0",
+    "@webstudio-is/sdk-components-react-radix": "0.294.0",
+    "@webstudio-is/sdk-components-react-router": "0.294.0",
+    "@webstudio-is/sdk-components-react": "0.294.0",
+    "@webstudio-is/wsauth": "0.294.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.293.0",
+    "@webstudio-is/wsauth": "0.294.0",
     "wrangler": "^4.14.1"
   }
 }

package/templates/ssg/app/route-templates/html/+data.ts

@@ -67,6 +67,14 @@ export const data = async (pageContext: PageContextServer) => {
     getResources({ system }).data,
     url
   );
+  Object.assign(
+    resources,
+    await loadResources(
+      customFetch,
+      getResources({ system, resources }).contentData ?? new Map(),
+      url
+    )
+  );
   const pageMeta = getPageMeta({ system, resources });
 
   return {

package/templates/ssg/package.json

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