@cloudflare/vite-plugin 0.0.8 → 0.1.0

package/dist/index.js

@@ -1236,6 +1236,7 @@ function createCloudflareEnvironmentOptions(workerConfig, userConfig, environmen
     optimizeDeps: {
       // Note: ssr pre-bundling is opt-in and we need to enable it by setting `noDiscovery` to false
       noDiscovery: false,
+      entries: workerConfig.main,
       exclude: [
         ...cloudflareBuiltInModules,
         // we have to exclude all node modules to work in dev-mode not just the unenv externals...
@@ -1321,33 +1322,33 @@ function writeDeployConfig(resolvedPluginConfig, resolvedViteConfig) {
     };
     fs.writeFileSync(deployConfigPath, JSON.stringify(deployConfig));
   } else {
-    const workerConfigPaths = Object.fromEntries(
-      Object.keys(resolvedPluginConfig.workers).map((environmentName) => {
-        const outputDirectory = resolvedViteConfig.environments[environmentName]?.build.outDir;
-        assert2(
-          outputDirectory,
-          `Unexpected error: ${environmentName} environment output directory is undefined`
-        );
-        return [
-          environmentName,
-          getRelativePathToWorkerConfig(
-            deployConfigDirectory,
-            resolvedViteConfig.root,
-            outputDirectory
-          )
-        ];
-      })
-    );
-    const { entryWorkerEnvironmentName } = resolvedPluginConfig;
-    const configPath = workerConfigPaths[entryWorkerEnvironmentName];
+    let entryWorkerConfigPath;
+    const auxiliaryWorkers = [];
+    for (const environmentName of Object.keys(resolvedPluginConfig.workers)) {
+      const outputDirectory = resolvedViteConfig.environments[environmentName]?.build.outDir;
+      assert2(
+        outputDirectory,
+        `Unexpected error: ${environmentName} environment output directory is undefined`
+      );
+      const configPath = getRelativePathToWorkerConfig(
+        deployConfigDirectory,
+        resolvedViteConfig.root,
+        outputDirectory
+      );
+      if (environmentName === resolvedPluginConfig.entryWorkerEnvironmentName) {
+        entryWorkerConfigPath = configPath;
+      } else {
+        auxiliaryWorkers.push({ configPath });
+      }
+    }
     assert2(
-      configPath,
-      `Unexpected error: ${entryWorkerEnvironmentName} environment output directory is undefined`
+      entryWorkerConfigPath,
+      `Unexpected error: entryWorkerConfigPath is undefined`
     );
-    const auxiliaryWorkers = Object.entries(workerConfigPaths).filter(
-      ([environmentName]) => environmentName !== entryWorkerEnvironmentName
-    ).map(([_, configPath2]) => ({ configPath: configPath2 }));
-    const deployConfig = { configPath, auxiliaryWorkers };
+    const deployConfig = {
+      configPath: entryWorkerConfigPath,
+      auxiliaryWorkers
+    };
     fs.writeFileSync(deployConfigPath, JSON.stringify(deployConfig));
   }
 }
@@ -2304,7 +2305,6 @@ function cloudflare2(pluginConfig = {}) {
                   )
                 );
               }
-              writeDeployConfig(resolvedPluginConfig, resolvedViteConfig);
             }
           }
         };
@@ -2376,6 +2376,11 @@ function cloudflare2(pluginConfig = {}) {
           source: JSON.stringify(config)
         });
       },
+      writeBundle() {
+        if (this.environment.name === (resolvedPluginConfig.type === "assets-only" ? "client" : resolvedPluginConfig.entryWorkerEnvironmentName)) {
+          writeDeployConfig(resolvedPluginConfig, resolvedViteConfig);
+        }
+      },
       handleHotUpdate(options) {
         if (resolvedPluginConfig.configPaths.has(options.file)) {
           options.server.restart();
@@ -2400,11 +2405,14 @@ function cloudflare2(pluginConfig = {}) {
           resolvedPluginConfig,
           miniflare
         );
-        const middleware = createMiddleware(({ request }) => {
-          return entryWorker.fetch(toMiniflareRequest(request), {
-            redirect: "manual"
-          });
-        });
+        const middleware = createMiddleware(
+          ({ request }) => {
+            return entryWorker.fetch(toMiniflareRequest(request), {
+              redirect: "manual"
+            });
+          },
+          { alwaysCallNext: false }
+        );
         handleWebSocket(
           viteDevServer.httpServer,
           entryWorker.fetch,
@@ -2423,11 +2431,14 @@ function cloudflare2(pluginConfig = {}) {
             pluginConfig.persistState ?? true
           )
         );
-        const middleware = createMiddleware(({ request }) => {
-          return miniflare2.dispatchFetch(toMiniflareRequest(request), {
-            redirect: "manual"
-          });
-        });
+        const middleware = createMiddleware(
+          ({ request }) => {
+            return miniflare2.dispatchFetch(toMiniflareRequest(request), {
+              redirect: "manual"
+            });
+          },
+          { alwaysCallNext: false }
+        );
         handleWebSocket(
           vitePreviewServer.httpServer,
           miniflare2.dispatchFetch,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudflare/vite-plugin",
-  "version": "0.0.8",
+  "version": "0.1.0",
   "description": "Cloudflare plugin for Vite",
   "keywords": [
     "cloudflare",
@@ -37,7 +37,7 @@
     "@hattip/adapter-node": "^0.0.49",
     "unenv": "2.0.0-rc.1",
     "ws": "^8.18.0",
-    "miniflare": "3.20250204.0"
+    "miniflare": "3.20250204.1"
   },
   "devDependencies": {
     "@cloudflare/workers-types": "^4.20250204.0",
@@ -47,9 +47,9 @@
     "tsup": "8.3.0",
     "typescript": "^5.7.2",
     "vite": "^6.1.0",
-    "@cloudflare/workers-shared": "0.13.2",
+    "@cloudflare/workers-shared": "0.14.1",
     "@cloudflare/workers-tsconfig": "0.0.0",
-    "wrangler": "3.108.0"
+    "wrangler": "3.109.0"
   },
   "peerDependencies": {
     "vite": "^6.1.0",