webstudio 0.0.0-5558cd0 → 0.0.0-5844e28

package/README.md

@@ -129,13 +129,7 @@ You can configure the project to support netlify serverless/edge-functions respe
 You can manually change it using the `build` command. For serverless functions:
 
 ```bash
-webstudio build --template netlify-functions
-```
-
-and for edge functions:
-
-```bash
-webstudio build --template netlify-edge-functions
+webstudio build --template netlify
 ```
 
 ## Important Notes

package/lib/cli.js

@@ -96,16 +96,6 @@ const PROJECT_TEMPLATES = [
     label: "Netlify",
     expand: ["react-router", "react-router-netlify"]
   },
-  {
-    value: "netlify-functions",
-    label: "Netlify Functions (legacy)",
-    expand: ["defaults", "netlify-functions"]
-  },
-  {
-    value: "netlify-edge-functions",
-    label: "Netlify Edge Functions (legacy)",
-    expand: ["defaults", "netlify-edge-functions"]
-  },
   {
     value: "ssg",
     label: "Static Site Generation (SSG)"
@@ -4610,7 +4600,7 @@ const meta$4 = {
 const meta$3 = {
   category: "hidden",
   icon: ResourceIcon,
-  type: "container",
+  type: "embed",
   constraints: {
     relation: "parent",
     component: { $eq: "HeadSlot" }
@@ -4619,7 +4609,7 @@ const meta$3 = {
 const meta$2 = {
   category: "hidden",
   icon: WindowInfoIcon,
-  type: "container",
+  type: "embed",
   constraints: {
     relation: "parent",
     component: { $eq: "HeadSlot" }
@@ -6417,8 +6407,6 @@ const getDeploymentInstructions = (deployTarget) => {
     case "vercel":
       return `Run ${pc.dim("npx vercel")} to publish on Vercel.`;
     case "netlify":
-    case "netlify-functions":
-    case "netlify-edge-functions":
       return [
         `To deploy to Netlify, run the following commands: `,
         `Run ${pc.dim("npx netlify-cli login")} to login to Netlify.`,
@@ -6431,7 +6419,7 @@ const getDeploymentInstructions = (deployTarget) => {
   }
 };
 const name = "webstudio";
-const version = "0.0.0-5558cd0";
+const version = "0.0.0-5844e28";
 const description = "Webstudio CLI";
 const author = "Webstudio <github@webstudio.is>";
 const homepage = "https://webstudio.is";
@@ -6462,7 +6450,7 @@ const engines = {
   node: ">=20.12"
 };
 const dependencies = {
-  "@clack/prompts": "^0.9.1",
+  "@clack/prompts": "^0.10.0",
   "@emotion/hash": "^0.9.2",
   acorn: "^8.14.0",
   "acorn-walk": "^8.3.4",
@@ -6479,8 +6467,6 @@ const dependencies = {
   zod: "^3.22.4"
 };
 const devDependencies = {
-  "@netlify/remix-adapter": "^2.5.1",
-  "@netlify/remix-edge-adapter": "3.4.2",
   "@netlify/vite-plugin-react-router": "^1.0.0",
   "@react-router/dev": "^7.1.5",
   "@react-router/fs-routes": "^7.1.5",
@@ -6493,6 +6479,7 @@ const devDependencies = {
   "@types/react": "^18.2.70",
   "@types/react-dom": "^18.2.25",
   "@types/yargs": "^17.0.33",
+  "@vercel/react-router": "^1.0.2",
   "@vitejs/plugin-react": "^4.3.4",
   "@webstudio-is/http-client": "workspace:*",
   "@webstudio-is/image": "workspace:*",
@@ -6504,14 +6491,14 @@ const devDependencies = {
   "@webstudio-is/sdk-components-react-remix": "workspace:*",
   "@webstudio-is/sdk-components-react-router": "workspace:*",
   "@webstudio-is/tsconfig": "workspace:*",
-  h3: "^1.14.0",
+  h3: "^1.15.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.5",
   "ts-expect": "^1.3.0",
-  vike: "^0.4.220",
+  vike: "^0.4.222",
   vite: "^5.4.11",
   vitest: "^3.0.4",
   wrangler: "^3.63.2"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webstudio",
-  "version": "0.0.0-5558cd0",
+  "version": "0.0.0-5844e28",
   "description": "Webstudio CLI",
   "author": "Webstudio <github@webstudio.is>",
   "homepage": "https://webstudio.is",
@@ -26,7 +26,7 @@
     "node": ">=20.12"
   },
   "dependencies": {
-    "@clack/prompts": "^0.9.1",
+    "@clack/prompts": "^0.10.0",
     "@emotion/hash": "^0.9.2",
     "acorn": "^8.14.0",
     "acorn-walk": "^8.3.4",
@@ -43,8 +43,6 @@
     "zod": "^3.22.4"
   },
   "devDependencies": {
-    "@netlify/remix-adapter": "^2.5.1",
-    "@netlify/remix-edge-adapter": "3.4.2",
     "@netlify/vite-plugin-react-router": "^1.0.0",
     "@react-router/dev": "^7.1.5",
     "@react-router/fs-routes": "^7.1.5",
@@ -57,28 +55,29 @@
     "@types/react": "^18.2.70",
     "@types/react-dom": "^18.2.25",
     "@types/yargs": "^17.0.33",
+    "@vercel/react-router": "^1.0.2",
     "@vitejs/plugin-react": "^4.3.4",
-    "h3": "^1.14.0",
+    "h3": "^1.15.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.5",
     "ts-expect": "^1.3.0",
-    "vike": "^0.4.220",
+    "vike": "^0.4.222",
     "vite": "^5.4.11",
     "vitest": "^3.0.4",
     "wrangler": "^3.63.2",
-    "@webstudio-is/http-client": "0.0.0-5558cd0",
-    "@webstudio-is/image": "0.0.0-5558cd0",
-    "@webstudio-is/react-sdk": "0.0.0-5558cd0",
-    "@webstudio-is/sdk": "0.0.0-5558cd0",
-    "@webstudio-is/sdk-components-animation": "0.0.0-5558cd0",
-    "@webstudio-is/sdk-components-react": "0.0.0-5558cd0",
-    "@webstudio-is/sdk-components-react-remix": "0.0.0-5558cd0",
-    "@webstudio-is/sdk-components-react-radix": "0.0.0-5558cd0",
-    "@webstudio-is/sdk-components-react-router": "0.0.0-5558cd0",
-    "@webstudio-is/tsconfig": "1.0.7"
+    "@webstudio-is/http-client": "0.0.0-5844e28",
+    "@webstudio-is/image": "0.0.0-5844e28",
+    "@webstudio-is/sdk": "0.0.0-5844e28",
+    "@webstudio-is/sdk-components-animation": "0.0.0-5844e28",
+    "@webstudio-is/sdk-components-react": "0.0.0-5844e28",
+    "@webstudio-is/react-sdk": "0.0.0-5844e28",
+    "@webstudio-is/sdk-components-react-radix": "0.0.0-5844e28",
+    "@webstudio-is/sdk-components-react-remix": "0.0.0-5844e28",
+    "@webstudio-is/tsconfig": "1.0.7",
+    "@webstudio-is/sdk-components-react-router": "0.0.0-5844e28"
   },
   "scripts": {
     "typecheck": "tsc",

package/templates/defaults/package.json

@@ -11,13 +11,13 @@
     "@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-5558cd0",
-    "@webstudio-is/react-sdk": "0.0.0-5558cd0",
-    "@webstudio-is/sdk": "0.0.0-5558cd0",
-    "@webstudio-is/sdk-components-react": "0.0.0-5558cd0",
-    "@webstudio-is/sdk-components-animation": "0.0.0-5558cd0",
-    "@webstudio-is/sdk-components-react-radix": "0.0.0-5558cd0",
-    "@webstudio-is/sdk-components-react-remix": "0.0.0-5558cd0",
+    "@webstudio-is/image": "0.0.0-5844e28",
+    "@webstudio-is/react-sdk": "0.0.0-5844e28",
+    "@webstudio-is/sdk": "0.0.0-5844e28",
+    "@webstudio-is/sdk-components-react": "0.0.0-5844e28",
+    "@webstudio-is/sdk-components-animation": "0.0.0-5844e28",
+    "@webstudio-is/sdk-components-react-radix": "0.0.0-5844e28",
+    "@webstudio-is/sdk-components-react-remix": "0.0.0-5844e28",
     "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

@@ -10,13 +10,13 @@
   "dependencies": {
     "@react-router/dev": "^7.1.5",
     "@react-router/fs-routes": "^7.1.5",
-    "@webstudio-is/image": "0.0.0-5558cd0",
-    "@webstudio-is/react-sdk": "0.0.0-5558cd0",
-    "@webstudio-is/sdk": "0.0.0-5558cd0",
-    "@webstudio-is/sdk-components-animation": "0.0.0-5558cd0",
-    "@webstudio-is/sdk-components-react-radix": "0.0.0-5558cd0",
-    "@webstudio-is/sdk-components-react-router": "0.0.0-5558cd0",
-    "@webstudio-is/sdk-components-react": "0.0.0-5558cd0",
+    "@webstudio-is/image": "0.0.0-5844e28",
+    "@webstudio-is/react-sdk": "0.0.0-5844e28",
+    "@webstudio-is/sdk": "0.0.0-5844e28",
+    "@webstudio-is/sdk-components-animation": "0.0.0-5844e28",
+    "@webstudio-is/sdk-components-react-radix": "0.0.0-5844e28",
+    "@webstudio-is/sdk-components-react-router": "0.0.0-5844e28",
+    "@webstudio-is/sdk-components-react": "0.0.0-5844e28",
     "isbot": "^5.1.22",
     "react": "18.3.0-canary-14898b6a9-20240318",
     "react-dom": "18.3.0-canary-14898b6a9-20240318",

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

@@ -5,7 +5,7 @@
   "dependencies": {
     "@react-router/node": "^7.1.5",
     "@react-router/serve": "^7.1.5",
-    "h3": "^1.14.0",
+    "h3": "^1.15.0",
     "ipx": "^3.0.1"
   }
 }

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

@@ -8,7 +8,7 @@ export const assetBaseUrl = "/assets/";
  * @type {import("@webstudio-is/image").ImageLoader}
  */
 export const imageLoader = (props) => {
-  if (process.env.NODE_ENV !== "production") {
+  if (import.meta.env.DEV) {
     return props.src;
   }
 

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

@@ -1,9 +1,9 @@
 {
   "scripts": {
-    "start": "npx vercel dev",
     "deploy": "npx vercel deploy"
   },
   "dependencies": {
-    "@react-router/node": "^7.1.5"
+    "@react-router/node": "^7.1.5",
+    "@vercel/react-router": "^1.0.2"
   }
 }

package/templates/react-router-vercel/react-router.config.ts

@@ -0,0 +1,6 @@
+import type { Config } from "@react-router/dev/config";
+import { vercelPreset } from "@vercel/react-router/vite";
+
+export default {
+  presets: [vercelPreset()],
+} satisfies Config;

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

@@ -1,4 +1,5 @@
 {
+  "framework": "vite",
   "images": {
     "domains": [],
     "sizes": [

package/templates/ssg/package.json

@@ -8,15 +8,15 @@
     "typecheck": "tsc"
   },
   "dependencies": {
-    "@webstudio-is/image": "0.0.0-5558cd0",
-    "@webstudio-is/react-sdk": "0.0.0-5558cd0",
-    "@webstudio-is/sdk": "0.0.0-5558cd0",
-    "@webstudio-is/sdk-components-react": "0.0.0-5558cd0",
-    "@webstudio-is/sdk-components-animation": "0.0.0-5558cd0",
-    "@webstudio-is/sdk-components-react-radix": "0.0.0-5558cd0",
+    "@webstudio-is/image": "0.0.0-5844e28",
+    "@webstudio-is/react-sdk": "0.0.0-5844e28",
+    "@webstudio-is/sdk": "0.0.0-5844e28",
+    "@webstudio-is/sdk-components-react": "0.0.0-5844e28",
+    "@webstudio-is/sdk-components-animation": "0.0.0-5844e28",
+    "@webstudio-is/sdk-components-react-radix": "0.0.0-5844e28",
     "react": "18.3.0-canary-14898b6a9-20240318",
     "react-dom": "18.3.0-canary-14898b6a9-20240318",
-    "vike": "^0.4.220"
+    "vike": "^0.4.222"
   },
   "devDependencies": {
     "@types/react": "^18.2.70",

package/templates/netlify-edge-functions/app/constants.mjs

@@ -1,29 +0,0 @@
-/**
- * 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 (process.env.NODE_ENV !== "production") {
-    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/netlify-edge-functions/app/entry.server.tsx

@@ -1,21 +0,0 @@
-import type { EntryContext } from "@remix-run/node";
-import { RemixServer } from "@remix-run/react";
-import { renderToString } from "react-dom/server";
-
-export default function handleRequest(
-  request: Request,
-  responseStatusCode: number,
-  responseHeaders: Headers,
-  remixContext: EntryContext
-) {
-  const markup = renderToString(
-    <RemixServer context={remixContext} url={request.url} />
-  );
-
-  responseHeaders.set("Content-Type", "text/html");
-
-  return new Response("<!DOCTYPE html>" + markup, {
-    headers: responseHeaders,
-    status: responseStatusCode,
-  });
-}

package/templates/netlify-edge-functions/netlify.toml

@@ -1,16 +0,0 @@
-[build]
-command = "npm run build"
-publish = "build/client"
-
-[dev]
-command = "npm run dev"
-framework = "vite"
-
-# Set immutable caching for static files, because they have fingerprinted filenames
-
-[[headers]]
-for = "/build/*"
-
-[headers.values]
-
-"Cache-Control" = "public, max-age=31560000, immutable"

package/templates/netlify-edge-functions/package.json

@@ -1,9 +0,0 @@
-{
-  "scripts": {
-    "start": "netlify serve"
-  },
-  "dependencies": {
-    "@netlify/edge-functions": "^2.11.1",
-    "@netlify/remix-edge-adapter": "^3.4.2"
-  }
-}

package/templates/netlify-edge-functions/vite.config.ts

@@ -1,18 +0,0 @@
-import { vitePlugin as remix } from "@remix-run/dev";
-import { defineConfig } from "vite";
-import { netlifyPlugin } from "@netlify/remix-edge-adapter/plugin";
-
-export default defineConfig({
-  plugins: [
-    remix({
-      future: {
-        v3_lazyRouteDiscovery: false,
-        v3_relativeSplatPath: false,
-        v3_singleFetch: false,
-        v3_fetcherPersist: false,
-        v3_throwAbortReason: false,
-      },
-    }),
-    netlifyPlugin(),
-  ],
-});

package/templates/netlify-functions/app/constants.mjs

@@ -1,29 +0,0 @@
-/**
- * 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 (process.env.NODE_ENV !== "production") {
-    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/netlify-functions/app/entry.server.tsx

@@ -1 +0,0 @@
-export { handleRequest as default } from "@netlify/remix-adapter";

package/templates/netlify-functions/netlify.toml

@@ -1,16 +0,0 @@
-[build]
-command = "npm run build"
-publish = "build/client"
-
-[dev]
-command = "npm run dev"
-framework = "vite"
-
-# Set immutable caching for static files, because they have fingerprinted filenames
-
-[[headers]]
-for = "/build/*"
-
-[headers.values]
-
-"Cache-Control" = "public, max-age=31560000, immutable"

package/templates/netlify-functions/package.json

@@ -1,9 +0,0 @@
-{
-  "scripts": {
-    "start": "npx netlify-cli serve"
-  },
-  "dependencies": {
-    "@netlify/functions": "^2.8.2",
-    "@netlify/remix-adapter": "^2.5.1"
-  }
-}

package/templates/netlify-functions/vite.config.ts

@@ -1,18 +0,0 @@
-import { vitePlugin as remix } from "@remix-run/dev";
-import { defineConfig } from "vite";
-import { netlifyPlugin } from "@netlify/remix-adapter/plugin";
-
-export default defineConfig({
-  plugins: [
-    remix({
-      future: {
-        v3_lazyRouteDiscovery: false,
-        v3_relativeSplatPath: false,
-        v3_singleFetch: false,
-        v3_fetcherPersist: false,
-        v3_throwAbortReason: false,
-      },
-    }),
-    netlifyPlugin(),
-  ],
-});