@cloudflare/vite-plugin 0.0.0-b24497daf → 0.0.0-b48741547

package/dist/index.js

@@ -1200,6 +1200,7 @@ var cloudflareBuiltInModules = [
   "cloudflare:workflows"
 ];
 var defaultConditions = ["workerd", "module", "browser"];
+var target = "es2022";
 function createCloudflareEnvironmentOptions(workerConfig, userConfig, environmentName) {
   return {
     resolve: {
@@ -1220,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),
@@ -1241,6 +1242,7 @@ function createCloudflareEnvironmentOptions(workerConfig, userConfig, environmen
       exclude: [...cloudflareBuiltInModules],
       esbuildOptions: {
         platform: "neutral",
+        target,
         conditions: [...defaultConditions, "development"],
         resolveExtensions: [
           ".mjs",
@@ -1552,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(
         {
@@ -1561,51 +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)
-            );
-            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);
@@ -1625,6 +1634,7 @@ function getDevMiniflareOptions(resolvedPluginConfig, viteDevServer) {
     ),
     workers: [
       ...assetWorkers,
+      ...externalWorkers,
       ...userWorkers.map((workerOptions) => {
         const wrappers = [
           `import { createWorkerEntrypointWrapper, createDurableObjectWrapper, createWorkflowEntrypointWrapper } from '${RUNNER_PATH}';`,
@@ -1740,15 +1750,18 @@ function getPreviewMiniflareOptions(vitePreviewServer, persistState) {
   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 { externalWorkers } = miniflareWorkerOptions;
     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,
-      ...miniflareWorkerOptions.main ? getPreviewModules(miniflareWorkerOptions.main, modulesRules) : { modules: true, script: "" }
-    };
+    return [
+      {
+        ...workerOptions,
+        name: workerOptions.name ?? config.name,
+        ...miniflareWorkerOptions.main ? getPreviewModules(miniflareWorkerOptions.main, modulesRules) : { modules: true, script: "" }
+      },
+      ...externalWorkers
+    ];
   });
   const logger = new ViteMiniflareLogger(resolvedViteConfig);
   return {
@@ -7522,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
@@ -7925,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"
   );
@@ -8090,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,
@@ -8142,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;
@@ -8157,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,
@@ -8190,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,
@@ -8204,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;
@@ -8245,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];
@@ -8264,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,
@@ -8283,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
@@ -8335,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,
@@ -8378,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,
@@ -8459,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,
@@ -8752,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`
@@ -8863,7 +8871,6 @@ var nonApplicableWorkerConfigs = {
     "build",
     "find_additional_modules",
     "no_bundle",
-    "node_compat",
     "preserve_file_names",
     "site",
     "tsconfig",
@@ -8880,7 +8887,6 @@ var nullableNonApplicable = [
   "find_additional_modules",
   "minify",
   "no_bundle",
-  "node_compat",
   "preserve_file_names",
   "site",
   "tsconfig",
@@ -9031,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,
@@ -9131,8 +9148,9 @@ function resolvePluginConfig(pluginConfig, userConfig, viteEnv) {
 }
 
 // src/websockets.ts
+import { coupleWebSocket } from "miniflare";
 import { WebSocketServer } from "ws";
-function handleWebSocket(httpServer, fetcher, logger) {
+function handleWebSocket(httpServer, fetcher) {
   const nodeWebSocket = new WebSocketServer({ noServer: true });
   httpServer.on(
     "upgrade",
@@ -9156,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);
         }
       );
@@ -9376,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);
@@ -9402,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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudflare/vite-plugin",
-  "version": "0.0.0-b24497daf",
+  "version": "0.0.0-b48741547",
   "description": "Cloudflare plugin for Vite",
   "keywords": [
     "cloudflare",
@@ -38,10 +38,11 @@
     "tinyglobby": "^0.2.12",
     "unenv": "2.0.0-rc.1",
     "ws": "8.18.0",
-    "miniflare": "0.0.0-b24497daf"
+    "miniflare": "0.0.0-b48741547",
+    "wrangler": "0.0.0-b48741547"
   },
   "devDependencies": {
-    "@cloudflare/workers-types": "^4.20250224.0",
+    "@cloudflare/workers-types": "^4.20250317.0",
     "@types/node": "^22.10.1",
     "@types/ws": "^8.5.13",
     "magic-string": "^0.30.12",
@@ -51,14 +52,13 @@
     "undici": "^5.28.5",
     "vite": "^6.1.0",
     "vitest": "~3.0.5",
-    "@cloudflare/workers-shared": "0.0.0-b24497daf",
-    "@cloudflare/workers-tsconfig": "0.0.0",
     "@cloudflare/mock-npm-registry": "0.0.0",
-    "wrangler": "0.0.0-b24497daf"
+    "@cloudflare/workers-tsconfig": "0.0.0",
+    "@cloudflare/workers-shared": "0.0.0-b48741547"
   },
   "peerDependencies": {
     "vite": "^6.1.0",
-    "wrangler": "^3.101.0"
+    "wrangler": "^3.101.0 || ^4.0.0"
   },
   "publishConfig": {
     "access": "public"
@@ -71,7 +71,7 @@
     "check:type": "tsc --build",
     "dev": "tsup --watch",
     "test": "vitest run",
-    "test:ci": "pnpm test && pnpm test:e2e",
+    "test:ci": "pnpm test",
     "test:e2e": "vitest run -c e2e/vitest.config.ts",
     "test:watch": "vitest"
   }