@cloudflare/vite-plugin 0.0.0-e2f5756c2 → 0.0.0-e62b097bb

package/dist/index.d.ts

@@ -19,6 +19,13 @@ interface PluginConfig extends EntryWorkerConfig {
     persistState?: PersistState;
 }
 
+/**
+ * Vite plugin that enables a full-featured integration between Vite and the Cloudflare Workers runtime.
+ *
+ * See the [README](https://github.com/cloudflare/workers-sdk/tree/main/packages/vite-plugin-cloudflare#readme) for more details.
+ *
+ * @param pluginConfig An optional {@link PluginConfig} object.
+ */
 declare function cloudflare(pluginConfig?: PluginConfig): vite.Plugin;
 
 export { cloudflare };

package/dist/index.js

@@ -1268,7 +1268,10 @@ var CloudflareDevEnvironment = class extends vite2.DevEnvironment {
         }
       }
     );
-    assert(response.ok, "Failed to initialize module runner");
+    assert(
+      response.ok,
+      `Failed to initialize module runner, error: ${await response.text()}`
+    );
     const webSocket = response.webSocket;
     assert(webSocket, "Failed to establish WebSocket");
     webSocket.accept();
@@ -1634,10 +1637,13 @@ function getDevMiniflareOptions(resolvedPluginConfig, viteDevServer) {
   ];
   const userWorkers = resolvedPluginConfig.type === "workers" ? Object.entries(resolvedPluginConfig.workers).map(
     ([environmentName, workerConfig]) => {
-      const miniflareWorkerOptions = unstable_getMiniflareWorkerOptions({
-        ...workerConfig,
-        assets: void 0
-      });
+      const miniflareWorkerOptions = unstable_getMiniflareWorkerOptions(
+        {
+          ...workerConfig,
+          assets: void 0
+        },
+        resolvedPluginConfig.cloudflareEnv
+      );
       const { ratelimits, ...workerOptions } = miniflareWorkerOptions.workerOptions;
       return {
         ...workerOptions,
@@ -2061,20 +2067,21 @@ function resolvePluginConfig(pluginConfig, userConfig, viteEnv) {
   const configPaths = /* @__PURE__ */ new Set();
   const persistState = pluginConfig.persistState ?? true;
   const root = userConfig.root ? path5.resolve(userConfig.root) : process.cwd();
-  const { CLOUDFLARE_ENV } = vite5.loadEnv(viteEnv.mode, root, "");
+  const { CLOUDFLARE_ENV: cloudflareEnv } = vite5.loadEnv(
+    viteEnv.mode,
+    root,
+    /* prefixes */
+    ""
+  );
   const configPath = pluginConfig.configPath ? path5.resolve(root, pluginConfig.configPath) : findWranglerConfig(root);
   assert6(
     configPath,
     `Config not found. Have you created a wrangler.json(c) or wrangler.toml file?`
   );
-  const entryWorkerResolvedConfig = getWorkerConfig(
-    configPath,
-    CLOUDFLARE_ENV,
-    {
-      visitedConfigPaths: configPaths,
-      isEntryWorker: true
-    }
-  );
+  const entryWorkerResolvedConfig = getWorkerConfig(configPath, cloudflareEnv, {
+    visitedConfigPaths: configPaths,
+    isEntryWorker: true
+  });
   if (entryWorkerResolvedConfig.type === "assets-only") {
     return {
       type: "assets-only",
@@ -2083,7 +2090,8 @@ function resolvePluginConfig(pluginConfig, userConfig, viteEnv) {
       persistState,
       rawConfigs: {
         entryWorker: entryWorkerResolvedConfig
-      }
+      },
+      cloudflareEnv
     };
   }
   const entryWorkerConfig = entryWorkerResolvedConfig.config;
@@ -2095,7 +2103,7 @@ function resolvePluginConfig(pluginConfig, userConfig, viteEnv) {
   for (const auxiliaryWorker of pluginConfig.auxiliaryWorkers ?? []) {
     const workerResolvedConfig = getWorkerConfig(
       path5.resolve(root, auxiliaryWorker.configPath),
-      CLOUDFLARE_ENV,
+      cloudflareEnv,
       {
         visitedConfigPaths: configPaths
       }
@@ -2123,7 +2131,8 @@ function resolvePluginConfig(pluginConfig, userConfig, viteEnv) {
     rawConfigs: {
       entryWorker: entryWorkerResolvedConfig,
       auxiliaryWorkers: auxiliaryWorkersResolvedConfigs
-    }
+    },
+    cloudflareEnv
   };
 }
 
@@ -2314,13 +2323,28 @@ function cloudflare2(pluginConfig = {}) {
           );
         }
         config = workerConfig;
+        if (workerConfig.configPath) {
+          const dotDevDotVarsContent = getDotDevDotVarsContent(
+            workerConfig.configPath,
+            resolvedPluginConfig.cloudflareEnv
+          );
+          if (dotDevDotVarsContent) {
+            this.emitFile({
+              type: "asset",
+              fileName: ".dev.vars",
+              source: dotDevDotVarsContent
+            });
+          }
+        }
       } else if (this.environment.name === "client") {
         const assetsOnlyConfig = resolvedPluginConfig.config;
         assetsOnlyConfig.assets.directory = ".";
+        const filesToAssetsIgnore = ["wrangler.json", ".dev.vars"];
         this.emitFile({
           type: "asset",
           fileName: ".assetsignore",
-          source: "wrangler.json"
+          source: `${filesToAssetsIgnore.join("\n")}
+`
         });
         config = assetsOnlyConfig;
       }
@@ -2329,7 +2353,9 @@ function cloudflare2(pluginConfig = {}) {
       }
       config.no_bundle = true;
       config.rules = [{ type: "ESModule", globs: ["**/*.js"] }];
-      config.unsafe = void 0;
+      if (config.unsafe && Object.keys(config.unsafe).length === 0) {
+        config.unsafe = void 0;
+      }
       this.emitFile({
         type: "asset",
         fileName: "wrangler.json",
@@ -2398,6 +2424,17 @@ function cloudflare2(pluginConfig = {}) {
     }
   };
 }
+function getDotDevDotVarsContent(configPath, cloudflareEnv) {
+  const configDir = path6.dirname(configPath);
+  const defaultDotDevDotVarsPath = `${configDir}/.dev.vars`;
+  const inputDotDevDotVarsPath = `${defaultDotDevDotVarsPath}${cloudflareEnv ? `.${cloudflareEnv}` : ""}`;
+  const targetPath = fs4.existsSync(inputDotDevDotVarsPath) ? inputDotDevDotVarsPath : fs4.existsSync(defaultDotDevDotVarsPath) ? defaultDotDevDotVarsPath : null;
+  if (targetPath) {
+    const dotDevDotVarsContent = fs4.readFileSync(targetPath);
+    return dotDevDotVarsContent;
+  }
+  return null;
+}
 export {
   cloudflare2 as cloudflare
 };

package/dist/runner-worker/index.js

@@ -21,7 +21,7 @@ function stripInternalEnv(internalEnv) {
   return userEnv;
 }
 
-// ../../node_modules/.pnpm/vite@6.0.7_@types+node@18.19.59_jiti@2.4.2/node_modules/vite/dist/node/module-runner.js
+// ../../node_modules/.pnpm/vite@6.0.7_@types+node@18.19.74_jiti@2.4.2/node_modules/vite/dist/node/module-runner.js
 var VALID_ID_PREFIX = "/@id/";
 var NULL_BYTE_PLACEHOLDER = "__x00__";
 var SOURCEMAPPING_URL = "sourceMa";
@@ -1531,7 +1531,14 @@ function createWorkerEntrypointWrapper(entrypoint) {
         const url = new URL(request.url);
         if (url.pathname === INIT_PATH) {
           const { 0: client, 1: server } = new WebSocketPair();
-          createModuleRunner(this.env, server);
+          try {
+            await createModuleRunner(this.env, server);
+          } catch (e) {
+            return new Response(
+              e instanceof Error ? e.message : JSON.stringify(e),
+              { status: 500 }
+            );
+          }
           return new Response(null, { status: 101, webSocket: client });
         }
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudflare/vite-plugin",
-  "version": "0.0.0-e2f5756c2",
+  "version": "0.0.0-e62b097bb",
   "description": "Cloudflare plugin for Vite",
   "keywords": [
     "cloudflare",
@@ -36,19 +36,19 @@
     "@hattip/adapter-node": "^0.0.49",
     "unenv": "npm:unenv-nightly@2.0.0-20241218-183400-5d6aec3",
     "ws": "^8.18.0",
-    "miniflare": "0.0.0-e2f5756c2"
+    "miniflare": "0.0.0-e62b097bb"
   },
   "devDependencies": {
-    "@cloudflare/workers-types": "^4.20241230.0",
+    "@cloudflare/workers-types": "^4.20250204.0",
     "@types/node": "^22.10.1",
     "@types/ws": "^8.5.13",
     "magic-string": "^0.30.12",
-    "tsup": "^8.3.0",
+    "tsup": "8.3.0",
     "typescript": "^5.7.2",
     "vite": "^6.0.7",
-    "wrangler": "0.0.0-e2f5756c2",
     "@cloudflare/workers-tsconfig": "0.0.0",
-    "@cloudflare/workers-shared": "0.0.0-e2f5756c2"
+    "@cloudflare/workers-shared": "0.0.0-e62b097bb",
+    "wrangler": "0.0.0-e62b097bb"
   },
   "peerDependencies": {
     "vite": "^6.0.7",
@@ -63,8 +63,8 @@
   "scripts": {
     "build": "tsup",
     "check:type": "tsc --build",
+    "dev": "tsup --watch",
     "test": "vitest",
-    "test:ci": "vitest run",
-    "watch": "tsup --watch"
+    "test:ci": "vitest run"
   }
 }