env-runner 0.3.2 → 0.3.3

package/dist/_chunks/miniflare-runner.d.mts

@@ -68,7 +68,10 @@ export interface MiniflareEnvRunnerOptions {
   persistent?: boolean;
   /** Wrap the user's `fetch` in a try/catch that returns structured JSON error responses. Default: `true`. */
   captureErrors?: boolean;
-  /** Export conditions for the fallback service (default `["workerd", "worker"]`). */
+  /**
+   * Export conditions for the fallback service (default `["workerd", "worker"]`),
+   * plus `import` or `require` matching how the module is loaded.
+   */
   exportConditions?: string[];
   /**
    * Load a wrangler config into Miniflare options (compat date/flags, bindings).

package/dist/_chunks/miniflare-runner.mjs

@@ -1269,6 +1269,7 @@ var MiniflareEnvRunner = class extends BaseEnvRunner {
 				};
 				options.unsafeUseModuleFallbackService = true;
 				const modulePathMap = /* @__PURE__ */ new Map();
+				const _redirects = /* @__PURE__ */ new Map();
 				const _lexersReady = Promise.all([ensureCjsLexer(), init]);
 				options.unsafeModuleFallbackService = async (request) => {
 					await _lexersReady;
@@ -1279,6 +1280,7 @@ var MiniflareEnvRunner = class extends BaseEnvRunner {
 					if (!specifier) return new Response(null, { status: 404 });
 					const cleanSpecifier = specifier.split("?")[0] || specifier;
 					const cleanRaw = rawSpecifier?.split("?")[0];
+					const method = request.headers.get("x-resolve-method") === "require" ? "require" : "import";
 					const bareSpecifier = cleanSpecifier.startsWith("/") ? cleanSpecifier.slice(1) : cleanSpecifier;
 					const referrerKey = referrer.startsWith("/") ? referrer.slice(1) : referrer;
 					const referrerPath = modulePathMap.get(referrerKey);
@@ -1312,6 +1314,7 @@ var MiniflareEnvRunner = class extends BaseEnvRunner {
 					let resolvedPath;
 					let resolvedId;
 					let pluginResolved = false;
+					let bareResolved = false;
 					const _resolvePlugins = _livePlugins();
 					const rawSource = rawSpecifier ? stripInternalQuery(rawSpecifier, version) : bareSpecifier + query;
 					const _pluginResolve = async (fallback) => {
@@ -1347,9 +1350,21 @@ var MiniflareEnvRunner = class extends BaseEnvRunner {
 							return _pluginErrorModule(name, error);
 						}
 					};
-					const pluginPath = await _pluginResolve(false);
-					if (pluginPath instanceof Response) return pluginPath;
-					resolvedPath = pluginPath;
+					const redirected = _redirects.get(specifier);
+					if (redirected) {
+						_redirects.delete(specifier);
+						resolvedPath = redirected.path;
+						resolvedId = redirected.id;
+						pluginResolved = redirected.id !== void 0;
+					} else if (method === "require" && cleanRaw?.startsWith("node:") && specifier === cleanRaw + NODE_REQUIRE_SUFFIX) return Response.json({
+						name: specifier,
+						esModule: createNodeRequireShim(cleanRaw)
+					});
+					else {
+						const pluginPath = await _pluginResolve(false);
+						if (pluginPath instanceof Response) return pluginPath;
+						resolvedPath = pluginPath;
+					}
 					const fileUrlRaw = cleanRaw || cleanSpecifier;
 					if (resolvedPath !== void 0) {} else if (fileUrlRaw.startsWith("file://")) try {
 						resolvedPath = fileURLToPath(fileUrlRaw);
@@ -1361,16 +1376,19 @@ var MiniflareEnvRunner = class extends BaseEnvRunner {
 						const contextRequire = referrerReal ? createRequire(referrerReal) : _require;
 						if (cleanRaw.startsWith("cloudflare:")) return new Response(null, { status: 404 });
 						if (cleanRaw.startsWith("node:")) {
-							const nodeName = cleanRaw.slice(5);
-							try {
-								resolvedPath = contextRequire.resolve(`unenv/node/${nodeName}`);
-							} catch {
-								return new Response(null, { status: 404 });
+							if (method === "require") {
+								const location = cleanRaw + NODE_REQUIRE_SUFFIX;
+								return new Response(null, {
+									status: 301,
+									headers: { location }
+								});
 							}
-						} else try {
+							return new Response(null, { status: 404 });
+						}
+						try {
 							resolvedPath = resolveModulePath(cleanRaw, {
 								from: referrerReal || entryBase,
-								conditions: _exportConditions,
+								conditions: [..._exportConditions, method],
 								try: true
 							}) || contextRequire.resolve(cleanRaw);
 						} catch {
@@ -1385,6 +1403,7 @@ var MiniflareEnvRunner = class extends BaseEnvRunner {
 							}
 							resolvedPath = failed;
 						}
+						bareResolved = true;
 					} else {
 						const referrerReal = referrerPath || (referrer.startsWith("/") ? referrer : "/" + referrer);
 						const referrerDir = dirname(referrerReal);
@@ -1406,6 +1425,20 @@ var MiniflareEnvRunner = class extends BaseEnvRunner {
 						if (failed instanceof Response) return failed;
 						resolvedPath = failed ?? resolvedPath;
 					}
+					if (bareResolved || pluginResolved) {
+						const path = toWorkerdPath(resolvedPath);
+						if (cleanSpecifier !== path) {
+							const location = pluginResolved ? restoreInternalQuery(path + queryOf(resolvedId), specifier) : path + rawQuery;
+							_redirects.set(location, {
+								path: resolvedPath,
+								id: pluginResolved ? resolvedId : void 0
+							});
+							return new Response(null, {
+								status: 301,
+								headers: { location: Buffer.from(location, "utf8").toString("latin1") }
+							});
+						}
+					}
 					if (_transformRequest) try {
 						const result = await _transformRequest(resolvedPath);
 						if (result?.code) {
@@ -1711,6 +1744,19 @@ function commonJSExports(contents) {
 		return [];
 	}
 }
+const NODE_REQUIRE_SUFFIX = "?__require";
+function createNodeRequireShim(specifier) {
+	const quoted = JSON.stringify(specifier);
+	const notFound = JSON.stringify(`No such module ${quoted}.`);
+	return [
+		`import * as __mod__ from ${quoted};`,
+		`export * from ${quoted};`,
+		`let __default__;`,
+		`try { __default__ = __mod__.default ?? __mod__; } catch { throw new Error(${notFound}); }`,
+		`export default __default__;`,
+		``
+	].join("\n");
+}
 function createCjsEsmShim(cjsSpecifier, contents) {
 	const namedExports = commonJSExports(contents).filter((e) => e !== "default" && e !== "__esModule");
 	let shim = `import __cjs_mod__ from ${JSON.stringify(cjsSpecifier)};\nexport default __cjs_mod__;\n`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "env-runner",
-  "version": "0.3.2",
+  "version": "0.3.3",
   "description": "Generic environment runner for JavaScript runtimes.",
   "license": "MIT",
   "repository": {