@vitejs/plugin-rsc 0.4.23 → 0.4.25

package/dist/{browser-DUDACP5e.d.ts → browser-mbRygLxB.d.ts}

@@ -1,4 +1,4 @@
-import { CallServerCallback } from "./index-CrcbP1rd.js";
+import { CallServerCallback } from "./index-QWzVHuya.js";
 
 //#region src/react/browser.d.ts
 declare function createFromReadableStream<T>(stream: ReadableStream<Uint8Array>, options?: object): Promise<T>;

package/dist/browser.d.ts

@@ -1,4 +1,4 @@
-import { CallServerCallback } from "./index-CrcbP1rd.js";
-import { setRequireModule } from "./browser-CyGTajab.js";
-import { callServer, createFromFetch, createFromReadableStream, createServerReference, createTemporaryReferenceSet, encodeReply, findSourceMapURL, setServerCallback } from "./browser-DUDACP5e.js";
+import { CallServerCallback } from "./index-QWzVHuya.js";
+import { setRequireModule } from "./browser-CuwQIlVY.js";
+import { callServer, createFromFetch, createFromReadableStream, createServerReference, createTemporaryReferenceSet, encodeReply, findSourceMapURL, setServerCallback } from "./browser-mbRygLxB.js";
 export { CallServerCallback, callServer, createFromFetch, createFromReadableStream, createServerReference, createTemporaryReferenceSet, encodeReply, findSourceMapURL, setRequireModule, setServerCallback };

package/dist/core/browser.d.ts

@@ -1,2 +1,2 @@
-import { setRequireModule } from "../browser-CyGTajab.js";
+import { setRequireModule } from "../browser-CuwQIlVY.js";
 export { setRequireModule };

package/dist/core/rsc.d.ts

@@ -1,3 +1,3 @@
-import "../index-CrcbP1rd.js";
-import { createClientManifest, createServerDecodeClientManifest, createServerManifest, loadServerAction, setRequireModule } from "../rsc-BeJKxeMX.js";
+import "../index-QWzVHuya.js";
+import { createClientManifest, createServerDecodeClientManifest, createServerManifest, loadServerAction, setRequireModule } from "../rsc-CxDPDiLz.js";
 export { createClientManifest, createServerDecodeClientManifest, createServerManifest, loadServerAction, setRequireModule };

package/dist/core/rsc.js

@@ -1,5 +1,5 @@
 import "../dist-DiJnRA1C.js";
 import "../shared-CEyKoKAb.js";
-import { createClientManifest, createServerDecodeClientManifest, createServerManifest, loadServerAction, setRequireModule } from "../rsc-C54XEgZY.js";
+import { createClientManifest, createServerDecodeClientManifest, createServerManifest, loadServerAction, setRequireModule } from "../rsc-BfBPoIV8.js";
 
 export { createClientManifest, createServerDecodeClientManifest, createServerManifest, loadServerAction, setRequireModule };

package/dist/core/ssr.d.ts

@@ -1,3 +1,3 @@
-import "../index-CrcbP1rd.js";
-import { createServerConsumerManifest, setRequireModule } from "../ssr-Bv84RACl.js";
+import "../index-QWzVHuya.js";
+import { createServerConsumerManifest, setRequireModule } from "../ssr-BoNKka-5.js";
 export { createServerConsumerManifest, setRequireModule };

package/dist/core/ssr.js

@@ -1,5 +1,5 @@
 import "../dist-DiJnRA1C.js";
 import "../shared-CEyKoKAb.js";
-import { createServerConsumerManifest, setRequireModule } from "../ssr-v4qYqcXu.js";
+import { createServerConsumerManifest, setRequireModule } from "../ssr--rFiBtws.js";
 
 export { createServerConsumerManifest, setRequireModule };

package/dist/{encryption-runtime-z7X8aRLB.js → encryption-runtime-CJUalqt3.js}

@@ -1,6 +1,6 @@
 import { once } from "./dist-DiJnRA1C.js";
 import { arrayToStream, concatArrayStream, decryptBuffer, encryptBuffer, fromBase64 } from "./encryption-utils-BDwwcMVT.js";
-import { createFromReadableStream, renderToReadableStream } from "./rsc-K03z8Dh0.js";
+import { createFromReadableStream, renderToReadableStream } from "./rsc-VjVw_i-M.js";
 import encryptionKeySource from "virtual:vite-rsc/encryption-key";
 
 //#region src/utils/encryption-runtime.ts

package/dist/extra/browser.d.ts

@@ -1,4 +1,4 @@
-import { RscPayload } from "../rsc-D-lnfNSa.js";
+import { RscPayload } from "../rsc-Cv3XEZqB.js";
 
 //#region src/extra/browser.d.ts
 

package/dist/extra/browser.js

@@ -3,7 +3,7 @@ import "../shared-CEyKoKAb.js";
 import "../browser-BhJd-Orx.js";
 import { createFromFetch, createFromReadableStream, createTemporaryReferenceSet, encodeReply, setServerCallback } from "../browser-D8OPzpF5.js";
 import "../browser-QU10IP0-.js";
-import { rscStream } from "../client-BPIq1kGs.js";
+import { rscStream } from "../client-C1J4FCf5.js";
 import React from "react";
 import ReactDomClient from "react-dom/client";
 import { jsx } from "react/jsx-runtime";

package/dist/extra/rsc.d.ts

@@ -1,2 +1,2 @@
-import { RscPayload, renderRequest } from "../rsc-D-lnfNSa.js";
+import { RscPayload, renderRequest } from "../rsc-Cv3XEZqB.js";
 export { RscPayload, renderRequest };

package/dist/extra/rsc.js

@@ -1,10 +1,10 @@
 import "../dist-DiJnRA1C.js";
 import "../shared-CEyKoKAb.js";
 import "../encryption-utils-BDwwcMVT.js";
-import { loadServerAction } from "../rsc-C54XEgZY.js";
-import { createTemporaryReferenceSet, decodeAction, decodeFormState, decodeReply, renderToReadableStream } from "../rsc-K03z8Dh0.js";
-import "../encryption-runtime-z7X8aRLB.js";
-import "../rsc-0ugrKC93.js";
+import { loadServerAction } from "../rsc-BfBPoIV8.js";
+import { createTemporaryReferenceSet, decodeAction, decodeFormState, decodeReply, renderToReadableStream } from "../rsc-VjVw_i-M.js";
+import "../encryption-runtime-CJUalqt3.js";
+import "../rsc-BwEwbLG4.js";
 import { Fragment, jsx, jsxs } from "react/jsx-runtime";
 
 //#region src/extra/rsc.tsx

