@vitejs/plugin-rsc 0.5.30 → 0.5.31

package/README.md

@@ -25,10 +25,15 @@ npm create vite@latest -- --template rsc
 
 **Integration examples:**
 
-- [`./examples/basic`](./examples/basic) - Advanced RSC features and testing
-  - This is mainly used for e2e testing and includes various advanced RSC usages (e.g. `"use cache"` example).
-- [`./examples/performance-track`](./examples/performance-track) - Minimal React Server Components performance track probe.
+- [`./examples/basic`](./examples/basic) - Comprehensive showcase of standard RSC features and the primary E2E test fixture.
+- [`./examples/use-cache`](./examples/use-cache) - Minimal cache feature inspired by Next.js's `"use cache"`, built with generic transform and RSC runtime APIs.
+- [`./examples/custom-server-function`](./examples/custom-server-function) - Third-party Server Function directive integration using server reference claims.
 - [`./examples/ssg`](./examples/ssg) - Static site generation with MDX and client components for interactivity.
+- [`./examples/ppr`](./examples/ppr) - Partial prerendering with a reusable static HTML shell and request-time RSC content.
+- [`./examples/no-ssr`](./examples/no-ssr) - RSC application without an SSR environment.
+- [`./examples/client-first`](./examples/client-first) - Experimental client-owned page that consumes RSC function results.
+- [`./examples/browser-mode`](./examples/browser-mode) - Advanced setup that runs both RSC and React client environments in the browser with custom module loading.
+- [`./examples/performance-track`](./examples/performance-track) - Minimal React Server Components performance track probe.
 - [`./examples/react-router`](./examples/react-router) - React Router RSC integration
   - Demonstrates how to integrate [experimental React Router RSC API](https://remix.run/blog/rsc-preview). React Router now provides [official RSC support](https://reactrouter.com/how-to/react-server-components), so it's recommended to follow React Router's official documentation for the latest integration.
 
@@ -525,6 +530,29 @@ This module provides Vite-integrated RSC runtime APIs based on
 - `createTemporaryReferenceSet`: Creates a temporary reference set shared by deserialization and reply serialization
 - `setServerCallback`: Configures how server functions are called
 
+### Low-level runtime entry points
+
+The runtime APIs are exposed through two layers:
+
+- `@vitejs/plugin-rsc/rsc`, `@vitejs/plugin-rsc/ssr`, and
+  `@vitejs/plugin-rsc/browser` are the recommended entry points for application
+  and framework runtime code. They initialize the plugin's built-in module
+  loading using the manifests generated by Vite and re-export the corresponding
+  React runtime APIs described above.
+- `@vitejs/plugin-rsc/react/rsc`, `@vitejs/plugin-rsc/react/ssr`, and
+  `@vitejs/plugin-rsc/react/browser` are low-level runtime adapters. They are
+  used by code generated for `"use client"` and `"use server"`, and by custom
+  integrations that provide module loading through `setRequireModule` instead
+  of using the plugin's generated manifests.
+
+The two layers share the same module loader within an environment, which allows
+generated code to use `/react/*` after a top-level entry initializes the
+built-in loader. Application code should continue using the top-level entries,
+which re-export the same runtime APIs. Direct use of `/react/*` is only needed
+by custom integrations that install their own loaders, such as the
+[`examples/browser-mode`](./examples/browser-mode) example, which runs the RSC
+and React client environments in the browser.
+
 ## Tips
 
 ### CSS Support

package/dist/{client-reference-DT0MYgPn.d.ts → client-reference-DR15qkcN.d.ts}

@@ -1,5 +1,5 @@
 import { t as ClientReferenceMetadata } from "./rsc-C3UdJLOW.js";
-import { i as ResolvedAssetDeps } from "./plugin-CaLiN8ED.js";
+import { i as ResolvedAssetDeps } from "./plugin-DQCCjJl0.js";
 //#region src/rsc/client-reference.d.ts
 type OnClientReference = (metadata: ClientReferenceMetadata & {
   deps: ResolvedAssetDeps;

package/dist/{index-BjJe9jqG.d.ts → index-COzKOTR1.d.ts}

@@ -526,6 +526,59 @@ interface AwaitExpression extends BaseExpression {
 }
 //#endregion
 //#region src/transforms/hoist.d.ts
+/**
+ * Turns an inline directive function into a module-level registered function.
+ * Conceptually:
+ *
+ * ```js
+ * function Component() {
+ *   const x = 1
+ *   async function action(y) {
+ *     "use server"
+ *     return x + y
+ *   }
+ * }
+ * ```
+ *
+ * becomes:
+ *
+ * ```js
+ * function Component() {
+ *   const x = 1
+ *   const action = __RUNTIME__($$hoist_0_action).bind(null, x)
+ * }
+ * export async function $$hoist_0_action(x, y) {
+ *   "use server"
+ *   return x + y
+ * }
+ * ```
+ *
+ * The generated export is `$$hoist_0_action`, so `names` contains
+ * `['$$hoist_0_action']` for this example.
+ *
+ * Here, `__RUNTIME__(...)` represents the registration expression returned by the
+ * `runtime` callback. When `encode` and `decode` are provided, the closure
+ * captures instead travel as one encoded bound argument:
+ *
+ * ```js
+ * function Component() {
+ *   const x = 1
+ *   const action = __RUNTIME__($$hoist_0_action).bind(
+ *     null,
+ *     __ENCODE__([x]),
+ *   )
+ * }
+ *
+ * export async function $$hoist_0_action($$hoist_encoded, y) {
+ *   const [x] = __DECODE__($$hoist_encoded)
+ *   "use server"
+ *   return x + y
+ * }
+ * ```
+ *
+ * In this second sketch, `__ENCODE__(...)` and `__DECODE__(...)` likewise
+ * represent the expressions returned by those code-generation callbacks.
+ */
 declare function transformHoistInlineDirective(input: string, ast: Program, { runtime, rejectNonAsyncFunction, ...options }: {
   runtime: (value: string, name: string, meta: {
     directiveMatch: RegExpMatchArray;
@@ -534,6 +587,7 @@ declare function transformHoistInlineDirective(input: string, ast: Program, { ru
   rejectNonAsyncFunction?: boolean;
   encode?: (value: string) => string;
   decode?: (value: string) => string;
+  /** Keep generated hoisted declarations module-local instead of exporting them. */
   noExport?: boolean;
 }): {
   output: MagicString;
@@ -627,9 +681,11 @@ declare function transformServerActionServer(input: string, ast: Program, option
 }): {
   exportNames: string[];
   output: MagicString;
+  referenceNames: string[];
 } | {
   output: MagicString;
   names: string[];
+  referenceNames: string[];
 };
 //#endregion
 //#region src/transforms/expand-export-all.d.ts

package/dist/index.d.ts

@@ -1,2 +1,2 @@
-import { c as getPluginApi, r as PluginApi, s as RscPluginOptions, u as vitePluginRsc } from "./plugin-CaLiN8ED.js";
-export { type PluginApi, type RscPluginOptions, vitePluginRsc as default, getPluginApi };
+import { c as getPluginApi, o as RscPluginManager, r as PluginApi, s as RscPluginOptions, u as vitePluginRsc } from "./plugin-DQCCjJl0.js";
+export { type PluginApi, type RscPluginManager, type RscPluginOptions, vitePluginRsc as default, getPluginApi };

package/dist/index.js

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

package/dist/{picocolors-D_Y2lyXp.js → picocolors-BVMUFdce.js}

@@ -1,4 +1,4 @@
-import { a as __commonJSMin } from "./plugin-ByvxS0by.js";
+import { a as __commonJSMin } from "./plugin-DbK8rF7n.js";
 //#region ../../node_modules/.pnpm/picocolors@1.1.1/node_modules/picocolors/picocolors.js
 var require_picocolors = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	let p = process || {};

package/dist/{plugin-CaLiN8ED.d.ts → plugin-DQCCjJl0.d.ts}

@@ -1,4 +1,4 @@
-import { f as TransformWrapExportFilter } from "./index-BjJe9jqG.js";
+import { f as TransformWrapExportFilter } from "./index-COzKOTR1.js";
 import MagicString from "magic-string";
 import { Plugin, ResolvedConfig, Rollup, ViteDevServer, parseAstAsync } from "vite";
 //#region src/plugins/import-environment.d.ts
@@ -9,6 +9,30 @@ type EnvironmentImportMeta = {
   specifier: string;
 };
 //#endregion
+//#region src/plugins/server-reference.d.ts
+type ServerReferenceMeta = {
+  importId: string;
+  referenceKey: string;
+  exportNames: string[];
+};
+type ServerReferenceClaimMap = DefaultMap<string, Map<string, ServerReferenceMeta>>;
+declare class ServerReferencesManager {
+  private manager;
+  claimMap: ServerReferenceClaimMap;
+  metaMap: Map<string, ServerReferenceMeta>;
+  constructor(manager: RscPluginManager);
+  resolve(id: string, serverEnvironmentName: string): ServerReferenceMeta;
+  replaceClaim(owner: string, id: string, meta: ServerReferenceMeta): void;
+  deleteClaim(owner: string, id: string): void;
+  findByReferenceKey(referenceKey: string): ServerReferenceMeta | undefined;
+  private normalizeImportId;
+}
+declare class DefaultMap<K, V> extends Map<K, V> {
+  private createDefault;
+  constructor(createDefault: (key: K) => V);
+  override get(key: K): V;
+}
+//#endregion
 //#region src/plugin.d.ts
 type ClientReferenceMeta = {
   importId: string;
@@ -19,11 +43,6 @@ type ClientReferenceMeta = {
   serverChunk?: string;
   groupChunkId?: string;
 };
-type ServerReferenceMeta = {
-  importId: string;
-  referenceKey: string;
-  exportNames: string[];
-};
 /**
  * @experimental
  */
@@ -35,7 +54,7 @@ declare class RscPluginManager {
   isScanBuild: boolean;
   clientReferenceMetaMap: Record<string, ClientReferenceMeta>;
   clientReferenceGroups: Record<string, ClientReferenceMeta[]>;
-  serverReferenceMetaMap: Record<string, ServerReferenceMeta>;
+  serverReferences: ServerReferencesManager;
   serverResourcesMetaMap: Record<string, {
     key: string;
   }>;
@@ -50,7 +69,7 @@ type RscPluginOptions = {
    * shorthand for configuring `environments.(name).build.rollupOptions.input.index`
    */
   entries?: Partial<Record<"client" | "ssr" | "rsc", string>>;
-  /** @default { enviornmentName: "rsc", entryName: "index" } */
+  /** @default { environmentName: "rsc", entryName: "index" } */
   serverHandler?: {
     environmentName: string;
     entryName: string;
@@ -78,6 +97,11 @@ type RscPluginOptions = {
    */
   defineEncryptionKey?: string;
   /** Escape hatch for Waku's `allowServer` */
+  keepUseClientProxy?: boolean;
+  /**
+   * @deprecated This option contains a typo. Use `keepUseClientProxy` instead.
+   * It will be removed in the next breaking release.
+   */
   keepUseCientProxy?: boolean;
   /**
    * Enable build-time validation of 'client-only' and 'server-only' imports

package/dist/{plugin-ByvxS0by.js → plugin-DbK8rF7n.js}

@@ -226,7 +226,7 @@ function getEntrySource(config, name) {
 	throw new Error(`[vite-rsc:getEntrySource] expected 'build.rollupOptions.input' to be an object with a '${name}' property that is a string, but got ${JSON.stringify(input)}`);
 }
 function getFallbackRollupEntry(input = {}) {
-	const inputEntries = Object.entries(normalizeRollupOpitonsInput(input));
+	const inputEntries = Object.entries(normalizeRollupOptionsInput(input));
 	if (inputEntries.length === 1) {
 		const [name, source] = inputEntries[0];
 		return {
@@ -236,7 +236,7 @@ function getFallbackRollupEntry(input = {}) {
 	}
 	throw new Error(`[vite-rsc] cannot determine fallback entry name from multiple entries, please specify the entry name explicitly`);
 }
-function normalizeRollupOpitonsInput(input = {}) {
+function normalizeRollupOptionsInput(input = {}) {
 	if (typeof input === "string") input = [input];
 	if (Array.isArray(input)) return Object.fromEntries(input.map((file) => [path.basename(file).slice(0, -path.extname(file).length), file]));
 	return input;
@@ -260,7 +260,7 @@ const ENV_IMPORTS_ENTRY_FALLBACK = "virtual:vite-rsc/env-imports-entry-fallback"
 function ensureEnvironmentImportsEntryFallback({ environments }) {
 	for (const [name, config] of Object.entries(environments)) {
 		if (name === "client") continue;
-		const input = normalizeRollupOpitonsInput(config.build?.rollupOptions?.input);
+		const input = normalizeRollupOptionsInput(config.build?.rollupOptions?.input);
 		if (Object.keys(input).length === 0) {
 			config.build = config.build || {};
 			config.build.rollupOptions = config.build.rollupOptions || {};
@@ -439,6 +439,80 @@ async function transformScanBuildStrip(code) {
 	return output;
 }
 //#endregion
+//#region src/plugins/server-reference.ts
+var ServerReferencesManager = class {
+	manager;
+	claimMap = new DefaultMap(() => /* @__PURE__ */ new Map());
+	metaMap = /* @__PURE__ */ new Map();
+	constructor(manager) {
+		this.manager = manager;
+	}
+	resolve(id, serverEnvironmentName) {
+		const importId = this.normalizeImportId(id);
+		return {
+			importId,
+			referenceKey: this.manager.config.command === "build" ? hashString(this.manager.toRelativeId(importId)) : normalizeViteImportAnalysisUrl(this.manager.server.environments[serverEnvironmentName], importId),
+			exportNames: []
+		};
+	}
+	replaceClaim(owner, id, meta) {
+		this.claimMap.get(id).set(owner, meta);
+		this.metaMap = deriveMetaMap(this.claimMap);
+	}
+	deleteClaim(owner, id) {
+		const ownerMap = this.claimMap.get(id);
+		ownerMap.delete(owner);
+		if (ownerMap.size === 0) this.claimMap.delete(id);
+		this.metaMap = deriveMetaMap(this.claimMap);
+	}
+	findByReferenceKey(referenceKey) {
+		for (const meta of this.metaMap.values()) if (meta.referenceKey === referenceKey) return meta;
+	}
+	normalizeImportId(id) {
+		return this.manager.config.command !== "build" && id.includes("/node_modules/") ? cleanUrl(id) : id;
+	}
+};
+function deriveMetaMap(claimMap) {
+	const normalizedClaimMap = new DefaultMap(() => /* @__PURE__ */ new Map());
+	for (const claims of claimMap.values()) for (const [owner, claim] of claims) normalizedClaimMap.get(claim.importId).set(owner, claim);
+	const metaMap = /* @__PURE__ */ new Map();
+	for (const [importId, claims] of normalizedClaimMap) metaMap.set(importId, aggregateClaims(importId, claims));
+	return metaMap;
+}
+function aggregateClaims(importId, claims) {
+	let aggregate;
+	const exportOwners = /* @__PURE__ */ new Map();
+	for (const [claimOwner, claim] of claims) {
+		if (!aggregate) aggregate = {
+			importId: claim.importId,
+			referenceKey: claim.referenceKey,
+			exportNames: []
+		};
+		else if (aggregate.importId !== claim.importId || aggregate.referenceKey !== claim.referenceKey) throw new Error(`[vite-rsc] conflicting server reference identity for '${importId}'`);
+		for (const name of claim.exportNames) {
+			const existingOwner = exportOwners.get(name);
+			if (existingOwner && existingOwner !== claimOwner) throw new Error(`[vite-rsc] server reference '${claim.referenceKey}#${name}' is claimed by both '${existingOwner}' and '${claimOwner}'`);
+			exportOwners.set(name, claimOwner);
+		}
+	}
+	assert(aggregate);
+	aggregate.exportNames = [...exportOwners.keys()].sort();
+	return aggregate;
+}
+var DefaultMap = class extends Map {
+	createDefault;
+	constructor(createDefault) {
+		super();
+		this.createDefault = createDefault;
+	}
+	get(key) {
+		if (super.has(key)) return super.get(key);
+		const value = this.createDefault(key);
+		this.set(key, value);
+		return value;
+	}
+};
+//#endregion
 //#region src/plugins/validate-import.ts
 function validateImportPlugin() {
 	return {
@@ -543,7 +617,7 @@ var RscPluginManager = class {
 	isScanBuild = false;
 	clientReferenceMetaMap = {};
 	clientReferenceGroups = {};
-	serverReferenceMetaMap = {};
+	serverReferences = new ServerReferencesManager(this);
 	serverResourcesMetaMap = {};
 	environmentImportMetaMap = {};
 	stabilize() {
@@ -614,13 +688,13 @@ function vitePluginRscMinimal(rscPluginOptions = {}, manager = new RscPluginMana
 							if (Object.values(manager.clientReferenceMetaMap).find((meta) => meta.referenceKey === parsed.id)) return `export {}`;
 						}
 						if (parsed.type === "server") {
-							let meta = Object.values(manager.serverReferenceMetaMap).find((meta) => meta.referenceKey === parsed.id);
+							let meta = manager.serverReferences.findByReferenceKey(parsed.id);
 							if (!meta) {
 								try {
 									const id = (await this.resolve(parsed.id))?.id ?? parsed.id;
 									if (isFileLoadingAllowed(manager.config, slash(cleanUrl(id)))) await this.environment.transformRequest(parsed.id);
 								} catch {}
-								meta = Object.values(manager.serverReferenceMetaMap).find((meta) => meta.referenceKey === parsed.id);
+								meta = manager.serverReferences.findByReferenceKey(parsed.id);
 							}
 							if (meta) return `export {}`;
 						}
@@ -636,7 +710,7 @@ function vitePluginRscMinimal(rscPluginOptions = {}, manager = new RscPluginMana
 function vitePluginRsc(rscPluginOptions = {}) {
 	const manager = new RscPluginManager();
 	const buildApp = async (builder) => {
-		const colors = await import("./picocolors-D_Y2lyXp.js").then((m) => /* @__PURE__ */ __toESM(m.default, 1));
+		const colors = await import("./picocolors-BVMUFdce.js").then((m) => /* @__PURE__ */ __toESM(m.default, 1));
 		const logStep = (msg) => {
 			builder.config.logger.info(colors.blue(msg));
 		};
@@ -1317,7 +1391,7 @@ function vitePluginUseClient(useClientPluginOptions, manager) {
 				const result = withRollupError(this, transformDirectiveProxyExport)(ast, {
 					directive: "use client",
 					code,
-					keep: !!useClientPluginOptions.keepUseCientProxy,
+					keep: !!(useClientPluginOptions.keepUseClientProxy ?? useClientPluginOptions.keepUseCientProxy),
 					runtime: (name, meta) => {
 						let proxyValue = `() => { throw new Error("Unexpectedly client reference export '" + ` + JSON.stringify(name) + ` + "' is called on server") }`;
 						if (meta?.value) proxyValue = `(${meta.value})`;
@@ -1441,7 +1515,12 @@ function vitePluginUseClient(useClientPluginOptions, manager) {
 						const resolved = await this.resolve(source, importer, options);
 						if (resolved && resolved.id.includes("/node_modules/")) {
 							const rootImporter = path.join(this.environment.config.root, "index.html");
-							const resolvedAtRoot = await this.resolve(source, rootImporter, options);
+							let resolvedAtRoot;
+							try {
+								resolvedAtRoot = await this.resolve(source, rootImporter, options);
+							} catch {
+								return;
+							}
 							if (!resolvedAtRoot || resolvedAtRoot.id !== resolved.id) return;
 							packageSources.set(resolved.id, source);
 							return resolved;
@@ -1577,11 +1656,12 @@ function vitePluginUseServer(useServerPluginOptions, manager) {
 	const serverEnvironmentName = useServerPluginOptions.environment?.rsc ?? "rsc";
 	const browserEnvironmentName = useServerPluginOptions.environment?.browser ?? "client";
 	const debug = createDebug("vite-rsc:use-server");
+	const pluginName = "rsc:use-server";
 	return [{
-		name: "rsc:use-server",
+		name: pluginName,
 		transform: { async handler(code, id) {
 			if (!code.includes("use server")) {
-				delete manager.serverReferenceMetaMap[id];
+				manager.serverReferences.deleteClaim(pluginName, id);
 				return;
 			}
 			let ast = await parseAstAsync(code);
@@ -1597,37 +1677,32 @@ function vitePluginUseServer(useServerPluginOptions, manager) {
 					ast = await parseAstAsync(code);
 				}
 			}
-			let normalizedId_;
-			const getNormalizedId = () => {
-				if (!normalizedId_) {
-					if (this.environment.mode === "dev" && id.includes("/node_modules/")) {
-						debug(`internal server reference created through a package imported in ${this.environment.name} environment: ${id}`);
-						id = cleanUrl(id);
-					}
-					if (manager.config.command === "build") normalizedId_ = hashString(manager.toRelativeId(id));
-					else normalizedId_ = normalizeViteImportAnalysisUrl(manager.server.environments[serverEnvironmentName], id);
+			let serverReference_;
+			const getServerReference = () => {
+				if (!serverReference_) {
+					if (this.environment.mode === "dev" && id.includes("/node_modules/")) debug(`internal server reference created through a package imported in ${this.environment.name} environment: ${id}`);
+					serverReference_ = manager.serverReferences.resolve(id, serverEnvironmentName);
 				}
-				return normalizedId_;
+				return serverReference_;
 			};
 			if (this.environment.name === serverEnvironmentName) {
 				const transformServerActionServer_ = withRollupError(this, transformServerActionServer);
 				const enableEncryption = useServerPluginOptions.enableActionEncryption ?? true;
 				const result = transformServerActionServer_(code, ast, {
-					runtime: (value, name) => `$$ReactServer.registerServerReference(${value}, ${JSON.stringify(getNormalizedId())}, ${JSON.stringify(name)})`,
+					runtime: (value, name) => `$$ReactServer.registerServerReference(${value}, ${JSON.stringify(getServerReference().referenceKey)}, ${JSON.stringify(name)})`,
 					rejectNonAsyncFunction: true,
 					encode: enableEncryption ? (value) => `__vite_rsc_encryption_runtime.encryptActionBoundArgs(${value})` : void 0,
 					decode: enableEncryption ? (value) => `await __vite_rsc_encryption_runtime.decryptActionBoundArgs(${value})` : void 0
 				});
 				const output = result.output;
 				if (!result || !output.hasChanged()) {
-					delete manager.serverReferenceMetaMap[id];
+					manager.serverReferences.deleteClaim(pluginName, id);
 					return;
 				}
-				manager.serverReferenceMetaMap[id] = {
-					importId: id,
-					referenceKey: getNormalizedId(),
-					exportNames: "names" in result ? result.names : result.exportNames
-				};
+				manager.serverReferences.replaceClaim(pluginName, id, {
+					...getServerReference(),
+					exportNames: result.referenceNames
+				});
 				const importSource = resolvePackage(`${PKG_NAME}/react/rsc/server`);
 				output.prepend(`import * as $$ReactServer from "${importSource}";\n`);
 				if (enableEncryption) {
@@ -1640,23 +1715,28 @@ function vitePluginUseServer(useServerPluginOptions, manager) {
 				};
 			} else {
 				if (!hasDirective(ast.body, "use server")) {
-					delete manager.serverReferenceMetaMap[id];
+					manager.serverReferences.deleteClaim(pluginName, id);
 					return;
 				}
 				const result = withRollupError(this, transformDirectiveProxyExport)(ast, {
 					code,
-					runtime: (name) => `$$ReactClient.createServerReference(${JSON.stringify(getNormalizedId() + "#" + name)},$$ReactClient.callServer, undefined, ` + (this.environment.mode === "dev" ? `$$ReactClient.findSourceMapURL,` : "undefined,") + `${JSON.stringify(name)})`,
+					runtime: (name) => `$$ReactClient.createServerReference(${JSON.stringify(getServerReference().referenceKey + "#" + name)},$$ReactClient.callServer, undefined, ` + (this.environment.mode === "dev" ? `$$ReactClient.findSourceMapURL,` : "undefined,") + `${JSON.stringify(name)})`,
 					directive: "use server",
 					rejectNonAsyncFunction: true
 				});
-				if (!result) return;
+				if (!result) {
+					manager.serverReferences.deleteClaim(pluginName, id);
+					return;
+				}
 				const output = result?.output;
-				if (!output?.hasChanged()) return;
-				manager.serverReferenceMetaMap[id] = {
-					importId: id,
-					referenceKey: getNormalizedId(),
+				if (!output?.hasChanged()) {
+					manager.serverReferences.deleteClaim(pluginName, id);
+					return;
+				}
+				manager.serverReferences.replaceClaim(pluginName, id, {
+					...getServerReference(),
 					exportNames: result.exportNames
-				};
+				});
 				const name = this.environment.name === browserEnvironmentName ? "browser" : "ssr";
 				const importSource = resolvePackage(`${PKG_NAME}/react/${name}`);
 				output.prepend(`import * as $$ReactClient from "${importSource}";\n`);
@@ -1672,7 +1752,7 @@ function vitePluginUseServer(useServerPluginOptions, manager) {
 			map: null
 		};
 		let code = "";
-		for (const meta of Object.values(manager.serverReferenceMetaMap)) {
+		for (const meta of manager.serverReferences.metaMap.values()) {
 			const key = JSON.stringify(meta.referenceKey);
 			const id = JSON.stringify(meta.importId);
 			const exports = meta.exportNames.map((name) => name === "default" ? "default: _default" : name).sort();

package/dist/plugin.d.ts

@@ -1,2 +1,2 @@
-import { a as ResolvedAssetsManifest, c as getPluginApi, d as vitePluginRscMinimal, i as ResolvedAssetDeps, l as transformRscCssExport, n as AssetsManifest, o as RscPluginManager, r as PluginApi, s as RscPluginOptions, t as AssetDeps, u as vitePluginRsc } from "./plugin-CaLiN8ED.js";
+import { a as ResolvedAssetsManifest, c as getPluginApi, d as vitePluginRscMinimal, i as ResolvedAssetDeps, l as transformRscCssExport, n as AssetsManifest, o as RscPluginManager, r as PluginApi, s as RscPluginOptions, t as AssetDeps, u as vitePluginRsc } from "./plugin-DQCCjJl0.js";
 export { AssetDeps, AssetsManifest, PluginApi, ResolvedAssetDeps, ResolvedAssetsManifest, type RscPluginManager, RscPluginOptions, vitePluginRsc as default, getPluginApi, transformRscCssExport, vitePluginRscMinimal };

package/dist/plugin.js

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

package/dist/rsc/server.d.ts

@@ -1,6 +1,6 @@
 import { a as createServerManifest, o as loadServerAction, r as createClientManifest, s as setRequireModule } from "../rsc-C3UdJLOW.js";
 import { a as registerClientReference, i as decodeReply, n as decodeAction, o as registerServerReference, r as decodeFormState, t as createTemporaryReferenceSet } from "../server-ZBjqNTqU.js";
-import { t as OnClientReference } from "../client-reference-DT0MYgPn.js";
+import { t as OnClientReference } from "../client-reference-DR15qkcN.js";
 //#region src/rsc/server.d.ts
 declare function renderToReadableStream<T>(data: T, options?: object, extraOptions?: {
   /**

package/dist/rsc/static.d.ts

@@ -1,5 +1,5 @@
 import { d as RenderToReadableStreamOptions, u as PrerenderResult } from "../index-C5IY2S-e.js";
-import { t as OnClientReference } from "../client-reference-DT0MYgPn.js";
+import { t as OnClientReference } from "../client-reference-DR15qkcN.js";
 //#region src/rsc/static.d.ts
 declare function prerender<T>(data: T, options?: RenderToReadableStreamOptions, extraOptions?: {
   /**

package/dist/ssr.d.ts

@@ -1,6 +1,6 @@
 import { s as EncodeFormActionCallback } from "./index-C5IY2S-e.js";
 import { createServerConsumerManifest, setRequireModule } from "./core/ssr.js";
-import { i as ResolvedAssetDeps } from "./plugin-CaLiN8ED.js";
+import { i as ResolvedAssetDeps } from "./plugin-DQCCjJl0.js";
 import { callServer, createFromReadableStream, createServerReference, createTemporaryReferenceSet, encodeReply, findSourceMapURL } from "./react/ssr.js";
 //#region src/ssr.d.ts
 /**

package/dist/transforms/index.d.ts

@@ -1,2 +1,2 @@
-import { a as extractIdentifiers, c as validateNonAsyncFunction, d as transformProxyExport, f as TransformWrapExportFilter, g as transformHoistInlineDirective, h as findDirectives, i as transformServerActionServer, l as TransformProxyExportOptions, m as transformWrapExport, n as TransformExpandExportAllOptions, o as extractNames, p as TransformWrapExportOptions, r as transformExpandExportAll, s as hasDirective, t as TransformExpandExportAllContext, u as transformDirectiveProxyExport } from "../index-BjJe9jqG.js";
+import { a as extractIdentifiers, c as validateNonAsyncFunction, d as transformProxyExport, f as TransformWrapExportFilter, g as transformHoistInlineDirective, h as findDirectives, i as transformServerActionServer, l as TransformProxyExportOptions, m as transformWrapExport, n as TransformExpandExportAllOptions, o as extractNames, p as TransformWrapExportOptions, r as transformExpandExportAll, s as hasDirective, t as TransformExpandExportAllContext, u as transformDirectiveProxyExport } from "../index-COzKOTR1.js";
 export { TransformExpandExportAllContext, TransformExpandExportAllOptions, TransformProxyExportOptions, TransformWrapExportFilter, TransformWrapExportOptions, extractIdentifiers, extractNames, findDirectives, hasDirective, transformDirectiveProxyExport, transformExpandExportAll, transformHoistInlineDirective, transformProxyExport, transformServerActionServer, transformWrapExport, validateNonAsyncFunction };

package/dist/transforms/index.js

@@ -3,6 +3,59 @@ import { a as validateNonAsyncFunction, i as hasDirective, n as extractIdentifie
 import MagicString from "magic-string";
 import { walk } from "estree-walker";
 //#region src/transforms/hoist.ts
+/**
+* Turns an inline directive function into a module-level registered function.
+* Conceptually:
+*
+* ```js
+* function Component() {
+*   const x = 1
+*   async function action(y) {
+*     "use server"
+*     return x + y
+*   }
+* }
+* ```
+*
+* becomes:
+*
+* ```js
+* function Component() {
+*   const x = 1
+*   const action = __RUNTIME__($$hoist_0_action).bind(null, x)
+* }
+* export async function $$hoist_0_action(x, y) {
+*   "use server"
+*   return x + y
+* }
+* ```
+*
+* The generated export is `$$hoist_0_action`, so `names` contains
+* `['$$hoist_0_action']` for this example.
+*
+* Here, `__RUNTIME__(...)` represents the registration expression returned by the
+* `runtime` callback. When `encode` and `decode` are provided, the closure
+* captures instead travel as one encoded bound argument:
+*
+* ```js
+* function Component() {
+*   const x = 1
+*   const action = __RUNTIME__($$hoist_0_action).bind(
+*     null,
+*     __ENCODE__([x]),
+*   )
+* }
+*
+* export async function $$hoist_0_action($$hoist_encoded, y) {
+*   const [x] = __DECODE__($$hoist_encoded)
+*   "use server"
+*   return x + y
+* }
+* ```
+*
+* In this second sketch, `__ENCODE__(...)` and `__DECODE__(...)` likewise
+* represent the expressions returned by those code-generation callbacks.
+*/
 function transformHoistInlineDirective(input, ast, { runtime, rejectNonAsyncFunction, ...options }) {
 	if (!input.endsWith("\n")) input += "\n";
 	const output = new MagicString(input);
@@ -378,11 +431,21 @@ function transformProxyExport(ast, options) {
 //#endregion
 //#region src/transforms/server-action.ts
 function transformServerActionServer(input, ast, options) {
-	if (hasDirective(ast.body, "use server")) return transformWrapExport(input, ast, options);
-	return transformHoistInlineDirective(input, ast, {
+	if (hasDirective(ast.body, "use server")) {
+		const result = transformWrapExport(input, ast, options);
+		return {
+			...result,
+			referenceNames: result.exportNames
+		};
+	}
+	const result = transformHoistInlineDirective(input, ast, {
 		...options,
 		directive: "use server"
 	});
+	return {
+		...result,
+		referenceNames: result.names
+	};
 }
 //#endregion
 //#region src/transforms/expand-export-all.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vitejs/plugin-rsc",
-  "version": "0.5.30",
+  "version": "0.5.31",
   "description": "React Server Components (RSC) support for Vite.",
   "keywords": [
     "react",
@@ -28,35 +28,24 @@
     "./transforms": "./dist/transforms/index.js",
     "./*": "./dist/*.js"
   },
-  "scripts": {
-    "test": "vitest",
-    "test-e2e": "playwright test --project=chromium",
-    "test-e2e-ci": "playwright test",
-    "tsc": "tsc -b ./tsconfig.json ./e2e/tsconfig.json ./examples/*/tsconfig.json",
-    "tsc-dev": "pnpm tsc --watch --preserveWatchOutput",
-    "dev": "tsdown --sourcemap --watch src",
-    "build": "tsdown",
-    "prepack": "tsdown"
-  },
   "dependencies": {
     "@rolldown/pluginutils": "^1.0.1",
     "es-module-lexer": "^2.3.1",
     "estree-walker": "^3.0.3",
     "magic-string": "^0.30.21",
-    "srvx": "^0.11.22",
+    "srvx": "^0.12.4",
     "strip-literal": "^3.1.0",
     "turbo-stream": "^3.2.0",
     "vitefu": "^1.1.3"
   },
   "devDependencies": {
     "@hiogawa/utils": "^1.7.0",
-    "@playwright/test": "^1.61.1",
+    "@playwright/test": "^1.62.0",
     "@tsconfig/strictest": "^2.0.8",
     "@types/estree": "^1.0.9",
     "@types/node": "^24.13.3",
     "@types/react": "^19.2.17",
     "@types/react-dom": "^19.2.3",
-    "@vitejs/plugin-react": "workspace:*",
     "@vitejs/test-dep-cjs-and-esm": "./test-dep/cjs-and-esm",
     "@vitejs/test-dep-cjs-falsy-primitive": "./test-dep/cjs-falsy-primitive",
     "picocolors": "^1.1.1",
@@ -64,7 +53,8 @@
     "react-dom": "^19.2.8",
     "react-server-dom-webpack": "^19.2.8",
     "tinyexec": "^1.2.4",
-    "tsdown": "^0.22.7"
+    "tsdown": "^0.22.14",
+    "@vitejs/plugin-react": "6.0.4"
   },
   "peerDependencies": {
     "react": "*",
@@ -87,5 +77,14 @@
       "type": "incompatible",
       "reason": "Uses Vite-specific APIs"
     }
+  },
+  "scripts": {
+    "test": "vitest",
+    "test-e2e": "playwright test --project=chromium",
+    "test-e2e-ci": "playwright test",
+    "tsc": "tsc -b ./tsconfig.json ./e2e/tsconfig.json ./examples/*/tsconfig.json",
+    "tsc-dev": "pnpm tsc --watch --preserveWatchOutput",
+    "dev": "tsdown --sourcemap --watch src",
+    "build": "tsdown"
   }
-}
+}