webstudio 0.0.0-4f7bf18 → 0.0.0-bd48788

package/lib/cli.js

@@ -28,7 +28,6 @@ import { kebabCase, camelCase } from "change-case";
 import "nanoid";
 import { parseExpressionAt } from "acorn";
 import { simple } from "acorn-walk";
-import warnOnce from "warn-once";
 import reservedIdentifiers from "reserved-identifiers";
 import hash from "@emotion/hash";
 import { x } from "tinyexec";
@@ -77,7 +76,21 @@ const PROJECT_TEMPLATES = [
     label: "Vanilla",
     expand: ["defaults"]
   },
-  { value: "vercel", label: "Vercel", expand: ["defaults", "vercel"] },
+  {
+    value: "docker",
+    label: "Docker",
+    expand: ["react-router", "react-router-docker"]
+  },
+  {
+    value: "vercel",
+    label: "Vercel",
+    expand: ["defaults", "vercel"]
+  },
+  {
+    value: "netlify",
+    label: "Netlify",
+    expand: ["react-router", "react-router-netlify"]
+  },
   {
     value: "netlify-functions",
     label: "Netlify Functions",
@@ -88,7 +101,10 @@ const PROJECT_TEMPLATES = [
     label: "Netlify Edge Functions",
     expand: ["defaults", "netlify-edge-functions"]
   },
-  { value: "ssg", label: "Static Site Generation (SSG)" },
+  {
+    value: "ssg",
+    label: "Static Site Generation (SSG)"
+  },
   {
     value: "ssg-netlify",
     label: "Static Site Generation (SSG) Netlify",
@@ -105,11 +121,6 @@ const INTERNAL_TEMPLATES = [
     value: "cloudflare",
     label: "Cloudflare",
     expand: ["defaults", "cloudflare"]
-  },
-  {
-    value: "react-router-docker",
-    label: "Dokcer",
-    expand: ["react-router-docker"]
   }
 ];
 const isFileExists = async (filePath) => {
@@ -2490,6 +2501,7 @@ const generateExpression = ({
         usedDataSources == null ? void 0 : usedDataSources.set(dep.id, dep);
         return scope.getName(dep.id, dep.name);
       }
+      return "undefined";
     }
   });
 };
