@cloudflare/vite-plugin 0.0.0-ca3cbc42a → 0.0.0-ca6001066

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";
 
@@ -1074,7 +1075,6 @@ import * as vite6 from "vite";
 
 // src/cloudflare-environment.ts
 import assert from "node:assert";
-import { builtinModules } from "node:module";
 import * as vite2 from "vite";
 
 // src/constants.ts
@@ -1207,7 +1207,9 @@ function createCloudflareEnvironmentOptions(workerConfig, userConfig, environmen
       //       dependencies as not external
       noExternal: true,
       // We want to use `workerd` package exports if available (e.g. for postgres).
-      conditions: [...defaultConditions, "development|production"]
+      conditions: [...defaultConditions, "development|production"],
+      // The Cloudflare ones are proper builtins in the environment
+      builtins: [...cloudflareBuiltInModules]
     },
     dev: {
       createEnvironment(name2, config) {
@@ -1229,19 +1231,14 @@ function createCloudflareEnvironmentOptions(workerConfig, userConfig, environmen
         //       so the input value here serves both as the build input as well as the starting point for
         //       dev pre-bundling crawling (were we not to set this input field we'd have to appropriately set
         //       optimizeDeps.entries in the dev config)
-        input: workerConfig.main,
-        external: [...cloudflareBuiltInModules]
+        input: workerConfig.main
       }
     },
     optimizeDeps: {
       // Note: ssr pre-bundling is opt-in and we need to enable it by setting `noDiscovery` to false
       noDiscovery: false,
       entries: workerConfig.main,
-      exclude: [
-        ...cloudflareBuiltInModules,
-        // we have to exclude all node modules to work in dev-mode not just the unenv externals...
-        ...builtinModules.concat(builtinModules.map((m) => `node:${m}`))
-      ],
+      exclude: [...cloudflareBuiltInModules],
       esbuildOptions: {
         platform: "neutral",
         conditions: [...defaultConditions, "development"],
@@ -1367,7 +1364,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,
@@ -1401,11 +1404,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);
       }
     }
@@ -1585,20 +1587,17 @@ function getDevMiniflareOptions(resolvedPluginConfig, viteDevServer) {
             );
             const [moduleId] = invokePayloadData.data;
             const moduleRE = new RegExp(MODULE_PATTERN);
-            if (moduleRE.test(moduleId)) {
+            const shouldExternalize = (
+              // Worker modules (CompiledWasm, Text, Data)
+              moduleRE.test(moduleId)
+            );
+            if (shouldExternalize) {
               const result2 = {
                 externalize: moduleId,
                 type: "module"
               };
               return MiniflareResponse.json({ result: result2 });
             }
-            if (moduleId.startsWith("cloudflare:")) {
-              const result2 = {
-                externalize: moduleId,
-                type: "builtin"
-              };
-              return MiniflareResponse.json({ result: result2 });
-            }
             const devEnvironment = viteDevServer.environments[environmentName];
             const result = await devEnvironment.hot.handleInvoke(payload);
             return MiniflareResponse.json(result);
@@ -1658,7 +1657,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(
@@ -1694,17 +1693,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
@@ -1713,6 +1714,26 @@ 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);
@@ -1721,13 +1742,12 @@ function getPreviewMiniflareOptions(vitePreviewServer, persistState) {
   );
   const workers = workerConfigs.map((config) => {
     const miniflareWorkerOptions = unstable_getMiniflareWorkerOptions(config);
-    const { ratelimits, ...workerOptions } = miniflareWorkerOptions.workerOptions;
+    const { ratelimits, modulesRules, ...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: "" }
+      ...miniflareWorkerOptions.main ? getPreviewModules(miniflareWorkerOptions.main, modulesRules) : { modules: true, script: "" }
     };
   });
   const logger = new ViteMiniflareLogger(resolvedViteConfig);
@@ -7310,7 +7330,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
@@ -7370,10 +7390,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, "/");
 }
