@cloudflare/vite-plugin 1.13.1 → 1.13.2

package/dist/index.js

@@ -7446,6 +7446,7 @@ var additionalModuleGlobalRE = new RegExp(
   "g"
 );
 var WORKER_ENTRY_PATH_HEADER = "__VITE_WORKER_ENTRY_PATH__";
+var IS_ENTRY_WORKER_HEADER = "__VITE_IS_ENTRY_WORKER__";
 var VIRTUAL_WORKER_ENTRY = `${virtualPrefix}worker-entry`;
 
 // src/utils.ts
@@ -7554,13 +7555,14 @@ var CloudflareDevEnvironment = class extends vite.DevEnvironment {
     });
     this.#webSocketContainer = webSocketContainer;
   }
-  async initRunner(worker, workerConfig) {
+  async initRunner(worker, workerConfig, isEntryWorker) {
     this.#worker = worker;
     const response = await this.#worker.fetch(
       new URL(INIT_PATH, UNKNOWN_HOST),
       {
         headers: {
           [WORKER_ENTRY_PATH_HEADER]: workerConfig.main,
+          [IS_ENTRY_WORKER_HEADER]: String(isEntryWorker),
           upgrade: "websocket"
         }
       }
@@ -7677,7 +7679,8 @@ function initRunners(resolvedPluginConfig, viteDevServer, miniflare2) {
       async ([environmentName, workerConfig]) => {
         debuglog2("Initializing worker:", workerConfig.name);
         const worker = await miniflare2.getWorker(workerConfig.name);
-        return viteDevServer.environments[environmentName].initRunner(worker, workerConfig);
+        const isEntryWorker = environmentName === resolvedPluginConfig.entryWorkerEnvironmentName;
+        return viteDevServer.environments[environmentName].initRunner(worker, workerConfig, isEntryWorker);
       }
     )
   );

package/dist/runner-worker/index.js

@@ -26,6 +26,7 @@ var additionalModuleGlobalRE = new RegExp(
   "g"
 );
 var WORKER_ENTRY_PATH_HEADER = "__VITE_WORKER_ENTRY_PATH__";
+var IS_ENTRY_WORKER_HEADER = "__VITE_IS_ENTRY_WORKER__";
 var VIRTUAL_WORKER_ENTRY = `${virtualPrefix}worker-entry`;
 
 // src/runner-worker/env.ts
@@ -39,6 +40,29 @@ function stripInternalEnv(internalEnv) {
   return userEnv;
 }
 
+// src/runner-worker/errors.ts
+function reduceError(e) {
+  return {
+    name: e?.name,
+    message: e?.message ?? String(e),
+    stack: e?.stack,
+    cause: e?.cause === void 0 ? void 0 : reduceError(e.cause)
+  };
+}
+async function maybeCaptureError(options, fn) {
+  if (!options.isEntryWorker || options.exportName !== "default" || options.key !== "fetch") {
+    return fn();
+  }
+  try {
+    return await fn();
+  } catch (error) {
+    return Response.json(reduceError(error), {
+      status: 500,
+      headers: { "MF-Experimental-Error-Stack": "true" }
+    });
+  }
+}
+
 // src/runner-worker/module-runner.ts
 import { DurableObject } from "cloudflare:workers";
 
@@ -1314,17 +1338,9 @@ async function createModuleRunner(env, webSocket) {
     {
       async runInlinedModule(context, transformed, module) {
         const code = `"use strict";async (${Object.keys(context).join(",")})=>{${transformed}}`;
-        try {
-          const fn = env.__VITE_UNSAFE_EVAL__.eval(code, module.id);
-          await fn(...Object.values(context));
-          Object.seal(context[ssrModuleExportsKey]);
-        } catch (error) {
-          if (error instanceof Error) {
-            error.message = `Error running module "${module.url}".
-${error.message}.`;
-          }
-          throw error;
-        }
+        const fn = env.__VITE_UNSAFE_EVAL__.eval(code, module.id);
+        await fn(...Object.values(context));
+        Object.seal(context[ssrModuleExportsKey]);
       },
       async runExternalModule(filepath) {
         if (filepath === "cloudflare:workers") {
@@ -1375,6 +1391,7 @@ var DURABLE_OBJECT_KEYS = [
 ];
 var WORKFLOW_ENTRYPOINT_KEYS = ["run"];
 var workerEntryPath = "";
+var isEntryWorker = false;
 function getRpcPropertyCallableThenable(key, property) {
   const fn = async function(...args) {
     const maybeFn = await property;
@@ -1453,56 +1470,67 @@ function createWorkerEntrypointWrapper(exportName) {
   }
   for (const key of WORKER_ENTRYPOINT_KEYS) {
     Wrapper.prototype[key] = async function(arg) {
-      if (key === "fetch") {
-        const request = arg;
-        const url = new URL(request.url);
-        if (url.pathname === INIT_PATH) {
-          const workerEntryPathHeader = request.headers.get(
-            WORKER_ENTRY_PATH_HEADER
-          );
-          if (!workerEntryPathHeader) {
-            throw new Error(
-              `Unexpected error: "${WORKER_ENTRY_PATH_HEADER}" header not set.`
+      return maybeCaptureError({ isEntryWorker, exportName, key }, async () => {
+        if (key === "fetch") {
+          const request = arg;
+          const url = new URL(request.url);
+          if (url.pathname === INIT_PATH) {
+            const workerEntryPathHeader = request.headers.get(
+              WORKER_ENTRY_PATH_HEADER
+            );
+            if (!workerEntryPathHeader) {
+              throw new Error(
+                `Unexpected error: "${WORKER_ENTRY_PATH_HEADER}" header not set.`
+              );
+            }
+            const isEntryWorkerHeader = request.headers.get(
+              IS_ENTRY_WORKER_HEADER
             );
+            if (!isEntryWorkerHeader) {
+              throw new Error(
+                `Unexpected error: "${IS_ENTRY_WORKER_HEADER}" header not set.`
+              );
+            }
+            workerEntryPath = workerEntryPathHeader;
+            isEntryWorker = isEntryWorkerHeader === "true";
+            const stub = this.env.__VITE_RUNNER_OBJECT__.get("singleton");
+            return stub.fetch(request);
           }
-          workerEntryPath = workerEntryPathHeader;
-          const stub = this.env.__VITE_RUNNER_OBJECT__.get("singleton");
-          return stub.fetch(request);
-        }
-      }
-      const exportValue = await getWorkerEntryExport(
-        workerEntryPath,
-        exportName
-      );
-      const userEnv = stripInternalEnv(this.env);
-      if (typeof exportValue === "object" && exportValue !== null) {
-        const maybeFn = exportValue[key];
-        if (typeof maybeFn !== "function") {
-          throw new TypeError(
-            `Expected "${exportName}" export of "${workerEntryPath}" to define a \`${key}()\` function.`
-          );
         }
-        return maybeFn.call(exportValue, arg, userEnv, this.ctx);
-      } else if (typeof exportValue === "function") {
-        const ctor = exportValue;
-        const instance = new ctor(this.ctx, userEnv);
-        if (!(instance instanceof WorkerEntrypoint)) {
-          throw new TypeError(
-            `Expected "${exportName}" export of "${workerEntryPath}" to be a subclass of \`WorkerEntrypoint\`.`
-          );
-        }
-        const maybeFn = instance[key];
-        if (typeof maybeFn !== "function") {
-          throw new TypeError(
-            `Expected "${exportName}" export of "${workerEntryPath}" to define a \`${key}()\` method.`
+        const exportValue = await getWorkerEntryExport(
+          workerEntryPath,
+          exportName
+        );
+        const userEnv = stripInternalEnv(this.env);
+        if (typeof exportValue === "object" && exportValue !== null) {
+          const maybeFn = exportValue[key];
+          if (typeof maybeFn !== "function") {
+            throw new TypeError(
+              `Expected "${exportName}" export of "${workerEntryPath}" to define a \`${key}()\` function.`
+            );
+          }
+          return maybeFn.call(exportValue, arg, userEnv, this.ctx);
+        } else if (typeof exportValue === "function") {
+          const ctor = exportValue;
+          const instance = new ctor(this.ctx, userEnv);
+          if (!(instance instanceof WorkerEntrypoint)) {
+            throw new TypeError(
+              `Expected "${exportName}" export of "${workerEntryPath}" to be a subclass of \`WorkerEntrypoint\`.`
+            );
+          }
+          const maybeFn = instance[key];
+          if (typeof maybeFn !== "function") {
+            throw new TypeError(
+              `Expected "${exportName}" export of "${workerEntryPath}" to define a \`${key}()\` method.`
+            );
+          }
+          return maybeFn.call(instance, arg);
+        } else {
+          return new TypeError(
+            `Expected "${exportName}" export of "${workerEntryPath}" to be an object or a class.`
           );
         }
-        return maybeFn.call(instance, arg);
-      } else {
-        return new TypeError(
-          `Expected "${exportName}" export of "${workerEntryPath}" to be an object or a class.`
-        );
-      }
+      });
     };
   }
   return Wrapper;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudflare/vite-plugin",
-  "version": "1.13.1",
+  "version": "1.13.2",
   "description": "Cloudflare plugin for Vite",
   "keywords": [
     "cloudflare",
@@ -40,11 +40,11 @@
     "unenv": "2.0.0-rc.21",
     "ws": "8.18.0",
     "@cloudflare/unenv-preset": "2.7.3",
-    "miniflare": "4.20250906.2",
-    "wrangler": "4.37.0"
+    "miniflare": "4.20250913.0",
+    "wrangler": "4.37.1"
   },
   "devDependencies": {
-    "@cloudflare/workers-types": "^4.20250906.0",
+    "@cloudflare/workers-types": "^4.20250913.0",
     "@types/node": "^22.10.1",
     "@types/ws": "^8.5.13",
     "magic-string": "^0.30.12",
@@ -60,7 +60,7 @@
   },
   "peerDependencies": {
     "vite": "^6.1.0 || ^7.0.0",
-    "wrangler": "^4.37.0"
+    "wrangler": "^4.37.1"
   },
   "publishConfig": {
     "access": "public"