@vitejs/plugin-rsc 0.4.17 → 0.4.18

package/dist/index.js

@@ -1,6 +1,6 @@
 import "./dist-DEF94lDJ.js";
 import "./plugin-CZbI4rhS.js";
-import { transformHoistInlineDirective, vitePluginRsc } from "./plugin-BxEQycAE.js";
+import { transformHoistInlineDirective, vitePluginRsc } from "./plugin-TNrMxDOB.js";
 import "./encryption-utils-BDwwcMVT.js";
 import "./rpc-tGuLT8PD.js";
 import "./vite-utils-Vzd7cqfv.js";

package/dist/{plugin-BxEQycAE.js → plugin-TNrMxDOB.js}

@@ -301,6 +301,116 @@ function transformServerActionServer(input, ast, options) {
 	});
 }
 
+//#endregion
+//#region src/plugins/utils.ts
+function evalValue(rawValue) {
+	const fn = new Function(`
+    var console, exports, global, module, process, require
+    return (\n${rawValue}\n)
+  `);
+	return fn();
+}
+function parseIdQuery(id) {
+	if (!id.includes("?")) return {
+		filename: id,
+		query: {}
+	};
+	const [filename, rawQuery] = id.split(`?`, 2);
+	const query = Object.fromEntries(new URLSearchParams(rawQuery));
+	return {
+		filename,
+		query
+	};
+}
+
+//#endregion
+//#region src/transforms/cjs.ts
+function transformCjsToEsm(code, ast) {
+	const output = new MagicString(code);
+	const analyzed = analyze(ast);
+	let parentNodes = [];
+	let hoistIndex = 0;
+	walk(ast, {
+		enter(node) {
+			parentNodes.push(node);
+			if (node.type === "CallExpression" && node.callee.type === "Identifier" && node.callee.name === "require" && node.arguments.length === 1) {
+				let isTopLevel = true;
+				for (const parent of parentNodes) {
+					if (parent.type === "FunctionExpression" || parent.type === "FunctionDeclaration" || parent.type === "ArrowFunctionExpression") isTopLevel = false;
+					const scope = analyzed.map.get(parent);
+					if (scope && scope.declarations.has("require")) return;
+				}
+				if (isTopLevel) {
+					output.update(node.start, node.callee.end, "(await import");
+					output.appendRight(node.end, ")");
+				} else {
+					const hoisted = `__cjs_to_esm_hoist_${hoistIndex}`;
+					const importee = code.slice(node.arguments[0].start, node.arguments[0].end);
+					output.prepend(`const ${hoisted} = await import(${importee});\n`);
+					output.update(node.start, node.end, hoisted);
+					hoistIndex++;
+				}
+			}
+		},
+		leave() {
+			parentNodes.pop();
+		}
+	});
+	output.prepend(`const exports = {}; const module = { exports };\n`);
+	return { output };
+}
+
+//#endregion
+//#region src/plugins/cjs.ts
+function cjsModuleRunnerPlugin() {
+	const warnedPackages = new Set(["use-sync-external-store"]);
+	return [{
+		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) {
+						const pkgJson = JSON.parse(fs.readFileSync(pkgJsonPath, "utf-8"));
+						if (pkgJson.type === "module") return;
+					}
+				}
+				const [, , , hasModuleSyntax] = esModuleLexer.parse(code);
+				if (hasModuleSyntax) return;
+				const packageKey = extractPackageKey(id);
+				if (!warnedPackages.has(packageKey)) {
+					this.warn(`Found non-optimized CJS dependency in '${this.environment.name}' environment. It is recommended to add the dependency to 'environments.${this.environment.name}.optimizeDeps.include'.`);
+					warnedPackages.add(packageKey);
+				}
+				const ast = await parseAstAsync(code);
+				const result = transformCjsToEsm(code, ast);
+				const output = result.output;
+				output.append(`__vite_ssr_exportAll__(module.exports)`);
+				return {
+					code: output.toString(),
+					map: output.generateMap({ hires: "boundary" })
+				};
+			}
+		}
+	}];
+}
+function extractPackageKey(id) {
+	const yarnMatch = id.match(/\/.yarn\/cache\/([^/]+)/);
+	if (yarnMatch) return yarnMatch[1];
+	if (id.includes("/node_modules")) {
+		id = id.split("/node_modules/").at(-1);
+		let [x, y] = id.split("/");
+		if (x.startsWith("@")) return `${x}/${y}`;
+		return x;
+	}
+	return id;
+}
+
 //#endregion
 //#region src/plugin.ts
 let serverReferences = {};
@@ -820,31 +930,10 @@ globalThis.AsyncLocalStorage = __viteRscAyncHooks.AsyncLocalStorage;
 		...vitePluginFindSourceMapURL(),
 		...vitePluginRscCss({ rscCssTransform: rscPluginOptions.rscCssTransform }),
 		...rscPluginOptions.validateImports !== false ? [validateImportPlugin()] : [],
