@base44-preview/vite-plugin 1.0.46-pr.136.11ca3d8 → 1.0.46-pr.136.cc02f83

package/README.md

@@ -61,14 +61,18 @@ dependency optimizer, for esbuild (Vite 7) and Rolldown (Vite 8):
 - **`ws`** resolves to `compat/workerd-ws.cjs`, a `ws`-shaped client over workerd's
   native WebSocket. The package's own browser build only throws. `WebSocketServer`
   throws too: server code can open sockets but not listen.
-- **`AsyncLocalStorage.enterWith()`**, which workerd omits, becomes a no-op. A module
-  that calls it first imports `compat/workerd-enter-with.mjs`.
+- **`AsyncLocalStorage.enterWith()`**, which always throws in workerd, becomes a
+  no-op. A module that calls it first imports `compat/workerd-enter-with.mjs`. The
+  no-op is global to the isolate: any code that relies on `enterWith()` to
+  propagate state gets nothing, silently, instead of an exception. Use `run()`.
 - **`createRequire()` in dev** gets its argument's query string dropped. Optimized
   dependencies carry Vite's `?v=` query, which workerd rejects. Builds are left
   byte-for-byte alone.
 
 Stagehand 3 needs all three. `@base44/functions-compiler` applies the first two to
-backend functions.
+backend functions. Cloudflare's `nodejs_compat` flag does not cover any of them:
+its `node:http` client cannot upgrade a connection, which `ws` needs, `enterWith()`
+throws by design, and `createRequire()` rejects queries.
 
 ### Build-status endpoint
 

package/compat/workerd-enter-with.mjs

@@ -1,7 +1,20 @@
-// Imported ahead of any Cloudflare Workers server module that calls enterWith(),
-// by the base44-workerd-compat plugin. workerd omits
-// AsyncLocalStorage.enterWith(); libraries such as Stagehand call it to seed a
-// context they also pass explicitly, so a no-op keeps them working.
+// Imported ahead of any Cloudflare Workers server module that calls enterWith,
+// by the base44-workerd-compat plugin. workerd defines
+// AsyncLocalStorage.prototype.enterWith but makes it always throw; libraries such
+// as Stagehand call it to seed a context they also pass explicitly, so a no-op
+// keeps them working.
+//
+// The no-op is global: any caller in the isolate that relies on enterWith to
+// propagate state gets nothing instead of an exception. Storing the value per
+// instance instead would leak it across the concurrent requests an isolate
+// serves, which is worse. A runtime whose enterWith works is left alone.
 import { AsyncLocalStorage } from "node:async_hooks";
 
-AsyncLocalStorage.prototype.enterWith = () => {};
+const native = AsyncLocalStorage.prototype.enterWith;
+let works = false;
+try {
+  native.call(new AsyncLocalStorage(), undefined);
+  works = true;
+} catch {}
+
+if (!works) AsyncLocalStorage.prototype.enterWith = function enterWith() {};

package/compat/workerd-ws.cjs

@@ -3,14 +3,23 @@
 // build needs node:net; workerd has a native WebSocket client, so this is a
 // `ws`-shaped client over it. Kept in step with @base44/functions-compiler's copy.
 "use strict";
+const CONNECTING = 0;
+const OPEN = 1;
+const CLOSING = 2;
+const CLOSED = 3;
 const toBuffer = (value) => (globalThis.Buffer ? globalThis.Buffer.from(value) : value);
+// The WHATWG close() that workerd implements accepts fewer codes than `ws` does.
+const isWhatwgCloseCode = (code) => code === 1000 || (code >= 3000 && code <= 4999);
+const later = (fn, ...args) => queueMicrotask(() => fn(...args));
 class WebSocket {
-  static CONNECTING = 0;
-  static OPEN = 1;
-  static CLOSING = 2;
-  static CLOSED = 3;
+  static CONNECTING = CONNECTING;
+  static OPEN = OPEN;
+  static CLOSING = CLOSING;
+  static CLOSED = CLOSED;
   #socket;
   #listeners = new Map();
+  #maxListeners = 10;
+  #terminated = false;
   constructor(address, protocols) {
     this.#socket = new globalThis.WebSocket(String(address), typeof protocols === "string" || Array.isArray(protocols) ? protocols : undefined);
     try { this.#socket.binaryType = "arraybuffer"; } catch {}
@@ -20,14 +29,18 @@ class WebSocket {
       this.emit("message", toBuffer(isBinary ? new Uint8Array(event.data) : event.data), isBinary);
     });
     this.#socket.addEventListener("error", (event) => this.emit("error", event.error ?? new Error(event.message || "WebSocket error")));
-    this.#socket.addEventListener("close", (event) => this.emit("close", event.code, toBuffer(event.reason ?? "")));
+    this.#socket.addEventListener("close", (event) => {
+      if (!this.#terminated) this.emit("close", event.code, toBuffer(event.reason ?? ""));
+    });
   }
