@vitejs/plugin-rsc 0.5.23 → 0.5.25

package/dist/{chunk-BYIdrdsR.js → chunk-DpdyVxdi.js}

@@ -6,7 +6,7 @@ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __commonJSMin = (cb, mod) => () => (mod || cb((mod = { exports: {} }).exports, mod), mod.exports);
+var __commonJSMin = (cb, mod) => () => (mod || (cb((mod = { exports: {} }).exports, mod), cb = null), mod.exports);
 var __copyProps = (to, from, except, desc) => {
 	if (from && typeof from === "object" || typeof from === "function") for (var keys = __getOwnPropNames(from), i = 0, n = keys.length, key; i < n; i++) {
 		key = keys[i];

package/dist/index.js

@@ -1,2 +1,2 @@
-import { r as vitePluginRsc, t as getPluginApi } from "./plugin-DMfc_Eqq.js";
+import { r as vitePluginRsc, t as getPluginApi } from "./plugin-BhzHKRFo.js";
 export { vitePluginRsc as default, getPluginApi };

package/dist/{picocolors-B6RAUUd2.js → picocolors-BDx0CW3k.js}

@@ -1,4 +1,4 @@
-import { t as __commonJSMin } from "./chunk-BYIdrdsR.js";
+import { t as __commonJSMin } from "./chunk-DpdyVxdi.js";
 //#region ../../node_modules/.pnpm/picocolors@1.1.1/node_modules/picocolors/picocolors.js
 var require_picocolors = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	let p = process || {}, argv = p.argv || [], env = p.env || {};

package/dist/{plugin-DMfc_Eqq.js → plugin-BhzHKRFo.js}

@@ -1,4 +1,4 @@
-import { n as __toESM } from "./chunk-BYIdrdsR.js";
+import { n as __toESM } from "./chunk-DpdyVxdi.js";
 import { t as createDebug } from "./dist-rz-Bnebz.js";
 import vitePluginRscCore from "./core/plugin.js";
 import { a as hasDirective } from "./scope-DKCDtt0O.js";
@@ -63,9 +63,9 @@ function normalizeResolvedIdToUrl(environment, url, resolved) {
 	if (url[0] !== "." && url[0] !== "/") url = wrapId(resolved.id);
 	return url;
 }
-function normalizeViteImportAnalysisUrl(environment, id) {
+function normalizeViteImportAnalysisUrl(environment, id, options) {
 	let url = normalizeResolvedIdToUrl(environment, id, { id });
-	if (environment.config.consumer === "client") {
+	if (options?.injectHMRTimestamp || environment.config.consumer === "client") {
 		const mod = environment.moduleGraph.getModuleById(id);
 		if (mod && mod.lastHMRTimestamp > 0) url = injectQuery(url, `t=${mod.lastHMRTimestamp}`);
 	}
@@ -605,7 +605,7 @@ function vitePluginRscMinimal(rscPluginOptions = {}, manager = new RscPluginMana
 function vitePluginRsc(rscPluginOptions = {}) {
 	const manager = new RscPluginManager();
 	const buildApp = async (builder) => {
-		const colors = await import("./picocolors-B6RAUUd2.js").then((m) => /* @__PURE__ */ __toESM(m.default, 1));
+		const colors = await import("./picocolors-BDx0CW3k.js").then((m) => /* @__PURE__ */ __toESM(m.default, 1));
 		const logStep = (msg) => {
 			builder.config.logger.info(colors.blue(msg));
 		};
@@ -796,7 +796,10 @@ function vitePluginRsc(rscPluginOptions = {}) {
 					environmentName: "rsc",
 					entryName: "index"
 				};
-				const handler = toNodeHandler(getFetchHandlerExport(await import(pathToFileURL(path.join(manager.config.environments[options.environmentName].build.outDir, `${options.entryName}.js`)).href)));
+				const handler = toNodeHandler(getFetchHandlerExport(await import(
+					/* @vite-ignore */
+					pathToFileURL(path.join(manager.config.environments[options.environmentName].build.outDir, `${options.entryName}.js`)).href
+)));
 				server.middlewares.use((req, _res, next) => {
 					delete req.headers["accept-encoding"];
 					next();
@@ -814,7 +817,10 @@ function vitePluginRsc(rscPluginOptions = {}) {
 			},
 			async hotUpdate(ctx) {
 				if (isCSSRequest(ctx.file)) {
-					if (this.environment.name === "client") return;
+					if (this.environment.name === "client") {
+						if (rscPluginOptions.cssLinkPrecedence ?? true) return;
+						if (ctx.server.environments.rsc?.moduleGraph.getModuleById(ctx.file)) return ctx.modules.filter((mod) => mod.type !== "css");
+					}
 				}
 				if (ctx.modules.map((mod) => mod.id).filter((v) => v !== null).length === 0) return;
 				if (this.environment.name === "rsc") {
@@ -999,6 +1005,15 @@ export function createRpcClient(params) {
 				}
 			}
 		},
+		{
+			name: "rsc:virtual:vite-rsc/track-bundles",
+			generateBundle: {
+				order: "post",
+				handler(_options, bundle) {
+					manager.bundles[this.environment.name] = bundle;
+				}
+			}
+		},
 		{
 			name: "rsc:virtual:vite-rsc/assets-manifest",
 			resolveId: {
@@ -1029,9 +1044,18 @@ export function createRpcClient(params) {
 				}
 			},
 			generateBundle(_options, bundle) {
-				manager.bundles[this.environment.name] = bundle;
 				if (this.environment.name === "client") {
 					const rscBundle = manager.bundles["rsc"];
+					if (!manager.config.environments.rsc.build.cssCodeSplit) {
+						let cssBundleName;
+						for (const output of Object.values(rscBundle)) if (output.type === "asset" && output.names.includes("style.css")) {
+							cssBundleName = output.fileName;
+							break;
+						}
+						if (cssBundleName) {
+							for (const output of Object.values(rscBundle)) if (output.type === "chunk") output.viteMetadata.importedCss.add(cssBundleName);
+						}
+					}
 					const assets = new Set(Object.values(rscBundle).flatMap((output) => output.type === "chunk" ? [...output.viteMetadata?.importedCss ?? [], ...output.viteMetadata?.importedAssets ?? []] : []));
 					for (const fileName of assets) {
 						const asset = rscBundle[fileName];
@@ -1043,7 +1067,7 @@ export function createRpcClient(params) {
 						});
 					}
 					const serverResources = {};
-					const rscAssetDeps = collectAssetDeps(manager.bundles["rsc"]);
+					const rscAssetDeps = collectAssetDeps(rscBundle);
 					for (const [id, meta] of Object.entries(manager.serverResourcesMetaMap)) serverResources[meta.key] = assetsURLOfDeps({
 						js: [],
 						css: rscAssetDeps[id]?.deps.css ?? []
@@ -1681,17 +1705,19 @@ function vitePluginRscCss(rscCssOptions = {}, manager) {
 		const cssIds = /* @__PURE__ */ new Set();
 		const visitedFiles = /* @__PURE__ */ new Set();
 		function recurse(id) {
-			if (visited.has(id)) return;
+			if (visited.has(id) || parseCssVirtual(id)) return;
 			visited.add(id);
 			const mod = environment.moduleGraph.getModuleById(id);
 			if (mod?.file) visitedFiles.add(mod.file);
 			for (const next of mod?.importedModules ?? []) if (next.id) if (isCSSRequest(next.id)) {
+				if (next.file) visitedFiles.add(next.file);
 				if (hasSpecialCssQuery(next.id)) continue;
 				cssIds.add(next.id);
 			} else recurse(next.id);
 		}
 		recurse(entryId);
-		const hrefs = [...cssIds].map((id) => normalizeViteImportAnalysisUrl(environment, id));
+		const cssLinkPrecedence = rscCssOptions?.cssLinkPrecedence ?? true;
+		const hrefs = [...cssIds].map((id) => normalizeViteImportAnalysisUrl(environment, id, { injectHMRTimestamp: !cssLinkPrecedence }));
 		return {
 			ids: [...cssIds],
 			hrefs,

package/dist/plugin.js

@@ -1,2 +1,2 @@
-import { i as vitePluginRscMinimal, n as transformRscCssExport, r as vitePluginRsc, t as getPluginApi } from "./plugin-DMfc_Eqq.js";
+import { i as vitePluginRscMinimal, n as transformRscCssExport, r as vitePluginRsc, t as getPluginApi } from "./plugin-BhzHKRFo.js";
 export { vitePluginRsc as default, getPluginApi, transformRscCssExport, vitePluginRscMinimal };

package/dist/transforms/index.js

@@ -24,7 +24,7 @@ function transformHoistInlineDirective(input, ast, { runtime, rejectNonAsyncFunc
 			}
 			const newName = `$$hoist_${names.length}` + (originalName ? `_${originalName}` : "");
 			names.push(newName);
-			output.update(node.start, node.body.start, `\n;${options.noExport ? "" : "export "}${node.async ? "async " : ""}function ${newName}(${newParams}) `);
+			output.update(node.start, node.body.start, `\n;${options.noExport ? "" : "export "}${node.async ? "async " : ""}function${node.generator ? "*" : ""} ${newName}(${newParams}) `);
 			output.appendLeft(node.end, `;\n/* #__PURE__ */ Object.defineProperty(${newName}, "name", { value: ${JSON.stringify(originalName)} });\n`);
 			output.move(node.start, node.end, input.length);
 			let newCode = `/* #__PURE__ */ ${runtime(newName, newName, { directiveMatch: match })}`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vitejs/plugin-rsc",
-  "version": "0.5.23",
+  "version": "0.5.25",
   "description": "React Server Components (RSC) support for Vite.",
   "keywords": [
     "react",
@@ -39,7 +39,7 @@
     "prepack": "tsdown"
   },
   "dependencies": {
-    "@rolldown/pluginutils": "1.0.0-rc.13",
+    "@rolldown/pluginutils": "1.0.0-rc.17",
     "es-module-lexer": "^2.0.0",
     "estree-walker": "^3.0.3",
     "magic-string": "^0.30.21",
@@ -63,8 +63,8 @@
     "react": "^19.2.5",
     "react-dom": "^19.2.5",
     "react-server-dom-webpack": "^19.2.5",
-    "tinyexec": "^1.0.4",
-    "tsdown": "^0.21.7"
+    "tinyexec": "^1.1.1",
+    "tsdown": "^0.21.10"
   },
   "peerDependencies": {
     "react": "*",