chore(deps): vite d002e7d (resolve.conditions rework) (#148)

hi-ogawa · Nov 1, 2024 · feaa3d2 · feaa3d2
1 parent 6103be8
commit feaa3d2
Show file tree

Hide file tree

Showing 13 changed files with 75 additions and 64 deletions.
diff --git a/examples/browser-cli/src/cli.ts b/examples/browser-cli/src/cli.ts
@@ -26,13 +26,9 @@ async function main() {
     },
     environments: {
       custom: {
-        webCompatible: true,
         resolve: {
           noExternal: true,
         },
-        optimizeDeps: {
-          exclude: ["vite/module-runner"],
-        },
       },
     },
     server: {

diff --git a/examples/browser-cli/vite.config.ts b/examples/browser-cli/vite.config.ts
@@ -12,6 +12,10 @@ export default defineConfig((_env) => ({
           "react-dom",
           "react-dom/client",
         ],
+        esbuildOptions: {
+          platform: "browser",
+          banner: undefined,
+        },
       },
     },
   },

diff --git a/examples/child-process/vite.config.ts b/examples/child-process/vite.config.ts
@@ -32,6 +32,7 @@ export default defineConfig((_env) => ({
   environments: {
     rsc: {
       resolve: {
+        conditions: ["module", "react-server"],
         externalConditions: ["react-server"],
       },
       dev: {

diff --git a/examples/react-server/vite.config.ts b/examples/react-server/vite.config.ts
@@ -127,7 +127,7 @@ function vitePluginReactServer(): PluginOption {
       tinyassert(config.environments);
       config.environments["rsc"] = {
         resolve: {
-          conditions: ["react-server"],
+          conditions: ["module", "react-server"],
           noExternal: true,
         },
         optimizeDeps: {

diff --git a/examples/react-ssr-workerd/vite.config.ts b/examples/react-ssr-workerd/vite.config.ts
@@ -41,7 +41,6 @@ export default defineConfig((_env) => ({
       },
     },
     workerd: {
-      webCompatible: true,
       resolve: {
         noExternal: true,
       },

diff --git a/examples/react-ssr/vite.config.workerd.ts b/examples/react-ssr/vite.config.workerd.ts
@@ -19,7 +19,6 @@ export default defineConfig((_env) => ({
   ],
   environments: {
     workerd: {
-      webCompatible: true,
       resolve: {
         noExternal: true,
       },

diff --git a/examples/vue-ssr-extra/vite.config.ts b/examples/vue-ssr-extra/vite.config.ts
@@ -37,17 +37,18 @@ export default defineConfig((_env) => ({
       },
     },
     workerd: {
-      webCompatible: true,
       resolve: {
         noExternal: true,
-      },
-      optimizeDeps: {
-        // prevent flaky outdated deps error
-        noDiscovery: true,
-        include: [],
+        conditions: ["module", "browser", "production/development"],
       },
       build: {
         outDir: "dist/server",
+        rollupOptions: {
+          output: {
+            // TODO: broken without this. probably my app setup issue.
+            inlineDynamicImports: true,
+          },
+        },
       },
     },
   },

diff --git a/examples/vue-ssr/vite.config.workerd.ts b/examples/vue-ssr/vite.config.workerd.ts
@@ -20,8 +20,8 @@ export default defineConfig((_env) => ({
   ],
   environments: {
     workerd: {
-      webCompatible: true,
       resolve: {
+        conditions: ["module"],
         noExternal: true,
       },
     },

diff --git a/examples/web-worker-rsc/vite.config.ts b/examples/web-worker-rsc/vite.config.ts
@@ -17,9 +17,10 @@ export default defineConfig((_env) => ({
       },
     },
     worker: {
-      webCompatible: true,
+      keepProcessEnv: false,
       resolve: {
-        conditions: ["react-server"],
+        // need "browser" condition for "react-server-dom-webpack/server"
+        conditions: ["module", "worker", "browser", "react-server"],
         noExternal: true,
       },
       optimizeDeps: {
@@ -29,6 +30,10 @@ export default defineConfig((_env) => ({
           "react/jsx-dev-runtime",
           "react-server-dom-webpack/server",
         ],
+        esbuildOptions: {
+          platform: "browser",
+          banner: undefined,
+        },
       },
     },
   },

diff --git a/examples/web-worker/vite.config.ts b/examples/web-worker/vite.config.ts
@@ -23,9 +23,9 @@ export default defineConfig((_env) => ({
       },
     },
     worker: {
-      webCompatible: true,
+      keepProcessEnv: false,
       resolve: {
-        conditions: ["worker"],
+        conditions: ["module", "worker"],
         noExternal: true,
       },
       optimizeDeps: {
@@ -35,6 +35,10 @@ export default defineConfig((_env) => ({
           "react/jsx-dev-runtime",
           "react-dom/server",
         ],
+        esbuildOptions: {
+          platform: "browser",
+          banner: undefined,
+        },
       },
       build: {
         assetsDir: "_worker",
@@ -46,11 +50,6 @@ export default defineConfig((_env) => ({
             // emit actual worker entries during `buildStart`
             _noop: "data:text/javascript,console.log()",
           },
-          output: {
-            // force false since vite enables it when `consumer: "server"` and `webCompatible: true`
-            // https://github.com/vitejs/vite/blob/95020ab49e12d143262859e095025cf02423c1d9/packages/vite/src/node/build.ts#L761-L766
-            inlineDynamicImports: false,
-          },
         },
       },
     },

diff --git a/package.json b/package.json
@@ -32,7 +32,7 @@
     "tsup": "^8.1.2",
     "tsx": "^4.16.2",
     "typescript": "^5.5.3",
-    "vite": "https://pkg.pr.new/vite@ddd5c5d",
+    "vite": "https://pkg.pr.new/vite@d002e7d",
     "vitest": "^2.0.3",
     "wrangler": "^3.79.0"
   },

diff --git a/packages/workerd/src/plugin.ts b/packages/workerd/src/plugin.ts
@@ -37,6 +37,14 @@ export function vitePluginWorkerd(pluginOptions: WorkerdPluginOptions): Plugin {
       return {
         environments: {
           workerd: {
+            keepProcessEnv: false,
+            optimizeDeps: {
+              // prevent `import { createRequire } from "node:module"`
+              esbuildOptions: {
+                platform: "browser",
+                banner: undefined,
+              },
+            },
             dev: {
               createEnvironment: (name, config) =>
                 createWorkerdDevEnvironment(name, config, pluginOptions),