@@ -3637,47 +3649,6 @@ const generateWebstudioComponent = ({
 `;
   return generatedComponent;
 };
-const imageSizes = [16, 32, 48, 64, 96, 128, 256, 384];
-const deviceSizes = [640, 750, 828, 1080, 1200, 1920, 2048, 3840];
-const allSizes = [...imageSizes, ...deviceSizes];
-const NON_EXISTING_DOMAIN = "https://a3cbcbec-cdb1-4ea4-ad60-43c795308ddc.ddc";
-const joinPath = (...segments) => {
-  return segments.filter((segment) => segment !== "").map((segment) => segment.replace(/(^\/+|\/+$)/g, "")).join("/");
-};
-const encodePathFragment = (fragment) => {
-  return encodeURIComponent(fragment).replace(/%2F/g, "/");
-};
-const wsImageLoader = (props2) => {
-  const width = props2.format === "raw" ? 16 : props2.width;
-  const quality = props2.format === "raw" ? 100 : props2.quality;
-  if (process.env.NODE_ENV !== "production") {
-    warnOnce(
-      allSizes.includes(width) === false,
-      "Width must be only from allowed values"
-    );
-  }
-  let src = props2.src;
-  if (src.startsWith("/cgi/asset")) {
-    src = src.slice("/cgi/asset".length);
-  }
-  const resultUrl = new URL("/cgi/image/", NON_EXISTING_DOMAIN);
-  if (props2.format !== "raw") {
-    resultUrl.searchParams.set("width", width.toString());
-    resultUrl.searchParams.set("quality", quality.toString());
-    if (props2.height != null) {
-      resultUrl.searchParams.set("height", props2.height.toString());
-    }
-    if (props2.fit != null) {
-      resultUrl.searchParams.set("fit", props2.fit);
-    }
-  }
-  resultUrl.searchParams.set("format", props2.format ?? "auto");
-  resultUrl.pathname = joinPath(resultUrl.pathname, encodePathFragment(src));
-  if (resultUrl.href.startsWith(NON_EXISTING_DOMAIN)) {
-    return `${resultUrl.pathname}?${resultUrl.searchParams.toString()}`;
-  }
-  return resultUrl.href;
-};
 const BOOLEAN_ATTRIBUTES = /* @__PURE__ */ new Set([
   "async",
   "autofocus",
@@ -5871,6 +5842,11 @@ const copyTemplates = async (template) => {
 const importFrom = (importee, importer) => {
   return relative(dirname(importer), importee).replaceAll("\\", "/");
 };
+const npmrc = `force=true
+loglevel=error
+audit=false
+fund=false
+`;
 const prebuild = async (options) => {
   var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
   if (options.template.length === 0) {
@@ -5898,14 +5874,14 @@ Please check webstudio --help for more details`
   await rm(generatedDir, { recursive: true, force: true });
   const routesDir = join(appRoot, "routes");
   await rm(routesDir, { recursive: true, force: true });
-  await writeFile(join(cwd(), ".npmrc"), "force=true");
+  await writeFile(join(cwd(), ".npmrc"), npmrc);
   for (const template of options.template) {
     await copyTemplates(template);
   }
   let framework;
   if (options.template.includes("ssg")) {
     framework = await createFramework();
-  } else if (options.template.includes("react-router-docker")) {
+  } else if (options.template.includes("react-router")) {
     framework = await createFramework$1();
   } else {
     framework = await createFramework$2();
@@ -6021,14 +5997,10 @@ Please check webstudio --help for more details`
     const assetOrigin = siteData.origin;
     for (const asset of siteData.assets) {
       if (asset.type === "image") {
-        const imagePath = wsImageLoader({
-          src: asset.name,
-          format: "raw"
-        });
         assetsToDownload.push(
           limit(
             () => downloadAsset(
-              `${assetOrigin}${imagePath}`,
+              `${assetOrigin}/cgi/image/${asset.name}?format=raw`,
               asset.name,
               assetBaseUrl
             )
@@ -6445,6 +6417,7 @@ const getDeploymentInstructions = (deployTarget) => {
   switch (deployTarget) {
     case "vercel":
       return `Run ${pc.dim("npx vercel")} to publish on Vercel.`;
+    case "netlify":
     case "netlify-functions":
     case "netlify-edge-functions":
       return [
@@ -6459,7 +6432,7 @@ const getDeploymentInstructions = (deployTarget) => {
   }
 };
 const name = "webstudio";
-const version = "0.0.0-4f7bf18";
+const version = "0.0.0-bd48788";
 const description = "Webstudio CLI";
 const author = "Webstudio <github@webstudio.is>";
 const homepage = "https://webstudio.is";
@@ -6501,18 +6474,17 @@ const dependencies = {
   "p-limit": "^6.2.0",
   parse5: "7.2.1",
   picocolors: "^1.1.1",
-  react: "18.3.0-canary-14898b6a9-20240318",
   "reserved-identifiers": "^1.0.0",
   tinyexec: "^0.3.2",
-  "warn-once": "^0.1.1",
   yargs: "^17.7.2",
   zod: "^3.22.4"
 };
 const devDependencies = {
   "@netlify/remix-adapter": "^2.5.1",
   "@netlify/remix-edge-adapter": "3.4.2",
-  "@react-router/dev": "^7.1.3",
-  "@react-router/fs-routes": "^7.1.3",
+  "@netlify/vite-plugin-react-router": "^1.0.0",
+  "@react-router/dev": "^7.1.4",
+  "@react-router/fs-routes": "^7.1.4",
   "@remix-run/cloudflare": "^2.15.2",
   "@remix-run/cloudflare-pages": "^2.15.2",
   "@remix-run/dev": "^2.15.2",
@@ -6536,10 +6508,11 @@ const devDependencies = {
   h3: "^1.14.0",
   ipx: "^3.0.1",
   prettier: "3.4.2",
+  react: "18.3.0-canary-14898b6a9-20240318",
   "react-dom": "18.3.0-canary-14898b6a9-20240318",
-  "react-router": "^7.1.3",
+  "react-router": "^7.1.4",
   "ts-expect": "^1.3.0",
-  vike: "^0.4.218",
+  vike: "^0.4.220",
   vite: "^5.4.11",
   vitest: "^3.0.2",
   wrangler: "^3.63.2"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webstudio",
-  "version": "0.0.0-4f7bf18",
+  "version": "0.0.0-bd48788",
   "description": "Webstudio CLI",
   "author": "Webstudio <github@webstudio.is>",
   "homepage": "https://webstudio.is",
@@ -37,18 +37,17 @@
     "p-limit": "^6.2.0",
     "parse5": "7.2.1",
     "picocolors": "^1.1.1",
-    "react": "18.3.0-canary-14898b6a9-20240318",
     "reserved-identifiers": "^1.0.0",
     "tinyexec": "^0.3.2",
-    "warn-once": "^0.1.1",
     "yargs": "^17.7.2",
     "zod": "^3.22.4"
   },
   "devDependencies": {
     "@netlify/remix-adapter": "^2.5.1",
     "@netlify/remix-edge-adapter": "3.4.2",
-    "@react-router/dev": "^7.1.3",
-    "@react-router/fs-routes": "^7.1.3",
+    "@netlify/vite-plugin-react-router": "^1.0.0",
+    "@react-router/dev": "^7.1.4",
+    "@react-router/fs-routes": "^7.1.4",
     "@remix-run/cloudflare": "^2.15.2",
     "@remix-run/cloudflare-pages": "^2.15.2",
     "@remix-run/dev": "^2.15.2",
@@ -62,22 +61,23 @@
     "h3": "^1.14.0",
     "ipx": "^3.0.1",
     "prettier": "3.4.2",
+    "react": "18.3.0-canary-14898b6a9-20240318",
     "react-dom": "18.3.0-canary-14898b6a9-20240318",
-    "react-router": "^7.1.3",
+    "react-router": "^7.1.4",
     "ts-expect": "^1.3.0",
-    "vike": "^0.4.218",
+    "vike": "^0.4.220",
     "vite": "^5.4.11",
     "vitest": "^3.0.2",
     "wrangler": "^3.63.2",
-    "@webstudio-is/http-client": "0.0.0-4f7bf18",
-    "@webstudio-is/image": "0.0.0-4f7bf18",
-    "@webstudio-is/react-sdk": "0.0.0-4f7bf18",
-    "@webstudio-is/sdk": "0.0.0-4f7bf18",
-    "@webstudio-is/sdk-components-animation": "0.0.0-4f7bf18",
-    "@webstudio-is/sdk-components-react": "0.0.0-4f7bf18",
-    "@webstudio-is/sdk-components-react-radix": "0.0.0-4f7bf18",
-    "@webstudio-is/sdk-components-react-remix": "0.0.0-4f7bf18",
-    "@webstudio-is/sdk-components-react-router": "0.0.0-4f7bf18",
+    "@webstudio-is/http-client": "0.0.0-bd48788",
+    "@webstudio-is/image": "0.0.0-bd48788",
+    "@webstudio-is/react-sdk": "0.0.0-bd48788",
+    "@webstudio-is/sdk": "0.0.0-bd48788",
+    "@webstudio-is/sdk-components-animation": "0.0.0-bd48788",
+    "@webstudio-is/sdk-components-react": "0.0.0-bd48788",
+    "@webstudio-is/sdk-components-react-radix": "0.0.0-bd48788",
+    "@webstudio-is/sdk-components-react-remix": "0.0.0-bd48788",
+    "@webstudio-is/sdk-components-react-router": "0.0.0-bd48788",
     "@webstudio-is/tsconfig": "1.0.7"
   },
   "scripts": {

package/templates/defaults/package.json

@@ -11,14 +11,14 @@
     "@remix-run/node": "2.15.2",
     "@remix-run/react": "2.15.2",
     "@remix-run/server-runtime": "2.15.2",
-    "@webstudio-is/image": "0.0.0-4f7bf18",
-    "@webstudio-is/react-sdk": "0.0.0-4f7bf18",
-    "@webstudio-is/sdk": "0.0.0-4f7bf18",
-    "@webstudio-is/sdk-components-react": "0.0.0-4f7bf18",
-    "@webstudio-is/sdk-components-animation": "0.0.0-4f7bf18",
-    "@webstudio-is/sdk-components-react-radix": "0.0.0-4f7bf18",
-    "@webstudio-is/sdk-components-react-remix": "0.0.0-4f7bf18",
-    "isbot": "^5.1.19",
+    "@webstudio-is/image": "0.0.0-bd48788",
+    "@webstudio-is/react-sdk": "0.0.0-bd48788",
+    "@webstudio-is/sdk": "0.0.0-bd48788",
+    "@webstudio-is/sdk-components-react": "0.0.0-bd48788",
+    "@webstudio-is/sdk-components-animation": "0.0.0-bd48788",
+    "@webstudio-is/sdk-components-react-radix": "0.0.0-bd48788",
+    "@webstudio-is/sdk-components-react-remix": "0.0.0-bd48788",
+    "isbot": "^5.1.22",
     "react": "18.3.0-canary-14898b6a9-20240318",
     "react-dom": "18.3.0-canary-14898b6a9-20240318"
   },

package/templates/react-router/package.json

@@ -0,0 +1,34 @@
+{
+  "type": "module",
+  "private": true,
+  "sideEffects": false,
+  "scripts": {
+    "build": "react-router build",
+    "dev": "react-router dev",
+    "typecheck": "tsc"
+  },
+  "dependencies": {
+    "@react-router/dev": "^7.1.4",
+    "@react-router/fs-routes": "^7.1.4",
+    "@webstudio-is/image": "0.0.0-bd48788",
+    "@webstudio-is/react-sdk": "0.0.0-bd48788",
+    "@webstudio-is/sdk": "0.0.0-bd48788",
+    "@webstudio-is/sdk-components-animation": "0.0.0-bd48788",
+    "@webstudio-is/sdk-components-react-radix": "0.0.0-bd48788",
+    "@webstudio-is/sdk-components-react-router": "0.0.0-bd48788",
+    "@webstudio-is/sdk-components-react": "0.0.0-bd48788",
+    "isbot": "^5.1.22",
+    "react": "18.3.0-canary-14898b6a9-20240318",
+    "react-dom": "18.3.0-canary-14898b6a9-20240318",
+    "react-router": "^7.1.4",
+    "vite": "^5.4.11"
+  },
+  "devDependencies": {
+    "@types/react": "^18.2.70",
+    "@types/react-dom": "^18.2.25",
+    "typescript": "5.7.3"
+  },
+  "engines": {
+    "node": ">=20.0.0"
+  }
+}

package/templates/react-router-docker/Dockerfile

@@ -1,22 +1,17 @@
-FROM node:22-alpine AS development-dependencies-env
-COPY . /app
-WORKDIR /app
-RUN npm install
-
-FROM node:22-alpine AS production-dependencies-env
-COPY .npmrc ./package.json /app/
+FROM node:22-alpine AS dependencies-env
+COPY .npmrc package.json /app/
 WORKDIR /app
 RUN npm install --omit=dev
 
-FROM node:22-alpine AS build-env
+FROM dependencies-env AS build-env
 COPY . /app/
-COPY --from=development-dependencies-env /app/node_modules /app/node_modules
 WORKDIR /app
+RUN npm install
 RUN npm run build
 
 FROM node:22-alpine
-COPY .npmrc ./package.json /app/
-COPY --from=production-dependencies-env /app/node_modules /app/node_modules
+COPY .npmrc package.json /app/
+COPY --from=dependencies-env /app/node_modules /app/node_modules
 COPY --from=build-env /app/build /app/build
 COPY --from=build-env /app/public /app/public
 WORKDIR /app

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

@@ -1,39 +1,11 @@
 {
-  "type": "module",
-  "private": true,
-  "sideEffects": false,
   "scripts": {
-    "build": "react-router build",
-    "dev": "react-router dev",
-    "start": "react-router-serve ./build/server/index.js",
-    "typecheck": "tsc"
+    "start": "react-router-serve ./build/server/index.js"
   },
   "dependencies": {
-    "@react-router/dev": "^7.1.3",
-    "@react-router/fs-routes": "^7.1.3",
-    "@react-router/node": "^7.1.3",
-    "@react-router/serve": "^7.1.3",
-    "@webstudio-is/image": "0.0.0-4f7bf18",
-    "@webstudio-is/react-sdk": "0.0.0-4f7bf18",
-    "@webstudio-is/sdk": "0.0.0-4f7bf18",
-    "@webstudio-is/sdk-components-animation": "0.0.0-4f7bf18",
-    "@webstudio-is/sdk-components-react-radix": "0.0.0-4f7bf18",
-    "@webstudio-is/sdk-components-react-router": "0.0.0-4f7bf18",
-    "@webstudio-is/sdk-components-react": "0.0.0-4f7bf18",
+    "@react-router/node": "^7.1.4",
+    "@react-router/serve": "^7.1.4",
     "h3": "^1.14.0",
-    "ipx": "^3.0.1",
-    "isbot": "^5.1.19",
-    "react": "18.3.0-canary-14898b6a9-20240318",
-    "react-dom": "18.3.0-canary-14898b6a9-20240318",
-    "react-router": "^7.1.3",
-    "vite": "^5.4.11"
-  },
-  "devDependencies": {
-    "@types/react": "^18.2.70",
-    "@types/react-dom": "^18.2.25",
-    "typescript": "5.7.3"
-  },
-  "engines": {
-    "node": ">=20.0.0"
+    "ipx": "^3.0.1"
   }
 }

package/templates/react-router-netlify/app/constants.mjs

@@ -0,0 +1,29 @@
+/**
+ * We use mjs extension as constants in this file is shared with the build script
+ * and we use `node --eval` to extract the constants.
+ */
+export const assetBaseUrl = "/assets/";
+
+/**
+ * @type {import("@webstudio-is/image").ImageLoader}
+ */
+export const imageLoader = (props) => {
+  if (import.meta.env.DEV) {
+    return props.src;
+  }
+
+  if (props.format === "raw") {
+    return props.src;
+  }
+
+  // https://docs.netlify.com/image-cdn/overview/
+  const searchParams = new URLSearchParams();
+  searchParams.set("url", props.src);
+  searchParams.set("w", props.width.toString());
+  if (props.height) {
+    searchParams.set("h", props.height.toString());
+  }
+  searchParams.set("q", props.quality.toString());
+  // fit=contain by default
+  return `/.netlify/images?${searchParams}`;
+};

package/templates/react-router-netlify/netlify.toml

@@ -0,0 +1,6 @@
+[build]
+command = "react-router build"
+publish = "build/client"
+
+[dev]
+command = "react-router dev"

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

@@ -0,0 +1,10 @@
+{
+  "scripts": {
+    "start": "npx netlify-cli serve",
+    "deploy": "npx netlify-cli deploy --build --prod"
+  },
+  "dependencies": {
+    "@netlify/vite-plugin-react-router": "^1.0.0",
+    "@react-router/node": "^7.1.4"
+  }
+}

package/templates/react-router-netlify/vite.config.ts

@@ -0,0 +1,7 @@
+import { reactRouter } from "@react-router/dev/vite";
+import { defineConfig } from "vite";
+import netlifyPlugin from "@netlify/vite-plugin-react-router";
+
+export default defineConfig({
+  plugins: [reactRouter(), netlifyPlugin()],
+});

package/templates/ssg/package.json

@@ -8,15 +8,15 @@
     "typecheck": "tsc"
   },
   "dependencies": {
-    "@webstudio-is/image": "0.0.0-4f7bf18",
-    "@webstudio-is/react-sdk": "0.0.0-4f7bf18",
-    "@webstudio-is/sdk": "0.0.0-4f7bf18",
-    "@webstudio-is/sdk-components-react": "0.0.0-4f7bf18",
-    "@webstudio-is/sdk-components-animation": "0.0.0-4f7bf18",
-    "@webstudio-is/sdk-components-react-radix": "0.0.0-4f7bf18",
+    "@webstudio-is/image": "0.0.0-bd48788",
+    "@webstudio-is/react-sdk": "0.0.0-bd48788",
+    "@webstudio-is/sdk": "0.0.0-bd48788",
+    "@webstudio-is/sdk-components-react": "0.0.0-bd48788",
+    "@webstudio-is/sdk-components-animation": "0.0.0-bd48788",
+    "@webstudio-is/sdk-components-react-radix": "0.0.0-bd48788",
     "react": "18.3.0-canary-14898b6a9-20240318",
     "react-dom": "18.3.0-canary-14898b6a9-20240318",
-    "vike": "^0.4.218"
+    "vike": "^0.4.220"
   },
   "devDependencies": {
     "@types/react": "^18.2.70",