refactor: upgrade to vite 6

TrySound · TrySound · commit 2a8d3d7f1cb6 · 2025-04-30T14:00:53.000+04:00
Got rid of "module" export condition everywhere.
Seems like it has very poor usage everywhere.
diff --git a/apps/builder/package.json b/apps/builder/package.json
@@ -137,7 +137,7 @@
     "react-test-renderer": "18.3.0-canary-14898b6a9-20240318",
     "type-fest": "^4.37.0",
     "typescript": "5.8.2",
-    "vite": "^5.4.11",
+    "vite": "^6.3.3",
     "vitest": "^3.1.2"
   },
   "sideEffects": false,
diff --git a/apps/builder/vite.config.ts b/apps/builder/vite.config.ts
@@ -1,5 +1,10 @@
 import path, { resolve } from "node:path";
-import { defineConfig, type CorsOptions } from "vite";
+import {
+  defaultClientConditions,
+  defaultServerConditions,
+  defineConfig,
+  type CorsOptions,
+} from "vite";
 import { vitePlugin as remix } from "@remix-run/dev";
 import { vercelPreset } from "@vercel/remix/vite";
 import type { IncomingMessage } from "node:http";
@@ -21,6 +26,10 @@ const hasPrivateFolders =
     ignore: ["**/node_modules/**"],
   }).length > 0;
 
