webstudio 0.167.0 → 0.168.0

package/README.md

@@ -35,7 +35,7 @@ To get started with the Webstudio CLI:
 1. Download and install the CLI using the following command:
 
    ```bash
-   npm install -g webstudio
+   npm install -g webstudio@latest
    ```
 
 1. Confirm the installation by checking the CLI version:

package/bin.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
 
-import { main } from "./lib/cli.js";
+import { main } from "#cli";
 
 await main();

package/lib/cli.js

@@ -367,6 +367,7 @@ var convertStyleString = (style) => {
   }
   return JSON.stringify(res);
 };
+var escape = (value) => JSON.stringify(value);
 var toAttrString = (name, value) => {
   const attName = name.toLowerCase();
   const jsxName = attName === "class" ? "className" : attName;
@@ -376,7 +377,7 @@ var toAttrString = (name, value) => {
   if (attName === "style") {
     return `${jsxName}={${convertStyleString(value)}}`;
   }
-  return `${jsxName}="${value}"`;
+  return `${jsxName}={${escape(value)}}`;
 };
 var attributesToString = (attributes) => attributes.map(([attName, value]) => ` ${toAttrString(attName, value)}`).join("");
 var convertTagName = (tagName) => {
@@ -389,15 +390,14 @@ var convertTagName = (tagName) => {
   }
   return tag;
 };
-var escapeValue = (value) => value.replace(/\\/g, "\\\\").replace(/`/g, "\\`").replace(/\$/g, "\\$").replace(/\r/g, "\\r").replace(/\n/g, "\\n");
 var htmlToJsx = (html) => {
   const parsedHtml = parseFragment(html, { scriptingEnabled: false });
   let result = "";
   for (const walkNode of walkChildNodes(parsedHtml)) {
     switch (walkNode.type) {
       case "text": {
-        const escapedValue = escapeValue(walkNode.value);
-        result += escapedValue ? "{`" + escapedValue + "`}" : "";
+        const escapedValue = escape(walkNode.value);
+        result += escapedValue ? "{" + escapedValue + "}" : "";
         break;
       }
       case "element-start": {
@@ -520,6 +520,7 @@ Please check webstudio --help for more details`
   const routesDir = join4(appRoot, "routes");
   await rm(routesDir, { recursive: true, force: true });
   await copyTemplates();
+  await writeFile4(join4(cwd3(), ".npmrc"), "force=true");
   for (const template of options.template) {
     if (template === "vanilla") {
       continue;
@@ -1092,7 +1093,7 @@ import makeCLI from "yargs";
 // package.json
 var package_default = {
   name: "webstudio",
-  version: "0.167.0",
+  version: "0.168.0",
   description: "Webstudio CLI",
   author: "Webstudio <github@webstudio.is>",
   homepage: "https://webstudio.is",
@@ -1101,6 +1102,12 @@ var package_default = {
     "webstudio-cli": "./bin.js",
     webstudio: "./bin.js"
   },
+  imports: {
+    "#cli": {
+      webstudio: "./src/cli.ts",
+      default: "./lib/cli.js"
+    }
+  },
   files: [
     "lib/*",
     "templates/*",
@@ -1111,11 +1118,13 @@ var package_default = {
     typecheck: "tsc",
     checks: "pnpm typecheck",
     build: "rm -rf lib && esbuild src/cli.ts --outdir=lib --bundle --format=esm --packages=external",
-    "local-run": "tsx --no-warnings ./src/bin.ts",
     dev: "esbuild src/cli.ts --watch --bundle --format=esm --packages=external --outdir=./lib",
     test: "NODE_OPTIONS=--experimental-vm-modules jest"
   },
   license: "AGPL-3.0-or-later",
+  engines: {
+    node: ">=20.12"
+  },
   dependencies: {
     "@clack/prompts": "^0.7.0",
     "@webstudio-is/http-client": "workspace:*",
@@ -1125,12 +1134,12 @@ var package_default = {
     "@webstudio-is/sdk-components-react": "workspace:*",
     "@webstudio-is/sdk-components-react-radix": "workspace:*",
     "@webstudio-is/sdk-components-react-remix": "workspace:*",
-    "change-case": "^5.0.2",
+    "change-case": "^5.4.4",
     deepmerge: "^4.3.1",
     "env-paths": "^3.0.0",
     execa: "^7.2.0",
-    parse5: "7.1.2",
     "p-limit": "^4.0.0",
+    parse5: "7.1.2",
     picocolors: "^1.0.1",
     "strip-indent": "^4.0.0",
     "title-case": "^4.1.0",
@@ -1157,7 +1166,7 @@ var package_default = {
     react: "18.3.0-canary-14898b6a9-20240318",
     "react-dom": "18.3.0-canary-14898b6a9-20240318",
     typescript: "5.4.5",
-    vite: "^5.2.12",
+    vite: "^5.2.13",
     wrangler: "^3.48.0"
   }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webstudio",
-  "version": "0.167.0",
+  "version": "0.168.0",
   "description": "Webstudio CLI",
   "author": "Webstudio <github@webstudio.is>",
   "homepage": "https://webstudio.is",
@@ -9,6 +9,12 @@
     "webstudio-cli": "./bin.js",
     "webstudio": "./bin.js"
   },
+  "imports": {
+    "#cli": {
+      "webstudio": "./src/cli.ts",
+      "default": "./lib/cli.js"
+    }
+  },
   "files": [
     "lib/*",
     "templates/*",
@@ -16,26 +22,29 @@
     "!*.{test,stories}.*"
   ],
   "license": "AGPL-3.0-or-later",
+  "engines": {
+    "node": ">=20.12"
+  },
   "dependencies": {
     "@clack/prompts": "^0.7.0",
-    "change-case": "^5.0.2",
+    "change-case": "^5.4.4",
     "deepmerge": "^4.3.1",
     "env-paths": "^3.0.0",
     "execa": "^7.2.0",
-    "parse5": "7.1.2",
     "p-limit": "^4.0.0",
+    "parse5": "7.1.2",
     "picocolors": "^1.0.1",
     "strip-indent": "^4.0.0",
     "title-case": "^4.1.0",
     "yargs": "^17.7.2",
     "zod": "^3.22.4",
-    "@webstudio-is/http-client": "0.167.0",
-    "@webstudio-is/image": "0.167.0",
-    "@webstudio-is/react-sdk": "0.167.0",
-    "@webstudio-is/sdk": "0.167.0",
-    "@webstudio-is/sdk-components-react-radix": "0.167.0",
-    "@webstudio-is/sdk-components-react": "0.167.0",
-    "@webstudio-is/sdk-components-react-remix": "0.167.0"
+    "@webstudio-is/image": "0.168.0",
+    "@webstudio-is/react-sdk": "0.168.0",
+    "@webstudio-is/sdk": "0.168.0",
+    "@webstudio-is/http-client": "0.168.0",
+    "@webstudio-is/sdk-components-react": "0.168.0",
+    "@webstudio-is/sdk-components-react-radix": "0.168.0",
+    "@webstudio-is/sdk-components-react-remix": "0.168.0"
   },
   "devDependencies": {
     "@jest/globals": "^29.7.0",
@@ -54,17 +63,16 @@
     "react": "18.3.0-canary-14898b6a9-20240318",
     "react-dom": "18.3.0-canary-14898b6a9-20240318",
     "typescript": "5.4.5",
-    "vite": "^5.2.12",
+    "vite": "^5.2.13",
     "wrangler": "^3.48.0",
-    "@webstudio-is/form-handlers": "0.167.0",
-    "@webstudio-is/tsconfig": "1.0.7",
-    "@webstudio-is/jest-config": "1.0.7"
+    "@webstudio-is/jest-config": "1.0.7",
+    "@webstudio-is/form-handlers": "0.168.0",
+    "@webstudio-is/tsconfig": "1.0.7"
   },
   "scripts": {
     "typecheck": "tsc",
     "checks": "pnpm typecheck",
     "build": "rm -rf lib && esbuild src/cli.ts --outdir=lib --bundle --format=esm --packages=external",
-    "local-run": "tsx --no-warnings ./src/bin.ts",
     "dev": "esbuild src/cli.ts --watch --bundle --format=esm --packages=external --outdir=./lib",
     "test": "NODE_OPTIONS=--experimental-vm-modules jest"
   }

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

@@ -186,24 +186,15 @@ export const links: LinksFunction = () => {
       rel: "icon",
       href: imageLoader({
         src: favIconAsset.name,
-        width: 128,
+        // width,height must be multiple of 48 https://developers.google.com/search/docs/appearance/favicon-in-search
+        width: 144,
+        height: 144,
+        fit: "pad",
         quality: 100,
         format: "auto",
       }),
       type: undefined,
     });
-  } else {
-    result.push({
-      rel: "icon",
-      href: "/favicon.ico",
-      type: "image/x-icon",
-    });
-
-    result.push({
-      rel: "shortcut icon",
-      href: "/favicon.ico",
-      type: "image/x-icon",
-    });
   }
 
   for (const asset of pageFontAssets) {

package/templates/defaults/package.json

@@ -11,13 +11,13 @@
     "@remix-run/node": "2.9.2",
     "@remix-run/react": "2.9.2",
     "@remix-run/server-runtime": "2.9.2",
-    "@webstudio-is/react-sdk": "0.167.0",
-    "@webstudio-is/sdk-components-react-radix": "0.167.0",
-    "@webstudio-is/sdk-components-react-remix": "0.167.0",
-    "@webstudio-is/sdk-components-react": "0.167.0",
-    "@webstudio-is/form-handlers": "0.167.0",
-    "@webstudio-is/image": "0.167.0",
-    "@webstudio-is/sdk": "0.167.0",
+    "@webstudio-is/react-sdk": "0.168.0",
+    "@webstudio-is/sdk-components-react-radix": "0.168.0",
+    "@webstudio-is/sdk-components-react-remix": "0.168.0",
+    "@webstudio-is/sdk-components-react": "0.168.0",
+    "@webstudio-is/form-handlers": "0.168.0",
+    "@webstudio-is/image": "0.168.0",
+    "@webstudio-is/sdk": "0.168.0",
     "isbot": "^5.1.8",
     "react": "18.3.0-canary-14898b6a9-20240318",
     "react-dom": "18.3.0-canary-14898b6a9-20240318"
@@ -27,7 +27,7 @@
     "@types/react": "^18.2.70",
     "@types/react-dom": "^18.2.25",
     "typescript": "5.4.5",
-    "vite": "^5.2.12"
+    "vite": "^5.2.13"
   },
   "engines": {
     "node": ">=20.0.0"