@@ -8487,7 +8507,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(
@@ -8574,7 +8594,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;
@@ -8719,7 +8739,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;
@@ -8747,12 +8768,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");
@@ -8763,37 +8789,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 })
+    };
   }
-  const resolved = resolvePathSync(source, {
-    url: import.meta.url
-  });
-  return {
-    unresolved: source,
-    resolved
-  };
+  if (nodeCompatEntries.has(source)) {
+    return {
+      unresolved: source,
+      resolved: resolvePathSync(source, { url: import.meta.url })
+    };
+  }
+}
+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
@@ -9106,9 +9131,9 @@ function resolvePluginConfig(pluginConfig, userConfig, viteEnv) {
 }
 
 // src/websockets.ts
-import ws from "ws";
+import { WebSocketServer } from "ws";
 function handleWebSocket(httpServer, fetcher, logger) {
-  const nodeWebSocket = new ws.Server({ noServer: true });
+  const nodeWebSocket = new WebSocketServer({ noServer: true });
   httpServer.on(
     "upgrade",
     async (request, socket, head) => {
@@ -9217,7 +9242,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,
@@ -9243,7 +9268,7 @@ function cloudflare2(pluginConfig = {}) {
                   )
                 );
               }
-            }
+            })
           }
         };
       },
@@ -9304,7 +9329,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;
         }
@@ -9462,49 +9487,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 result = resolveNodeJSImport(source);
+        if (!result) {
+          return this.resolve(source, importer, options);
         }
-        const workerConfig = getWorkerConfig2(this.environment.name);
-        if (!isNodeCompat(workerConfig)) {
-          return this.resolve(strippedSource, 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);

package/dist/runner-worker/index.js

@@ -25,7 +25,7 @@ function stripInternalEnv(internalEnv) {
   return userEnv;
 }
 
-// ../../node_modules/.pnpm/vite@6.1.0_@types+node@18.19.74_jiti@2.4.2/node_modules/vite/dist/node/module-runner.js
+// ../../node_modules/.pnpm/vite@6.1.0_@types+node@18.19.76_jiti@2.4.2/node_modules/vite/dist/node/module-runner.js
 var VALID_ID_PREFIX = "/@id/";
 var NULL_BYTE_PLACEHOLDER = "__x00__";
 var SOURCEMAPPING_URL = "sourceMa";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudflare/vite-plugin",
-  "version": "0.0.0-ca3cbc42a",
+  "version": "0.0.0-ca6001066",
   "description": "Cloudflare plugin for Vite",
   "keywords": [
     "cloudflare",
@@ -35,25 +35,26 @@
   "dependencies": {
     "@cloudflare/unenv-preset": "1.1.1",
     "@hattip/adapter-node": "^0.0.49",
+    "tinyglobby": "^0.2.12",
     "unenv": "2.0.0-rc.1",
-    "ws": "^8.18.0",
-    "miniflare": "0.0.0-ca3cbc42a"
+    "ws": "8.18.0",
+    "miniflare": "0.0.0-ca6001066"
   },
   "devDependencies": {
-    "@cloudflare/workers-types": "^4.20250204.0",
+    "@cloudflare/workers-types": "^4.20250224.0",
     "@types/node": "^22.10.1",
     "@types/ws": "^8.5.13",
     "magic-string": "^0.30.12",
     "mlly": "^1.7.4",
     "tsup": "8.3.0",
     "typescript": "^5.7.2",
-    "undici": "^5.28.4",
+    "undici": "^5.28.5",
     "vite": "^6.1.0",
-    "vitest": "~2.1.9",
+    "vitest": "~3.0.5",
+    "@cloudflare/workers-shared": "0.0.0-ca6001066",
     "@cloudflare/mock-npm-registry": "0.0.0",
-    "@cloudflare/workers-shared": "0.0.0-ca3cbc42a",
     "@cloudflare/workers-tsconfig": "0.0.0",
-    "wrangler": "0.0.0-ca3cbc42a"
+    "wrangler": "0.0.0-ca6001066"
   },
   "peerDependencies": {
     "vite": "^6.1.0",