package/dist/extra/ssr.js

@@ -1,10 +1,10 @@
 import "../dist-DiJnRA1C.js";
 import "../shared-CEyKoKAb.js";
-import "../shared-Cwk6fxfN.js";
-import "../ssr-v4qYqcXu.js";
-import { createFromReadableStream } from "../ssr-D154nyka.js";
-import "../ssr-BnEu3hbo.js";
-import { injectRSCPayload } from "../server-DoWzqBNF.js";
+import "../shared-BWHxNw3Q.js";
+import "../ssr--rFiBtws.js";
+import { createFromReadableStream } from "../ssr-BEKKb_cw.js";
+import "../ssr-CWjOQSe3.js";
+import { injectRSCPayload } from "../server-D0-DavPP.js";
 import React from "react";
 import { jsx } from "react/jsx-runtime";
 import ReactDomServer from "react-dom/server.edge";

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { RscPluginOptions, vitePluginRsc } from "./plugin-CrIhPWor.js";
+import { RscPluginOptions, vitePluginRsc } from "./plugin-YtSjJn3Y.js";
 import MagicString from "magic-string";
 import { Program } from "estree";
 

package/dist/index.js

@@ -1,9 +1,8 @@
 import "./dist-DiJnRA1C.js";
 import "./plugin-CZbI4rhS.js";
-import { transformHoistInlineDirective, vitePluginRsc } from "./plugin-Ddfc3b6D.js";
+import { transformHoistInlineDirective, vitePluginRsc } from "./plugin--LiSJGtB.js";
 import "./encryption-utils-BDwwcMVT.js";
 import "./rpc-tGuLT8PD.js";
-import "./vite-utils-Vzd7cqfv.js";
-import "./shared-Cwk6fxfN.js";
+import "./shared-BWHxNw3Q.js";
 
 export { vitePluginRsc as default, transformHoistInlineDirective };

package/dist/{plugin-Ddfc3b6D.js → plugin--LiSJGtB.js}

@@ -2,8 +2,7 @@ import { createDebug, tinyassert } from "./dist-DiJnRA1C.js";
 import { vitePluginRscCore } from "./plugin-CZbI4rhS.js";
 import { generateEncryptionKey, toBase64 } from "./encryption-utils-BDwwcMVT.js";
 import { createRpcServer } from "./rpc-tGuLT8PD.js";
-import { cleanUrl, normalizeViteImportAnalysisUrl, prepareError } from "./vite-utils-Vzd7cqfv.js";
-import { parseCssVirtual, parseIdQuery, toCssVirtual } from "./shared-Cwk6fxfN.js";
+import { parseCssVirtual, parseIdQuery, toCssVirtual } from "./shared-BWHxNw3Q.js";
 import { createRequire } from "node:module";
 import assert from "node:assert";
 import fs from "node:fs";
@@ -17,6 +16,7 @@ import { defaultServerConditions, isCSSRequest, normalizePath, parseAstAsync } f
 import { crawlFrameworkPkgs, findClosestPkgJsonPath } from "vitefu";
 import { walk } from "estree-walker";
 import { analyze, extract_names } from "periscopic";
+import { stripVTControlCharacters } from "node:util";
 import { createHash } from "node:crypto";
 
 //#region src/transforms/hoist.ts
@@ -306,6 +306,78 @@ function transformServerActionServer(input, ast, options) {
 	});
 }
 
