@cloudflare/vite-plugin 0.0.0-39933740e → 0.0.0-3b60131ca

package/dist/asset-workers/router-worker.js

@@ -1985,7 +1985,7 @@ var we = class {
     this.hasWritten || this.readyAnalytics && (this.hasWritten = true, this.readyAnalytics.logEvent({ version: 1, accountId: this.data.accountId, indexId: this.data.scriptId?.toString(), doubles: [this.data.requestTime ?? -1, this.data.coloId ?? -1, this.data.metalId ?? -1, this.data.coloTier ?? -1, this.data.userWorkerAhead === void 0 ? -1 : Number(this.data.userWorkerAhead)], blobs: [this.data.hostname?.substring(0, 256), this.data.dispatchtype, this.data.error?.substring(0, 256), this.data.version, this.data.coloRegion] }));
   }
 };
-var On = (t4) => ({ invoke_user_worker_ahead_of_assets: t4?.invoke_user_worker_ahead_of_assets ?? false, has_user_worker: t4?.has_user_worker ?? false, account_id: t4?.account_id ?? -1, script_id: t4?.script_id ?? -1 });
+var On = (t4) => ({ invoke_user_worker_ahead_of_assets: t4?.invoke_user_worker_ahead_of_assets ?? false, has_user_worker: t4?.has_user_worker ?? false, account_id: t4?.account_id ?? -1, script_id: t4?.script_id ?? -1, debug: t4?.debug ?? false });
 var Bc = { async fetch(t4, e, n) {
   let r, o = false, s = new we(e.ANALYTICS), i = new ue(e.UNSAFE_PERFORMANCE), a = i.now();
   try {

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 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);
@@ -5783,7 +5784,8 @@ 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 RouterConfigSchema = z.object({
   invoke_user_worker_ahead_of_assets: z.boolean().optional(),
@@ -5831,14 +5833,14 @@ var AssetConfigSchema = z.object({
 });
 
 // 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;
@@ -12879,6 +12881,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") {
@@ -12909,7 +12920,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 })
@@ -13828,8 +13839,7 @@ var nonApplicableWorkerConfigs = {
     "preserve_file_names",
     "rules",
     "site",
-    "tsconfig",
-    "upload_source_maps"
+    "tsconfig"
   ]
 };
 var nullableNonApplicable = [
@@ -13840,8 +13850,7 @@ var nullableNonApplicable = [
   "no_bundle",
   "preserve_file_names",
   "site",
-  "tsconfig",
-  "upload_source_maps"
+  "tsconfig"
 ];
 function readWorkerConfig(configPath, env2) {
   const nonApplicable = {
@@ -14174,6 +14183,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;
@@ -14244,7 +14304,7 @@ function cloudflare2(pluginConfig = {}) {
                   resolvedPluginConfig.workers
                 ).map((environmentName) => {
                   const environment = builder.environments[environmentName];
-                  assert9(
+                  assert10(
                     environment,
                     `${environmentName} environment not found`
                   );
@@ -14265,6 +14325,12 @@ function cloudflare2(pluginConfig = {}) {
       },
       configResolved(config) {
         resolvedViteConfig = config;
+        if (resolvedPluginConfig?.type === "workers") {
+          validateWorkerEnvironmentsResolvedConfigs(
+            resolvedPluginConfig,
+            resolvedViteConfig
+          );
+        }
       },
       generateBundle(_, bundle) {
         let config;
@@ -14285,7 +14351,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"
             );
@@ -14349,20 +14415,18 @@ 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(
+        assert10(
           viteDevServer.httpServer,
           "Unexpected error: No Vite HTTP server"
         );
@@ -14370,8 +14434,8 @@ function cloudflare2(pluginConfig = {}) {
           pluginConfig,
           viteDevServer
         );
-        if (miniflare) {
-          await miniflare.setOptions(
+        if (!miniflare) {
+          miniflare = new Miniflare(
             getDevMiniflareOptions(
               resolvedPluginConfig,
               viteDevServer,
@@ -14379,7 +14443,7 @@ function cloudflare2(pluginConfig = {}) {
             )
           );
         } else {
-          miniflare = new Miniflare(
+          await miniflare.setOptions(
             getDevMiniflareOptions(
               resolvedPluginConfig,
               viteDevServer,
@@ -14390,7 +14454,7 @@ function cloudflare2(pluginConfig = {}) {
         await initRunners(resolvedPluginConfig, viteDevServer, miniflare);
         const middleware = createMiddleware(
           async ({ request }) => {
-            assert9(miniflare, `Miniflare not defined`);
+            assert10(miniflare, `Miniflare not defined`);
             const routerWorker = await getRouterWorker(miniflare);
             return routerWorker.fetch(toMiniflareRequest(request), {
               redirect: "manual"
@@ -14399,7 +14463,7 @@ function cloudflare2(pluginConfig = {}) {
           { alwaysCallNext: false }
         );
         handleWebSocket(viteDevServer.httpServer, async () => {
-          assert9(miniflare, `Miniflare not defined`);
+          assert10(miniflare, `Miniflare not defined`);
           const routerWorker = await getRouterWorker(miniflare);
           return routerWorker.fetch;
         });
@@ -14499,7 +14563,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}.`
           );
@@ -14545,6 +14609,18 @@ 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]
             },
@@ -14572,7 +14648,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"
           );
@@ -14586,7 +14662,9 @@ 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);
@@ -14615,6 +14693,25 @@ function cloudflare2(pluginConfig = {}) {
         );
       }
     },
+    // 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.
     {
       name: "vite-plugin-cloudflare:debug",
@@ -14644,7 +14741,7 @@ function cloudflare2(pluginConfig = {}) {
           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(async (req, res, next) => {
@@ -14680,6 +14777,9 @@ function cloudflare2(pluginConfig = {}) {
                       build.onResolve(
                         { filter: NODEJS_MODULES_RE },
                         ({ path: path10, importer }) => {
+                          if (isNodeAls(workerConfig) && isNodeAlsModule(path10)) {
+                            return;
+                          }
                           const nodeJsCompatWarnings = nodeJsCompatWarningsMap.get(workerConfig);
                           nodeJsCompatWarnings?.registerImport(path10, importer);
                           return { path: path10, external: true };
@@ -14709,6 +14809,9 @@ function cloudflare2(pluginConfig = {}) {
       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);
@@ -14722,11 +14825,17 @@ 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(
@@ -14756,6 +14865,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
 };

package/dist/runner-worker/index.js

@@ -1394,13 +1394,6 @@ async function createModuleRunner(env, webSocket, viteRoot) {
     },
     {
       async runInlinedModule(context, transformed, module) {
-        if (module.file.includes("/node_modules") && !module.file.includes("/node_modules/.vite")) {
-          throw new Error(
-            `[Error] Trying to import non-prebundled module (only prebundled modules are allowed): ${module.id}
-
-(have you excluded the module via \`optimizeDeps.exclude\`?)`
-          );
-        }
         const codeDefinition = `'use strict';async (${Object.keys(context).join(
           ","
         )})=>{{`;
@@ -1426,13 +1419,6 @@ async function createModuleRunner(env, webSocket, viteRoot) {
             )
           });
         }
-        if (!additionalModuleRE.test(filepath) && filepath.includes("/node_modules") && !filepath.includes("/node_modules/.vite")) {
-          throw new Error(
-            `[Error] Trying to import non-prebundled module (only prebundled modules are allowed): ${filepath}
-
-(have you externalized the module via \`resolve.external\`?)`
-          );
-        }
         filepath = filepath.replace(/^file:\/\//, "");
         return import(filepath);
       }
@@ -1449,20 +1435,21 @@ async function getWorkerEntryExport(path, entrypoint) {
 }
 
 // src/runner-worker/index.ts
+var IGNORED_KEYS = ["self", "tailStream"];
 var WORKER_ENTRYPOINT_KEYS = [
   "fetch",
+  "queue",
   "tail",
+  "test",
   "trace",
-  "scheduled",
-  "queue",
-  "test"
+  "scheduled"
 ];
 var DURABLE_OBJECT_KEYS = [
-  "fetch",
   "alarm",
-  "webSocketMessage",
+  "fetch",
   "webSocketClose",
-  "webSocketError"
+  "webSocketError",
+  "webSocketMessage"
 ];
 var WORKFLOW_ENTRYPOINT_KEYS = ["run"];
 var entryPath = "";
@@ -1527,7 +1514,7 @@ function createWorkerEntrypointWrapper(entrypoint) {
           if (value !== void 0) {
             return value;
           }
-          if (key === "self" || typeof key === "symbol" || DURABLE_OBJECT_KEYS.includes(key)) {
+          if (typeof key === "symbol" || IGNORED_KEYS.includes(key) || DURABLE_OBJECT_KEYS.includes(key)) {
             return;
           }
           const property = getWorkerEntrypointRpcProperty.call(
@@ -1625,7 +1612,7 @@ function createDurableObjectWrapper(className) {
           if (value !== void 0) {
             return value;
           }
-          if (key === "self" || typeof key === "symbol" || WORKER_ENTRYPOINT_KEYS.includes(key)) {
+          if (typeof key === "symbol" || IGNORED_KEYS.includes(key) || WORKER_ENTRYPOINT_KEYS.includes(key)) {
             return;
           }
           const property = getDurableObjectRpcProperty.call(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudflare/vite-plugin",
-  "version": "0.0.0-39933740e",
+  "version": "0.0.0-3b60131ca",
   "description": "Cloudflare plugin for Vite",
   "keywords": [
     "cloudflare",
@@ -34,17 +34,18 @@
   ],
   "dependencies": {
     "@hattip/adapter-node": "^0.0.49",
+    "@rollup/plugin-replace": "^6.0.1",
     "get-port": "^7.1.0",
     "picocolors": "^1.1.1",
     "tinyglobby": "^0.2.12",
     "unenv": "2.0.0-rc.15",
     "ws": "8.18.0",
-    "@cloudflare/unenv-preset": "0.0.0-39933740e",
-    "miniflare": "0.0.0-39933740e",
-    "wrangler": "0.0.0-39933740e"
+    "@cloudflare/unenv-preset": "0.0.0-3b60131ca",
+    "wrangler": "0.0.0-3b60131ca",
+    "miniflare": "0.0.0-3b60131ca"
   },
   "devDependencies": {
-    "@cloudflare/workers-types": "^4.20250321.0",
+    "@cloudflare/workers-types": "^4.20250424.0",
     "@types/node": "^22.10.1",
     "@types/ws": "^8.5.13",
     "magic-string": "^0.30.12",
@@ -53,9 +54,9 @@
     "typescript": "^5.7.2",
     "undici": "^5.28.5",
     "vite": "^6.1.0",
-    "vitest": "~3.0.8",
-    "@cloudflare/workers-shared": "0.0.0-39933740e",
+    "vitest": "~3.1.1",
     "@cloudflare/mock-npm-registry": "0.0.0",
+    "@cloudflare/workers-shared": "0.0.0-3b60131ca",
     "@cloudflare/workers-tsconfig": "0.0.0"
   },
   "peerDependencies": {