webstudio 0.254.0 → 0.257.0

package/lib/cli.js

@@ -822,7 +822,7 @@ var toValue = (styleValue, transformValue) => {
   }
   if (value.type === "color") {
     let [c1, c2, c3] = value.components;
-    const alpha = value.alpha;
+    const alpha = typeof value.alpha === "number" ? value.alpha : toValue(value.alpha);
     switch (value.colorSpace) {
       case "srgb": {
         c1 = Math.round(c1 * 255);
@@ -842,11 +842,15 @@ var toValue = (styleValue, transformValue) => {
         return `oklab(${c1} ${c2} ${c3} / ${alpha})`;
       case "oklch":
         return `oklch(${c1} ${c2} ${c3} / ${alpha})`;
-      // Fall back to color() function for less common color spaces
+      // Fall back to color() function for less common color spaces.
+      // Webstudio uses colorjs internal names; map to CSS predefined color space names.
       case "p3":
-      case "srgb-linear":
+        return `color(display-p3 ${c1} ${c2} ${c3} / ${alpha})`;
       case "a98rgb":
+        return `color(a98-rgb ${c1} ${c2} ${c3} / ${alpha})`;
       case "prophoto":
+        return `color(prophoto-rgb ${c1} ${c2} ${c3} / ${alpha})`;
+      case "srgb-linear":
       case "rec2020":
       case "xyz-d65":
       case "xyz-d50":
@@ -955,7 +959,7 @@ var ColorValue = z.object({
     z.literal("xyz-d50")
   ]),
   components: z.tuple([z.number(), z.number(), z.number()]),
-  alpha: z.number(),
+  alpha: z.union([z.number(), z.lazy(() => VarValue)]),
   hidden: z.boolean().optional()
 });
 var FunctionValue = z.object({
@@ -1884,11 +1888,10 @@ var DefaultPagePage = z.string().refine((path) => path !== "", "Can't be empty")
 var OldPagePath = z.string().refine((path) => path !== "", "Can't be empty").refine((path) => path !== "/", "Can't be just a /").refine(
   (path) => path === "" || path.startsWith("/"),
   "Must start with a / or a full URL e.g. https://website.org"
-).refine((path) => path.endsWith("/") === false, "Can't end with a /").refine((path) => path.includes("//") === false, "Can't contain repeating /").refine(
-  (path) => /^[-_a-zA-Z0-9*:?\\/.]*$/.test(path),
-  // Allow uppercase letters (A-Z)
-  "Only a-z, A-Z, 0-9, -, _, /, :, ?, . and * are allowed"
-).refine(
+).refine((path) => path.endsWith("/") === false, "Can't end with a /").refine((path) => path.includes("//") === false, "Can't contain repeating /").refine((path) => {
+  const disallowedChars = /[\s<>"{}|\\^`[\]\u0000-\u001f\u007f]/;
+  return !disallowedChars.test(path);
+}, "Path contains invalid characters (spaces or URL-unsafe characters are not allowed)").refine(
   (path) => path !== "/s" && path.startsWith("/s/") === false,
   "/s prefix is reserved for the system"
 ).refine(
@@ -1910,7 +1913,7 @@ var ProjectMeta = z.object({
   faviconAssetId: z.string().optional(),
   code: z.string().optional()
 });
-var ProjectNewRedirectPath = z.string().refine((data) => {
+var ProjectNewRedirectPath = z.string().min(1, "Path is required").refine((data) => {
   try {
     new URL(data, "http://url.com");
     return true;
@@ -2340,12 +2343,11 @@ var Breakpoint = z.object({
   if (condition !== void 0) {
     return minWidth === void 0 && maxWidth === void 0;
   }
-  return (
-    // Either min or max width have to be defined
-    minWidth !== void 0 && maxWidth === void 0 || minWidth === void 0 && maxWidth !== void 0 || // This is a base breakpoint
-    minWidth === void 0 && maxWidth === void 0
-  );
-}, "Either minWidth, maxWidth, or condition should be defined, but not both");
+  if (minWidth !== void 0 && maxWidth !== void 0) {
+    return minWidth < maxWidth;
+  }
+  return true;
+}, "Width-based (minWidth/maxWidth) and condition are mutually exclusive, and minWidth must be less than maxWidth");
 z.map(BreakpointId, Breakpoint);
 var StyleSourceId = z.string();
 var StyleSourceToken = z.object({
@@ -2901,6 +2903,11 @@ var span$1 = div$1;
 var html = [
   { property: "display", value: { type: "keyword", value: "grid" } },
   { property: "min-height", value: { type: "unit", unit: "%", value: 100 } },
+  { property: "grid-template-rows", value: { type: "keyword", value: "auto" } },
+  {
+    property: "grid-template-columns",
+    value: { type: "unit", unit: "fr", value: 1 }
+  },
   {
     property: "font-family",
     value: { type: "fontFamily", value: ["Arial", "Roboto", "sans-serif"] }
@@ -3335,7 +3342,7 @@ var tags = [
 ];
 var rootComponent = "ws:root";
 var rootMeta = {
-  label: "Global Root",
+  label: "Global root",
   icon: SettingsIcon,
   presetStyle: {
     html
@@ -9042,7 +9049,7 @@ const getDeploymentInstructions = (deployTarget) => {
   }
 };
 const name = "webstudio";
-const version = "0.254.0";
+const version = "0.257.0";
 const description = "Webstudio CLI";
 const author = "Webstudio <github@webstudio.is>";
 const homepage = "https://webstudio.is";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webstudio",
-  "version": "0.254.0",
+  "version": "0.257.0",
   "description": "Webstudio CLI",
   "author": "Webstudio <github@webstudio.is>",
   "homepage": "https://webstudio.is",
@@ -71,17 +71,17 @@
     "vite": "^6.3.4",
     "vitest": "^3.1.2",
     "wrangler": "^3.63.2",
-    "@webstudio-is/css-engine": "0.254.0",
-    "@webstudio-is/http-client": "0.254.0",
-    "@webstudio-is/image": "0.254.0",
-    "@webstudio-is/sdk": "0.254.0",
-    "@webstudio-is/sdk-components-animation": "0.254.0",
-    "@webstudio-is/react-sdk": "0.254.0",
-    "@webstudio-is/sdk-components-react": "0.254.0",
-    "@webstudio-is/sdk-components-react-radix": "0.254.0",
-    "@webstudio-is/sdk-components-react-remix": "0.254.0",
-    "@webstudio-is/sdk-components-react-router": "0.254.0",
-    "@webstudio-is/tsconfig": "1.0.7"
+    "@webstudio-is/css-engine": "0.257.0",
+    "@webstudio-is/http-client": "0.257.0",
+    "@webstudio-is/react-sdk": "0.257.0",
+    "@webstudio-is/image": "0.257.0",
+    "@webstudio-is/sdk": "0.257.0",
+    "@webstudio-is/sdk-components-react": "0.257.0",
+    "@webstudio-is/sdk-components-react-router": "0.257.0",
+    "@webstudio-is/tsconfig": "1.0.7",
+    "@webstudio-is/sdk-components-react-radix": "0.257.0",
+    "@webstudio-is/sdk-components-react-remix": "0.257.0",
+    "@webstudio-is/sdk-components-animation": "0.257.0"
   },
   "scripts": {
     "typecheck": "tsgo --noEmit",

package/templates/defaults/package.json

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

package/templates/react-router/package.json

@@ -10,13 +10,13 @@
   "dependencies": {
     "@react-router/dev": "^7.5.3",
     "@react-router/fs-routes": "^7.5.3",
-    "@webstudio-is/image": "0.254.0",
-    "@webstudio-is/react-sdk": "0.254.0",
-    "@webstudio-is/sdk": "0.254.0",
-    "@webstudio-is/sdk-components-animation": "0.254.0",
-    "@webstudio-is/sdk-components-react-radix": "0.254.0",
-    "@webstudio-is/sdk-components-react-router": "0.254.0",
-    "@webstudio-is/sdk-components-react": "0.254.0",
+    "@webstudio-is/image": "0.257.0",
+    "@webstudio-is/react-sdk": "0.257.0",
+    "@webstudio-is/sdk": "0.257.0",
+    "@webstudio-is/sdk-components-animation": "0.257.0",
+    "@webstudio-is/sdk-components-react-radix": "0.257.0",
+    "@webstudio-is/sdk-components-react-router": "0.257.0",
+    "@webstudio-is/sdk-components-react": "0.257.0",
     "isbot": "^5.1.25",
     "react": "18.3.0-canary-14898b6a9-20240318",
     "react-dom": "18.3.0-canary-14898b6a9-20240318",

package/templates/ssg/package.json

@@ -8,12 +8,12 @@
     "typecheck": "tsgo --noEmit"
   },
   "dependencies": {
-    "@webstudio-is/image": "0.254.0",
-    "@webstudio-is/react-sdk": "0.254.0",
-    "@webstudio-is/sdk": "0.254.0",
-    "@webstudio-is/sdk-components-react": "0.254.0",
-    "@webstudio-is/sdk-components-animation": "0.254.0",
-    "@webstudio-is/sdk-components-react-radix": "0.254.0",
+    "@webstudio-is/image": "0.257.0",
+    "@webstudio-is/react-sdk": "0.257.0",
+    "@webstudio-is/sdk": "0.257.0",
+    "@webstudio-is/sdk-components-react": "0.257.0",
+    "@webstudio-is/sdk-components-animation": "0.257.0",
+    "@webstudio-is/sdk-components-react-radix": "0.257.0",
     "react": "18.3.0-canary-14898b6a9-20240318",
     "react-dom": "18.3.0-canary-14898b6a9-20240318",
     "vike": "^0.4.229"

package/templates/ssg/pages/+config.ts

@@ -1,6 +1,7 @@
 import type { Config } from "vike/types";
 
 export default {
+  prerender: true,
   meta: {
     Head: {
       env: { server: true, client: true },

package/templates/ssg/vite.config.ts

@@ -3,7 +3,7 @@ import react from "@vitejs/plugin-react";
 import vike from "vike/plugin";
 
 export default defineConfig({
-  plugins: [react(), vike({ prerender: true })],
+  plugins: [react(), vike()],
   resolve: {
     conditions: ["browser", "development|production"],
   },