@vitejs/plugin-rsc 0.5.16 → 0.5.18

package/dist/browser.d.ts

@@ -1,4 +1,4 @@
-import { n as CallServerCallback } from "./index-DqoQPvhP.js";
-import { t as setRequireModule } from "./browser-BmyjVnfA.js";
+import { n as CallServerCallback } from "./index-now_lP2V.js";
+import { t as setRequireModule } from "./browser-s-WcB8A7.js";
 import { callServer, createFromFetch, createFromReadableStream, createServerReference, createTemporaryReferenceSet, encodeReply, findSourceMapURL, setServerCallback } from "./react/browser.js";
 export { CallServerCallback, callServer, createFromFetch, createFromReadableStream, createServerReference, createTemporaryReferenceSet, encodeReply, findSourceMapURL, setRequireModule, setServerCallback };

package/dist/{cjs-DH9Oa3zy.js → cjs-D2v1gYgq.js}

@@ -1,5 +1,5 @@
-import { t as createDebug } from "./dist-DZUJDIM2.js";
-import { n as parseIdQuery } from "./shared-Chot7h9j.js";
+import { t as createDebug } from "./dist-yW9-EeG1.js";
+import { n as parseIdQuery } from "./shared-CGK4coF3.js";
 import fs from "node:fs";
 import path from "node:path";
 import { fileURLToPath, pathToFileURL } from "node:url";
@@ -11,7 +11,10 @@ import { walk } from "estree-walker";
 import { analyze } from "periscopic";
 
 //#region src/transforms/cjs.ts