-		...vendorUseSyncExternalStorePlugin(),
 		scanBuildStripPlugin(),
-		detectNonOptimizedCjsPlugin()
+		...cjsModuleRunnerPlugin()
 	];
 }
-function detectNonOptimizedCjsPlugin() {
-	return {
-		name: "rsc:detect-non-optimized-cjs",
-		apply: "serve",
-		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;
-				let isEsm = id.endsWith(".mjs");
-				if (id.endsWith(".js")) {
-					const pkgJsonPath = await findClosestPkgJsonPath(path.dirname(id));
-					if (pkgJsonPath) {
-						const pkgJson = JSON.parse(fs.readFileSync(pkgJsonPath, "utf-8"));
-						isEsm = pkgJson.type === "module";
-					}
-				}
-				if (!isEsm) this.warn(`[vite-rsc] found non-optimized CJS dependency in '${this.environment.name}' environment. It is recommended to manually add the dependency to 'environments.${this.environment.name}.optimizeDeps.include'.`);
-			}
-		}
-	};
-}
 function scanBuildStripPlugin() {
 	return {
 		name: "rsc:scan-strip",
@@ -1499,25 +1588,6 @@ function generateResourcesCode(depsCode) {
     export const Resources = (${ResourcesFn.toString()})(__vite_rsc_react__, ${depsCode});
   `;
 }
-function evalValue(rawValue) {
-	const fn = new Function(`
-    var console, exports, global, module, process, require
-    return (\n${rawValue}\n)
-  `);
-	return fn();
-}
-function parseIdQuery(id) {
-	if (!id.includes("?")) return {
-		filename: id,
-		query: {}
-	};
-	const [filename, rawQuery] = id.split(`?`, 2);
-	const query = Object.fromEntries(new URLSearchParams(rawQuery));
-	return {
-		filename,
-		query
-	};
-}
 async function transformRscCssExport(options) {
 	if (hasDirective(options.ast.body, "use client")) return;
 	const result = transformWrapExport(options.code, options.ast, {
@@ -1596,24 +1666,6 @@ function validateImportPlugin() {
 		}
 	};
 }
-function vendorUseSyncExternalStorePlugin() {
-	const exports = [
-		"use-sync-external-store",
-		"use-sync-external-store/with-selector",
-		"use-sync-external-store/with-selector.js",
-		"use-sync-external-store/shim",
-		"use-sync-external-store/shim/index.js",
-		"use-sync-external-store/shim/with-selector",
-		"use-sync-external-store/shim/with-selector.js"
-	];
-	return [{
-		name: "rsc:vendor-use-sync-external-store",
-		apply: "serve",
-		config() {
-			return { environments: { ssr: { optimizeDeps: { include: exports.map((e) => `${PKG_NAME} > ${e}`) } } } };
-		}
-	}];
-}
 function sortObject(o) {
 	return Object.fromEntries(Object.entries(o).sort(([a], [b]) => a.localeCompare(b)));
 }

package/dist/plugin.js

@@ -1,6 +1,6 @@
 import "./dist-DEF94lDJ.js";
 import "./plugin-CZbI4rhS.js";
-import { __fix_cloudflare, findSourceMapURL, transformRscCssExport, vitePluginFindSourceMapURL, vitePluginRsc, vitePluginRscCss, vitePluginRscMinimal } from "./plugin-BxEQycAE.js";
+import { __fix_cloudflare, findSourceMapURL, transformRscCssExport, vitePluginFindSourceMapURL, vitePluginRsc, vitePluginRscCss, vitePluginRscMinimal } from "./plugin-TNrMxDOB.js";
 import "./encryption-utils-BDwwcMVT.js";
 import "./rpc-tGuLT8PD.js";
 import "./vite-utils-Vzd7cqfv.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vitejs/plugin-rsc",
-  "version": "0.4.17",
+  "version": "0.4.18",
   "description": "React Server Components (RSC) support for Vite.",
   "keywords": [
     "vite",
@@ -44,7 +44,6 @@
     "magic-string": "^0.30.17",
     "periscopic": "^4.0.2",
     "turbo-stream": "^3.1.0",
-    "use-sync-external-store": "^1.5.0",
     "vitefu": "^1.1.1"
   },
   "devDependencies": {
@@ -52,7 +51,7 @@
     "@playwright/test": "^1.54.2",
     "@tsconfig/strictest": "^2.0.5",
     "@types/estree": "^1.0.8",
-    "@types/node": "^22.17.0",
+    "@types/node": "^22.17.1",
     "@types/react": "^19.1.9",
     "@types/react-dom": "^19.1.7",
     "@vitejs/plugin-react": "workspace:*",
@@ -61,7 +60,7 @@
     "react-server-dom-webpack": "^19.1.1",
     "rsc-html-stream": "^0.0.7",
     "tinyexec": "^1.0.1",
-    "tsdown": "^0.13.2",
+    "tsdown": "^0.14.0",
     "vite-plugin-inspect": "^11.3.2"
   },
   "peerDependencies": {