+//#endregion
+//#region src/plugins/vite-utils.ts
+const VALID_ID_PREFIX = `/@id/`;
+const NULL_BYTE_PLACEHOLDER = `__x00__`;
+const FS_PREFIX = `/@fs/`;
+function wrapId(id) {
+	return id.startsWith(VALID_ID_PREFIX) ? id : VALID_ID_PREFIX + id.replace("\0", NULL_BYTE_PLACEHOLDER);
+}
+function withTrailingSlash(path$1) {
+	if (path$1[path$1.length - 1] !== "/") return `${path$1}/`;
+	return path$1;
+}
+const postfixRE = /[?#].*$/;
+function cleanUrl(url) {
+	return url.replace(postfixRE, "");
+}
+function splitFileAndPostfix(path$1) {
+	const file = cleanUrl(path$1);
+	return {
+		file,
+		postfix: path$1.slice(file.length)
+	};
+}
+const windowsSlashRE = /\\/g;
+function slash(p) {
+	return p.replace(windowsSlashRE, "/");
+}
+const isWindows = typeof process !== "undefined" && process.platform === "win32";
+function injectQuery(url, queryToInject) {
+	const { file, postfix } = splitFileAndPostfix(url);
+	const normalizedFile = isWindows ? slash(file) : file;
+	return `${normalizedFile}?${queryToInject}${postfix[0] === "?" ? `&${postfix.slice(1)}` : postfix}`;
+}
+function normalizeResolvedIdToUrl(environment, url, resolved) {
+	const root = environment.config.root;
+	const depsOptimizer = environment.depsOptimizer;
+	if (resolved.id.startsWith(withTrailingSlash(root))) url = resolved.id.slice(root.length);
+	else if (depsOptimizer?.isOptimizedDepFile(resolved.id) || resolved.id !== "/@react-refresh" && path.isAbsolute(resolved.id) && fs.existsSync(cleanUrl(resolved.id))) url = path.posix.join(FS_PREFIX, resolved.id);
+	else url = resolved.id;
+	if (url[0] !== "." && url[0] !== "/") url = wrapId(resolved.id);
+	return url;
+}
+function normalizeViteImportAnalysisUrl(environment, id) {
+	let url = normalizeResolvedIdToUrl(environment, id, { id });
+	if (environment.config.consumer === "client") {
+		const mod = environment.moduleGraph.getModuleById(id);
+		if (mod && mod.lastHMRTimestamp > 0) url = injectQuery(url, `t=${mod.lastHMRTimestamp}`);
+	}
+	return url;
+}
+function prepareError(err) {
+	return {
+		message: stripVTControlCharacters(err.message),
+		stack: stripVTControlCharacters(cleanStack(err.stack || "")),
+		id: err.id,
+		frame: stripVTControlCharacters(err.frame || ""),
+		plugin: err.plugin,
+		pluginCode: err.pluginCode?.toString(),
+		loc: err.loc
+	};
+}
+function cleanStack(stack) {
+	return stack.split(/\n/).filter((l) => /^\s*at/.test(l)).join("\n");
+}
+function evalValue(rawValue) {
+	const fn = new Function(`
+    var console, exports, global, module, process, require
+    return (\n${rawValue}\n)
+  `);
+	return fn();
+}
+
 //#endregion
 //#region src/transforms/cjs.ts
 function transformCjsToEsm(code, ast) {
@@ -402,13 +474,6 @@ function extractPackageKey(id) {
 
 //#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 sortObject(o) {
 	return Object.fromEntries(Object.entries(o).sort(([a], [b]) => a.localeCompare(b)));
 }
@@ -567,6 +632,7 @@ async function findSourceMapURL(server, filename, environmentName) {
 
 //#endregion
 //#region src/plugin.ts
+const isRolldownVite = "rolldownVersion" in vite;
 const BUILD_ASSETS_MANIFEST_NAME = "__vite_rsc_assets_manifest.js";
 const PKG_NAME = "@vitejs/plugin-rsc";
 const REACT_SERVER_DOM_NAME = `${PKG_NAME}/vendor/react-server-dom`;
@@ -582,12 +648,16 @@ var RscPluginManager = class {
 	buildAssetsManifest;
 	isScanBuild = false;
 	clientReferenceMetaMap = {};
+	clientReferenceGroups = {};
 	serverReferenceMetaMap = {};
 	serverResourcesMetaMap = {};
 	stabilize() {
 		this.clientReferenceMetaMap = sortObject(this.clientReferenceMetaMap);
 		this.serverResourcesMetaMap = sortObject(this.serverResourcesMetaMap);
 	}
+	toRelativeId(id) {
+		return normalizePath(path.relative(this.config.root, id));
+	}
 };
 /** @experimental */
 function vitePluginRscMinimal(rscPluginOptions = {}, manager = new RscPluginManager()) {
@@ -708,6 +778,7 @@ function vitePluginRsc(rscPluginOptions = {}) {
 									"react/jsx-runtime",
 									"react/jsx-dev-runtime",
 									"react-dom/server.edge",
+									"react-dom/static.edge",
 									`${REACT_SERVER_DOM_NAME}/client.edge`
 								],
 								exclude: [PKG_NAME]
@@ -746,6 +817,20 @@ function vitePluginRsc(rscPluginOptions = {}) {
 			buildApp: rscPluginOptions.useBuildAppHook ? buildApp : void 0,
 			configureServer(server) {
 				globalThis.__viteRscDevServer = server;
+				const oldSend = server.environments.client.hot.send;
+				server.environments.client.hot.send = async function(...args) {
+					const e = args[0];
+					if (e && typeof e === "object" && e.type === "update") {
+						for (const update of e.updates) if (update.type === "js-update") {
+							const mod = server.environments.client.moduleGraph.urlToModuleMap.get(update.path);
+							if (mod && mod.id && manager.clientReferenceMetaMap[mod.id]) {
+								const serverMod = server.environments.rsc.moduleGraph.getModuleById(mod.id);
+								if (serverMod) server.environments.rsc.moduleGraph.invalidateModule(serverMod);
+							}
+						}
+					}
+					return oldSend.apply(this, args);
+				};
 				if (rscPluginOptions.disableServerHandler) return;
 				if (rscPluginOptions.serverHandler === false) return;
 				const options = rscPluginOptions.serverHandler ?? {
@@ -797,7 +882,7 @@ function vitePluginRsc(rscPluginOptions = {}) {
 			},
 			async hotUpdate(ctx) {
 				if (isCSSRequest(ctx.file)) {
-					if (this.environment.name === "client") return ctx.modules.filter((m) => !m.id?.includes("?direct"));
+					if (this.environment.name === "client") return ctx.modules.filter((m) => !(m.id?.includes("?direct") && !m.isSelfAccepting));
 				}
 				const ids = ctx.modules.map((mod) => mod.id).filter((v) => v !== null);
 				if (ids.length === 0) return;
@@ -991,8 +1076,8 @@ function vitePluginRsc(rscPluginOptions = {}) {
 					assert(entry);
 					const entryUrl = assetsURL(entry.chunk.fileName, manager);
 					const clientReferenceDeps = {};
-					for (const [id, meta] of Object.entries(manager.clientReferenceMetaMap)) {
-						const deps = assetDeps[id]?.deps ?? {
+					for (const meta of Object.values(manager.clientReferenceMetaMap)) {
+						const deps = assetDeps[meta.groupChunkId]?.deps ?? {
 							js: [],
 							css: []
 						};
@@ -1081,17 +1166,9 @@ import.meta.hot.on("rsc:update", () => {
 		}),
 		{
 			name: "rsc:inject-async-local-storage",
-			async configureServer() {
-				const __viteRscAyncHooks = await import("node:async_hooks");
-				globalThis.AsyncLocalStorage = __viteRscAyncHooks.AsyncLocalStorage;
-			},
-			banner(chunk) {
-				if ((this.environment.name === "ssr" || this.environment.name === "rsc") && this.environment.mode === "build" && chunk.isEntry) return `\
-import * as __viteRscAyncHooks from "node:async_hooks";
-globalThis.AsyncLocalStorage = __viteRscAyncHooks.AsyncLocalStorage;
-`;
-				return "";
-			}
+			transform: { handler(code) {
+				if ((this.environment.name === "ssr" || this.environment.name === "rsc") && code.includes("typeof AsyncLocalStorage") && code.includes("new AsyncLocalStorage()") && !code.includes("__viteRscAyncHooks")) return (this.environment.mode === "build" && !isRolldownVite ? `const __viteRscAyncHooks = require("node:async_hooks");` : `import * as __viteRscAyncHooks from "node:async_hooks";`) + `globalThis.AsyncLocalStorage = __viteRscAyncHooks.AsyncLocalStorage;` + code;
+			} }
 		},
 		...vitePluginRscMinimal(rscPluginOptions, manager),
 		...vitePluginFindSourceMapURL(),
@@ -1162,7 +1239,7 @@ function vitePluginUseClient(useClientPluginOptions, manager) {
 					referenceKey = importId;
 				} else {
 					importId = id;
-					referenceKey = hashString(normalizePath(path.relative(manager.config.root, id)));
+					referenceKey = hashString(manager.toRelativeId(id));
 				}
 				const transformDirectiveProxyExport_ = withRollupError(this, transformDirectiveProxyExport);
 				const result = transformDirectiveProxyExport_(ast, {
@@ -1192,29 +1269,72 @@ function vitePluginUseClient(useClientPluginOptions, manager) {
 				};
 			}
 		},
-		createVirtualPlugin("vite-rsc/client-references", function() {
-			if (this.environment.mode === "dev") return {
-				code: `export default {}`,
-				map: null
-			};
-			let code = "";
-			for (const meta of Object.values(manager.clientReferenceMetaMap)) {
-				const key = JSON.stringify(meta.referenceKey);
-				const id = JSON.stringify(meta.importId);
-				const exports = meta.renderedExports.map((name) => name === "default" ? "default: _default" : name).sort();
-				code += `
-          ${key}: async () => {
-            const {${exports}} = await import(${id});
-            return {${exports}};
-          },
-        `;
+		{
+			name: "rsc:use-client/build-references",
+			resolveId(source) {
+				if (source.startsWith("virtual:vite-rsc/client-references")) return "\0" + source;
+			},
+			load(id) {
+				if (id === "\0virtual:vite-rsc/client-references") {
+					if (this.environment.mode === "dev") return {
+						code: `export default {}`,
+						map: null
+					};
+					if (manager.isScanBuild) {
+						let code$1 = ``;
+						for (const meta of Object.values(manager.clientReferenceMetaMap)) code$1 += `import ${JSON.stringify(meta.importId)};\n`;
+						return {
+							code: code$1,
+							map: null
+						};
+					}
+					let code = "";
+					manager.clientReferenceGroups = {};
+					for (const meta of Object.values(manager.clientReferenceMetaMap)) {
+						let name = useClientPluginOptions.clientChunks?.({
+							id: meta.importId,
+							serverChunk: meta.serverChunk
+						}) ?? manager.toRelativeId(meta.importId);
+						name = cleanUrl(name.replaceAll("..", "__"));
+						const group = manager.clientReferenceGroups[name] ??= [];
+						group.push(meta);
+						meta.groupChunkId = `\0virtual:vite-rsc/client-references/group/${name}`;
+					}
+					debug$1("client-reference-groups", manager.clientReferenceGroups);
+					for (const [name, metas] of Object.entries(manager.clientReferenceGroups)) {
+						const groupVirtual = `virtual:vite-rsc/client-references/group/${name}`;
+						for (const meta of metas) code += `\
+                ${JSON.stringify(meta.referenceKey)}: async () => {
+                  const m = await import(${JSON.stringify(groupVirtual)});
+                  return m.export_${meta.referenceKey};
+                },
+              `;
+					}
+					code = `export default {${code}};\n`;
+					return {
+						code,
+						map: null
+					};
+				}
+				if (id.startsWith("\0virtual:vite-rsc/client-references/group/")) {
+					const name = id.slice(42);
+					const metas = manager.clientReferenceGroups[name];
+					assert(metas, `unknown client reference group: ${name}`);
+					let code = ``;
+					for (const meta of metas) {
+						const exports = meta.renderedExports.map((name$1) => `${name$1}: import_${meta.referenceKey}.${name$1},\n`).sort().join("");
+						code += `
+              import * as import_${meta.referenceKey} from ${JSON.stringify(meta.importId)};
+              export const export_${meta.referenceKey} = {${exports}};
+            `;
+					}
+					return {
+						code,
+						map: null
+					};
+				}
 			}
-			code = `export default {${code}};\n`;
-			return {
-				code,
-				map: null
-			};
-		}),
+		},
 		{
 			name: "rsc:virtual-client-in-server-package",
 			async load(id) {
@@ -1255,9 +1375,23 @@ function vitePluginUseClient(useClientPluginOptions, manager) {
 			},
 			generateBundle(_options, bundle) {
 				if (this.environment.name !== serverEnvironmentName) return;
-				for (const chunk of Object.values(bundle)) if (chunk.type === "chunk") for (const [id, mod] of Object.entries(chunk.modules)) {
-					const meta = manager.clientReferenceMetaMap[id];
-					if (meta) meta.renderedExports = mod.renderedExports;
+				for (const chunk of Object.values(bundle)) if (chunk.type === "chunk") {
+					const metas = [];
+					for (const id of chunk.moduleIds) {
+						const meta = manager.clientReferenceMetaMap[id];
+						if (meta) metas.push([id, meta]);
+					}
+					if (metas.length > 0) {
+						let serverChunk;
+						if (chunk.facadeModuleId) serverChunk = "facade:" + manager.toRelativeId(chunk.facadeModuleId);
+						else serverChunk = "shared:" + manager.toRelativeId(metas.map(([id]) => id).sort()[0]);
+						for (const [id, meta] of metas) {
+							const mod = chunk.modules[id];
+							assert(mod);
+							meta.renderedExports = mod.renderedExports;
+							meta.serverChunk = serverChunk;
+						}
+					}
 				}
 			}
 		},
@@ -1368,7 +1502,7 @@ function vitePluginUseServer(useServerPluginOptions, manager) {
 						debug$1(`internal server reference created through a package imported in ${this.environment.name} environment: ${id}`);
 						id = cleanUrl(id);
 					}
-					if (manager.config.command === "build") normalizedId_ = hashString(path.relative(manager.config.root, id));
+					if (manager.config.command === "build") normalizedId_ = hashString(manager.toRelativeId(id));
 					else normalizedId_ = normalizeViteImportAnalysisUrl(manager.server.environments[serverEnvironmentName], id);
 				}
 				return normalizedId_;
@@ -1689,7 +1823,7 @@ function vitePluginRscCss(rscCssOptions = {}, manager) {
 						}, manager);
 						return generateResourcesCode(serializeValueWithRuntime(deps), manager);
 					} else {
-						const key = normalizePath(path.relative(manager.config.root, importer));
+						const key = manager.toRelativeId(importer);
 						manager.serverResourcesMetaMap[importer] = { key };
 						return `
               import __vite_rsc_assets_manifest__ from "virtual:vite-rsc/assets-manifest";

package/dist/{plugin-CrIhPWor.d.ts → plugin-YtSjJn3Y.d.ts}

@@ -17,6 +17,8 @@ type ClientReferenceMeta = {
   packageSource?: string;
   exportNames: string[];
   renderedExports: string[];
+  serverChunk?: string;
+  groupChunkId?: string;
 };
 type ServerRerferenceMeta = {
   importId: string;
@@ -30,11 +32,13 @@ declare class RscPluginManager {
   buildAssetsManifest: AssetsManifest | undefined;
   isScanBuild: boolean;
   clientReferenceMetaMap: Record<string, ClientReferenceMeta>;
+  clientReferenceGroups: Record<string, ClientReferenceMeta[]>;
   serverReferenceMetaMap: Record<string, ServerRerferenceMeta>;
   serverResourcesMetaMap: Record<string, {
     key: string;
   }>;
   stabilize(): void;
+  toRelativeId(id: string): string;
 }
 type RscPluginOptions = {
   /**
@@ -97,6 +101,18 @@ type RscPluginOptions = {
     ssr?: string;
     rsc?: string;
   };
+  /**
+  * Custom chunking strategy for client reference modules.
+  *
+  * This function allows you to group multiple client components into
+  * custom chunks instead of having each module in its own chunk.
+  */
+  clientChunks?: (meta: {
+    /** client reference module id */
+    id: string;
+    /** server chunk which includes a corresponding client reference proxy module */
+    serverChunk: string;
+  }) => string | undefined;
 };
 /** @experimental */
 declare function vitePluginRscMinimal(rscPluginOptions?: RscPluginOptions, manager?: RscPluginManager): Plugin[];

package/dist/plugin.d.ts

@@ -1,2 +1,2 @@
-import { AssetDeps, AssetsManifest, ResolvedAssetDeps, ResolvedAssetsManifest, RscPluginOptions, transformRscCssExport, vitePluginRsc, vitePluginRscMinimal } from "./plugin-CrIhPWor.js";
+import { AssetDeps, AssetsManifest, ResolvedAssetDeps, ResolvedAssetsManifest, RscPluginOptions, transformRscCssExport, vitePluginRsc, vitePluginRscMinimal } from "./plugin-YtSjJn3Y.js";
 export { AssetDeps, AssetsManifest, ResolvedAssetDeps, ResolvedAssetsManifest, RscPluginOptions, vitePluginRsc as default, transformRscCssExport, vitePluginRscMinimal };

package/dist/plugin.js

@@ -1,9 +1,8 @@
 import "./dist-DiJnRA1C.js";
 import "./plugin-CZbI4rhS.js";
-import { transformRscCssExport, vitePluginRsc, vitePluginRscMinimal } from "./plugin-Ddfc3b6D.js";
+import { transformRscCssExport, vitePluginRsc, vitePluginRscMinimal } from "./plugin--LiSJGtB.js";
 import "./encryption-utils-BDwwcMVT.js";
 import "./rpc-tGuLT8PD.js";
-import "./vite-utils-Vzd7cqfv.js";
-import "./shared-Cwk6fxfN.js";
+import "./shared-BWHxNw3Q.js";
 
 export { vitePluginRsc as default, transformRscCssExport, vitePluginRscMinimal };

package/dist/react/browser.d.ts

@@ -1,4 +1,4 @@
-import { CallServerCallback } from "../index-CrcbP1rd.js";
-import { setRequireModule } from "../browser-CyGTajab.js";
-import { callServer, createFromFetch, createFromReadableStream, createServerReference, createTemporaryReferenceSet, encodeReply, findSourceMapURL, setServerCallback } from "../browser-DUDACP5e.js";
+import { CallServerCallback } from "../index-QWzVHuya.js";
+import { setRequireModule } from "../browser-CuwQIlVY.js";
+import { callServer, createFromFetch, createFromReadableStream, createServerReference, createTemporaryReferenceSet, encodeReply, findSourceMapURL, setServerCallback } from "../browser-mbRygLxB.js";
 export { CallServerCallback, callServer, createFromFetch, createFromReadableStream, createServerReference, createTemporaryReferenceSet, encodeReply, findSourceMapURL, setRequireModule, setServerCallback };

package/dist/react/rsc.d.ts

@@ -1,4 +1,4 @@
-import "../index-CrcbP1rd.js";
-import { loadServerAction, setRequireModule } from "../rsc-BeJKxeMX.js";
-import { createClientTemporaryReferenceSet, createFromReadableStream, createTemporaryReferenceSet, decodeAction, decodeFormState, decodeReply, encodeReply, registerClientReference, registerServerReference, renderToReadableStream } from "../rsc-A9Zr9bEE.js";
+import "../index-QWzVHuya.js";
+import { loadServerAction, setRequireModule } from "../rsc-CxDPDiLz.js";
+import { createClientTemporaryReferenceSet, createFromReadableStream, createTemporaryReferenceSet, decodeAction, decodeFormState, decodeReply, encodeReply, registerClientReference, registerServerReference, renderToReadableStream } from "../rsc-CFtzqEG8.js";
 export { createClientTemporaryReferenceSet, createFromReadableStream, createTemporaryReferenceSet, decodeAction, decodeFormState, decodeReply, encodeReply, loadServerAction, registerClientReference, registerServerReference, renderToReadableStream, setRequireModule };

package/dist/react/rsc.js

@@ -1,6 +1,6 @@
 import "../dist-DiJnRA1C.js";
 import "../shared-CEyKoKAb.js";
-import { loadServerAction, setRequireModule } from "../rsc-C54XEgZY.js";
-import { createClientTemporaryReferenceSet, createFromReadableStream, createTemporaryReferenceSet, decodeAction, decodeFormState, decodeReply, encodeReply, registerClientReference, registerServerReference, renderToReadableStream } from "../rsc-K03z8Dh0.js";
+import { loadServerAction, setRequireModule } from "../rsc-BfBPoIV8.js";
+import { createClientTemporaryReferenceSet, createFromReadableStream, createTemporaryReferenceSet, decodeAction, decodeFormState, decodeReply, encodeReply, registerClientReference, registerServerReference, renderToReadableStream } from "../rsc-VjVw_i-M.js";
 
 export { createClientTemporaryReferenceSet, createFromReadableStream, createTemporaryReferenceSet, decodeAction, decodeFormState, decodeReply, encodeReply, loadServerAction, registerClientReference, registerServerReference, renderToReadableStream, setRequireModule };

package/dist/react/ssr.d.ts

@@ -1,4 +1,4 @@
-import "../index-CrcbP1rd.js";
-import { setRequireModule } from "../ssr-Bv84RACl.js";
-import { callServer, createFromReadableStream, createServerReference, findSourceMapURL } from "../ssr-EOoYUXrM.js";
+import "../index-QWzVHuya.js";
+import { setRequireModule } from "../ssr-BoNKka-5.js";
+import { callServer, createFromReadableStream, createServerReference, findSourceMapURL } from "../ssr-D6GTzOzx.js";
 export { callServer, createFromReadableStream, createServerReference, findSourceMapURL, setRequireModule };

package/dist/react/ssr.js

@@ -1,6 +1,6 @@
 import "../dist-DiJnRA1C.js";
 import "../shared-CEyKoKAb.js";
-import { setRequireModule } from "../ssr-v4qYqcXu.js";
-import { callServer, createFromReadableStream, createServerReference, findSourceMapURL } from "../ssr-D154nyka.js";
+import { setRequireModule } from "../ssr--rFiBtws.js";
+import { callServer, createFromReadableStream, createServerReference, findSourceMapURL } from "../ssr-BEKKb_cw.js";
 
 export { callServer, createFromReadableStream, createServerReference, findSourceMapURL, setRequireModule };

package/dist/{rsc-0ugrKC93.js → rsc-BwEwbLG4.js}

@@ -1,4 +1,4 @@
-import { setRequireModule } from "./rsc-C54XEgZY.js";
+import { setRequireModule } from "./rsc-BfBPoIV8.js";
 import serverReferences from "virtual:vite-rsc/server-references";
 
 //#region src/rsc.tsx

package/dist/{rsc-BeJKxeMX.d.ts → rsc-CxDPDiLz.d.ts}

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

package/dist/{rsc-K03z8Dh0.js → rsc-VjVw_i-M.js}

@@ -1,4 +1,4 @@
-import { createClientManifest, createServerDecodeClientManifest, createServerManifest } from "./rsc-C54XEgZY.js";
+import { createClientManifest, createServerDecodeClientManifest, createServerManifest } from "./rsc-BfBPoIV8.js";
 import * as ReactServer from "@vitejs/plugin-rsc/vendor/react-server-dom/server.edge";
 import * as ReactClient from "@vitejs/plugin-rsc/vendor/react-server-dom/client.edge";
 

package/dist/rsc-html-stream/browser.js

@@ -1,4 +1,4 @@
-import { rscStream } from "../client-BPIq1kGs.js";
+import { rscStream } from "../client-C1J4FCf5.js";
 
 //#region src/rsc-html-stream/browser.ts
 /** @deprecated use `rsc-html-stream/client` instead */

package/dist/rsc-html-stream/ssr.js

@@ -1,4 +1,4 @@
-import { injectRSCPayload } from "../server-DoWzqBNF.js";
+import { injectRSCPayload } from "../server-D0-DavPP.js";
 
 //#region src/rsc-html-stream/ssr.ts
 /** @deprecated use `rsc-html-stream/server` instead */

package/dist/rsc.d.ts

@@ -1,5 +1,5 @@
-import "./index-CrcbP1rd.js";
-import { createClientManifest, createServerManifest, loadServerAction, setRequireModule } from "./rsc-BeJKxeMX.js";
-import { createClientTemporaryReferenceSet, createFromReadableStream, createTemporaryReferenceSet, decodeAction, decodeFormState, decodeReply, encodeReply, registerClientReference, registerServerReference, renderToReadableStream } from "./rsc-A9Zr9bEE.js";
-import { decryptActionBoundArgs, encryptActionBoundArgs } from "./encryption-runtime-BmDC7d-3.js";
+import "./index-QWzVHuya.js";
+import { createClientManifest, createServerManifest, loadServerAction, setRequireModule } from "./rsc-CxDPDiLz.js";
+import { createClientTemporaryReferenceSet, createFromReadableStream, createTemporaryReferenceSet, decodeAction, decodeFormState, decodeReply, encodeReply, registerClientReference, registerServerReference, renderToReadableStream } from "./rsc-CFtzqEG8.js";
+import { decryptActionBoundArgs, encryptActionBoundArgs } from "./encryption-runtime-SgJRa9yj.js";
 export { createClientManifest, createClientTemporaryReferenceSet, createFromReadableStream, createServerManifest, createTemporaryReferenceSet, decodeAction, decodeFormState, decodeReply, decryptActionBoundArgs, encodeReply, encryptActionBoundArgs, loadServerAction, registerClientReference, registerServerReference, renderToReadableStream, setRequireModule };

package/dist/rsc.js

@@ -1,9 +1,9 @@
 import "./dist-DiJnRA1C.js";
 import "./shared-CEyKoKAb.js";
 import "./encryption-utils-BDwwcMVT.js";
-import { createClientManifest, createServerManifest, loadServerAction, setRequireModule } from "./rsc-C54XEgZY.js";
-import { createClientTemporaryReferenceSet, createFromReadableStream, createTemporaryReferenceSet, decodeAction, decodeFormState, decodeReply, encodeReply, registerClientReference, registerServerReference, renderToReadableStream } from "./rsc-K03z8Dh0.js";
-import { decryptActionBoundArgs, encryptActionBoundArgs } from "./encryption-runtime-z7X8aRLB.js";
-import "./rsc-0ugrKC93.js";
+import { createClientManifest, createServerManifest, loadServerAction, setRequireModule } from "./rsc-BfBPoIV8.js";
+import { createClientTemporaryReferenceSet, createFromReadableStream, createTemporaryReferenceSet, decodeAction, decodeFormState, decodeReply, encodeReply, registerClientReference, registerServerReference, renderToReadableStream } from "./rsc-VjVw_i-M.js";
+import { decryptActionBoundArgs, encryptActionBoundArgs } from "./encryption-runtime-CJUalqt3.js";
+import "./rsc-BwEwbLG4.js";
 
 export { createClientManifest, createClientTemporaryReferenceSet, createFromReadableStream, createServerManifest, createTemporaryReferenceSet, decodeAction, decodeFormState, decodeReply, decryptActionBoundArgs, encodeReply, encryptActionBoundArgs, loadServerAction, registerClientReference, registerServerReference, renderToReadableStream, setRequireModule };

package/dist/{ssr-D154nyka.js → ssr-BEKKb_cw.js}

@@ -1,4 +1,4 @@
-import { createServerConsumerManifest } from "./ssr-v4qYqcXu.js";
+import { createServerConsumerManifest } from "./ssr--rFiBtws.js";
 import * as ReactClient from "@vitejs/plugin-rsc/vendor/react-server-dom/client.edge";
 
 //#region src/react/ssr.ts

package/dist/{ssr-Bv84RACl.d.ts → ssr-BoNKka-5.d.ts}

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

package/dist/{ssr-BnEu3hbo.js → ssr-CWjOQSe3.js}

@@ -1,5 +1,5 @@
-import { toCssVirtual } from "./shared-Cwk6fxfN.js";
-import { setRequireModule } from "./ssr-v4qYqcXu.js";
+import { toCssVirtual } from "./shared-BWHxNw3Q.js";
+import { setRequireModule } from "./ssr--rFiBtws.js";
 import * as clientReferences from "virtual:vite-rsc/client-references";
 import assetsManifest from "virtual:vite-rsc/assets-manifest";
 import * as ReactDOM from "react-dom";

package/dist/ssr.d.ts

@@ -1,4 +1,4 @@
-import "./index-CrcbP1rd.js";
-import { createServerConsumerManifest, setRequireModule } from "./ssr-Bv84RACl.js";
-import { callServer, createFromReadableStream, createServerReference, findSourceMapURL } from "./ssr-EOoYUXrM.js";
+import "./index-QWzVHuya.js";
+import { createServerConsumerManifest, setRequireModule } from "./ssr-BoNKka-5.js";
+import { callServer, createFromReadableStream, createServerReference, findSourceMapURL } from "./ssr-D6GTzOzx.js";
 export { callServer, createFromReadableStream, createServerConsumerManifest, createServerReference, findSourceMapURL, setRequireModule };

package/dist/ssr.js

@@ -1,8 +1,8 @@
 import "./dist-DiJnRA1C.js";
 import "./shared-CEyKoKAb.js";
-import "./shared-Cwk6fxfN.js";
-import { createServerConsumerManifest, setRequireModule } from "./ssr-v4qYqcXu.js";
-import { callServer, createFromReadableStream, createServerReference, findSourceMapURL } from "./ssr-D154nyka.js";
-import "./ssr-BnEu3hbo.js";
+import "./shared-BWHxNw3Q.js";
+import { createServerConsumerManifest, setRequireModule } from "./ssr--rFiBtws.js";
+import { callServer, createFromReadableStream, createServerReference, findSourceMapURL } from "./ssr-BEKKb_cw.js";
+import "./ssr-CWjOQSe3.js";
 
 export { callServer, createFromReadableStream, createServerConsumerManifest, createServerReference, findSourceMapURL, setRequireModule };

package/dist/utils/encryption-runtime.d.ts

@@ -1,2 +1,2 @@
-import { decryptActionBoundArgs, encryptActionBoundArgs } from "../encryption-runtime-BmDC7d-3.js";
+import { decryptActionBoundArgs, encryptActionBoundArgs } from "../encryption-runtime-SgJRa9yj.js";
 export { decryptActionBoundArgs, encryptActionBoundArgs };

package/dist/utils/encryption-runtime.js

@@ -1,8 +1,8 @@
 import "../dist-DiJnRA1C.js";
 import "../shared-CEyKoKAb.js";
 import "../encryption-utils-BDwwcMVT.js";
-import "../rsc-C54XEgZY.js";
-import "../rsc-K03z8Dh0.js";
-import { decryptActionBoundArgs, encryptActionBoundArgs } from "../encryption-runtime-z7X8aRLB.js";
+import "../rsc-BfBPoIV8.js";
+import "../rsc-VjVw_i-M.js";
+import { decryptActionBoundArgs, encryptActionBoundArgs } from "../encryption-runtime-CJUalqt3.js";
 
 export { decryptActionBoundArgs, encryptActionBoundArgs };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vitejs/plugin-rsc",
-  "version": "0.4.23",
+  "version": "0.4.25",
   "description": "React Server Components (RSC) support for Vite.",
   "keywords": [
     "vite",
@@ -41,26 +41,26 @@
     "@remix-run/node-fetch-server": "^0.8.0",
     "es-module-lexer": "^1.7.0",
     "estree-walker": "^3.0.3",
-    "magic-string": "^0.30.17",
+    "magic-string": "^0.30.18",
     "periscopic": "^4.0.2",
     "turbo-stream": "^3.1.0",
     "vitefu": "^1.1.1"
   },
   "devDependencies": {
     "@hiogawa/utils": "^1.7.0",
-    "@playwright/test": "^1.54.2",
+    "@playwright/test": "^1.55.0",
     "@tsconfig/strictest": "^2.0.5",
     "@types/estree": "^1.0.8",
-    "@types/node": "^22.17.2",
-    "@types/react": "^19.1.10",
-    "@types/react-dom": "^19.1.7",
+    "@types/node": "^22.18.0",
+    "@types/react": "^19.1.11",
+    "@types/react-dom": "^19.1.8",
     "@vitejs/plugin-react": "workspace:*",
     "react": "^19.1.1",
     "react-dom": "^19.1.1",
     "react-server-dom-webpack": "^19.1.1",
     "rsc-html-stream": "^0.0.7",
     "tinyexec": "^1.0.1",
-    "tsdown": "^0.14.1"
+    "tsdown": "^0.14.2"
   },
   "peerDependencies": {
     "react": "*",

package/dist/vite-utils-Vzd7cqfv.js

@@ -1,79 +0,0 @@
-import fs from "node:fs";
-import path from "node:path";
-import { stripVTControlCharacters } from "node:util";
-
-//#region src/vite-utils.ts
-const VALID_ID_PREFIX = `/@id/`;
-const NULL_BYTE_PLACEHOLDER = `__x00__`;
-const FS_PREFIX = `/@fs/`;
-function wrapId(id) {
-	return id.startsWith(VALID_ID_PREFIX) ? id : VALID_ID_PREFIX + id.replace("\0", NULL_BYTE_PLACEHOLDER);
-}
-function unwrapId(id) {
-	return id.startsWith(VALID_ID_PREFIX) ? id.slice(VALID_ID_PREFIX.length).replace(NULL_BYTE_PLACEHOLDER, "\0") : id;
-}
-function withTrailingSlash(path$1) {
-	if (path$1[path$1.length - 1] !== "/") return `${path$1}/`;
-	return path$1;
-}
-const postfixRE = /[?#].*$/;
-function cleanUrl(url) {
-	return url.replace(postfixRE, "");
-}
-function splitFileAndPostfix(path$1) {
-	const file = cleanUrl(path$1);
-	return {
-		file,
-		postfix: path$1.slice(file.length)
-	};
-}
-const windowsSlashRE = /\\/g;
-function slash(p) {
-	return p.replace(windowsSlashRE, "/");
-}
-const isWindows = typeof process !== "undefined" && process.platform === "win32";
-function injectQuery(url, queryToInject) {
-	const { file, postfix } = splitFileAndPostfix(url);
-	const normalizedFile = isWindows ? slash(file) : file;
-	return `${normalizedFile}?${queryToInject}${postfix[0] === "?" ? `&${postfix.slice(1)}` : postfix}`;
-}
-function joinUrlSegments(a, b) {
-	if (!a || !b) return a || b || "";
-	if (a.endsWith("/")) a = a.substring(0, a.length - 1);
-	if (b[0] !== "/") b = "/" + b;
-	return a + b;
-}
-function normalizeResolvedIdToUrl(environment, url, resolved) {
-	const root = environment.config.root;
-	const depsOptimizer = environment.depsOptimizer;
-	if (resolved.id.startsWith(withTrailingSlash(root))) url = resolved.id.slice(root.length);
-	else if (depsOptimizer?.isOptimizedDepFile(resolved.id) || resolved.id !== "/@react-refresh" && path.isAbsolute(resolved.id) && fs.existsSync(cleanUrl(resolved.id))) url = path.posix.join(FS_PREFIX, resolved.id);
-	else url = resolved.id;
-	if (url[0] !== "." && url[0] !== "/") url = wrapId(resolved.id);
-	return url;
-}
-function normalizeViteImportAnalysisUrl(environment, id) {
-	let url = normalizeResolvedIdToUrl(environment, id, { id });
-	if (environment.config.consumer === "client") {
-		const mod = environment.moduleGraph.getModuleById(id);
-		if (mod && mod.lastHMRTimestamp > 0) url = injectQuery(url, `t=${mod.lastHMRTimestamp}`);
-	}
-	return url;
-}
-function prepareError(err) {
-	return {
-		message: stripVTControlCharacters(err.message),
-		stack: stripVTControlCharacters(cleanStack(err.stack || "")),
-		id: err.id,
-		frame: stripVTControlCharacters(err.frame || ""),
-		plugin: err.plugin,
-		pluginCode: err.pluginCode?.toString(),
-		loc: err.loc
-	};
-}
-function cleanStack(stack) {
-	return stack.split(/\n/).filter((l) => /^\s*at/.test(l)).join("\n");
-}
-
-//#endregion
-export { FS_PREFIX, NULL_BYTE_PLACEHOLDER, VALID_ID_PREFIX, cleanUrl, injectQuery, joinUrlSegments, normalizeResolvedIdToUrl, normalizeViteImportAnalysisUrl, prepareError, slash, splitFileAndPostfix, unwrapId, withTrailingSlash, wrapId };

package/dist/vite-utils.d.ts

@@ -1,23 +0,0 @@
-import { DevEnvironment, ErrorPayload, Rollup } from "vite";
-
-//#region src/vite-utils.d.ts
-declare const VALID_ID_PREFIX = "/@id/";
-declare const NULL_BYTE_PLACEHOLDER = "__x00__";
-declare const FS_PREFIX = "/@fs/";
-declare function wrapId(id: string): string;
-declare function unwrapId(id: string): string;
-declare function withTrailingSlash(path: string): string;
-declare function cleanUrl(url: string): string;
-declare function splitFileAndPostfix(path: string): {
-  file: string;
-  postfix: string;
-};
-declare function slash(p: string): string;
-declare function injectQuery(url: string, queryToInject: string): string;
-declare function joinUrlSegments(a: string, b: string): string;
-declare function normalizeResolvedIdToUrl(environment: DevEnvironment, url: string, resolved: Rollup.PartialResolvedId): string;
-declare function normalizeViteImportAnalysisUrl(environment: DevEnvironment, id: string): string;
-type RollupError = Rollup.RollupError;
-declare function prepareError(err: Error | RollupError): ErrorPayload["err"];
-//#endregion
-export { FS_PREFIX, NULL_BYTE_PLACEHOLDER, VALID_ID_PREFIX, cleanUrl, injectQuery, joinUrlSegments, normalizeResolvedIdToUrl, normalizeViteImportAnalysisUrl, prepareError, slash, splitFileAndPostfix, unwrapId, withTrailingSlash, wrapId };

package/dist/vite-utils.js

@@ -1,3 +0,0 @@
-import { FS_PREFIX, NULL_BYTE_PLACEHOLDER, VALID_ID_PREFIX, cleanUrl, injectQuery, joinUrlSegments, normalizeResolvedIdToUrl, normalizeViteImportAnalysisUrl, prepareError, slash, splitFileAndPostfix, unwrapId, withTrailingSlash, wrapId } from "./vite-utils-Vzd7cqfv.js";
-
-export { FS_PREFIX, NULL_BYTE_PLACEHOLDER, VALID_ID_PREFIX, cleanUrl, injectQuery, joinUrlSegments, normalizeResolvedIdToUrl, normalizeViteImportAnalysisUrl, prepareError, slash, splitFileAndPostfix, unwrapId, withTrailingSlash, wrapId };