+const conditions = hasPrivateFolders
+  ? ["webstudio-private", "webstudio"]
+  : ["webstudio"];
+
 export default defineConfig(({ mode }) => {
   if (mode === "development") {
     // Enable self-signed certificates for development service 2 service fetch calls.
@@ -65,10 +74,7 @@ export default defineConfig(({ mode }) => {
       },
     ],
     resolve: {
-      conditions: hasPrivateFolders
-        ? ["webstudio-private", "webstudio"]
-        : ["webstudio"],
-
+      conditions: [...conditions, "browser", "development|production"],
       alias: [
         {
           find: "~",
@@ -82,6 +88,11 @@ export default defineConfig(({ mode }) => {
         },
       ],
     },
+    ssr: {
+      resolve: {
+        conditions: [...conditions, "node", "development|production"],
+      },
+    },
     define: {
       "process.env.NODE_ENV": JSON.stringify(mode),
     },
diff --git a/fixtures/react-router-docker/package.json b/fixtures/react-router-docker/package.json
@@ -27,7 +27,7 @@
     "react": "18.3.0-canary-14898b6a9-20240318",
     "react-dom": "18.3.0-canary-14898b6a9-20240318",
     "react-router": "^7.5.0",
-    "vite": "^5.4.11",
+    "vite": "^6.3.3",
     "webstudio": "workspace:*"
   },
   "private": true,
diff --git a/fixtures/react-router-docker/vite.config.ts b/fixtures/react-router-docker/vite.config.ts
@@ -3,4 +3,12 @@ import { reactRouter } from "@react-router/dev/vite";
 
 export default defineConfig({
   plugins: [reactRouter()],
+  resolve: {
+    conditions: ["browser", "development|production"],
+  },
+  ssr: {
+    resolve: {
+      conditions: ["node", "development|production"],
+    },
+  },
 });
diff --git a/fixtures/react-router-netlify/package.json b/fixtures/react-router-netlify/package.json
@@ -27,7 +27,7 @@
     "react": "18.3.0-canary-14898b6a9-20240318",
     "react-dom": "18.3.0-canary-14898b6a9-20240318",
     "react-router": "^7.5.0",
-    "vite": "^5.4.11",
+    "vite": "^6.3.3",
     "webstudio": "workspace:*"
   },
   "type": "module",
diff --git a/fixtures/react-router-netlify/vite.config.ts b/fixtures/react-router-netlify/vite.config.ts
@@ -4,4 +4,12 @@ import netlifyPlugin from "@netlify/vite-plugin-react-router";
 
 export default defineConfig({
   plugins: [reactRouter(), netlifyPlugin()],
+  resolve: {
+    conditions: ["browser", "development|production"],
+  },
+  ssr: {
+    resolve: {
+      conditions: ["node", "development|production"],
+    },
+  },
 });
diff --git a/fixtures/react-router-vercel/package.json b/fixtures/react-router-vercel/package.json
@@ -26,7 +26,7 @@
     "react": "18.3.0-canary-14898b6a9-20240318",
     "react-dom": "18.3.0-canary-14898b6a9-20240318",
     "react-router": "^7.5.0",
-    "vite": "^5.4.11",
+    "vite": "^6.3.3",
     "webstudio": "workspace:*"
   },
   "private": true,
diff --git a/fixtures/react-router-vercel/vite.config.ts b/fixtures/react-router-vercel/vite.config.ts
@@ -3,4 +3,12 @@ import { reactRouter } from "@react-router/dev/vite";
 
 export default defineConfig({
   plugins: [reactRouter()],
+  resolve: {
+    conditions: ["browser", "development|production"],
+  },
+  ssr: {
+    resolve: {
+      conditions: ["node", "development|production"],
+    },
+  },
 });
diff --git a/fixtures/ssg-netlify-by-project-id/package.json b/fixtures/ssg-netlify-by-project-id/package.json
@@ -24,10 +24,10 @@
   "devDependencies": {
     "@types/react": "^18.2.70",
     "@types/react-dom": "^18.2.25",
-    "@vitejs/plugin-react": "^4.3.4",
+    "@vitejs/plugin-react": "^4.4.1",
     "prettier": "3.5.3",
     "typescript": "5.8.2",
-    "vite": "^5.4.11",
+    "vite": "^6.3.3",
     "webstudio": "workspace:*"
   },
   "dependencies": {
diff --git a/fixtures/ssg-netlify-by-project-id/vite.config.ts b/fixtures/ssg-netlify-by-project-id/vite.config.ts
@@ -4,4 +4,12 @@ import vike from "vike/plugin";
 
 export default defineConfig({
   plugins: [react(), vike({ prerender: true })],
+  resolve: {
+    conditions: ["browser", "development|production"],
+  },
+  ssr: {
+    resolve: {
+      conditions: ["node", "development|production"],
+    },
+  },
 });
diff --git a/fixtures/ssg/package.json b/fixtures/ssg/package.json
@@ -24,10 +24,10 @@
   "devDependencies": {
     "@types/react": "^18.2.70",
     "@types/react-dom": "^18.2.25",
-    "@vitejs/plugin-react": "^4.3.4",
+    "@vitejs/plugin-react": "^4.4.1",
     "prettier": "3.5.3",
     "typescript": "5.8.2",
-    "vite": "^5.4.11",
+    "vite": "^6.3.3",
     "webstudio": "workspace:*"
   },
   "dependencies": {
diff --git a/fixtures/ssg/vite.config.ts b/fixtures/ssg/vite.config.ts
@@ -4,4 +4,12 @@ import vike from "vike/plugin";
 
 export default defineConfig({
   plugins: [react(), vike({ prerender: true })],
+  resolve: {
+    conditions: ["browser", "development|production"],
+  },
+  ssr: {
+    resolve: {
+      conditions: ["node", "development|production"],
+    },
+  },
 });
diff --git a/fixtures/webstudio-cloudflare-template/package.json b/fixtures/webstudio-cloudflare-template/package.json
@@ -53,7 +53,7 @@
     "@types/react-dom": "^18.2.25",
     "fast-glob": "^3.3.2",
     "typescript": "5.8.2",
-    "vite": "^5.4.11",
+    "vite": "^6.3.3",
     "wrangler": "^3.63.2"
   }
 }
diff --git a/fixtures/webstudio-cloudflare-template/vite.config.ts b/fixtures/webstudio-cloudflare-template/vite.config.ts
@@ -25,11 +25,11 @@ const conditions = hasPrivateFolders
 
 export default defineConfig(({ mode }) => ({
   resolve: {
-    conditions,
+    conditions: [...conditions, "browser", "development|production"],
   },
   ssr: {
     resolve: {
-      conditions,
+      conditions: [...conditions, "node", "development|production"],
     },
   },
   plugins: [
diff --git a/fixtures/webstudio-features/.template/vite.config.ts b/fixtures/webstudio-features/.template/vite.config.ts
@@ -24,11 +24,11 @@ const conditions = hasPrivateFolders
 
 export default defineConfig({
   resolve: {
-    conditions,
+    conditions: [...conditions, "browser", "development|production"],
   },
   ssr: {
     resolve: {
-      conditions,
+      conditions: [...conditions, "node", "development|production"],
     },
   },
   plugins: [reactRouter(), dedupeMeta],
diff --git a/fixtures/webstudio-features/package.json b/fixtures/webstudio-features/package.json
@@ -27,7 +27,7 @@
     "react": "18.3.0-canary-14898b6a9-20240318",
     "react-dom": "18.3.0-canary-14898b6a9-20240318",
     "react-router": "^7.5.0",
-    "vite": "^5.4.11",
+    "vite": "^6.3.3",
     "webstudio": "workspace:*"
   },
   "devDependencies": {
diff --git a/fixtures/webstudio-features/vite.config.ts b/fixtures/webstudio-features/vite.config.ts
@@ -24,11 +24,11 @@ const conditions = hasPrivateFolders
 
 export default defineConfig({
   resolve: {
-    conditions,
+    conditions: [...conditions, "browser", "development|production"],
   },
   ssr: {
     resolve: {
-      conditions,
+      conditions: [...conditions, "node", "development|production"],
     },
   },
   plugins: [reactRouter(), dedupeMeta],
diff --git a/package.json b/package.json
@@ -39,7 +39,7 @@
     "@types/css-tree": "^2.3.1",
     "@types/node": "^22.13.10",
     "@types/react": "^18.2.70",
-    "esbuild": "^0.25.1",
+    "esbuild": "^0.25.3",
     "eslint": "^9.22.0",
     "eslint-plugin-react-hooks": "^5.2.0",
     "eslint-plugin-unicorn": "^57.0.0",
diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -61,7 +61,7 @@
     "@types/react-dom": "^18.2.25",
     "@types/yargs": "^17.0.33",
     "@vercel/react-router": "^1.1.0",
-    "@vitejs/plugin-react": "^4.3.4",
+    "@vitejs/plugin-react": "^4.4.1",
     "@webstudio-is/css-engine": "workspace:*",
     "@webstudio-is/http-client": "workspace:*",
     "@webstudio-is/image": "workspace:*",
@@ -81,7 +81,7 @@
     "react-router": "^7.5.0",
     "ts-expect": "^1.3.0",
     "vike": "^0.4.228",
-    "vite": "^5.4.11",
+    "vite": "^6.3.3",
     "vitest": "^3.1.2",
     "wrangler": "^3.63.2"
   }
diff --git a/packages/cli/templates/cloudflare/vite.config.ts b/packages/cli/templates/cloudflare/vite.config.ts
@@ -18,4 +18,12 @@ export default defineConfig(({ mode }) => ({
       },
     }),
   ].filter(Boolean),
+  resolve: {
+    conditions: ["browser", "development|production"],
+  },
+  ssr: {
+    resolve: {
+      conditions: ["node", "development|production"],
+    },
+  },
 }));
diff --git a/packages/cli/templates/defaults/package.json b/packages/cli/templates/defaults/package.json
@@ -27,7 +27,7 @@
     "@types/react": "^18.2.70",
     "@types/react-dom": "^18.2.25",
     "typescript": "5.8.2",
-    "vite": "^5.4.11"
+    "vite": "^6.3.3"
   },
   "engines": {
     "node": ">=20.0.0"
diff --git a/packages/cli/templates/defaults/vite.config.ts b/packages/cli/templates/defaults/vite.config.ts
@@ -13,4 +13,12 @@ export default defineConfig({
       },
     }),
   ],
+  resolve: {
+    conditions: ["browser", "development|production"],
+  },
+  ssr: {
+    resolve: {
+      conditions: ["node", "development|production"],
+    },
+  },
 });
diff --git a/packages/cli/templates/react-router-netlify/vite.config.ts b/packages/cli/templates/react-router-netlify/vite.config.ts
@@ -4,4 +4,12 @@ import netlifyPlugin from "@netlify/vite-plugin-react-router";
 
 export default defineConfig({
   plugins: [reactRouter(), netlifyPlugin()],
+  resolve: {
+    conditions: ["browser", "development|production"],
+  },
+  ssr: {
+    resolve: {
+      conditions: ["node", "development|production"],
+    },
+  },
 });
diff --git a/packages/cli/templates/react-router/package.json b/packages/cli/templates/react-router/package.json
@@ -21,7 +21,7 @@
     "react": "18.3.0-canary-14898b6a9-20240318",
     "react-dom": "18.3.0-canary-14898b6a9-20240318",
     "react-router": "^7.5.0",
-    "vite": "^5.4.11"
+    "vite": "^6.3.3"
   },
   "devDependencies": {
     "@types/react": "^18.2.70",
diff --git a/packages/cli/templates/react-router/vite.config.ts b/packages/cli/templates/react-router/vite.config.ts
@@ -3,4 +3,12 @@ import { reactRouter } from "@react-router/dev/vite";
 
 export default defineConfig({
   plugins: [reactRouter()],
+  resolve: {
+    conditions: ["browser", "development|production"],
+  },
+  ssr: {
+    resolve: {
+      conditions: ["node", "development|production"],
+    },
+  },
 });
diff --git a/packages/cli/templates/saas-helpers/vite.config.ts b/packages/cli/templates/saas-helpers/vite.config.ts
@@ -25,11 +25,11 @@ const conditions = hasPrivateFolders
 
 export default defineConfig(({ mode }) => ({
   resolve: {
-    conditions,
+    conditions: [...conditions, "browser", "development|production"],
   },
   ssr: {
     resolve: {
-      conditions,
+      conditions: [...conditions, "node", "development|production"],
     },
   },
   plugins: [
diff --git a/packages/cli/templates/ssg/package.json b/packages/cli/templates/ssg/package.json
@@ -21,9 +21,9 @@
   "devDependencies": {
     "@types/react": "^18.2.70",
     "@types/react-dom": "^18.2.25",
-    "@vitejs/plugin-react": "^4.3.4",
+    "@vitejs/plugin-react": "^4.4.1",
     "typescript": "5.8.2",
-    "vite": "^5.4.11"
+    "vite": "^6.3.3"
   },
   "engines": {
     "node": ">=20.0.0"
diff --git a/packages/cli/templates/ssg/vite.config.ts b/packages/cli/templates/ssg/vite.config.ts
@@ -4,4 +4,12 @@ import vike from "vike/plugin";
 
 export default defineConfig({
   plugins: [react(), vike({ prerender: true })],
+  resolve: {
+    conditions: ["browser", "development|production"],
+  },
+  ssr: {
+    resolve: {
+      conditions: ["node", "development|production"],
+    },
+  },
 });
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
