@cloudflare/vite-plugin 1.10.2 → 1.11.0

package/dist/index.js

@@ -486,8 +486,10 @@ var require_mime = __commonJS({
 
 // src/index.ts
 import assert12 from "node:assert";
+import { randomUUID as randomUUID2 } from "node:crypto";
 import * as fsp2 from "node:fs/promises";
 import * as path13 from "node:path";
+import util3 from "node:util";
 
 // ../containers-shared/src/utils.ts
 import { execFileSync, spawn as spawn2 } from "child_process";
@@ -1786,6 +1788,7 @@ var MagicString = class _MagicString {
 
 // src/index.ts
 import { Miniflare } from "miniflare";
+import colors4 from "picocolors";
 import * as vite6 from "vite";
 
 // src/constants.ts
@@ -2298,36 +2301,36 @@ function maybeGetFile(filePath) {
 
 // ../../node_modules/.pnpm/zod@3.22.3/node_modules/zod/lib/index.mjs
 var util;
-(function(util2) {
-  util2.assertEqual = (val) => val;
+(function(util4) {
+  util4.assertEqual = (val) => val;
   function assertIs(_arg) {
   }
-  util2.assertIs = assertIs;
+  util4.assertIs = assertIs;
   function assertNever(_x) {
     throw new Error();
   }
-  util2.assertNever = assertNever;
-  util2.arrayToEnum = (items) => {
+  util4.assertNever = assertNever;
+  util4.arrayToEnum = (items) => {
     const obj = {};
     for (const item of items) {
       obj[item] = item;
     }
     return obj;
   };
-  util2.getValidEnumValues = (obj) => {
-    const validKeys = util2.objectKeys(obj).filter((k) => typeof obj[obj[k]] !== "number");
+  util4.getValidEnumValues = (obj) => {
+    const validKeys = util4.objectKeys(obj).filter((k) => typeof obj[obj[k]] !== "number");
     const filtered = {};
     for (const k of validKeys) {
       filtered[k] = obj[k];
     }
-    return util2.objectValues(filtered);
+    return util4.objectValues(filtered);
   };
-  util2.objectValues = (obj) => {
-    return util2.objectKeys(obj).map(function(e) {
+  util4.objectValues = (obj) => {
+    return util4.objectKeys(obj).map(function(e) {
       return obj[e];
     });
   };
-  util2.objectKeys = typeof Object.keys === "function" ? (obj) => Object.keys(obj) : (object) => {
+  util4.objectKeys = typeof Object.keys === "function" ? (obj) => Object.keys(obj) : (object) => {
     const keys = [];
     for (const key in object) {
       if (Object.prototype.hasOwnProperty.call(object, key)) {
@@ -2336,19 +2339,19 @@ var util;
     }
     return keys;
   };
-  util2.find = (arr, checker) => {
+  util4.find = (arr, checker) => {
     for (const item of arr) {
       if (checker(item))
         return item;
     }
     return void 0;
   };
-  util2.isInteger = typeof Number.isInteger === "function" ? (val) => Number.isInteger(val) : (val) => typeof val === "number" && isFinite(val) && Math.floor(val) === val;
+  util4.isInteger = typeof Number.isInteger === "function" ? (val) => Number.isInteger(val) : (val) => typeof val === "number" && isFinite(val) && Math.floor(val) === val;
   function joinValues(array, separator = " | ") {
     return array.map((val) => typeof val === "string" ? `'${val}'` : val).join(separator);
   }
-  util2.joinValues = joinValues;
-  util2.jsonStringifyReplacer = (_, value) => {
+  util4.joinValues = joinValues;
+  util4.jsonStringifyReplacer = (_, value) => {
     if (typeof value === "bigint") {
       return value.toString();
     }
@@ -6285,6 +6288,7 @@ function getImportedAssetPaths(viteManifest) {
 
 // src/cloudflare-environment.ts
 import assert4 from "node:assert";
+import util2 from "node:util";
 import * as vite2 from "vite";
 
 // src/node-js-compat.ts
@@ -13454,6 +13458,7 @@ function toMiniflareRequest(request2) {
 
 // src/cloudflare-environment.ts
 var webSocketUndefinedError = "The WebSocket is undefined";
+var debuglog = util2.debuglog("@cloudflare:vite-plugin");
 function createHotChannel(webSocketContainer) {
   const listenersMap = /* @__PURE__ */ new Map();
   const client = {
@@ -13507,14 +13512,15 @@ var CloudflareDevEnvironment = class extends vite2.DevEnvironment {
     });
     this.#webSocketContainer = webSocketContainer;
   }
-  async initRunner(worker, workerConfig) {
+  async initRunner(worker, workerConfig, configId) {
     this.#worker = worker;
     const response = await this.#worker.fetch(
       new URL(INIT_PATH, UNKNOWN_HOST),
       {
         headers: {
           [VITE_DEV_METADATA_HEADER]: JSON.stringify({
-            entryPath: workerConfig.main
+            entryPath: workerConfig.main,
+            configId
           }),
           upgrade: "websocket"
         }
@@ -13598,12 +13604,13 @@ function createCloudflareEnvironmentOptions(workerConfig, userConfig, environmen
     keepProcessEnv: isNodeCompat(workerConfig)
   };
 }
-function initRunners(resolvedPluginConfig, viteDevServer, miniflare2) {
+function initRunners(resolvedPluginConfig, viteDevServer, miniflare2, configId) {
   return Promise.all(
     Object.entries(resolvedPluginConfig.workers).map(
       async ([environmentName, workerConfig]) => {
+        debuglog(configId, "Initializing worker:", workerConfig.name);
         const worker = await miniflare2.getWorker(workerConfig.name);
-        return viteDevServer.environments[environmentName].initRunner(worker, workerConfig);
+        return viteDevServer.environments[environmentName].initRunner(worker, workerConfig, configId);
       }
     )
   );
@@ -14826,36 +14833,45 @@ function writeDeployConfig(resolvedPluginConfig, resolvedViteConfig) {
 }
 
 // src/dev-vars.ts
-import * as fs4 from "node:fs";
 import * as path9 from "node:path";
-function getDotDevDotVarsContent(configPath, cloudflareEnv) {
-  const configDir = path9.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);
+import { unstable_getVarsForDev } from "wrangler";
+function getLocalDevVarsForPreview(configPath, cloudflareEnv) {
+  const dotDevDotVars = unstable_getVarsForDev(
+    configPath,
+    void 0,
+    // We don't currently support setting a list of custom `.env` files.
+    {},
+    // Don't pass actual vars since these will be loaded from the wrangler.json.
+    cloudflareEnv
+  );
+  const dotDevDotVarsEntries = Array.from(Object.entries(dotDevDotVars));
+  if (dotDevDotVarsEntries.length > 0) {
+    const dotDevDotVarsContent = dotDevDotVarsEntries.map(([key, value]) => {
+      return `${key} = "${value?.toString().replaceAll(`"`, `\\"`)}"
+`;
+    }).join("");
     return dotDevDotVarsContent;
   }
-  return null;
 }
-function hasDotDevDotVarsFileChanged(resolvedPluginConfig, changedFilePath) {
-  return [...resolvedPluginConfig.configPaths].some((configPath) => {
-    const dotDevDotVars = path9.join(path9.dirname(configPath), ".dev.vars");
-    if (dotDevDotVars === changedFilePath) {
-      return true;
-    }
-    if (resolvedPluginConfig.cloudflareEnv) {
-      const dotDevDotVarsForEnv = `${dotDevDotVars}.${resolvedPluginConfig.cloudflareEnv}`;
-      return dotDevDotVarsForEnv === changedFilePath;
-    }
-    return false;
+function hasLocalDevVarsFileChanged({
+  configPaths,
+  cloudflareEnv
+}, changedFilePath) {
+  return [...configPaths].some((configPath) => {
+    const configDir = path9.dirname(configPath);
+    return [
+      ".dev.vars",
+      ".env",
+      ...cloudflareEnv ? [`.dev.vars.${cloudflareEnv}`, `.env.${cloudflareEnv}`] : []
+    ].some(
+      (localDevFile) => changedFilePath === path9.join(configDir, localDevFile)
+    );
   });
 }
 
 // src/miniflare-options.ts
 import assert8 from "node:assert";
-import * as fs5 from "node:fs";
+import * as fs4 from "node:fs";
 import * as fsp from "node:fs/promises";
 import * as path10 from "node:path";
 import { fileURLToPath as fileURLToPath2 } from "node:url";
@@ -15015,7 +15031,7 @@ async function getDevMiniflareOptions(config) {
         {
           type: "ESModule",
           path: path10.join(miniflareModulesRoot, ROUTER_WORKER_PATH),
-          contents: fs5.readFileSync(
+          contents: fs4.readFileSync(
             fileURLToPath2(new URL(ROUTER_WORKER_PATH, import.meta.url))
           )
         }
@@ -15038,7 +15054,7 @@ async function getDevMiniflareOptions(config) {
         {
           type: "ESModule",
           path: path10.join(miniflareModulesRoot, ASSET_WORKER_PATH),
-          contents: fs5.readFileSync(
+          contents: fs4.readFileSync(
             fileURLToPath2(new URL(ASSET_WORKER_PATH, import.meta.url))
           )
         }
@@ -15258,7 +15274,7 @@ async function getDevMiniflareOptions(config) {
             {
               type: "ESModule",
               path: path10.join(miniflareModulesRoot, RUNNER_PATH),
-              contents: fs5.readFileSync(
+              contents: fs4.readFileSync(
                 fileURLToPath2(new URL(RUNNER_PATH, import.meta.url))
               )
             }
@@ -15524,7 +15540,7 @@ import * as vite5 from "vite";
 
 // src/workers-configs.ts
 import assert9 from "node:assert";
-import * as fs6 from "node:fs";
+import * as fs5 from "node:fs";
 import * as path11 from "node:path";
 import { unstable_readConfig as unstable_readConfig2 } from "wrangler";
 var nonApplicableWorkerConfigs = {
@@ -15708,7 +15724,7 @@ function getWorkerConfig(configPath, env2, opts) {
   if (!config.main) {
     throw new Error(missingFieldErrorMessage(`'main'`, configPath, env2));
   }
-  const mainStat = fs6.statSync(config.main, { throwIfNoEntry: false });
+  const mainStat = fs5.statSync(config.main, { throwIfNoEntry: false });
   if (!mainStat) {
     throw new Error(
       `The provided Wrangler config main field (${config.main}) doesn't point to an existing file`
@@ -15742,7 +15758,7 @@ function getValidatedWranglerConfigPath(root, requestedConfigPath, isForAuxiliar
         `${errorMessagePrefix} doesn't point to a file with the correct file extension. It should point to a jsonc, json or toml file (${foundExtensionMessage} instead)`
       );
     }
-    const mainStat = fs6.statSync(configPath2, { throwIfNoEntry: false });
+    const mainStat = fs5.statSync(configPath2, { throwIfNoEntry: false });
     if (!mainStat) {
       throw new Error(
         `${errorMessagePrefix} doesn't point to an existing file`
@@ -15770,7 +15786,7 @@ function getValidatedWranglerConfigPath(root, requestedConfigPath, isForAuxiliar
 function findWranglerConfig(root) {
   for (const extension of allowedWranglerConfigExtensions) {
     const configPath = path11.join(root, `wrangler.${extension}`);
-    if (fs6.existsSync(configPath)) {
+    if (fs5.existsSync(configPath)) {
       return configPath;
     }
   }
@@ -15968,6 +15984,7 @@ function handleWebSocket(httpServer, getFetcher) {
 }
 
 // src/index.ts
+var debuglog2 = util3.debuglog("@cloudflare:vite-plugin");
 var workersConfigsWarningShown = false;
 var miniflare;
 function cloudflare(pluginConfig = {}) {
@@ -15977,6 +15994,7 @@ function cloudflare(pluginConfig = {}) {
   const nodeJsCompatWarningsMap = /* @__PURE__ */ new Map();
   let containerImageTagsSeen;
   let runningContainerIds;
+  let restartingServer = false;
   return [
     {
       name: "vite-plugin-cloudflare",
@@ -16114,15 +16132,15 @@ if (import.meta.hot) {
           }
           config = workerConfig;
           if (workerConfig.configPath) {
-            const dotDevDotVarsContent = getDotDevDotVarsContent(
+            const localDevVars = getLocalDevVarsForPreview(
               workerConfig.configPath,
               resolvedPluginConfig.cloudflareEnv
             );
-            if (dotDevDotVarsContent) {
+            if (localDevVars) {
               this.emitFile({
                 type: "asset",
                 fileName: ".dev.vars",
-                source: dotDevDotVarsContent
+                source: localDevVars
               });
             }
           }
@@ -16159,27 +16177,44 @@ if (import.meta.hot) {
           writeDeployConfig(resolvedPluginConfig, resolvedViteConfig);
         }
       },
-      hotUpdate(options) {
-        assertIsNotPreview(resolvedPluginConfig);
-        const changedFilePath = path13.resolve(options.file);
-        if (resolvedPluginConfig.configPaths.has(changedFilePath) || hasDotDevDotVarsFileChanged(resolvedPluginConfig, changedFilePath) || hasAssetsConfigChanged(
-          resolvedPluginConfig,
-          resolvedViteConfig,
-          changedFilePath
-        )) {
-          options.server.restart();
-          return [];
-        }
-      },
       // Vite `configureServer` Hook
       // see https://vite.dev/guide/api-plugin.html#configureserver
       async configureServer(viteDevServer) {
+        const restartServer = viteDevServer.restart.bind(viteDevServer);
+        viteDevServer.restart = async () => {
+          try {
+            restartingServer = true;
+            debuglog2(configId, "From server.restart(): Restarting server...");
+            await restartServer();
+            debuglog2(configId, "From server.restart(): Restarted server...");
+          } finally {
+            restartingServer = false;
+          }
+        };
         assertIsNotPreview(resolvedPluginConfig);
+        const configId = randomUUID2();
         const inputInspectorPort = await getInputInspectorPortOption(
           resolvedPluginConfig,
           viteDevServer,
           miniflare
         );
+        const configChangedHandler = async (changedFilePath) => {
+          assertIsNotPreview(resolvedPluginConfig);
+          if (resolvedPluginConfig.configPaths.has(changedFilePath) || hasLocalDevVarsFileChanged(resolvedPluginConfig, changedFilePath) || hasAssetsConfigChanged(
+            resolvedPluginConfig,
+            resolvedViteConfig,
+            changedFilePath
+          )) {
+            debuglog2(configId, "Config changed: " + changedFilePath);
+            viteDevServer.watcher.off("change", configChangedHandler);
+            debuglog2(
+              configId,
+              "Restarting dev server and aborting previous setup"
+            );
+            await viteDevServer.restart();
+          }
+        };
+        viteDevServer.watcher.on("change", configChangedHandler);
         let containerBuildId;
         const entryWorkerConfig = getEntryWorkerConfig(resolvedPluginConfig);
         const hasDevContainers = entryWorkerConfig?.containers?.length && entryWorkerConfig.dev.enable_containers;
@@ -16195,14 +16230,23 @@ if (import.meta.hot) {
           containerBuildId
         });
         if (!miniflare) {
+          debuglog2(configId, "Creating new Miniflare instance");
           miniflare = new Miniflare(miniflareDevOptions);
         } else {
+          debuglog2(configId, "Updating the Miniflare instance");
           await miniflare.setOptions(miniflareDevOptions);
+          debuglog2(configId, "Miniflare is ready");
         }
         let preMiddleware;
         if (resolvedPluginConfig.type === "workers") {
           assert12(entryWorkerConfig, `No entry Worker config`);
-          await initRunners(resolvedPluginConfig, viteDevServer, miniflare);
+          debuglog2(configId, "Initializing the Vite module runners");
+          await initRunners(
+            resolvedPluginConfig,
+            viteDevServer,
+            miniflare,
+            configId
+          );
           const entryWorkerName = entryWorkerConfig.name;
           if (viteDevServer.httpServer) {
             handleWebSocket(viteDevServer.httpServer, async () => {
@@ -16240,6 +16284,13 @@ if (import.meta.hot) {
             };
           }
           if (hasDevContainers) {
+            viteDevServer.config.logger.info(
+              colors4.dim(
+                colors4.yellow(
+                  "\u2237 Building container images for local development...\n"
+                )
+              )
+            );
             containerImageTagsSeen = await prepareContainerImages({
               containersConfig: entryWorkerConfig.containers,
               containerBuildId,
@@ -16247,6 +16298,13 @@ if (import.meta.hot) {
               dockerPath,
               configPath: entryWorkerConfig.configPath
             });
+            viteDevServer.config.logger.info(
+              colors4.dim(
+                colors4.yellow(
+                  "\n\u26A1\uFE0F Containers successfully built. To rebuild your containers during development, restart the Vite dev server (r + enter)."
+                )
+              )
+            );
             const dockerPollIntervalId = setInterval(async () => {
               if (containerImageTagsSeen?.size) {
                 runningContainerIds = await getContainerIdsByImageTags(
@@ -16316,6 +16374,13 @@ if (import.meta.hot) {
         );
         if (hasDevContainers) {
           const dockerPath = getDockerPath();
+          vitePreviewServer.config.logger.info(
+            colors4.dim(
+              colors4.yellow(
+                "\u2237 Building container images for local preview...\n"
+              )
+            )
+          );
           containerImageTagsSeen = await prepareContainerImages({
             containersConfig: entryWorkerConfig.containers,
             containerBuildId,
@@ -16323,6 +16388,9 @@ if (import.meta.hot) {
             dockerPath,
             configPath: entryWorkerConfig.configPath
           });
+          vitePreviewServer.config.logger.info(
+            colors4.dim(colors4.yellow("\n\u26A1\uFE0F Containers successfully built.\n"))
+          );
           const dockerPollIntervalId = setInterval(async () => {
             if (containerImageTagsSeen?.size) {
               runningContainerIds = await getContainerIdsByImageTags(
@@ -16358,6 +16426,14 @@ if (import.meta.hot) {
           containerImageTagsSeen.clear();
           runningContainerIds = [];
         }
+        debuglog2("buildEnd:", restartingServer ? "restarted" : "disposing");
+        if (!restartingServer) {
+          debuglog2("buildEnd: disposing Miniflare instance");
+          await miniflare?.dispose().catch((error) => {
+            debuglog2("buildEnd: failed to dispose Miniflare instance:", error);
+          });
+          miniflare = void 0;
+        }
       }
     },
     // Plugin to provide a fallback entry file

package/dist/runner-worker/index.js

@@ -1224,9 +1224,12 @@ function exportAll(exports, sourceModule) {
 
 // src/runner-worker/module-runner.ts
 var moduleRunner;
-async function createModuleRunner(env, webSocket) {
+var oldConfigId;
+async function createModuleRunner(env, webSocket, configId) {
   if (moduleRunner) {
-    throw new Error("Runner already initialized");
+    throw new Error(
+      "Runner already initialized; old configId: " + oldConfigId + ", new configId: " + configId
+    );
   }
   const transport = createWebSocketModuleRunnerTransport({
     createConnection() {
@@ -1234,6 +1237,7 @@ async function createModuleRunner(env, webSocket) {
       return webSocket;
     }
   });
+  oldConfigId = configId;
   moduleRunner = new ModuleRunner(
     {
       sourcemapInterceptor: "prepareStackTrace",
@@ -1369,6 +1373,8 @@ async function getWorkerEntrypointRpcProperty(entrypoint, key) {
 }
 function createWorkerEntrypointWrapper(entrypoint) {
   class Wrapper extends WorkerEntrypoint {
+    /** A unique identifier used for debugging errors when config updates. */
+    configId;
     constructor(ctx, env) {
       super(ctx, env);
       return new Proxy(this, {
@@ -1402,7 +1408,11 @@ function createWorkerEntrypointWrapper(entrypoint) {
             entryPath = viteDevMetadata.entryPath;
             const { 0: client, 1: server } = new WebSocketPair();
             webSocket = client;
-            await createModuleRunner(this.env, server);
+            await createModuleRunner(
+              this.env,
+              server,
+              viteDevMetadata.configId
+            );
           } catch (e) {
             return new Response(
               e instanceof Error ? e.message : JSON.stringify(e),
@@ -1563,13 +1573,13 @@ function getViteDevMetadata(request) {
       `Unexpected internal error, vite dev metadata header JSON parsing failed, value = ${viteDevMetadataHeader}`
     );
   }
-  const { entryPath: entryPath2 } = parsedViteDevMetadataHeader;
+  const { entryPath: entryPath2, configId } = parsedViteDevMetadataHeader;
   if (entryPath2 === void 0) {
     throw new Error(
       "Unexpected internal error, vite dev metadata header doesn't contain an entryPath value"
     );
   }
-  return { entryPath: entryPath2 };
+  return { entryPath: entryPath2, configId };
 }
 export {
   createDurableObjectWrapper,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudflare/vite-plugin",
-  "version": "1.10.2",
+  "version": "1.11.0",
   "description": "Cloudflare plugin for Vite",
   "keywords": [
     "cloudflare",
@@ -41,11 +41,11 @@
     "unenv": "2.0.0-rc.19",
     "ws": "8.18.0",
     "@cloudflare/unenv-preset": "2.5.0",
-    "miniflare": "4.20250726.0",
-    "wrangler": "4.26.1"
+    "miniflare": "4.20250730.0",
+    "wrangler": "4.27.0"
   },
   "devDependencies": {
-    "@cloudflare/workers-types": "^4.20250726.0",
+    "@cloudflare/workers-types": "^4.20250730.0",
     "@types/node": "^22.10.1",
     "@types/ws": "^8.5.13",
     "magic-string": "^0.30.12",
@@ -61,7 +61,7 @@
   },
   "peerDependencies": {
     "vite": "^6.1.0 || ^7.0.0",
-    "wrangler": "^4.26.1"
+    "wrangler": "^4.27.0"
   },
   "publishConfig": {
     "access": "public"