-  get readyState() { return this.#socket.readyState; }
+  get readyState() { return this.#terminated ? CLOSED : this.#socket.readyState; }
   get url() { return this.#socket.url; }
   get protocol() { return this.#socket.protocol; }
-  on(name, listener) { return this.#add(name, listener, false); }
-  addListener(name, listener) { return this.#add(name, listener, false); }
-  once(name, listener) { return this.#add(name, listener, true); }
+  on(name, listener) { return this.#add(name, listener, false, false); }
+  addListener(name, listener) { return this.#add(name, listener, false, false); }
+  once(name, listener) { return this.#add(name, listener, true, false); }
+  prependListener(name, listener) { return this.#add(name, listener, false, true); }
+  prependOnceListener(name, listener) { return this.#add(name, listener, true, true); }
   off(name, listener) { return this.removeListener(name, listener); }
   removeListener(name, listener) {
     const listeners = this.#listeners.get(name);
@@ -39,7 +52,13 @@ class WebSocket {
     else this.#listeners.delete(name);
     return this;
   }
+  listeners(name) { return (this.#listeners.get(name) ?? []).map((entry) => entry.listener); }
+  listenerCount(name) { return this.#listeners.get(name)?.length ?? 0; }
+  eventNames() { return [...this.#listeners.keys()].filter((name) => this.listenerCount(name) > 0); }
+  setMaxListeners(count) { this.#maxListeners = count; return this; }
+  getMaxListeners() { return this.#maxListeners; }
   emit(name, ...args) {
+    // Dispatch to a snapshot, as Node's EventEmitter does.
     const listeners = this.#listeners.get(name) ?? [];
     this.#listeners.set(name, listeners.filter((entry) => !entry.once));
     for (const entry of listeners) entry.listener.apply(this, args);
@@ -49,27 +68,68 @@ class WebSocket {
     const done = typeof options === "function" ? options : callback;
     try {
       this.#socket.send(data);
-      done?.();
     } catch (error) {
       if (!done) throw error;
-      done(error);
+      later(done, error);
+      return;
     }
+    // `ws` reports completion asynchronously; so does this.
+    if (done) later(done);
+  }
+  // workerd answers the peer's pings itself but cannot send one. A keepalive
+  // loop waiting for "pong" would otherwise kill a healthy socket, so an open
+  // socket answers with one.
+  ping(data, mask, callback) {
+    const done = [data, mask, callback].find((arg) => typeof arg === "function");
+    if (this.readyState === OPEN) later(() => this.emit("pong", toBuffer("")));
+    if (done) later(done);
+  }
+  pong(data, mask, callback) {
+    const done = [data, mask, callback].find((arg) => typeof arg === "function");
+    if (done) later(done);
   }
-  close(code, reason) { this.#socket.close(code, reason); }
-  terminate() { this.#socket.close(); }
-  #add(name, listener, once) {
+  close(code, reason) {
+    try {
+      this.#socket.close(code, reason);
+    } catch (error) {
+      // A code `ws` accepts but WHATWG close() rejects, such as 1001.
+      if (code === undefined || isWhatwgCloseCode(code)) throw error;
+      this.#socket.close(1000, reason);
+    }
+  }
+  // `ws` tears the connection down at once. workerd has no abrupt close, so the
+  // socket is closed normally and "close" is reported now, not on the reply.
+  terminate() {
+    if (this.#terminated || this.#socket.readyState === CLOSED) return;
+    this.#terminated = true;
+    try { this.#socket.close(); } catch {}
+    later(() => this.emit("close", 1006, toBuffer("")));
+  }
+  #add(name, listener, once, prepend) {
     const listeners = this.#listeners.get(name) ?? [];
-    listeners.push({ listener, once });
+    if (prepend) listeners.unshift({ listener, once });
+    else listeners.push({ listener, once });
     this.#listeners.set(name, listeners);
     return this;
   }
 }
+Object.assign(WebSocket.prototype, { CONNECTING, OPEN, CLOSING, CLOSED });
+const unavailable = (what) => new Error(`ws ${what} is not available in Cloudflare Workers server code, which only supports the ws WebSocket client.`);
 class WebSocketServer {
-  constructor() {
-    throw new Error("ws WebSocketServer is not available in Base44 functions: a function can open WebSocket connections but cannot listen for them.");
-  }
+  constructor() { throw unavailable("WebSocketServer"); }
+}
+class Receiver {
+  constructor() { throw unavailable("Receiver"); }
+}
+class Sender {
+  constructor() { throw unavailable("Sender"); }
 }
+function createWebSocketStream() { throw unavailable("createWebSocketStream"); }
 module.exports = WebSocket;
 module.exports.WebSocket = WebSocket;
 module.exports.WebSocketServer = WebSocketServer;
+module.exports.Server = WebSocketServer;
+module.exports.Receiver = Receiver;
+module.exports.Sender = Sender;
+module.exports.createWebSocketStream = createWebSocketStream;
 module.exports.default = WebSocket;

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAc,MAAM,MAAM,CAAC;AAU/C,YAAY,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAmBlD,eAAO,MAAM,uBAAuB,UAWnC,CAAC;AAeF,MAAM,CAAC,OAAO,UAAU,UAAU,CAChC,IAAI,GAAE;IACJ,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,gBAAgB,CAAC,EAAE,OAAO,CAAC;CACvB,iBA2PP"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAc,MAAM,MAAM,CAAC;AAU/C,YAAY,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAiBlD,eAAO,MAAM,uBAAuB,UAWnC,CAAC;AAeF,MAAM,CAAC,OAAO,UAAU,UAAU,CAChC,IAAI,GAAE;IACJ,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,gBAAgB,CAAC,EAAE,OAAO,CAAC;CACvB,iBA2PP"}

package/dist/index.js

@@ -1,18 +1,16 @@
 import path from "node:path";
-import { loadEnv, version as viteVersion } from "vite";
+import { loadEnv } from "vite";
 import { errorOverlayPlugin } from "./error-overlay-plugin.js";
 import { visualEditPlugin } from "./visual-edit-plugin.js";
-import { filterPackagesInProject } from "./utils.js";
+import { filterPackagesInProject, isVite8OrLater } from "./utils.js";
 import { htmlInjectionsPlugin } from "./html-injections-plugin.js";
 import { buildStatusPlugin } from "./build-status-plugin.js";
 import { base44RuntimePlugin } from "./base44-runtime-plugin.js";
 import { workerdCompatPlugin } from "./workerd-compat-plugin.js";
 import { routeRequestLogPlugin } from "./route-request-log/vite-plugin.js";
 const isRunningInSandbox = !!process.env.MODAL_SANDBOX_ID;
-// Vite 8 pre-bundles deps with Rolldown instead of esbuild and deprecates
-// `optimizeDeps.esbuildOptions`. Both spellings mean the same thing here:
-// treat .js files as JSX, since app code routinely puts JSX in .js.
-const isVite8OrLater = Number(viteVersion.split(".")[0]) >= 8;
+// Both optimizer spellings mean the same thing here: treat .js files as JSX,
+// since app code routinely puts JSX in .js.
 const jsxInJsFiles = isVite8OrLater
     ? { rolldownOptions: { moduleTypes: { ".js": "jsx" } } }
     : { esbuildOptions: { loader: { ".js": "jsx" } } };

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}

package/dist/utils.d.ts

@@ -1,2 +1,3 @@
+export declare const isVite8OrLater: boolean;
 export declare function filterPackagesInProject(packages: string[], root: string): string[];
 //# sourceMappingURL=utils.d.ts.map

package/dist/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAeA,wBAAgB,uBAAuB,CACrC,QAAQ,EAAE,MAAM,EAAE,EAClB,IAAI,EAAE,MAAM,GACX,MAAM,EAAE,CAmBV"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAMA,eAAO,MAAM,cAAc,SAAyC,CAAC;AAcrE,wBAAgB,uBAAuB,CACrC,QAAQ,EAAE,MAAM,EAAE,EAClB,IAAI,EAAE,MAAM,GACX,MAAM,EAAE,CAmBV"}

package/dist/utils.js

@@ -1,5 +1,9 @@
 import { readFileSync, existsSync } from "fs";
 import { join } from "path";
+import { version as viteVersion } from "vite";
+// Vite 8 pre-bundles deps with Rolldown instead of esbuild and deprecates
+// `optimizeDeps.esbuildOptions`.
+export const isVite8OrLater = Number(viteVersion.split(".")[0]) >= 8;
 /**
  * The package that owns an optimizeDeps entry. Deep entries like
  * `react-dom/client` are separate entries to Vite's optimizer but are declared

package/dist/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,IAAI,CAAC;AAC9C,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAE5B;;;;GAIG;AACH,SAAS,aAAa,CAAC,KAAa;IAClC,MAAM,QAAQ,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAClC,OAAO,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC;QAC1B,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC;QAChC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC;AAC3B,CAAC;AAED,MAAM,UAAU,uBAAuB,CACrC,QAAkB,EAClB,IAAY;IAEZ,IAAI,CAAC;QACH,MAAM,eAAe,GAAG,IAAI,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;QACnD,IAAI,CAAC,UAAU,CAAC,eAAe,CAAC,EAAE,CAAC;YACjC,OAAO,EAAE,CAAC;QACZ,CAAC;QAED,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC,CAAC;QACvE,MAAM,OAAO,GAAG;YACd,GAAG,WAAW,CAAC,YAAY;YAC3B,GAAG,WAAW,CAAC,eAAe;YAC9B,GAAG,WAAW,CAAC,gBAAgB;SAChC,CAAC;QAEF,OAAO,QAAQ,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,aAAa,CAAC,GAAG,CAAC,IAAI,OAAO,CAAC,CAAC;IACjE,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,IAAI,CAAC,sCAAsC,EAAE,KAAK,CAAC,CAAC;QAC5D,OAAO,EAAE,CAAC;IACZ,CAAC;AACH,CAAC"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,IAAI,CAAC;AAC9C,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,MAAM,CAAC;AAE9C,0EAA0E;AAC1E,iCAAiC;AACjC,MAAM,CAAC,MAAM,cAAc,GAAG,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;AAErE;;;;GAIG;AACH,SAAS,aAAa,CAAC,KAAa;IAClC,MAAM,QAAQ,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAClC,OAAO,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC;QAC1B,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC;QAChC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC;AAC3B,CAAC;AAED,MAAM,UAAU,uBAAuB,CACrC,QAAkB,EAClB,IAAY;IAEZ,IAAI,CAAC;QACH,MAAM,eAAe,GAAG,IAAI,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;QACnD,IAAI,CAAC,UAAU,CAAC,eAAe,CAAC,EAAE,CAAC;YACjC,OAAO,EAAE,CAAC;QACZ,CAAC;QAED,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC,CAAC;QACvE,MAAM,OAAO,GAAG;YACd,GAAG,WAAW,CAAC,YAAY;YAC3B,GAAG,WAAW,CAAC,eAAe;YAC9B,GAAG,WAAW,CAAC,gBAAgB;SAChC,CAAC;QAEF,OAAO,QAAQ,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,aAAa,CAAC,GAAG,CAAC,IAAI,OAAO,CAAC,CAAC;IACjE,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,IAAI,CAAC,sCAAsC,EAAE,KAAK,CAAC,CAAC;QAC5D,OAAO,EAAE,CAAC;IACZ,CAAC;AACH,CAAC"}

package/dist/workerd-compat-plugin.d.ts

@@ -1,9 +1,21 @@
 import type { Plugin } from "vite";
 export declare const WORKERD_WS_ADAPTER: string;
 export declare const WORKERD_ENTER_WITH_PATCH: string;
-/** Prepends the patch on the first line, so line numbers stay put. */
-export declare function withEnterWithPatch(code: string, id: string): string | null;
-/** Strips the query from `createRequire` arguments, for dev-served modules. */
-export declare function withQueryFreeCreateRequire(code: string): string | null;
-export declare function workerdCompatPlugin(): Plugin;
+export interface PatchOptions {
+    /** Also route `createRequire` calls through the query-dropping wrapper. */
+    createRequire: boolean;
+}
+/**
+ * Patches a workerd server module: imports the enterWith no-op ahead of a module
+ * that calls `.enterWith()`, and, with `createRequire`, routes node:module's
+ * `createRequire` through a wrapper that drops the id's query. Code is inserted
+ * on the first line after any shebang or directive prologue, so strict mode
+ * holds and line numbers stay put. Returns null when nothing applies.
+ */
+export declare function patchServerModule(code: string, id: string, options: PatchOptions): string | null;
+export interface WorkerdCompatOptions {
+    /** Which dependency optimizer to hook. Defaults to the installed Vite's. */
+    rolldown?: boolean;
+}
+export declare function workerdCompatPlugin({ rolldown }?: WorkerdCompatOptions): Plugin;
 //# sourceMappingURL=workerd-compat-plugin.d.ts.map

package/dist/workerd-compat-plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"workerd-compat-plugin.d.ts","sourceRoot":"","sources":["../src/workerd-compat-plugin.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAsB,MAAM,EAAE,MAAM,MAAM,CAAC;AA0BvD,eAAO,MAAM,kBAAkB,QAA+B,CAAC;AAC/D,eAAO,MAAM,wBAAwB,QAAuC,CAAC;AAS7E,sEAAsE;AACtE,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAO1E;AAKD,+EAA+E;AAC/E,wBAAgB,0BAA0B,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAQtE;AAqDD,wBAAgB,mBAAmB,IAAI,MAAM,CAoB5C"}
+{"version":3,"file":"workerd-compat-plugin.d.ts","sourceRoot":"","sources":["../src/workerd-compat-plugin.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAsB,MAAM,EAAE,MAAM,MAAM,CAAC;AA4BvD,eAAO,MAAM,kBAAkB,QAA+B,CAAC;AAC/D,eAAO,MAAM,wBAAwB,QAAuC,CAAC;AA6G7E,MAAM,WAAW,YAAY;IAC3B,2EAA2E;IAC3E,aAAa,EAAE,OAAO,CAAC;CACxB;AAED;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,YAAY,GAAG,MAAM,GAAG,IAAI,CA6DhG;AAiDD,MAAM,WAAW,oBAAoB;IACnC,4EAA4E;IAC5E,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAED,wBAAgB,mBAAmB,CAAC,EAAE,QAAyB,EAAE,GAAE,oBAAyB,GAAG,MAAM,CAqBpG"}

package/dist/workerd-compat-plugin.js

@@ -1,10 +1,13 @@
 import { readFile } from "node:fs/promises";
 import { fileURLToPath } from "node:url";
-import { version as viteVersion } from "vite";
+import { parse } from "@babel/parser";
+import { default as traverse } from "@babel/traverse";
+import { normalizePath } from "vite";
+import { isVite8OrLater } from "./utils.js";
 /**
- * Closes two workerd gaps that break Node-targeted npm clients (Stagehand among
- * them) in full-stack server code, matching what @base44/functions-compiler does
- * for backend functions:
+ * Closes three workerd gaps that break Node-targeted npm clients (Stagehand among
+ * them) in full-stack server code. @base44/functions-compiler covers the first
+ * two for backend functions:
  *
  * - `ws`: its exports map sends the "browser" condition (which Cloudflare's Vite
  *   plugin resolves with) to a stub that throws on use. It is served as a
@@ -20,37 +23,172 @@ import { version as viteVersion } from "vite";
  * Only environments that resolve with the "workerd" condition are touched, so
  * the browser bundle and a Node-run server keep the real modules.
  */
-const compatFile = (name) => fileURLToPath(new URL(`../compat/${name}`, import.meta.url));
+// Vite ids use forward slashes on every platform, so these must too.
+const compatFile = (name) => normalizePath(fileURLToPath(new URL(`../compat/${name}`, import.meta.url)));
 export const WORKERD_WS_ADAPTER = compatFile("workerd-ws.cjs");
 export const WORKERD_ENTER_WITH_PATCH = compatFile("workerd-enter-with.mjs");
 const isWorkerd = (conditions) => !!conditions?.includes("workerd");
+// `ws` exports only its root, so a deep import never resolves to begin with.
 const redirect = (id) => (id === "ws" ? WORKERD_WS_ADAPTER : null);
-const ESM_SYNTAX = /^\s*(import|export)\b/m;
-/** Prepends the patch on the first line, so line numbers stay put. */
-export function withEnterWithPatch(code, id) {
-    if (!code.includes(".enterWith(") || id.split("?")[0] === WORKERD_ENTER_WITH_PATCH) {
-        return null;
+// JSON, CSS and the like reach a "pre" transform raw. Virtual ids often have no
+// extension at all, and are JavaScript.
+const NON_SCRIPT_FILE = /\.(?![cm]?[jt]sx?$)[a-z0-9]+$/i;
+const NODE_MODULE = new Set(["module", "node:module"]);
+const CREATE_REQUIRE_IMPL = "__b44CreateRequireImpl";
+const CREATE_REQUIRE = "__b44CreateRequire";
+// @babel/traverse is CommonJS: Node's ESM interop nests the function under
+// `default`, while bundlers and Vitest hand it over directly.
+const traverseAst = (traverse.default ?? traverse);
+const pathOf = (id) => id.split("?")[0] ?? id;
+function parserPlugins(file) {
+    if (/\.tsx$/.test(file))
+        return [["typescript", "jsx"]];
+    if (/\.[cm]?ts$/.test(file))
+        return [["typescript"]];
+    // Apps routinely put JSX in .js, but JSX parsing can misread plain JS, so it
+    // is only the fallback.
+    return [[], ["jsx"]];
+}
+function parseModule(code, file) {
+    for (const plugins of parserPlugins(file)) {
+        try {
+            return parse(code, {
+                // A module is ESM only if it has ESM syntax: text that merely looks
+                // like an import, inside a string or comment, does not count.
+                sourceType: /\.c[jt]s$/.test(file) ? "script" : /\.m[jt]s$/.test(file) ? "module" : "unambiguous",
+                allowReturnOutsideFunction: true,
+                allowAwaitOutsideFunction: true,
+                plugins,
+            });
+        }
+        catch {
+            // Try the next plugin set.
+        }
+    }
+    return null;
+}
+const isRequireOfNodeModule = (node) => node?.type === "CallExpression" &&
+    node.callee.type === "Identifier" &&
+    node.callee.name === "require" &&
+    node.arguments[0]?.type === "StringLiteral" &&
+    NODE_MODULE.has(node.arguments[0].value);
+const keyName = (key) => key.type === "Identifier" ? key.name : key.type === "StringLiteral" ? key.value : undefined;
+/** Whether `name` at `path` is node:module's createRequire, under any alias. */
+function bindsCreateRequire(path, name) {
+    const binding = path.scope.getBinding(name);
+    if (!binding)
+        return false;
+    const decl = binding.path.node;
+    const parent = binding.path.parent;
+    if (decl.type === "ImportSpecifier") {
+        return (parent.type === "ImportDeclaration" &&
+            NODE_MODULE.has(parent.source.value) &&
+            keyName(decl.imported) === "createRequire");
     }
-    const patch = JSON.stringify(WORKERD_ENTER_WITH_PATCH);
-    // An ESM import in a CommonJS module would turn it into ESM; require it there.
-    return ESM_SYNTAX.test(code) ? `import ${patch};${code}` : `require(${patch});${code}`;
+    // const { createRequire } = require("node:module")
+    if (decl.type === "VariableDeclarator" && decl.id.type === "ObjectPattern" && isRequireOfNodeModule(decl.init)) {
+        return decl.id.properties.some((prop) => prop.type === "ObjectProperty" &&
+            keyName(prop.key) === "createRequire" &&
+            prop.value.type === "Identifier" &&
+            prop.value.name === name);
+    }
+    return false;
+}
+/** Whether `name` at `path` is node:module itself, as a default, namespace or required binding. */
+function bindsNodeModule(path, name) {
+    const binding = path.scope.getBinding(name);
+    if (!binding)
+        return false;
+    const decl = binding.path.node;
+    const parent = binding.path.parent;
+    if (decl.type === "ImportDefaultSpecifier" || decl.type === "ImportNamespaceSpecifier") {
+        return parent.type === "ImportDeclaration" && NODE_MODULE.has(parent.source.value);
+    }
+    return decl.type === "VariableDeclarator" && decl.id.type === "Identifier" && isRequireOfNodeModule(decl.init);
 }
-// A call, not a property access or a local `function createRequire(` declaration.
-const CREATE_REQUIRE_CALL = /(?<![.\w$]|function\s+)createRequire\(/g;
-/** Strips the query from `createRequire` arguments, for dev-served modules. */
-export function withQueryFreeCreateRequire(code) {
-    if (!code.match(CREATE_REQUIRE_CALL) || code.includes("__b44CreateRequireImpl"))
+/** The callee of a call that reaches node:module's createRequire, or null. */
+function createRequireCallee(path) {
+    const callee = path.node.callee;
+    if (callee.type === "Identifier") {
+        return bindsCreateRequire(path, callee.name) ? callee : null;
+    }
+    if (callee.type !== "MemberExpression" || callee.computed || keyName(callee.property) !== "createRequire") {
         return null;
-    const wrapper = "const __b44CreateRequire = (path) => __b44CreateRequireImpl(String(path).replace(/[?#].*$/, \"\"));";
-    const binding = ESM_SYNTAX.test(code)
-        ? 'import { createRequire as __b44CreateRequireImpl } from "node:module";'
-        : 'const { createRequire: __b44CreateRequireImpl } = require("node:module");';
-    return binding + wrapper + code.replace(CREATE_REQUIRE_CALL, "__b44CreateRequire(");
+    }
+    const object = callee.object;
+    if (object.type === "Identifier")
+        return bindsNodeModule(path, object.name) ? callee : null;
+    return isRequireOfNodeModule(object) ? callee : null;
 }
-function devTransform(code, id) {
-    const patched = withEnterWithPatch(code, id) ?? code;
-    return withQueryFreeCreateRequire(patched) ?? (patched === code ? null : patched);
+/**
+ * Patches a workerd server module: imports the enterWith no-op ahead of a module
+ * that calls `.enterWith()`, and, with `createRequire`, routes node:module's
+ * `createRequire` through a wrapper that drops the id's query. Code is inserted
+ * on the first line after any shebang or directive prologue, so strict mode
+ * holds and line numbers stay put. Returns null when nothing applies.
+ */
+export function patchServerModule(code, id, options) {
+    const file = pathOf(id);
+    if (NON_SCRIPT_FILE.test(file.slice(file.lastIndexOf("/") + 1)) || file === WORKERD_ENTER_WITH_PATCH)
+        return null;
+    const mayEnterWith = code.includes(".enterWith(");
+    const mayCreateRequire = options.createRequire && code.includes("createRequire") && !code.includes(CREATE_REQUIRE_IMPL);
+    if (!mayEnterWith && !mayCreateRequire)
+        return null;
+    const ast = parseModule(code, file);
+    if (!ast)
+        return null;
+    let callsEnterWith = false;
+    const callees = [];
+    const visit = (path) => {
+        const callee = path.node.callee;
+        if (mayEnterWith &&
+            (callee.type === "MemberExpression" || callee.type === "OptionalMemberExpression") &&
+            !callee.computed &&
+            keyName(callee.property) === "enterWith") {
+            callsEnterWith = true;
+        }
+        const target = mayCreateRequire ? createRequireCallee(path) : null;
+        if (target)
+            callees.push(target);
+    };
+    traverseAst(ast, { CallExpression: visit, OptionalCallExpression: visit });
+    if (!callsEnterWith && callees.length === 0)
+        return null;
+    const isEsm = ast.program.sourceType === "module";
+    let prefix = "";
+    if (callsEnterWith) {
+        const patch = JSON.stringify(WORKERD_ENTER_WITH_PATCH);
+        // An ESM import in a CommonJS module would turn it into ESM; require it there.
+        prefix += isEsm ? `import ${patch};` : `require(${patch});`;
+    }
+    if (callees.length > 0) {
+        prefix += isEsm
+            ? `import { createRequire as ${CREATE_REQUIRE_IMPL} } from "node:module";`
+            : `const { createRequire: ${CREATE_REQUIRE_IMPL} } = require("node:module");`;
+        prefix += `const ${CREATE_REQUIRE} = (path) => ${CREATE_REQUIRE_IMPL}(String(path).replace(/[?#].*$/, ""));`;
+    }
+    // A shebang line cannot be followed on the same line, so the code goes at the
+    // start of the next one.
+    const { interpreter, directives } = ast.program;
+    let afterInterpreter = 0;
+    if (interpreter) {
+        const newline = code.indexOf("\n", interpreter.end);
+        if (newline === -1)
+            prefix = `\n${prefix}`;
+        afterInterpreter = newline === -1 ? code.length : newline + 1;
+    }
+    const insertAt = Math.max(afterInterpreter, ...directives.map((d) => d.end));
+    const edits = [
+        { start: insertAt, end: insertAt, text: prefix },
+        ...callees.map((node) => ({ start: node.start, end: node.end, text: CREATE_REQUIRE })),
+    ].sort((a, b) => b.start - a.start);
+    let out = code;
+    for (const edit of edits)
+        out = out.slice(0, edit.start) + edit.text + out.slice(edit.end);
+    return out;
 }
+const devTransform = (code, id) => patchServerModule(code, id, { createRequire: true });
 // Dev pre-bundles dependencies without running Vite plugins, so the dependency
 // optimizer, which only runs in dev, needs its own copy. Each copy checks the
 // build's conditions itself: Cloudflare's plugin sets them after ours has run.
@@ -61,7 +199,8 @@ function esbuildOptimizerPlugin() {
             if (!isWorkerd(build.initialOptions.conditions))
                 return;
             build.onResolve({ filter: /^ws$/ }, () => ({ path: WORKERD_WS_ADAPTER }));
-            build.onLoad({ filter: /\.[cm]?js$/ }, async (args) => {
+            // Other namespaces hold virtual modules with no file to read.
+            build.onLoad({ filter: /\.[cm]?js$/, namespace: "file" }, async (args) => {
                 const code = devTransform(await readFile(args.path, "utf8"), args.path);
                 return code === null ? undefined : { contents: code, loader: "js" };
             });
@@ -80,8 +219,7 @@ function rolldownOptimizerPlugin() {
     };
 }
 const OPTIMIZED_DEP = /[\\/]node_modules[\\/]\.vite[\\/]/;
-const isVite8OrLater = Number(viteVersion.split(".")[0]) >= 8;
-export function workerdCompatPlugin() {
+export function workerdCompatPlugin({ rolldown = isVite8OrLater } = {}) {
     return {
         name: "base44-workerd-compat",
         enforce: "pre",
@@ -89,9 +227,10 @@ export function workerdCompatPlugin() {
         configEnvironment(name) {
             if (name === "client")
                 return;
-            const optimizeDeps = isVite8OrLater
+            const optimizeDeps = rolldown
                 ? { rolldownOptions: { plugins: [rolldownOptimizerPlugin()] } }
                 : { esbuildOptions: { plugins: [esbuildOptimizerPlugin()] } };
+            // Vite 7's types do not know `rolldownOptions`, hence the cast.
             return { optimizeDeps };
         },
         resolveId: (id) => redirect(id),
@@ -99,7 +238,7 @@ export function workerdCompatPlugin() {
             // The optimizer already patched its output.
             if (OPTIMIZED_DEP.test(id))
                 return null;
-            return this.environment.mode === "dev" ? devTransform(code, id) : withEnterWithPatch(code, id);
+            return patchServerModule(code, id, { createRequire: this.environment.mode === "dev" });
         },
     };
 }

package/dist/workerd-compat-plugin.js.map

@@ -1 +1 @@
-{"version":3,"file":"workerd-compat-plugin.js","sourceRoot":"","sources":["../src/workerd-compat-plugin.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"workerd-compat-plugin.js","sourceRoot":"","sources":["../src/workerd-compat-plugin.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@base44-preview/vite-plugin",
-  "version": "1.0.46-pr.136.11ca3d8",
+  "version": "1.0.46-pr.136.cc02f83",
   "description": "The Vite plugin for base44 based applications",
   "type": "module",
   "license": "MIT",

package/src/index.ts

@@ -1,9 +1,9 @@
 import path from "node:path";
 import type { Plugin, UserConfig } from "vite";
-import { loadEnv, version as viteVersion } from "vite";
+import { loadEnv } from "vite";
 import { errorOverlayPlugin } from "./error-overlay-plugin.js";
 import { visualEditPlugin } from "./visual-edit-plugin.js";
-import { filterPackagesInProject } from "./utils.js";
+import { filterPackagesInProject, isVite8OrLater } from "./utils.js";
 import { htmlInjectionsPlugin } from "./html-injections-plugin.js";
 import { buildStatusPlugin } from "./build-status-plugin.js";
 import { base44RuntimePlugin } from "./base44-runtime-plugin.js";
@@ -13,10 +13,8 @@ export type { DocumentScript } from "./consts.js";
 
 const isRunningInSandbox = !!process.env.MODAL_SANDBOX_ID;
 
-// Vite 8 pre-bundles deps with Rolldown instead of esbuild and deprecates
-// `optimizeDeps.esbuildOptions`. Both spellings mean the same thing here:
-// treat .js files as JSX, since app code routinely puts JSX in .js.
-const isVite8OrLater = Number(viteVersion.split(".")[0]) >= 8;
+// Both optimizer spellings mean the same thing here: treat .js files as JSX,
+// since app code routinely puts JSX in .js.
 const jsxInJsFiles = isVite8OrLater
   ? { rolldownOptions: { moduleTypes: { ".js": "jsx" } } }
   : { esbuildOptions: { loader: { ".js": "jsx" } } };

package/src/utils.ts

@@ -1,5 +1,10 @@
 import { readFileSync, existsSync } from "fs";
 import { join } from "path";
+import { version as viteVersion } from "vite";
+
+// Vite 8 pre-bundles deps with Rolldown instead of esbuild and deprecates
+// `optimizeDeps.esbuildOptions`.
+export const isVite8OrLater = Number(viteVersion.split(".")[0]) >= 8;
 
 /**
  * The package that owns an optimizeDeps entry. Deep entries like

package/src/workerd-compat-plugin.ts

@@ -1,12 +1,16 @@
 import { readFile } from "node:fs/promises";
 import { fileURLToPath } from "node:url";
+import { parse, type ParserPlugin } from "@babel/parser";
+import { default as traverse, type NodePath } from "@babel/traverse";
+import type * as t from "@babel/types";
 import type { EnvironmentOptions, Plugin } from "vite";
-import { version as viteVersion } from "vite";
+import { normalizePath } from "vite";
+import { isVite8OrLater } from "./utils.js";
 
 /**
- * Closes two workerd gaps that break Node-targeted npm clients (Stagehand among
- * them) in full-stack server code, matching what @base44/functions-compiler does
- * for backend functions:
+ * Closes three workerd gaps that break Node-targeted npm clients (Stagehand among
+ * them) in full-stack server code. @base44/functions-compiler covers the first
+ * two for backend functions:
  *
  * - `ws`: its exports map sends the "browser" condition (which Cloudflare's Vite
  *   plugin resolves with) to a stub that throws on use. It is served as a
@@ -23,8 +27,9 @@ import { version as viteVersion } from "vite";
  * the browser bundle and a Node-run server keep the real modules.
  */
 
+// Vite ids use forward slashes on every platform, so these must too.
 const compatFile = (name: string) =>
-  fileURLToPath(new URL(`../compat/${name}`, import.meta.url));
+  normalizePath(fileURLToPath(new URL(`../compat/${name}`, import.meta.url)));
 
 export const WORKERD_WS_ADAPTER = compatFile("workerd-ws.cjs");
 export const WORKERD_ENTER_WITH_PATCH = compatFile("workerd-enter-with.mjs");
@@ -32,39 +37,187 @@ export const WORKERD_ENTER_WITH_PATCH = compatFile("workerd-enter-with.mjs");
 const isWorkerd = (conditions: readonly string[] | undefined) =>
   !!conditions?.includes("workerd");
 
+// `ws` exports only its root, so a deep import never resolves to begin with.
 const redirect = (id: string) => (id === "ws" ? WORKERD_WS_ADAPTER : null);
 
-const ESM_SYNTAX = /^\s*(import|export)\b/m;
+// JSON, CSS and the like reach a "pre" transform raw. Virtual ids often have no
+// extension at all, and are JavaScript.
+const NON_SCRIPT_FILE = /\.(?![cm]?[jt]sx?$)[a-z0-9]+$/i;
+const NODE_MODULE = new Set(["module", "node:module"]);
+const CREATE_REQUIRE_IMPL = "__b44CreateRequireImpl";
+const CREATE_REQUIRE = "__b44CreateRequire";
 
-/** Prepends the patch on the first line, so line numbers stay put. */
-export function withEnterWithPatch(code: string, id: string): string | null {
-  if (!code.includes(".enterWith(") || id.split("?")[0] === WORKERD_ENTER_WITH_PATCH) {
+// @babel/traverse is CommonJS: Node's ESM interop nests the function under
+// `default`, while bundlers and Vitest hand it over directly.
+const traverseAst = ((traverse as unknown as { default?: typeof traverse }).default ?? traverse) as unknown as typeof traverse.default;
+
+const pathOf = (id: string) => id.split("?")[0] ?? id;
+
+function parserPlugins(file: string): ParserPlugin[][] {
+  if (/\.tsx$/.test(file)) return [["typescript", "jsx"]];
+  if (/\.[cm]?ts$/.test(file)) return [["typescript"]];
+  // Apps routinely put JSX in .js, but JSX parsing can misread plain JS, so it
+  // is only the fallback.
+  return [[], ["jsx"]];
+}
+
+function parseModule(code: string, file: string): t.File | null {
+  for (const plugins of parserPlugins(file)) {
+    try {
+      return parse(code, {
+        // A module is ESM only if it has ESM syntax: text that merely looks
+        // like an import, inside a string or comment, does not count.
+        sourceType: /\.c[jt]s$/.test(file) ? "script" : /\.m[jt]s$/.test(file) ? "module" : "unambiguous",
+        allowReturnOutsideFunction: true,
+        allowAwaitOutsideFunction: true,
+        plugins,
+      });
+    } catch {
+      // Try the next plugin set.
+    }
+  }
+  return null;
+}
+
+const isRequireOfNodeModule = (node: t.Node | null | undefined): boolean =>
+  node?.type === "CallExpression" &&
+  node.callee.type === "Identifier" &&
+  node.callee.name === "require" &&
+  node.arguments[0]?.type === "StringLiteral" &&
+  NODE_MODULE.has(node.arguments[0].value);
+
+const keyName = (key: t.Node): string | undefined =>
+  key.type === "Identifier" ? key.name : key.type === "StringLiteral" ? key.value : undefined;
+
+/** Whether `name` at `path` is node:module's createRequire, under any alias. */
+function bindsCreateRequire(path: NodePath, name: string): boolean {
+  const binding = path.scope.getBinding(name);
+  if (!binding) return false;
+  const decl = binding.path.node;
+  const parent = binding.path.parent;
+  if (decl.type === "ImportSpecifier") {
+    return (
+      parent.type === "ImportDeclaration" &&
+      NODE_MODULE.has(parent.source.value) &&
+      keyName(decl.imported) === "createRequire"
+    );
+  }
+  // const { createRequire } = require("node:module")
+  if (decl.type === "VariableDeclarator" && decl.id.type === "ObjectPattern" && isRequireOfNodeModule(decl.init)) {
+    return decl.id.properties.some(
+      (prop) =>
+        prop.type === "ObjectProperty" &&
+        keyName(prop.key) === "createRequire" &&
+        prop.value.type === "Identifier" &&
+        prop.value.name === name,
+    );
+  }
+  return false;
+}
+
+/** Whether `name` at `path` is node:module itself, as a default, namespace or required binding. */
+function bindsNodeModule(path: NodePath, name: string): boolean {
+  const binding = path.scope.getBinding(name);
+  if (!binding) return false;
+  const decl = binding.path.node;
+  const parent = binding.path.parent;
+  if (decl.type === "ImportDefaultSpecifier" || decl.type === "ImportNamespaceSpecifier") {
+    return parent.type === "ImportDeclaration" && NODE_MODULE.has(parent.source.value);
+  }
+  return decl.type === "VariableDeclarator" && decl.id.type === "Identifier" && isRequireOfNodeModule(decl.init);
+}
+
+/** The callee of a call that reaches node:module's createRequire, or null. */
+function createRequireCallee(path: NodePath<t.CallExpression | t.OptionalCallExpression>): t.Node | null {
+  const callee = path.node.callee;
+  if (callee.type === "Identifier") {
+    return bindsCreateRequire(path, callee.name) ? callee : null;
+  }
+  if (callee.type !== "MemberExpression" || callee.computed || keyName(callee.property) !== "createRequire") {
     return null;
   }
-  const patch = JSON.stringify(WORKERD_ENTER_WITH_PATCH);
-  // An ESM import in a CommonJS module would turn it into ESM; require it there.
-  return ESM_SYNTAX.test(code) ? `import ${patch};${code}` : `require(${patch});${code}`;
+  const object = callee.object;
+  if (object.type === "Identifier") return bindsNodeModule(path, object.name) ? callee : null;
+  return isRequireOfNodeModule(object) ? callee : null;
 }
 
-// A call, not a property access or a local `function createRequire(` declaration.
-const CREATE_REQUIRE_CALL = /(?<![.\w$]|function\s+)createRequire\(/g;
-
-/** Strips the query from `createRequire` arguments, for dev-served modules. */
-export function withQueryFreeCreateRequire(code: string): string | null {
-  if (!code.match(CREATE_REQUIRE_CALL) || code.includes("__b44CreateRequireImpl")) return null;
-  const wrapper =
-    "const __b44CreateRequire = (path) => __b44CreateRequireImpl(String(path).replace(/[?#].*$/, \"\"));";
-  const binding = ESM_SYNTAX.test(code)
-    ? 'import { createRequire as __b44CreateRequireImpl } from "node:module";'
-    : 'const { createRequire: __b44CreateRequireImpl } = require("node:module");';
-  return binding + wrapper + code.replace(CREATE_REQUIRE_CALL, "__b44CreateRequire(");
+export interface PatchOptions {
+  /** Also route `createRequire` calls through the query-dropping wrapper. */
+  createRequire: boolean;
 }
 
-function devTransform(code: string, id: string): string | null {
-  const patched = withEnterWithPatch(code, id) ?? code;
-  return withQueryFreeCreateRequire(patched) ?? (patched === code ? null : patched);
+/**
+ * Patches a workerd server module: imports the enterWith no-op ahead of a module
+ * that calls `.enterWith()`, and, with `createRequire`, routes node:module's
+ * `createRequire` through a wrapper that drops the id's query. Code is inserted
+ * on the first line after any shebang or directive prologue, so strict mode
+ * holds and line numbers stay put. Returns null when nothing applies.
+ */
+export function patchServerModule(code: string, id: string, options: PatchOptions): string | null {
+  const file = pathOf(id);
+  if (NON_SCRIPT_FILE.test(file.slice(file.lastIndexOf("/") + 1)) || file === WORKERD_ENTER_WITH_PATCH) return null;
+  const mayEnterWith = code.includes(".enterWith(");
+  const mayCreateRequire =
+    options.createRequire && code.includes("createRequire") && !code.includes(CREATE_REQUIRE_IMPL);
+  if (!mayEnterWith && !mayCreateRequire) return null;
+
+  const ast = parseModule(code, file);
+  if (!ast) return null;
+
+  let callsEnterWith = false;
+  const callees: t.Node[] = [];
+  const visit = (path: NodePath<t.CallExpression | t.OptionalCallExpression>) => {
+    const callee = path.node.callee;
+    if (
+      mayEnterWith &&
+      (callee.type === "MemberExpression" || callee.type === "OptionalMemberExpression") &&
+      !callee.computed &&
+      keyName(callee.property) === "enterWith"
+    ) {
+      callsEnterWith = true;
+    }
+    const target = mayCreateRequire ? createRequireCallee(path) : null;
+    if (target) callees.push(target);
+  };
+  traverseAst(ast, { CallExpression: visit, OptionalCallExpression: visit });
+  if (!callsEnterWith && callees.length === 0) return null;
+
+  const isEsm = ast.program.sourceType === "module";
+  let prefix = "";
+  if (callsEnterWith) {
+    const patch = JSON.stringify(WORKERD_ENTER_WITH_PATCH);
+    // An ESM import in a CommonJS module would turn it into ESM; require it there.
+    prefix += isEsm ? `import ${patch};` : `require(${patch});`;
+  }
+  if (callees.length > 0) {
+    prefix += isEsm
+      ? `import { createRequire as ${CREATE_REQUIRE_IMPL} } from "node:module";`
+      : `const { createRequire: ${CREATE_REQUIRE_IMPL} } = require("node:module");`;
+    prefix += `const ${CREATE_REQUIRE} = (path) => ${CREATE_REQUIRE_IMPL}(String(path).replace(/[?#].*$/, ""));`;
+  }
+
+  // A shebang line cannot be followed on the same line, so the code goes at the
+  // start of the next one.
+  const { interpreter, directives } = ast.program;
+  let afterInterpreter = 0;
+  if (interpreter) {
+    const newline = code.indexOf("\n", interpreter.end!);
+    if (newline === -1) prefix = `\n${prefix}`;
+    afterInterpreter = newline === -1 ? code.length : newline + 1;
+  }
+  const insertAt = Math.max(afterInterpreter, ...directives.map((d) => d.end!));
+
+  const edits = [
+    { start: insertAt, end: insertAt, text: prefix },
+    ...callees.map((node) => ({ start: node.start!, end: node.end!, text: CREATE_REQUIRE })),
+  ].sort((a, b) => b.start - a.start);
+  let out = code;
+  for (const edit of edits) out = out.slice(0, edit.start) + edit.text + out.slice(edit.end);
+  return out;
 }
 
+const devTransform = (code: string, id: string) => patchServerModule(code, id, { createRequire: true });
+
 // Structural esbuild types: esbuild is Vite's dependency, not ours.
 interface EsbuildBuild {
   initialOptions: { conditions?: string[] };
@@ -73,7 +226,7 @@ interface EsbuildBuild {
     callback: (args: { path: string }) => { path: string } | undefined,
   ): void;
   onLoad(
-    options: { filter: RegExp },
+    options: { filter: RegExp; namespace: string },
     callback: (args: { path: string }) => Promise<{ contents: string; loader: "js" } | undefined>,
   ): void;
 }
@@ -87,7 +240,8 @@ function esbuildOptimizerPlugin() {
     setup(build: EsbuildBuild) {
       if (!isWorkerd(build.initialOptions.conditions)) return;
       build.onResolve({ filter: /^ws$/ }, () => ({ path: WORKERD_WS_ADAPTER }));
-      build.onLoad({ filter: /\.[cm]?js$/ }, async (args) => {
+      // Other namespaces hold virtual modules with no file to read.
+      build.onLoad({ filter: /\.[cm]?js$/, namespace: "file" }, async (args) => {
         const code = devTransform(await readFile(args.path, "utf8"), args.path);
         return code === null ? undefined : { contents: code, loader: "js" };
       });
@@ -109,9 +263,12 @@ function rolldownOptimizerPlugin() {
 
 const OPTIMIZED_DEP = /[\\/]node_modules[\\/]\.vite[\\/]/;
 
-const isVite8OrLater = Number(viteVersion.split(".")[0]) >= 8;
+export interface WorkerdCompatOptions {
+  /** Which dependency optimizer to hook. Defaults to the installed Vite's. */
+  rolldown?: boolean;
+}
 
-export function workerdCompatPlugin(): Plugin {
+export function workerdCompatPlugin({ rolldown = isVite8OrLater }: WorkerdCompatOptions = {}): Plugin {
   return {
     name: "base44-workerd-compat",
     enforce: "pre",
@@ -119,16 +276,17 @@ export function workerdCompatPlugin(): Plugin {
       isWorkerd(environment.config.resolve.conditions),
     configEnvironment(name) {
       if (name === "client") return;
-      const optimizeDeps = isVite8OrLater
+      const optimizeDeps = rolldown
         ? { rolldownOptions: { plugins: [rolldownOptimizerPlugin()] } }
         : { esbuildOptions: { plugins: [esbuildOptimizerPlugin()] } };
+      // Vite 7's types do not know `rolldownOptions`, hence the cast.
       return { optimizeDeps } as EnvironmentOptions;
     },
     resolveId: (id) => redirect(id),
     transform(code, id) {
       // The optimizer already patched its output.
       if (OPTIMIZED_DEP.test(id)) return null;
-      return this.environment.mode === "dev" ? devTransform(code, id) : withEnterWithPatch(code, id);
+      return patchServerModule(code, id, { createRequire: this.environment.mode === "dev" });
     },
   };
 }