-const CJS_INTEROP_HELPER = `function __cjs_interop__(m) { return m.__cjs_module_runner_transform ? m.default : m; }`;
+function __cjs_interop__(m) {
+	return m.__cjs_module_runner_transform || "default" in m && Object.keys(m).every((k) => k === "default" || m[k] === m.default[k]) ? m.default : m;
+}
+const CJS_INTEROP_HELPER = __cjs_interop__.toString().replace(/\n\s*/g, "");
 function transformCjsToEsm(code, ast, options) {
 	const output = new MagicString(code);
 	const analyzed = analyze(ast);
@@ -67,29 +70,35 @@ function cjsModuleRunnerPlugin() {
 		name: "cjs-module-runner-transform",
 		apply: "serve",
 		applyToEnvironment: (env) => env.config.dev.moduleRunnerTransform,
-		async transform(code, id) {
-			if (id.includes("/node_modules/") && !id.startsWith(this.environment.config.cacheDir) && /\b(require|exports)\b/.test(code)) {
-				id = parseIdQuery(id).filename;
-				if (!/\.[cm]?js$/.test(id)) return;
-				if (id.endsWith(".mjs")) return;
-				if (id.endsWith(".js")) {
-					const pkgJsonPath = await findClosestPkgJsonPath(path.dirname(id));
-					if (pkgJsonPath) {
-						if (JSON.parse(fs.readFileSync(pkgJsonPath, "utf-8")).type === "module") return;
+		transform: {
+			filter: {
+				id: /\/node_modules\//,
+				code: /\b(require|exports)\b/
+			},
+			async handler(code, id) {
+				if (id.includes("/node_modules/") && !id.startsWith(this.environment.config.cacheDir) && /\b(require|exports)\b/.test(code)) {
+					id = parseIdQuery(id).filename;
+					if (!/\.[cm]?js$/.test(id)) return;
+					if (id.endsWith(".mjs")) return;
+					if (id.endsWith(".js")) {
+						const pkgJsonPath = await findClosestPkgJsonPath(path.dirname(id));
+						if (pkgJsonPath) {
+							if (JSON.parse(fs.readFileSync(pkgJsonPath, "utf-8")).type === "module") return;
+						}
 					}
+					const [, , , hasModuleSyntax] = esModuleLexer.parse(code);
+					if (hasModuleSyntax) return;
+					const packageKey = extractPackageKey(id);
+					if (!warnedPackages.has(packageKey)) {
+						debug(`non-optimized CJS dependency in '${this.environment.name}' environment: ${id}`);
+						warnedPackages.add(packageKey);
+					}
+					const output = transformCjsToEsm(code, await parseAstAsync(code), { id }).output;
+					return {
+						code: output.toString(),
+						map: output.generateMap({ hires: "boundary" })
+					};
 				}
-				const [, , , hasModuleSyntax] = esModuleLexer.parse(code);
-				if (hasModuleSyntax) return;
-				const packageKey = extractPackageKey(id);
-				if (!warnedPackages.has(packageKey)) {
-					debug(`non-optimized CJS dependency in '${this.environment.name}' environment: ${id}`);
-					warnedPackages.add(packageKey);
-				}
-				const output = transformCjsToEsm(code, await parseAstAsync(code), { id }).output;
-				return {
-					code: output.toString(),
-					map: output.generateMap({ hires: "boundary" })
-				};
 			}
 		}
 	}];

package/dist/core/browser.d.ts

@@ -1,2 +1,2 @@
-import { t as setRequireModule } from "../browser-BmyjVnfA.js";
+import { t as setRequireModule } from "../browser-s-WcB8A7.js";
 export { setRequireModule };

package/dist/core/browser.js

@@ -1,5 +1,5 @@
-import { n as memoize } from "../dist-DZUJDIM2.js";
-import { a as setInternalRequire, i as removeReferenceCacheTag } from "../shared-DEpnONZf.js";
+import { n as memoize } from "../dist-yW9-EeG1.js";
+import { a as setInternalRequire, i as removeReferenceCacheTag } from "../shared-rtJPs0Yj.js";
 
 //#region src/core/browser.ts
 let init = false;

package/dist/core/plugin.js

@@ -1,3 +1,3 @@
-import { t as vitePluginRscCore } from "../plugin-B1AJWrMi.js";
+import { t as vitePluginRscCore } from "../plugin-BGmSmdwL.js";
 
 export { vitePluginRscCore as default };

package/dist/core/rsc.d.ts

@@ -1,4 +1,4 @@
-import { r as ModuleMap, t as BundlerConfig } from "../index-DqoQPvhP.js";
+import { r as ModuleMap, t as BundlerConfig } from "../index-now_lP2V.js";
 
 //#region src/core/rsc.d.ts
 declare function setRequireModule(options: {

package/dist/core/rsc.js

@@ -1,3 +1,3 @@
-import { a as setRequireModule, i as loadServerAction, n as createServerDecodeClientManifest, r as createServerManifest, t as createClientManifest } from "../rsc-BCFg12vs.js";
+import { a as setRequireModule, i as loadServerAction, n as createServerDecodeClientManifest, r as createServerManifest, t as createClientManifest } from "../rsc-Bhp6O2qz.js";
 
 export { createClientManifest, createServerDecodeClientManifest, createServerManifest, loadServerAction, setRequireModule };

package/dist/core/ssr.d.ts

@@ -1,4 +1,4 @@
-import { i as ServerConsumerManifest } from "../index-DqoQPvhP.js";
+import { i as ServerConsumerManifest } from "../index-now_lP2V.js";
 
 //#region src/core/ssr.d.ts
 declare function setRequireModule(options: {

package/dist/core/ssr.js

@@ -1,5 +1,5 @@
-import { n as memoize } from "../dist-DZUJDIM2.js";
-import { a as setInternalRequire, i as removeReferenceCacheTag } from "../shared-DEpnONZf.js";
+import { n as memoize } from "../dist-yW9-EeG1.js";
+import { a as setInternalRequire, i as removeReferenceCacheTag } from "../shared-rtJPs0Yj.js";
 
 //#region src/core/ssr.ts
 let init = false;

package/dist/{dist-DZUJDIM2.js → dist-yW9-EeG1.js}

@@ -58,7 +58,7 @@ function createDebugPattern(namespace) {
 	const alts = [namespace];
 	for (let i = 1; i < parts.length; i++) alts.push(parts.slice(0, i).join(":") + ":*");
 	const pattern = alts.map((pattern2) => escapeRegExp(pattern2)).join("|");
-	return /* @__PURE__ */ new RegExp(`(^|,)(${pattern})($|,)`);
+	return new RegExp(`(^|,)(${pattern})($|,)`);
 }
 
 //#endregion