@cloudflare/vite-plugin 0.0.0-0322d085f → 0.0.0-0435d8ef5

package/dist/index.js

@@ -1,6 +1,7 @@
 // src/index.ts
 import assert9 from "node:assert";
 import * as fs5 from "node:fs";
+import { builtinModules as builtinModules2 } from "node:module";
 import * as path7 from "node:path";
 import { createMiddleware } from "@hattip/adapter-node";
 
@@ -1088,13 +1089,9 @@ var INIT_PATH = "/__vite_plugin_cloudflare_init__";
 var MODULE_PATTERN = `__CLOUDFLARE_MODULE__(${MODULE_TYPES.join("|")})__(.*?)__`;
 
 // src/utils.ts
-import { builtinModules } from "node:module";
 import * as path from "node:path";
 import { Request as MiniflareRequest } from "miniflare";
 import "vite";
-var nodeBuiltInModules = new Set(
-  builtinModules.concat(builtinModules.map((m) => `node:${m}`))
-);
 function getOutputDirectory(userConfig, environmentName) {
   const rootOutputDirectory = userConfig.build?.outDir ?? "dist";
   return userConfig.environments?.[environmentName]?.build?.outDir ?? path.join(rootOutputDirectory, environmentName);
@@ -1203,6 +1200,7 @@ var cloudflareBuiltInModules = [
   "cloudflare:workflows"
 ];
 var defaultConditions = ["workerd", "module", "browser"];
+var target = "es2022";
 function createCloudflareEnvironmentOptions(workerConfig, userConfig, environmentName) {
   return {
     resolve: {
@@ -1212,9 +1210,7 @@ function createCloudflareEnvironmentOptions(workerConfig, userConfig, environmen
       // We want to use `workerd` package exports if available (e.g. for postgres).
       conditions: [...defaultConditions, "development|production"],
       // The Cloudflare ones are proper builtins in the environment
-      builtins: [...cloudflareBuiltInModules],
-      // The Node.js ones are no proper builtins in the environment since we also polyfill them using unenv
-      external: [...nodeBuiltInModules]
+      builtins: [...cloudflareBuiltInModules]
     },
     dev: {
       createEnvironment(name2, config) {
@@ -1225,7 +1221,7 @@ function createCloudflareEnvironmentOptions(workerConfig, userConfig, environmen
       createEnvironment(name2, config) {
         return new vite2.BuildEnvironment(name2, config);
       },
-      target: "es2022",
+      target,
       // We need to enable `emitAssets` in order to support additional modules defined by `rules`
       emitAssets: true,
       outDir: getOutputDirectory(userConfig, environmentName),
@@ -1243,12 +1239,10 @@ function createCloudflareEnvironmentOptions(workerConfig, userConfig, environmen
       // Note: ssr pre-bundling is opt-in and we need to enable it by setting `noDiscovery` to false
       noDiscovery: false,
       entries: workerConfig.main,
-      exclude: [
-        // we have to exclude all node modules to work in dev-mode not just the unenv externals...
-        ...nodeBuiltInModules
-      ],
+      exclude: [...cloudflareBuiltInModules],
       esbuildOptions: {
         platform: "neutral",
+        target,
         conditions: [...defaultConditions, "development"],
         resolveExtensions: [
           ".mjs",
@@ -1372,7 +1366,13 @@ import * as fs2 from "node:fs";
 import * as fsp from "node:fs/promises";
 import * as path3 from "node:path";
 import { fileURLToPath } from "node:url";
-import { Log, LogLevel, Response as MiniflareResponse } from "miniflare";
+import {
+  kCurrentWorker,
+  Log,
+  LogLevel,
+  Response as MiniflareResponse
+} from "miniflare";
+import { globSync } from "tinyglobby";
 import "vite";
 import {
   unstable_getMiniflareWorkerOptions,
@@ -1406,11 +1406,10 @@ function getWorkerToWorkerEntrypointNamesMap(workers) {
   );
   for (const worker of workers) {
     for (const value of Object.values(worker.serviceBindings ?? {})) {
-      if (typeof value === "object" && "name" in value && typeof value.name === "string" && value.entrypoint !== void 0 && value.entrypoint !== "default") {
-        const entrypointNames = workerToWorkerEntrypointNamesMap.get(
-          value.name
-        );
-        assert4(entrypointNames, missingWorkerErrorMessage(value.name));
+      if (typeof value === "object" && "name" in value && value.entrypoint !== void 0 && value.entrypoint !== "default") {
+        const targetWorkerName = value.name === kCurrentWorker ? worker.name : value.name;
+        const entrypointNames = workerToWorkerEntrypointNamesMap.get(targetWorkerName);
+        assert4(entrypointNames, missingWorkerErrorMessage(targetWorkerName));
         entrypointNames.add(value.entrypoint);
       }
     }
@@ -1555,7 +1554,7 @@ function getDevMiniflareOptions(resolvedPluginConfig, viteDevServer) {
       }
     }
   ];
-  const userWorkers = resolvedPluginConfig.type === "workers" ? Object.entries(resolvedPluginConfig.workers).map(
+  const workersFromConfig = resolvedPluginConfig.type === "workers" ? Object.entries(resolvedPluginConfig.workers).map(
     ([environmentName, workerConfig]) => {
       const miniflareWorkerOptions = unstable_getMiniflareWorkerOptions(
         {
@@ -1564,52 +1563,58 @@ function getDevMiniflareOptions(resolvedPluginConfig, viteDevServer) {
         },
         resolvedPluginConfig.cloudflareEnv
       );
+      const { externalWorkers: externalWorkers2 } = miniflareWorkerOptions;
       const { ratelimits, ...workerOptions } = miniflareWorkerOptions.workerOptions;
       return {
-        ...workerOptions,
-        // We have to add the name again because `unstable_getMiniflareWorkerOptions` sets it to `undefined`
-        name: workerConfig.name,
-        modulesRoot: miniflareModulesRoot,
-        unsafeEvalBinding: "__VITE_UNSAFE_EVAL__",
-        bindings: {
-          ...workerOptions.bindings,
-          __VITE_ROOT__: resolvedViteConfig.root,
-          __VITE_ENTRY_PATH__: workerConfig.main
-        },
-        serviceBindings: {
-          ...workerOptions.serviceBindings,
-          ...environmentName === resolvedPluginConfig.entryWorkerEnvironmentName && workerConfig.assets?.binding ? {
-            [workerConfig.assets.binding]: ASSET_WORKER_NAME
-          } : {},
-          __VITE_INVOKE_MODULE__: async (request) => {
-            const payload = await request.json();
-            const invokePayloadData = payload.data;
-            assert4(
-              invokePayloadData.name === "fetchModule",
-              `Invalid invoke event: ${invokePayloadData.name}`
-            );
-            const [moduleId] = invokePayloadData.data;
-            const moduleRE = new RegExp(MODULE_PATTERN);
-            const shouldExternalize = (
-              // Worker modules (CompiledWasm, Text, Data)
-              moduleRE.test(moduleId) || // Node.js builtin node modules (they will be resolved to unenv aliases)
-              nodeBuiltInModules.has(moduleId)
-            );
-            if (shouldExternalize) {
-              const result2 = {
-                externalize: moduleId,
-                type: "module"
-              };
-              return MiniflareResponse.json({ result: result2 });
+        externalWorkers: externalWorkers2,
+        worker: {
+          ...workerOptions,
+          name: workerOptions.name ?? workerConfig.name,
+          modulesRoot: miniflareModulesRoot,
+          unsafeEvalBinding: "__VITE_UNSAFE_EVAL__",
+          bindings: {
+            ...workerOptions.bindings,
+            __VITE_ROOT__: resolvedViteConfig.root,
+            __VITE_ENTRY_PATH__: workerConfig.main
+          },
+          serviceBindings: {
+            ...workerOptions.serviceBindings,
+            ...environmentName === resolvedPluginConfig.entryWorkerEnvironmentName && workerConfig.assets?.binding ? {
+              [workerConfig.assets.binding]: ASSET_WORKER_NAME
+            } : {},
+            __VITE_INVOKE_MODULE__: async (request) => {
+              const payload = await request.json();
+              const invokePayloadData = payload.data;
+              assert4(
+                invokePayloadData.name === "fetchModule",
+                `Invalid invoke event: ${invokePayloadData.name}`
+              );
+              const [moduleId] = invokePayloadData.data;
+              const moduleRE = new RegExp(MODULE_PATTERN);
+              const shouldExternalize = (
+                // Worker modules (CompiledWasm, Text, Data)
+                moduleRE.test(moduleId)
+              );
+              if (shouldExternalize) {
+                const result2 = {
+                  externalize: moduleId,
+                  type: "module"
+                };
+                return MiniflareResponse.json({ result: result2 });
+              }
+              const devEnvironment = viteDevServer.environments[environmentName];
+              const result = await devEnvironment.hot.handleInvoke(payload);
+              return MiniflareResponse.json(result);
             }
-            const devEnvironment = viteDevServer.environments[environmentName];
-            const result = await devEnvironment.hot.handleInvoke(payload);
-            return MiniflareResponse.json(result);
           }
         }
       };
     }
   ) : [];
+  const userWorkers = workersFromConfig.map((options) => options.worker);
+  const externalWorkers = workersFromConfig.flatMap(
+    (options) => options.externalWorkers
+  );
   const workerToWorkerEntrypointNamesMap = getWorkerToWorkerEntrypointNamesMap(userWorkers);
   const workerToDurableObjectClassNamesMap = getWorkerToDurableObjectClassNamesMap(userWorkers);
   const workerToWorkflowEntrypointClassNamesMap = getWorkerToWorkflowEntrypointClassNamesMap(userWorkers);
@@ -1629,6 +1634,7 @@ function getDevMiniflareOptions(resolvedPluginConfig, viteDevServer) {
     ),
     workers: [
       ...assetWorkers,
+      ...externalWorkers,
       ...userWorkers.map((workerOptions) => {
         const wrappers = [
           `import { createWorkerEntrypointWrapper, createDurableObjectWrapper, createWorkflowEntrypointWrapper } from '${RUNNER_PATH}';`,
@@ -1661,7 +1667,7 @@ function getDevMiniflareOptions(resolvedPluginConfig, viteDevServer) {
         const workflowEntrypointClassNames = workerToWorkflowEntrypointClassNamesMap.get(workerOptions.name);
         assert4(
           workflowEntrypointClassNames,
-          `WorkflowEntrypoint class names not found for worker ${workerOptions.name}`
+          `WorkflowEntrypoint class names not found for worker: ${workerOptions.name}`
         );
         for (const className of [...workflowEntrypointClassNames].sort()) {
           wrappers.push(
@@ -1697,17 +1703,19 @@ function getDevMiniflareOptions(resolvedPluginConfig, viteDevServer) {
       );
       const moduleRE = new RegExp(MODULE_PATTERN);
       const match = moduleRE.exec(rawSpecifier);
-      assert4(match, `Unexpected error: no match for module ${rawSpecifier}.`);
+      assert4(match, `Unexpected error: no match for module: ${rawSpecifier}.`);
       const [full, moduleType, modulePath] = match;
       assert4(
         modulePath,
-        `Unexpected error: module path not found in reference ${full}.`
+        `Unexpected error: module path not found in reference: ${full}.`
       );
       let source;
       try {
         source = fs2.readFileSync(modulePath);
       } catch (error) {
-        throw new Error(`Import ${modulePath} not found. Does the file exist?`);
+        throw new Error(
+          `Import "${modulePath}" not found. Does the file exist?`
+        );
       }
       return MiniflareResponse.json({
         // Cap'n Proto expects byte arrays for `:Data` typed fields from JSON
@@ -1716,22 +1724,44 @@ function getDevMiniflareOptions(resolvedPluginConfig, viteDevServer) {
     }
   };
 }
+function getPreviewModules(main, modulesRules) {
+  assert4(modulesRules, `Unexpected error: 'modulesRules' is undefined`);
+  const rootPath = path3.dirname(main);
+  const entryPath = path3.basename(main);
+  return {
+    rootPath,
+    modules: [
+      {
+        type: "ESModule",
+        path: entryPath
+      },
+      ...modulesRules.flatMap(
+        ({ type, include }) => globSync(include, { cwd: rootPath, ignore: entryPath }).map((path8) => ({
+          type,
+          path: path8
+        }))
+      )
+    ]
+  };
+}
 function getPreviewMiniflareOptions(vitePreviewServer, persistState) {
   const resolvedViteConfig = vitePreviewServer.config;
   const configPaths = getWorkerConfigPaths(resolvedViteConfig.root);
   const workerConfigs = configPaths.map(
     (configPath) => unstable_readConfig({ config: configPath })
   );
-  const workers = workerConfigs.map((config) => {
+  const workers = workerConfigs.flatMap((config) => {
     const miniflareWorkerOptions = unstable_getMiniflareWorkerOptions(config);
-    const { ratelimits, ...workerOptions } = miniflareWorkerOptions.workerOptions;
-    return {
-      ...workerOptions,
-      // We have to add the name again because `unstable_getMiniflareWorkerOptions` sets it to `undefined`
-      name: config.name,
-      modules: true,
-      ...miniflareWorkerOptions.main ? { scriptPath: miniflareWorkerOptions.main } : { script: "" }
-    };
+    const { externalWorkers } = miniflareWorkerOptions;
+    const { ratelimits, modulesRules, ...workerOptions } = miniflareWorkerOptions.workerOptions;
+    return [
+      {
+        ...workerOptions,
+        name: workerOptions.name ?? config.name,
+        ...miniflareWorkerOptions.main ? getPreviewModules(miniflareWorkerOptions.main, modulesRules) : { modules: true, script: "" }
+      },
+      ...externalWorkers
+    ];
   });
   const logger = new ViteMiniflareLogger(resolvedViteConfig);
   return {
@@ -7313,7 +7343,7 @@ Parser.acorn = {
 };
 
 // ../../node_modules/.pnpm/mlly@1.7.4/node_modules/mlly/dist/index.mjs
-import { builtinModules as builtinModules2, createRequire } from "node:module";
+import { builtinModules, createRequire } from "node:module";
 import fs3, { realpathSync, statSync as statSync2, promises } from "node:fs";
 
 // ../../node_modules/.pnpm/ufo@1.5.4/node_modules/ufo/dist/index.mjs
@@ -7373,10 +7403,10 @@ var isAbsolute = function(p) {
 import { fileURLToPath as fileURLToPath$1, URL as URL$1, pathToFileURL as pathToFileURL$1 } from "node:url";
 import assert5 from "node:assert";
 import process$1 from "node:process";
-import path4, { dirname as dirname3 } from "node:path";
+import path4, { dirname as dirname4 } from "node:path";
 import v8 from "node:v8";
 import { format as format2, inspect } from "node:util";
-var BUILTIN_MODULES = new Set(builtinModules2);
+var BUILTIN_MODULES = new Set(builtinModules);
 function normalizeSlash(path8) {
   return path8.replace(/\\/g, "/");
 }
@@ -7505,14 +7535,14 @@ codes.ERR_INVALID_PACKAGE_TARGET = createError(
    * @param {boolean} [isImport=false]
    * @param {string} [base]
    */
-  (packagePath, key, target, isImport = false, base = void 0) => {
-    const relatedError = typeof target === "string" && !isImport && target.length > 0 && !target.startsWith("./");
+  (packagePath, key, target2, isImport = false, base = void 0) => {
+    const relatedError = typeof target2 === "string" && !isImport && target2.length > 0 && !target2.startsWith("./");
     if (key === ".") {
       assert5(isImport === false);
-      return `Invalid "exports" main target ${JSON.stringify(target)} defined in the package config ${packagePath}package.json${base ? ` imported from ${base}` : ""}${relatedError ? '; targets must start with "./"' : ""}`;
+      return `Invalid "exports" main target ${JSON.stringify(target2)} defined in the package config ${packagePath}package.json${base ? ` imported from ${base}` : ""}${relatedError ? '; targets must start with "./"' : ""}`;
     }
     return `Invalid "${isImport ? "imports" : "exports"}" target ${JSON.stringify(
-      target
+      target2
     )} defined for '${key}' in the package config ${packagePath}package.json${base ? ` imported from ${base}` : ""}${relatedError ? '; targets must start with "./"' : ""}`;
   },
   Error
@@ -7908,14 +7938,14 @@ var patternRegEx = /\*/g;
 var encodedSeparatorRegEx = /%2f|%5c/i;
 var emittedPackageWarnings = /* @__PURE__ */ new Set();
 var doubleSlashRegEx = /[/\\]{2}/;
-function emitInvalidSegmentDeprecation(target, request, match, packageJsonUrl, internal, base, isTarget) {
+function emitInvalidSegmentDeprecation(target2, request, match, packageJsonUrl, internal, base, isTarget) {
   if (process$1.noDeprecation) {
     return;
   }
   const pjsonPath = fileURLToPath$1(packageJsonUrl);
-  const double = doubleSlashRegEx.exec(isTarget ? target : request) !== null;
+  const double = doubleSlashRegEx.exec(isTarget ? target2 : request) !== null;
   process$1.emitWarning(
-    `Use of deprecated ${double ? "double slash" : "leading or trailing slash matching"} resolving "${target}" for module request "${request}" ${request === match ? "" : `matched to "${match}" `}in the "${internal ? "imports" : "exports"}" field module resolution of the package at ${pjsonPath}${base ? ` imported from ${fileURLToPath$1(base)}` : ""}.`,
+    `Use of deprecated ${double ? "double slash" : "leading or trailing slash matching"} resolving "${target2}" for module request "${request}" ${request === match ? "" : `matched to "${match}" `}in the "${internal ? "imports" : "exports"}" field module resolution of the package at ${pjsonPath}${base ? ` imported from ${fileURLToPath$1(base)}` : ""}.`,
     "DeprecationWarning",
     "DEP0166"
   );
@@ -8073,47 +8103,47 @@ function throwInvalidSubpath(request, match, packageJsonUrl, internal, base) {
     base && fileURLToPath$1(base)
   );
 }
-function invalidPackageTarget(subpath, target, packageJsonUrl, internal, base) {
-  target = typeof target === "object" && target !== null ? JSON.stringify(target, null, "") : `${target}`;
+function invalidPackageTarget(subpath, target2, packageJsonUrl, internal, base) {
+  target2 = typeof target2 === "object" && target2 !== null ? JSON.stringify(target2, null, "") : `${target2}`;
   return new ERR_INVALID_PACKAGE_TARGET(
     fileURLToPath$1(new URL$1(".", packageJsonUrl)),
     subpath,
-    target,
+    target2,
     internal,
     base && fileURLToPath$1(base)
   );
 }
-function resolvePackageTargetString(target, subpath, match, packageJsonUrl, base, pattern, internal, isPathMap, conditions) {
-  if (subpath !== "" && !pattern && target[target.length - 1] !== "/")
-    throw invalidPackageTarget(match, target, packageJsonUrl, internal, base);
-  if (!target.startsWith("./")) {
-    if (internal && !target.startsWith("../") && !target.startsWith("/")) {
+function resolvePackageTargetString(target2, subpath, match, packageJsonUrl, base, pattern, internal, isPathMap, conditions) {
+  if (subpath !== "" && !pattern && target2[target2.length - 1] !== "/")
+    throw invalidPackageTarget(match, target2, packageJsonUrl, internal, base);
+  if (!target2.startsWith("./")) {
+    if (internal && !target2.startsWith("../") && !target2.startsWith("/")) {
       let isURL = false;
       try {
-        new URL$1(target);
+        new URL$1(target2);
         isURL = true;
       } catch {
       }
       if (!isURL) {
         const exportTarget = pattern ? RegExpPrototypeSymbolReplace.call(
           patternRegEx,
-          target,
+          target2,
           () => subpath
-        ) : target + subpath;
+        ) : target2 + subpath;
         return packageResolve(exportTarget, packageJsonUrl, conditions);
       }
     }
-    throw invalidPackageTarget(match, target, packageJsonUrl, internal, base);
+    throw invalidPackageTarget(match, target2, packageJsonUrl, internal, base);
   }
-  if (invalidSegmentRegEx.exec(target.slice(2)) !== null) {
-    if (deprecatedInvalidSegmentRegEx.exec(target.slice(2)) === null) {
+  if (invalidSegmentRegEx.exec(target2.slice(2)) !== null) {
+    if (deprecatedInvalidSegmentRegEx.exec(target2.slice(2)) === null) {
       if (!isPathMap) {
         const request = pattern ? match.replace("*", () => subpath) : match + subpath;
         const resolvedTarget = pattern ? RegExpPrototypeSymbolReplace.call(
           patternRegEx,
-          target,
+          target2,
           () => subpath
-        ) : target;
+        ) : target2;
         emitInvalidSegmentDeprecation(
           resolvedTarget,
           request,
@@ -8125,14 +8155,14 @@ function resolvePackageTargetString(target, subpath, match, packageJsonUrl, base
         );
       }
     } else {
-      throw invalidPackageTarget(match, target, packageJsonUrl, internal, base);
+      throw invalidPackageTarget(match, target2, packageJsonUrl, internal, base);
     }
   }
-  const resolved = new URL$1(target, packageJsonUrl);
+  const resolved = new URL$1(target2, packageJsonUrl);
   const resolvedPath = resolved.pathname;
   const packagePath = new URL$1(".", packageJsonUrl).pathname;
   if (!resolvedPath.startsWith(packagePath))
-    throw invalidPackageTarget(match, target, packageJsonUrl, internal, base);
+    throw invalidPackageTarget(match, target2, packageJsonUrl, internal, base);
   if (subpath === "") return resolved;
   if (invalidSegmentRegEx.exec(subpath) !== null) {
     const request = pattern ? match.replace("*", () => subpath) : match + subpath;
@@ -8140,9 +8170,9 @@ function resolvePackageTargetString(target, subpath, match, packageJsonUrl, base
       if (!isPathMap) {
         const resolvedTarget = pattern ? RegExpPrototypeSymbolReplace.call(
           patternRegEx,
-          target,
+          target2,
           () => subpath
-        ) : target;
+        ) : target2;
         emitInvalidSegmentDeprecation(
           resolvedTarget,
           request,
@@ -8173,10 +8203,10 @@ function isArrayIndex(key) {
   if (`${keyNumber}` !== key) return false;
   return keyNumber >= 0 && keyNumber < 4294967295;
 }
-function resolvePackageTarget(packageJsonUrl, target, subpath, packageSubpath, base, pattern, internal, isPathMap, conditions) {
-  if (typeof target === "string") {
+function resolvePackageTarget(packageJsonUrl, target2, subpath, packageSubpath, base, pattern, internal, isPathMap, conditions) {
+  if (typeof target2 === "string") {
     return resolvePackageTargetString(
-      target,
+      target2,
       subpath,
       packageSubpath,
       packageJsonUrl,
@@ -8187,8 +8217,8 @@ function resolvePackageTarget(packageJsonUrl, target, subpath, packageSubpath, b
       conditions
     );
   }
-  if (Array.isArray(target)) {
-    const targetList = target;
+  if (Array.isArray(target2)) {
+    const targetList = target2;
     if (targetList.length === 0) return null;
     let lastException;
     let i = -1;
@@ -8228,8 +8258,8 @@ function resolvePackageTarget(packageJsonUrl, target, subpath, packageSubpath, b
     }
     throw lastException;
   }
-  if (typeof target === "object" && target !== null) {
-    const keys = Object.getOwnPropertyNames(target);
+  if (typeof target2 === "object" && target2 !== null) {
+    const keys = Object.getOwnPropertyNames(target2);
     let i = -1;
     while (++i < keys.length) {
       const key = keys[i];
@@ -8247,7 +8277,7 @@ function resolvePackageTarget(packageJsonUrl, target, subpath, packageSubpath, b
       if (key === "default" || conditions && conditions.has(key)) {
         const conditionalTarget = (
           /** @type {unknown} */
-          target[key]
+          target2[key]
         );
         const resolveResult = resolvePackageTarget(
           packageJsonUrl,
@@ -8266,12 +8296,12 @@ function resolvePackageTarget(packageJsonUrl, target, subpath, packageSubpath, b
     }
     return null;
   }
-  if (target === null) {
+  if (target2 === null) {
     return null;
   }
   throw invalidPackageTarget(
     packageSubpath,
-    target,
+    target2,
     packageJsonUrl,
     internal,
     base
@@ -8318,10 +8348,10 @@ function packageExportsResolve(packageJsonUrl, packageSubpath, packageConfig, ba
     exports = { ".": exports };
   }
   if (own.call(exports, packageSubpath) && !packageSubpath.includes("*") && !packageSubpath.endsWith("/")) {
-    const target = exports[packageSubpath];
+    const target2 = exports[packageSubpath];
     const resolveResult = resolvePackageTarget(
       packageJsonUrl,
-      target,
+      target2,
       "",
       packageSubpath,
       base,
@@ -8361,13 +8391,13 @@ function packageExportsResolve(packageJsonUrl, packageSubpath, packageConfig, ba
     }
   }
   if (bestMatch) {
-    const target = (
+    const target2 = (
       /** @type {unknown} */
       exports[bestMatch]
     );
     const resolveResult = resolvePackageTarget(
       packageJsonUrl,
-      target,
+      target2,
       bestMatchSubpath,
       bestMatch,
       base,
@@ -8442,10 +8472,10 @@ function packageImportsResolve(name2, base, conditions) {
           }
         }
         if (bestMatch) {
-          const target = imports[bestMatch];
+          const target2 = imports[bestMatch];
           const resolveResult = resolvePackageTarget(
             packageJsonUrl,
-            target,
+            target2,
             bestMatchSubpath,
             bestMatch,
             base,
@@ -8490,7 +8520,7 @@ function parsePackageName(specifier, base) {
   return { packageName, packageSubpath, isScoped };
 }
 function packageResolve(specifier, base, conditions) {
-  if (builtinModules2.includes(specifier)) {
+  if (builtinModules.includes(specifier)) {
     return new URL$1("node:" + specifier);
   }
   const { packageName, packageSubpath, isScoped } = parsePackageName(
@@ -8577,7 +8607,7 @@ function moduleResolve(specifier, base, conditions, preserveSymlinks) {
     try {
       resolved = new URL$1(specifier);
     } catch (error_) {
-      if (isRemote && !builtinModules2.includes(specifier)) {
+      if (isRemote && !builtinModules.includes(specifier)) {
         const error = new ERR_UNSUPPORTED_RESOLVE_REQUEST(specifier, base);
         error.cause = error_;
         throw error;
@@ -8722,7 +8752,8 @@ var { env } = defineEnv({
   nodeCompat: true,
   presets: [cloudflare]
 });
-var CLOUDFLARE_VIRTUAL_PREFIX = "\0__CLOUDFLARE_NODEJS_COMPAT__";
+var nodeCompatExternals = new Set(env.external);
+var nodeCompatEntries = getNodeCompatEntries();
 function isNodeCompat(workerConfig) {
   if (workerConfig === void 0) {
     return false;
@@ -8734,11 +8765,6 @@ function isNodeCompat(workerConfig) {
   if (nodeCompatMode === "v2") {
     return true;
   }
-  if (nodeCompatMode === "legacy") {
-    throw new Error(
-      "Unsupported Node.js compat mode (legacy). Remove the `node_compat` setting and add the `nodejs_compat` flag instead."
-    );
-  }
   if (nodeCompatMode === "v1") {
     throw new Error(
       `Unsupported Node.js compat mode (v1). Only the v2 mode is supported, either change your compat date to "2024-09-23" or later, or set the "nodejs_compat_v2" compatibility flag`
@@ -8750,12 +8776,17 @@ function injectGlobalCode(id, code) {
   const injectedCode = Object.entries(env.inject).map(([globalName, globalInject]) => {
     if (typeof globalInject === "string") {
       const moduleSpecifier2 = globalInject;
-      return `import var_${globalName} from "${CLOUDFLARE_VIRTUAL_PREFIX}${moduleSpecifier2}";
+      return `import var_${globalName} from "${moduleSpecifier2}";
 globalThis.${globalName} = var_${globalName};
 `;
     }
     const [moduleSpecifier, exportName] = globalInject;
-    return `import var_${globalName} from "${CLOUDFLARE_VIRTUAL_PREFIX}${moduleSpecifier}";
+    assert6(
+      moduleSpecifier !== void 0,
+      "Expected moduleSpecifier to be defined"
+    );
+    assert6(exportName !== void 0, "Expected exportName to be defined");
+    return `import var_${globalName} from "${moduleSpecifier}";
 globalThis.${globalName} = var_${globalName}.${exportName};
 `;
   }).join("\n");
@@ -8766,37 +8797,36 @@ globalThis.${globalName} = var_${globalName}.${exportName};
     map: modified.generateMap({ hires: "boundary", source: id })
   };
 }
-function getNodeCompatAliases() {
-  const aliases = {};
-  Object.keys(env.alias).forEach((key) => {
-    if (!env.external.includes(key)) {
-      aliases[key] = CLOUDFLARE_VIRTUAL_PREFIX + key;
-    }
-  });
-  return aliases;
-}
-function getNodeCompatExternals() {
-  return env.external;
-}
-function maybeStripNodeJsVirtualPrefix(source) {
-  return source.startsWith(CLOUDFLARE_VIRTUAL_PREFIX) ? source.slice(CLOUDFLARE_VIRTUAL_PREFIX.length) : void 0;
-}
 function resolveNodeJSImport(source) {
   const alias = env.alias[source];
   if (alias) {
-    assert6(
-      !env.external.includes(alias),
-      `Unexpected unenv alias to external module: ${source} -> ${alias}`
-    );
-    source = alias;
+    return {
+      unresolved: alias,
+      resolved: resolvePathSync(alias, { url: import.meta.url })
+    };
+  }
+  if (nodeCompatEntries.has(source)) {
+    return {
+      unresolved: source,
+      resolved: resolvePathSync(source, { url: import.meta.url })
+    };
   }
-  const resolved = resolvePathSync(source, {
-    url: import.meta.url
-  });
-  return {
-    unresolved: source,
-    resolved
-  };
+}
+function getNodeCompatEntries() {
+  const entries = new Set(Object.values(env.alias));
+  for (const globalInject of Object.values(env.inject)) {
+    if (typeof globalInject === "string") {
+      entries.add(globalInject);
+    } else {
+      assert6(
+        globalInject[0] !== void 0,
+        "Expected first element of globalInject to be defined"
+      );
+      entries.add(globalInject[0]);
+    }
+  }
+  nodeCompatExternals.forEach((external) => entries.delete(external));
+  return entries;
 }
 
 // src/plugin-config.ts
@@ -8841,7 +8871,6 @@ var nonApplicableWorkerConfigs = {
     "build",
     "find_additional_modules",
     "no_bundle",
-    "node_compat",
     "preserve_file_names",
     "site",
     "tsconfig",
@@ -8858,7 +8887,6 @@ var nullableNonApplicable = [
   "find_additional_modules",
   "minify",
   "no_bundle",
-  "node_compat",
   "preserve_file_names",
   "site",
   "tsconfig",
@@ -9009,6 +9037,17 @@ function getWorkerConfig(configPath, env2, opts) {
     };
   }
   assert7(config.main, missingFieldErrorMessage(`'main'`, configPath, env2));
+  const mainStat = fs4.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`
+    );
+  }
+  if (mainStat.isDirectory()) {
+    throw new Error(
+      `The provided Wrangler config main field (${config.main}) points to a directory, it needs to point to a file instead`
+    );
+  }
   return {
     type: "worker",
     raw,
@@ -9109,9 +9148,10 @@ function resolvePluginConfig(pluginConfig, userConfig, viteEnv) {
 }
 
 // src/websockets.ts
-import ws from "ws";
-function handleWebSocket(httpServer, fetcher, logger) {
-  const nodeWebSocket = new ws.Server({ noServer: true });
+import { coupleWebSocket } from "miniflare";
+import { WebSocketServer } from "ws";
+function handleWebSocket(httpServer, fetcher) {
+  const nodeWebSocket = new WebSocketServer({ noServer: true });
   httpServer.on(
     "upgrade",
     async (request, socket, head) => {
@@ -9134,34 +9174,7 @@ function handleWebSocket(httpServer, fetcher, logger) {
         socket,
         head,
         async (clientWebSocket) => {
-          workerWebSocket.accept();
-          workerWebSocket.addEventListener("message", (event) => {
-            clientWebSocket.send(event.data);
-          });
-          workerWebSocket.addEventListener("error", (event) => {
-            logger.error(
-              `WebSocket error:
-${event.error?.stack || event.error?.message}`,
-              { error: event.error }
-            );
-          });
-          workerWebSocket.addEventListener("close", () => {
-            clientWebSocket.close();
-          });
-          clientWebSocket.on("message", (data2, isBinary) => {
-            workerWebSocket.send(
-              isBinary ? Array.isArray(data2) ? Buffer.concat(data2) : data2 : data2.toString()
-            );
-          });
-          clientWebSocket.on("error", (error) => {
-            logger.error(`WebSocket error:
-${error.stack || error.message}`, {
-              error
-            });
-          });
-          clientWebSocket.on("close", () => {
-            workerWebSocket.close();
-          });
+          coupleWebSocket(clientWebSocket, workerWebSocket);
           nodeWebSocket.emit("connection", clientWebSocket, request);
         }
       );
@@ -9220,7 +9233,7 @@ function cloudflare2(pluginConfig = {}) {
             }
           } : void 0,
           builder: {
-            async buildApp(builder) {
+            buildApp: userConfig.builder?.buildApp ?? (async (builder) => {
               const clientEnvironment = builder.environments.client;
               const defaultHtmlPath = path7.resolve(
                 builder.config.root,
@@ -9246,7 +9259,7 @@ function cloudflare2(pluginConfig = {}) {
                   )
                 );
               }
-            }
+            })
           }
         };
       },
@@ -9307,7 +9320,7 @@ function cloudflare2(pluginConfig = {}) {
           return;
         }
         config.no_bundle = true;
-        config.rules = [{ type: "ESModule", globs: ["**/*.js"] }];
+        config.rules = [{ type: "ESModule", globs: ["**/*.js", "**/*.mjs"] }];
         if (config.unsafe && Object.keys(config.unsafe).length === 0) {
           config.unsafe = void 0;
         }
@@ -9354,11 +9367,7 @@ function cloudflare2(pluginConfig = {}) {
           },
           { alwaysCallNext: false }
         );
-        handleWebSocket(
-          viteDevServer.httpServer,
-          entryWorker.fetch,
-          viteDevServer.config.logger
-        );
+        handleWebSocket(viteDevServer.httpServer, entryWorker.fetch);
         return () => {
           viteDevServer.middlewares.use((req, res, next) => {
             middleware(req, res, next);
@@ -9380,16 +9389,10 @@ function cloudflare2(pluginConfig = {}) {
           },
           { alwaysCallNext: false }
         );
-        handleWebSocket(
-          vitePreviewServer.httpServer,
-          miniflare2.dispatchFetch,
-          vitePreviewServer.config.logger
-        );
-        return () => {
-          vitePreviewServer.middlewares.use((req, res, next) => {
-            middleware(req, res, next);
-          });
-        };
+        handleWebSocket(vitePreviewServer.httpServer, miniflare2.dispatchFetch);
+        vitePreviewServer.middlewares.use((req, res, next) => {
+          middleware(req, res, next);
+        });
       }
     },
     // Plugin to support `CompiledWasm` modules
@@ -9465,49 +9468,61 @@ function cloudflare2(pluginConfig = {}) {
       apply(_config, env2) {
         return !env2.isPreview;
       },
-      config() {
-        return {
-          resolve: {
-            alias: getNodeCompatAliases()
-          }
-        };
-      },
-      configEnvironment(environmentName) {
-        const workerConfig = getWorkerConfig2(environmentName);
-        if (isNodeCompat(workerConfig)) {
+      configEnvironment(name2) {
+        if (isNodeCompat(getWorkerConfig2(name2))) {
           return {
-            build: {
-              rollupOptions: {
-                external: getNodeCompatExternals()
-              }
+            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;
+              // But also we want to avoid following the ones that are polyfilled since the dependency-optimizer import analyzer does not
+              // resolve these imports using our `resolveId()` hook causing the optimization step to fail.
+              exclude: [
+                ...builtinModules2,
+                ...builtinModules2.map((m) => `node:${m}`)
+              ]
             }
           };
         }
       },
+      applyToEnvironment(environment) {
+        return isNodeCompat(getWorkerConfig2(environment.name));
+      },
+      // We need the resolver from this plugin to run before built-in ones, otherwise Vite's built-in
+      // resolver will try to externalize the Node.js module imports (e.g. `perf_hooks` and `node:tty`)
+      // rather than allowing the resolve hook here to alias then to polyfills.
+      enforce: "pre",
       async resolveId(source, importer, options) {
-        const strippedSource = maybeStripNodeJsVirtualPrefix(source);
-        if (!strippedSource) {
-          return;
-        }
-        const workerConfig = getWorkerConfig2(this.environment.name);
-        if (!isNodeCompat(workerConfig)) {
-          return this.resolve(strippedSource, importer, options);
+        const result = resolveNodeJSImport(source);
+        if (!result) {
+          return this.resolve(source, importer, options);
         }
-        const { unresolved, resolved } = resolveNodeJSImport(strippedSource);
-        if (this.environment.mode === "dev" && this.environment.depsOptimizer) {
-          const optimized = this.environment.depsOptimizer.registerMissingImport(
-            unresolved,
-            resolved
-          ).id;
-          return this.resolve(optimized, importer, options);
+        if (this.environment.mode === "dev") {
+          assert9(
+            this.environment.depsOptimizer,
+            "depsOptimizer is required in dev mode"
+          );
+          const { id } = this.environment.depsOptimizer.registerMissingImport(
+            result.unresolved,
+            result.resolved
+          );
+          return this.resolve(id, importer, options);
         }
-        return this.resolve(resolved, importer, options);
+        return this.resolve(result.resolved, importer, options);
       },
       async transform(code, id) {
         const workerConfig = getWorkerConfig2(this.environment.name);
-        if (!isNodeCompat(workerConfig)) {
-          return;
-        }
+        assert9(workerConfig, "Expected a worker config");
         const resolvedId = await this.resolve(workerConfig.main);
         if (id === resolvedId?.id) {
           return injectGlobalCode(id, code);