@cloudflare/vite-plugin 0.0.0-e6fea1318 → 0.0.0-e7fce2523

package/dist/index.js

@@ -485,11 +485,12 @@ var require_mime = __commonJS({
 });
 
 // src/index.ts
-import assert9 from "node:assert";
+import assert10 from "node:assert";
 import * as fs5 from "node:fs";
 import * as fsp2 from "node:fs/promises";
 import * as path9 from "node:path";
-import { createMiddleware } from "@hattip/adapter-node";
+import { createRequest, sendResponse } from "@mjackson/node-fetch-server";
+import replace from "@rollup/plugin-replace";
 
 // ../../node_modules/.pnpm/@jridgewell+sourcemap-codec@1.5.0/node_modules/@jridgewell/sourcemap-codec/dist/sourcemap-codec.mjs
 var comma = ",".charCodeAt(0);
@@ -1557,6 +1558,7 @@ var MagicString = class _MagicString {
 
 // src/index.ts
 import { Miniflare } from "miniflare";
+import colors3 from "picocolors";
 import * as vite7 from "vite";
 
 // src/constants.ts
@@ -1587,7 +1589,7 @@ function matchAdditionalModule(source) {
   return null;
 }
 function createModuleReference(type, id) {
-  return `__CLOUDFLARE_MODULE__${type}__${id}__`;
+  return `__CLOUDFLARE_MODULE__${type}__${id}__CLOUDFLARE_MODULE__`;
 }
 
 // src/asset-config.ts
@@ -5782,10 +5784,17 @@ var z = /* @__PURE__ */ Object.freeze({
 // ../workers-shared/utils/types.ts
 var InternalConfigSchema = z.object({
   account_id: z.number().optional(),
-  script_id: z.number().optional()
+  script_id: z.number().optional(),
+  debug: z.boolean().optional()
+});
+var StaticRoutingSchema = z.object({
+  version: z.literal(1),
+  include: z.array(z.string()),
+  exclude: z.array(z.string()).optional()
 });
 var RouterConfigSchema = z.object({
   invoke_user_worker_ahead_of_assets: z.boolean().optional(),
+  static_routing: StaticRoutingSchema.optional(),
   has_user_worker: z.boolean().optional(),
   ...InternalConfigSchema.shape
 });
@@ -5826,18 +5835,19 @@ var AssetConfigSchema = z.object({
   not_found_handling: z.enum(["single-page-application", "404-page", "none"]).optional(),
   redirects: RedirectsSchema,
   headers: HeadersSchema,
+  has_static_routing: z.boolean().optional(),
   ...InternalConfigSchema.shape
 });
 
 // src/asset-config.ts
-function hasAssetsConfigChanged(resolvedPluginConfig, resolvedViteConfig, changedFile) {
+function hasAssetsConfigChanged(resolvedPluginConfig, resolvedViteConfig, changedFilePath) {
   if (!resolvedPluginConfig.experimental?.headersAndRedirectsDevModeSupport) {
     return false;
   }
   return [
     getRedirectsConfigPath(resolvedViteConfig),
     getHeadersConfigPath(resolvedViteConfig)
-  ].includes(path.resolve(changedFile));
+  ].includes(changedFilePath);
 }
 function getAssetsConfig(resolvedPluginConfig, entryWorkerConfig, resolvedConfig) {
   const assetsConfig = resolvedPluginConfig.type === "assets-only" ? resolvedPluginConfig.config.assets : entryWorkerConfig?.assets;
@@ -12878,6 +12888,15 @@ function isNodeCompat(workerConfig) {
   }
   return false;
 }
+function isNodeAls(workerConfig) {
+  return workerConfig !== void 0 && getNodeCompat(
+    workerConfig.compatibility_date,
+    workerConfig.compatibility_flags ?? []
+  ).mode === "als";
+}
+function isNodeAlsModule(path10) {
+  return /^(node:)?async_hooks$/.test(path10);
+}
 function injectGlobalCode(id, code) {
   const injectedCode = Object.entries(env.inject).map(([globalName, globalInject]) => {
     if (typeof globalInject === "string") {
@@ -12908,7 +12927,7 @@ globalThis.${globalName} = var_${globalName}.${exportName};
 }
 function resolveNodeJSImport(source) {
   const alias = env.alias[source];
-  if (alias) {
+  if (alias && !nodeCompatExternals.has(alias)) {
     return {
       unresolved: alias,
       resolved: resolvePathSync(alias, { url: import.meta.url })
@@ -12939,8 +12958,9 @@ function getNodeCompatEntries() {
   return entries;
 }
 var NodeJsCompatWarnings = class {
-  constructor(environment) {
-    this.environment = environment;
+  constructor(environmentName, resolvedViteConfig) {
+    this.environmentName = environmentName;
+    this.resolvedViteConfig = resolvedViteConfig;
   }
   sources = /* @__PURE__ */ new Map();
   timer;
@@ -12948,6 +12968,7 @@ var NodeJsCompatWarnings = class {
     const importers = this.sources.get(source) ?? /* @__PURE__ */ new Set();
     this.sources.set(source, importers);
     importers.add(importer);
+    this.renderWarningsOnIdle();
   }
   renderWarningsOnIdle() {
     if (this.timer) {
@@ -12960,19 +12981,16 @@ var NodeJsCompatWarnings = class {
   }
   renderWarnings() {
     if (this.sources.size > 0) {
-      let message = `
-
-Unexpected Node.js imports for environment "${this.environment.name}". Do you need to enable the "nodejs_compat" compatibility flag?
-Refer to https://developers.cloudflare.com/workers/runtime-apis/nodejs/ for more details.
+      let message = `Unexpected Node.js imports for environment "${this.environmentName}". Do you need to enable the "nodejs_compat" compatibility flag? Refer to https://developers.cloudflare.com/workers/runtime-apis/nodejs/ for more details.
 `;
       this.sources.forEach((importers, source) => {
         importers.forEach((importer) => {
-          message += ` - "${source}" imported from "${path3.relative(this.environment.config.root, importer)}"
+          message += ` - "${source}" imported from "${path3.relative(this.resolvedViteConfig.root, importer)}"
 `;
         });
       });
-      this.environment.logger.warn(message, {
-        environment: this.environment.name
+      this.resolvedViteConfig.logger.warn(message, {
+        timestamp: true
       });
       this.sources.clear();
     }
@@ -12982,7 +13000,7 @@ Refer to https://developers.cloudflare.com/workers/runtime-apis/nodejs/ for more
 // src/shared.ts
 var UNKNOWN_HOST = "http://localhost";
 var INIT_PATH = "/__vite_plugin_cloudflare_init__";
-var ADDITIONAL_MODULE_PATTERN = `__CLOUDFLARE_MODULE__(${ADDITIONAL_MODULE_TYPES.join("|")})__(.*?)__`;
+var ADDITIONAL_MODULE_PATTERN = `__CLOUDFLARE_MODULE__(${ADDITIONAL_MODULE_TYPES.join("|")})__(.*?)__CLOUDFLARE_MODULE__`;
 var additionalModuleRE = new RegExp(ADDITIONAL_MODULE_PATTERN);
 var additionalModuleGlobalRE = new RegExp(
   ADDITIONAL_MODULE_PATTERN,
@@ -12992,6 +13010,7 @@ var VITE_DEV_METADATA_HEADER = "__VITE_DEV_METADATA__";
 
 // src/utils.ts
 import * as path4 from "node:path";
+import getPort, { portNumbers } from "get-port";
 import { Request as MiniflareRequest } from "miniflare";
 import "vite";
 function getOutputDirectory(userConfig, environmentName) {
@@ -13017,23 +13036,13 @@ function toMiniflareRequest(request) {
     duplex: "half"
   });
 }
-function nodeHeadersToWebHeaders(nodeHeaders) {
-  const headers = new Headers();
-  for (const [key, value] of Object.entries(nodeHeaders)) {
-    if (typeof value === "string") {
-      headers.append(key, value);
-    } else if (Array.isArray(value)) {
-      for (const item of value) {
-        headers.append(key, item);
-      }
-    }
-  }
-  return headers;
-}
 var postfixRE = /[?#].*$/;
 function cleanUrl(url) {
   return url.replace(postfixRE, "");
 }
+function getFirstAvailablePort(start) {
+  return getPort({ port: portNumbers(start, 65535) });
+}
 
 // src/cloudflare-environment.ts
 var webSocketUndefinedError = "The WebSocket is undefined";
@@ -13340,6 +13349,7 @@ import {
   LogLevel,
   Response as MiniflareResponse
 } from "miniflare";
+import colors2 from "picocolors";
 import { globSync } from "tinyglobby";
 import "vite";
 import { unstable_getMiniflareWorkerOptions } from "wrangler";
@@ -13444,7 +13454,30 @@ function getEntryWorkerConfig(resolvedPluginConfig) {
   }
   return resolvedPluginConfig.workers[resolvedPluginConfig.entryWorkerEnvironmentName];
 }
-function getDevMiniflareOptions(resolvedPluginConfig, viteDevServer) {
+function filterTails(tails, userWorkers, log) {
+  return tails?.filter((tailService) => {
+    let name;
+    if (typeof tailService === "string") {
+      name = tailService;
+    } else if (typeof tailService === "object" && "name" in tailService && typeof tailService.name === "string") {
+      name = tailService.name;
+    } else {
+      return true;
+    }
+    const found = userWorkers.some((w) => w.name === name);
+    if (!found) {
+      log(
+        colors2.dim(
+          colors2.yellow(
+            `Tail consumer "${name}" was not found in your config. Make sure you add it if you'd like to simulate receiving tail events locally.`
+          )
+        )
+      );
+    }
+    return found;
+  });
+}
+function getDevMiniflareOptions(resolvedPluginConfig, viteDevServer, inspectorPort) {
   const resolvedViteConfig = viteDevServer.config;
   const entryWorkerConfig = getEntryWorkerConfig(resolvedPluginConfig);
   const assetsConfig = getAssetsConfig(
@@ -13536,7 +13569,7 @@ function getDevMiniflareOptions(resolvedPluginConfig, viteDevServer) {
         worker: {
           ...workerOptions,
           name: workerOptions.name ?? workerConfig.name,
-          unsafeInspectorProxy: resolvedPluginConfig.inspectorPort !== false,
+          unsafeInspectorProxy: inspectorPort !== false,
           modulesRoot: miniflareModulesRoot,
           unsafeEvalBinding: "__VITE_UNSAFE_EVAL__",
           serviceBindings: {
@@ -13578,8 +13611,8 @@ function getDevMiniflareOptions(resolvedPluginConfig, viteDevServer) {
   const logger = new ViteMiniflareLogger(resolvedViteConfig);
   return {
     log: logger,
-    inspectorPort: resolvedPluginConfig.inspectorPort || void 0,
-    unsafeInspectorProxy: resolvedPluginConfig.inspectorPort !== false,
+    inspectorPort: inspectorPort === false ? void 0 : inspectorPort,
+    unsafeInspectorProxy: inspectorPort !== false,
     handleRuntimeStdio(stdout, stderr) {
       const decoder = new TextDecoder();
       stdout.forEach((data2) => logger.info(decoder.decode(data2)));
@@ -13635,6 +13668,11 @@ function getDevMiniflareOptions(resolvedPluginConfig, viteDevServer) {
         }
         return {
           ...workerOptions,
+          tails: filterTails(
+            workerOptions.tails,
+            userWorkers,
+            viteDevServer.config.logger.warn
+          ),
           modules: [
             {
               type: "ESModule",
@@ -13716,7 +13754,7 @@ function getPreviewModules(main, modulesRules) {
     ]
   };
 }
-function getPreviewMiniflareOptions(vitePreviewServer, workerConfigs, persistState, inspectorPort = DEFAULT_INSPECTOR_PORT) {
+function getPreviewMiniflareOptions(vitePreviewServer, workerConfigs, persistState, inspectorPort) {
   const resolvedViteConfig = vitePreviewServer.config;
   const workers = workerConfigs.flatMap((config) => {
     const miniflareWorkerOptions = unstable_getMiniflareWorkerOptions(config);
@@ -13725,6 +13763,11 @@ function getPreviewMiniflareOptions(vitePreviewServer, workerConfigs, persistSta
     return [
       {
         ...workerOptions,
+        tails: filterTails(
+          workerOptions.tails,
+          workerConfigs,
+          vitePreviewServer.config.logger.warn
+        ),
         name: workerOptions.name ?? config.name,
         unsafeInspectorProxy: inspectorPort !== false,
         ...miniflareWorkerOptions.main ? getPreviewModules(miniflareWorkerOptions.main, modulesRules) : { modules: true, script: "" }
@@ -13735,7 +13778,7 @@ function getPreviewMiniflareOptions(vitePreviewServer, workerConfigs, persistSta
   const logger = new ViteMiniflareLogger(resolvedViteConfig);
   return {
     log: logger,
-    inspectorPort: inspectorPort || void 0,
+    inspectorPort: inspectorPort === false ? void 0 : inspectorPort,
     unsafeInspectorProxy: inspectorPort !== false,
     handleRuntimeStdio(stdout, stderr) {
       const decoder = new TextDecoder();
@@ -13824,8 +13867,7 @@ var nonApplicableWorkerConfigs = {
     "preserve_file_names",
     "rules",
     "site",
-    "tsconfig",
-    "upload_source_maps"
+    "tsconfig"
   ]
 };
 var nullableNonApplicable = [
@@ -13836,8 +13878,7 @@ var nullableNonApplicable = [
   "no_bundle",
   "preserve_file_names",
   "site",
-  "tsconfig",
-  "upload_source_maps"
+  "tsconfig"
 ];
 function readWorkerConfig(configPath, env2) {
   const nonApplicable = {
@@ -14053,7 +14094,6 @@ function workerNameToEnvironmentName(workerName) {
 function resolvePluginConfig(pluginConfig, userConfig, viteEnv) {
   const configPaths = /* @__PURE__ */ new Set();
   const persistState = pluginConfig.persistState ?? true;
-  const inspectorPort = pluginConfig.inspectorPort ?? DEFAULT_INSPECTOR_PORT;
   const experimental = pluginConfig.experimental ?? {};
   const root = userConfig.root ? path8.resolve(userConfig.root) : process.cwd();
   const { CLOUDFLARE_ENV: cloudflareEnv } = vite6.loadEnv(
@@ -14079,7 +14119,6 @@ function resolvePluginConfig(pluginConfig, userConfig, viteEnv) {
       type: "assets-only",
       config: entryWorkerResolvedConfig.config,
       configPaths,
-      inspectorPort,
       persistState,
       rawConfigs: {
         entryWorker: entryWorkerResolvedConfig
@@ -14125,7 +14164,6 @@ function resolvePluginConfig(pluginConfig, userConfig, viteEnv) {
     type: "workers",
     configPaths,
     persistState,
-    inspectorPort,
     workers,
     entryWorkerEnvironmentName,
     rawConfigs: {
@@ -14138,6 +14176,7 @@ function resolvePluginConfig(pluginConfig, userConfig, viteEnv) {
 }
 
 // src/websockets.ts
+import { createHeaders } from "@mjackson/node-fetch-server";
 import { coupleWebSocket } from "miniflare";
 import { WebSocketServer } from "ws";
 function handleWebSocket(httpServer, getFetcher) {
@@ -14149,7 +14188,7 @@ function handleWebSocket(httpServer, getFetcher) {
       if (request.headers["sec-websocket-protocol"]?.startsWith("vite")) {
         return;
       }
-      const headers = nodeHeadersToWebHeaders(request.headers);
+      const headers = createHeaders(request);
       const fetcher = await getFetcher();
       const response = await fetcher(url, {
         headers,
@@ -14173,6 +14212,57 @@ function handleWebSocket(httpServer, getFetcher) {
   );
 }
 
+// src/worker-environments-validation.ts
+import assert9 from "node:assert";
+function validateWorkerEnvironmentsResolvedConfigs(resolvedPluginConfig, resolvedViteConfig) {
+  const workersEnvironmentNames = Object.keys(resolvedPluginConfig.workers);
+  const disallowedEnvsConfigs = /* @__PURE__ */ new Map();
+  for (const envName of workersEnvironmentNames) {
+    const workerEnvConfig = resolvedViteConfig.environments[envName];
+    assert9(workerEnvConfig, `Missing environment config for "${envName}"`);
+    const { optimizeDeps, resolve: resolve7 } = workerEnvConfig;
+    const disallowedConfig = {};
+    const disallowedOptimizeDepsExcludeEntries = (optimizeDeps.exclude ?? []).filter((entry) => {
+      if (cloudflareBuiltInModules.includes(entry)) {
+        return false;
+      }
+      if (isNodeAlsModule(entry) && isNodeAls(resolvedPluginConfig.workers[envName])) {
+        return false;
+      }
+      if (NODEJS_MODULES_RE.test(entry) && isNodeCompat(resolvedPluginConfig.workers[envName])) {
+        return false;
+      }
+      return true;
+    });
+    if (disallowedOptimizeDepsExcludeEntries.length > 0) {
+      disallowedConfig.optimizeDepsExclude = disallowedOptimizeDepsExcludeEntries;
+    }
+    if (resolve7.external === true || resolve7.external.length > 0) {
+      disallowedConfig.resolveExternal = resolve7.external;
+    }
+    if (Object.keys(disallowedConfig).length > 0) {
+      disallowedEnvsConfigs.set(envName, disallowedConfig);
+    }
+  }
+  if (disallowedEnvsConfigs.size > 0) {
+    const errorMessage = `The following environment configurations are incompatible with the Cloudflare Vite plugin:
+${[
+      ...disallowedEnvsConfigs
+    ].map(
+      ([envName, disallowedConfig]) => [
+        disallowedConfig.optimizeDepsExclude ? `	- "${envName}" environment: \`optimizeDeps.exclude\`: ${JSON.stringify(disallowedConfig.optimizeDepsExclude)}
+` : null,
+        disallowedConfig.resolveExternal ? `	- "${envName}" environment: \`resolve.external\`: ${JSON.stringify(disallowedConfig.resolveExternal)}
+` : null
+      ].join("")
+    ).join(
+      ""
+    )}To resolve this issue, avoid setting \`optimizeDeps.exclude\` and \`resolve.external\` in your Cloudflare Worker environments.
+`;
+    throw new Error(errorMessage);
+  }
+}
+
 // src/index.ts
 var workersConfigsWarningShown = false;
 var miniflare;
@@ -14243,7 +14333,7 @@ function cloudflare2(pluginConfig = {}) {
                   resolvedPluginConfig.workers
                 ).map((environmentName) => {
                   const environment = builder.environments[environmentName];
-                  assert9(
+                  assert10(
                     environment,
                     `${environmentName} environment not found`
                   );
@@ -14264,6 +14354,12 @@ function cloudflare2(pluginConfig = {}) {
       },
       configResolved(config) {
         resolvedViteConfig = config;
+        if (resolvedPluginConfig?.type === "workers") {
+          validateWorkerEnvironmentsResolvedConfigs(
+            resolvedPluginConfig,
+            resolvedViteConfig
+          );
+        }
       },
       generateBundle(_, bundle) {
         let config;
@@ -14284,7 +14380,7 @@ function cloudflare2(pluginConfig = {}) {
           if (isEntryWorker && hasClientBuild) {
             const workerOutputDirectory = this.environment.config.build.outDir;
             const clientOutputDirectory = resolvedViteConfig.environments.client?.build.outDir;
-            assert9(
+            assert10(
               clientOutputDirectory,
               "Unexpected error: client output directory is undefined"
             );
@@ -14348,78 +14444,100 @@ function cloudflare2(pluginConfig = {}) {
         }
       },
       hotUpdate(options) {
-        if (
-          // Vite normalizes `options.file` so we use `path.resolve` for Windows compatibility
-          resolvedPluginConfig.configPaths.has(path9.resolve(options.file)) || hasAssetsConfigChanged(
-            resolvedPluginConfig,
-            resolvedViteConfig,
-            options.file
-          )
-        ) {
+        const changedFilePath = path9.resolve(options.file);
+        if (resolvedPluginConfig.configPaths.has(changedFilePath) || hasDotDevDotVarsFileChanged(resolvedPluginConfig, changedFilePath) || hasAssetsConfigChanged(
+          resolvedPluginConfig,
+          resolvedViteConfig,
+          changedFilePath
+        )) {
           options.server.restart();
           return [];
         }
       },
       async configureServer(viteDevServer) {
-        assert9(
-          viteDevServer.httpServer,
-          "Unexpected error: No Vite HTTP server"
+        const inputInspectorPort = await getInputInspectorPortOption(
+          pluginConfig,
+          viteDevServer
         );
-        if (miniflare) {
-          await miniflare.setOptions(
-            getDevMiniflareOptions(resolvedPluginConfig, viteDevServer)
+        if (!miniflare) {
+          miniflare = new Miniflare(
+            getDevMiniflareOptions(
+              resolvedPluginConfig,
+              viteDevServer,
+              inputInspectorPort
+            )
           );
         } else {
-          miniflare = new Miniflare(
-            getDevMiniflareOptions(resolvedPluginConfig, viteDevServer)
+          await miniflare.setOptions(
+            getDevMiniflareOptions(
+              resolvedPluginConfig,
+              viteDevServer,
+              inputInspectorPort
+            )
           );
         }
         await initRunners(resolvedPluginConfig, viteDevServer, miniflare);
-        const middleware = createMiddleware(
-          async ({ request }) => {
-            assert9(miniflare, `Miniflare not defined`);
+        if (viteDevServer.httpServer) {
+          handleWebSocket(viteDevServer.httpServer, async () => {
+            assert10(miniflare, `Miniflare not defined`);
             const routerWorker = await getRouterWorker(miniflare);
-            return routerWorker.fetch(toMiniflareRequest(request), {
-              redirect: "manual"
-            });
-          },
-          { alwaysCallNext: false }
-        );
-        handleWebSocket(viteDevServer.httpServer, async () => {
-          assert9(miniflare, `Miniflare not defined`);
-          const routerWorker = await getRouterWorker(miniflare);
-          return routerWorker.fetch;
-        });
+            return routerWorker.fetch;
+          });
+        }
         return () => {
-          viteDevServer.middlewares.use((req, res, next) => {
-            middleware(req, res, next);
+          viteDevServer.middlewares.use(async (req, res, next) => {
+            try {
+              assert10(miniflare, `Miniflare not defined`);
+              const routerWorker = await getRouterWorker(miniflare);
+              const request = createRequest(req, res);
+              const response = await routerWorker.fetch(
+                toMiniflareRequest(request),
+                {
+                  redirect: "manual"
+                }
+              );
+              if (req.httpVersionMajor === 2) {
+                response.headers.delete("transfer-encoding");
+              }
+              await sendResponse(res, response);
+            } catch (error) {
+              next(error);
+            }
           });
         };
       },
-      configurePreviewServer(vitePreviewServer) {
+      async configurePreviewServer(vitePreviewServer) {
         const workerConfigs = getWorkerConfigs(vitePreviewServer.config.root);
+        const inputInspectorPort = await getInputInspectorPortOption(
+          pluginConfig,
+          vitePreviewServer
+        );
         const miniflare2 = new Miniflare(
           getPreviewMiniflareOptions(
             vitePreviewServer,
             workerConfigs,
             pluginConfig.persistState ?? true,
-            pluginConfig.inspectorPort
+            inputInspectorPort
           )
         );
-        const middleware = createMiddleware(
-          ({ request }) => {
-            return miniflare2.dispatchFetch(toMiniflareRequest(request), {
-              redirect: "manual"
-            });
-          },
-          { alwaysCallNext: false }
-        );
         handleWebSocket(
           vitePreviewServer.httpServer,
           () => miniflare2.dispatchFetch
         );
-        vitePreviewServer.middlewares.use((req, res, next) => {
-          middleware(req, res, next);
+        vitePreviewServer.middlewares.use(async (req, res, next) => {
+          try {
+            const request = createRequest(req, res);
+            const response = await miniflare2.dispatchFetch(
+              toMiniflareRequest(request),
+              { redirect: "manual" }
+            );
+            if (req.httpVersionMajor === 2) {
+              response.headers.delete("transfer-encoding");
+            }
+            await sendResponse(res, response);
+          } catch (error) {
+            next(error);
+          }
         });
       }
     },
@@ -14482,7 +14600,7 @@ function cloudflare2(pluginConfig = {}) {
         for (const match of matches) {
           magicString ??= new MagicString(code);
           const [full, _, modulePath] = match;
-          assert9(
+          assert10(
             modulePath,
             `Unexpected error: module path not found in reference ${full}.`
           );
@@ -14528,17 +14646,22 @@ function cloudflare2(pluginConfig = {}) {
       configEnvironment(name) {
         if (isNodeCompat(getWorkerConfig2(name))) {
           return {
+            build: {
+              rollupOptions: {
+                plugins: [
+                  replace({
+                    "process.env.NODE_ENV": JSON.stringify(
+                      process.env.NODE_ENV ?? "production"
+                    ),
+                    preventAssignment: true
+                  })
+                ]
+              }
+            },
             resolve: {
               builtins: [...nodeCompatExternals]
             },
             optimizeDeps: {
-              // This is a list of dependency entry-points that should be pre-bundled.
-              // In this case we provide a list of all the possible polyfills so that they are pre-bundled,
-              // ready ahead the first request to the dev server.
-              // Without this the dependency optimizer will try to bundle them on-the-fly in the middle of the first request,
-              // which can potentially cause problems if it leads to previous pre-bundling to become stale and needing to be reloaded.
-              // TODO: work out how to re-enable pre-bundling of these
-              // include: [...getNodeCompatEntries()],
               // This is a list of module specifiers that the dependency optimizer should not follow when doing import analysis.
               // In this case we provide a list of all the Node.js modules, both those built-in to workerd and those that will be polyfilled.
               // Obviously we don't want/need the optimizer to try to process modules that are built-in;
@@ -14562,7 +14685,7 @@ function cloudflare2(pluginConfig = {}) {
           return this.resolve(source, importer, options);
         }
         if (this.environment.mode === "dev") {
-          assert9(
+          assert10(
             this.environment.depsOptimizer,
             "depsOptimizer is required in dev mode"
           );
@@ -14576,11 +14699,54 @@ function cloudflare2(pluginConfig = {}) {
       },
       async transform(code, id) {
         const workerConfig = getWorkerConfig2(this.environment.name);
-        assert9(workerConfig, "Expected a worker config");
+        if (!workerConfig) {
+          return;
+        }
         const resolvedId = await this.resolve(workerConfig.main);
         if (id === resolvedId?.id) {
           return injectGlobalCode(id, code);
         }
+      },
+      async configureServer(viteDevServer) {
+        await Promise.all(
+          Object.values(viteDevServer.environments).flatMap(
+            async (environment) => {
+              const workerConfig = getWorkerConfig2(environment.name);
+              if (isNodeCompat(workerConfig)) {
+                await environment.depsOptimizer?.init();
+                return Array.from(nodeCompatEntries).map((entry) => {
+                  const result = resolveNodeJSImport(entry);
+                  if (result) {
+                    const registration = environment.depsOptimizer?.registerMissingImport(
+                      result.unresolved,
+                      result.resolved
+                    );
+                    return registration?.processing;
+                  }
+                });
+              }
+            }
+          )
+        );
+      }
+    },
+    // Plugin that handles Node.js Async Local Storage (ALS) compatibility support for Vite Environments that are hosted in Cloudflare Workers.
+    {
+      name: "vite-plugin-cloudflare:nodejs-als",
+      apply(_config, env2) {
+        return !env2.isPreview;
+      },
+      configEnvironment(name, config) {
+        if (isNodeAls(getWorkerConfig2(name))) {
+          return {
+            resolve: {
+              builtins: ["async_hooks", "node:async_hooks"]
+            },
+            optimizeDeps: {
+              exclude: ["async_hooks", "node:async_hooks"]
+            }
+          };
+        }
       }
     },
     // Plugin that provides an __debug path for debugging the Cloudflare Workers.
@@ -14590,39 +14756,35 @@ function cloudflare2(pluginConfig = {}) {
       //       the preview middleware here can take precedence
       enforce: "pre",
       configureServer(viteDevServer) {
-        if (resolvedPluginConfig.type === "workers" && resolvedPluginConfig.inspectorPort !== false) {
+        if (resolvedPluginConfig.type === "workers" && pluginConfig.inspectorPort !== false) {
           addDebugToVitePrintUrls(viteDevServer);
         }
         const workerNames = resolvedPluginConfig.type === "assets-only" ? [] : Object.values(resolvedPluginConfig.workers).map(
           (worker) => worker.name
         );
-        viteDevServer.middlewares.use((req, res, next) => {
-          if (req.url === debuggingPath && resolvedPluginConfig.inspectorPort !== false) {
-            const html = getDebugPathHtml(
-              workerNames,
-              resolvedPluginConfig.inspectorPort
-            );
+        viteDevServer.middlewares.use(async (req, res, next) => {
+          const resolvedInspectorPort = await getResolvedInspectorPort(pluginConfig);
+          if (req.url === debuggingPath && resolvedInspectorPort) {
+            const html = getDebugPathHtml(workerNames, resolvedInspectorPort);
             res.setHeader("Content-Type", "text/html");
             return res.end(html);
           }
           next();
         });
       },
-      configurePreviewServer(vitePreviewServer) {
+      async configurePreviewServer(vitePreviewServer) {
         const workerConfigs = getWorkerConfigs(vitePreviewServer.config.root);
         if (workerConfigs.length >= 1 && pluginConfig.inspectorPort !== false) {
           addDebugToVitePrintUrls(vitePreviewServer);
         }
         const workerNames = workerConfigs.map((worker) => {
-          assert9(worker.name, "Expected the Worker to have a name");
+          assert10(worker.name, "Expected the Worker to have a name");
           return worker.name;
         });
-        vitePreviewServer.middlewares.use((req, res, next) => {
-          if (req.url === debuggingPath && pluginConfig.inspectorPort !== false) {
-            const html = getDebugPathHtml(
-              workerNames,
-              pluginConfig.inspectorPort ?? DEFAULT_INSPECTOR_PORT
-            );
+        vitePreviewServer.middlewares.use(async (req, res, next) => {
+          const resolvedInspectorPort = await getResolvedInspectorPort(pluginConfig);
+          if (req.url === debuggingPath && resolvedInspectorPort) {
+            const html = getDebugPathHtml(workerNames, resolvedInspectorPort);
             res.setHeader("Content-Type", "text/html");
             return res.end(html);
           }
@@ -14636,6 +14798,9 @@ function cloudflare2(pluginConfig = {}) {
       apply(_config, env2) {
         return !env2.isPreview;
       },
+      // We must ensure that the `resolveId` hook runs before the built-in ones.
+      // Otherwise we never see the Node.js built-in imports since they get handled by default Vite behavior.
+      enforce: "pre",
       configEnvironment(environmentName) {
         const workerConfig = getWorkerConfig2(environmentName);
         if (workerConfig && !isNodeCompat(workerConfig)) {
@@ -14649,21 +14814,14 @@ function cloudflare2(pluginConfig = {}) {
                       build.onResolve(
                         { filter: NODEJS_MODULES_RE },
                         ({ path: path10, importer }) => {
+                          if (isNodeAls(workerConfig) && isNodeAlsModule(path10)) {
+                            return;
+                          }
                           const nodeJsCompatWarnings = nodeJsCompatWarningsMap.get(workerConfig);
-                          assert9(
-                            nodeJsCompatWarnings,
-                            `expected nodeJsCompatWarnings to be defined for Worker "${workerConfig.name}"`
-                          );
-                          nodeJsCompatWarnings.registerImport(path10, importer);
+                          nodeJsCompatWarnings?.registerImport(path10, importer);
                           return { path: path10, external: true };
                         }
                       );
-                      build.onEnd(() => {
-                        const nodeJsCompatWarnings = nodeJsCompatWarningsMap.get(workerConfig);
-                        if (nodeJsCompatWarnings) {
-                          nodeJsCompatWarnings.renderWarnings();
-                        }
-                      });
                     }
                   }
                 ]
@@ -14672,47 +14830,28 @@ function cloudflare2(pluginConfig = {}) {
           };
         }
       },
-      configureServer(viteDevServer) {
-        for (const environment of Object.values(viteDevServer.environments)) {
-          const workerConfig = getWorkerConfig2(environment.name);
+      configResolved(resolvedViteConfig2) {
+        for (const environmentName of Object.keys(
+          resolvedViteConfig2.environments
+        )) {
+          const workerConfig = getWorkerConfig2(environmentName);
           if (workerConfig && !isNodeCompat(workerConfig)) {
             nodeJsCompatWarningsMap.set(
               workerConfig,
-              new NodeJsCompatWarnings(environment)
+              new NodeJsCompatWarnings(environmentName, resolvedViteConfig2)
             );
           }
         }
       },
-      buildStart() {
-        const workerConfig = getWorkerConfig2(this.environment.name);
-        if (workerConfig && !isNodeCompat(workerConfig)) {
-          nodeJsCompatWarningsMap.set(
-            workerConfig,
-            new NodeJsCompatWarnings(this.environment)
-          );
-        }
-      },
-      buildEnd() {
-        const workerConfig = getWorkerConfig2(this.environment.name);
-        if (workerConfig && !isNodeCompat(workerConfig)) {
-          const nodeJsCompatWarnings = nodeJsCompatWarningsMap.get(workerConfig);
-          assert9(
-            nodeJsCompatWarnings,
-            `expected nodeJsCompatWarnings to be defined for Worker "${workerConfig.name}"`
-          );
-          nodeJsCompatWarnings.renderWarnings();
-        }
-      },
-      // We must ensure that the `resolveId` hook runs before the built-in ones otherwise we
-      // never see the Node.js built-in imports since they get handled by default Vite behavior.
-      enforce: "pre",
       async resolveId(source, importer) {
         const workerConfig = getWorkerConfig2(this.environment.name);
         if (workerConfig && !isNodeCompat(workerConfig)) {
+          if (isNodeAls(workerConfig) && isNodeAlsModule(source)) {
+            return;
+          }
           const nodeJsCompatWarnings = nodeJsCompatWarningsMap.get(workerConfig);
           if (nodejsBuiltins.has(source)) {
             nodeJsCompatWarnings?.registerImport(source, importer);
-            nodeJsCompatWarnings?.renderWarningsOnIdle();
             return {
               id: source,
               external: true
@@ -14723,10 +14862,35 @@ function cloudflare2(pluginConfig = {}) {
     }
   ];
   function getWorkerConfig2(environmentName) {
-    assert9(resolvedPluginConfig, "Expected resolvedPluginConfig to be defined");
+    assert10(resolvedPluginConfig, "Expected resolvedPluginConfig to be defined");
     return resolvedPluginConfig.type !== "assets-only" ? resolvedPluginConfig.workers[environmentName] : void 0;
   }
 }
+async function getInputInspectorPortOption(pluginConfig, viteServer) {
+  if (pluginConfig.inspectorPort === void 0 || pluginConfig.inspectorPort === 0) {
+    const resolvedInspectorPort = await getResolvedInspectorPort(pluginConfig);
+    if (resolvedInspectorPort !== null) {
+      return resolvedInspectorPort;
+    }
+  }
+  const inputInspectorPort = pluginConfig.inspectorPort ?? await getFirstAvailablePort(DEFAULT_INSPECTOR_PORT);
+  if (pluginConfig.inspectorPort === void 0 && inputInspectorPort !== DEFAULT_INSPECTOR_PORT) {
+    viteServer.config.logger.warn(
+      colors3.dim(
+        `Default inspector port ${DEFAULT_INSPECTOR_PORT} not available, using ${inputInspectorPort} instead
+`
+      )
+    );
+  }
+  return inputInspectorPort;
+}
+async function getResolvedInspectorPort(pluginConfig) {
+  if (miniflare && pluginConfig.inspectorPort !== false) {
+    const miniflareInspectorUrl = await miniflare.getInspectorURL();
+    return Number.parseInt(miniflareInspectorUrl.port);
+  }
+  return null;
+}
 function getDotDevDotVarsContent(configPath, cloudflareEnv) {
   const configDir = path9.dirname(configPath);
   const defaultDotDevDotVarsPath = `${configDir}/.dev.vars`;
@@ -14738,6 +14902,19 @@ function getDotDevDotVarsContent(configPath, cloudflareEnv) {
   }
   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;
+  });
+}
 export {
   cloudflare2 as cloudflare
 };