@vitejs/plugin-rsc 0.5.35 → 0.5.37

package/README.md

@@ -425,10 +425,12 @@ export default defineConfig({
       // this is enabled by default. See the "server-only and client-only import" section below for details.
       validateImports: true,
 
-      // by default, the plugin uses a build-time generated encryption key for
-      // "use server" closure argument binding.
-      // This can be overwritten by configuring `defineEncryptionKey` option,
-      // for example, to obtain a key through environment variable during runtime.
+      // by default, the plugin generates a random encryption key for "use server" closure
+      // arguments at build time and writes it into the build output.
+      // `defineEncryptionKey` is a JavaScript expression evaluated at runtime instead,
+      // so the key can be loaded as a runtime secret, rotated without rebuilding,
+      // and shared by server instances built separately from the same source.
+      // It isn't meant to keep encrypted closures valid across different app versions.
       // cf. https://nextjs.org/docs/app/guides/data-security#overwriting-encryption-keys-advanced
       defineEncryptionKey: 'process.env.MY_ENCRYPTION_KEY',
 

package/dist/{client-reference-Bk5pzNGN.d.ts → client-reference-CWbaj3vK.d.ts}

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

package/dist/{encryption-utils-BNbYHtC4.js → encryption-utils-Bmw1Q82C.js}

@@ -51,21 +51,23 @@ async function generateEncryptionKey() {
 	const exported = await crypto.subtle.exportKey("raw", key);
 	return new Uint8Array(exported);
 }
-async function encryptBuffer(data, key) {
+async function encryptBuffer(data, key, additionalData) {
 	const iv = crypto.getRandomValues(/* @__PURE__ */ new Uint8Array(16));
 	const encrypted = await crypto.subtle.encrypt({
 		name: "AES-GCM",
-		iv
+		iv,
+		...additionalData && { additionalData }
 	}, key, data);
 	return toBase64(concatArray([iv, new Uint8Array(encrypted)]));
 }
-async function decryptBuffer(encryptedString, key) {
+async function decryptBuffer(encryptedString, key, additionalData) {
 	const concatenated = fromBase64(encryptedString);
 	const iv = concatenated.slice(0, 16);
 	const encrypted = concatenated.slice(16);
 	return crypto.subtle.decrypt({
 		name: "AES-GCM",
-		iv
+		iv,
+		...additionalData && { additionalData }
 	}, key, encrypted);
 }
 //#endregion

package/dist/{index-XXYjyFr6.d.ts → index-DFncbcyO.d.ts}

@@ -531,8 +531,9 @@ type TransformHoistInlineDirectiveOptions = {
   runtime: (value: string, name: string, meta: TransformHoistInlineDirectiveMeta) => string;
   directive: string | RegExp;
   rejectNonAsyncFunction?: boolean;
-  encode?: (value: string) => string;
-  decode?: (value: string) => string;
+  /** `name` is the hoisted function's name, e.g. to bind the encoding to it. */
+  encode?: (value: string, name: string) => string;
+  decode?: (value: string, name: string) => string;
   /** Keep generated hoisted declarations module-local instead of exporting them. */
   noExport?: boolean;
   /**
@@ -547,6 +548,8 @@ type TransformHoistInlineDirectiveMeta = {
   directiveMatch: RegExpMatchArray;
   /** Original source function before closure captures are added as parameters. */
   valueNode: ArrowFunctionExpression | FunctionDeclaration | FunctionExpression;
+  /** Closure captures, in the order they are bound ahead of the original parameters. */
+  bindVars: string[];
 };
 type TransformHoistInlineDirectiveResult = {
   output: MagicString;
@@ -928,8 +931,8 @@ declare function rejectNonAsyncFunction$1(opts: {
 type TransformServerActionServerOptions = {
   runtime: (value: string, name: string) => string;
   rejectNonAsyncFunction?: boolean;
-  encode?: (value: string) => string;
-  decode?: (value: string) => string;
+  encode?: (value: string, name: string) => string;
+  decode?: (value: string, name: string) => string;
 };
 type TransformServerActionServerResult = {
   exportNames: string[];

package/dist/index.d.ts

@@ -1,2 +1,2 @@
-import { c as getPluginApi, o as RscPluginManager, r as PluginApi, s as RscPluginOptions, u as vitePluginRsc } from "./plugin-CKqXjp8D.js";
+import { c as getPluginApi, o as RscPluginManager, r as PluginApi, s as RscPluginOptions, u as vitePluginRsc } from "./plugin-C2nJizTd.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-CLvIS10V.js";
+import { r as vitePluginRsc, t as getPluginApi } from "./plugin-C4C80eZm.js";
 export { vitePluginRsc as default, getPluginApi };

package/dist/{picocolors-DCTC64Zv.js → picocolors-BPyd8zCA.js}

@@ -1,4 +1,4 @@
-import { a as __commonJSMin } from "./plugin-CLvIS10V.js";
+import { a as __commonJSMin } from "./plugin-C4C80eZm.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-CKqXjp8D.d.ts → plugin-C2nJizTd.d.ts}

@@ -1,4 +1,4 @@
-import { v as TransformWrapExportFilter } from "./index-XXYjyFr6.js";
+import { v as TransformWrapExportFilter } from "./index-DFncbcyO.js";
 import MagicString from "magic-string";
 import { Plugin, ResolvedConfig, Rollup, ViteDevServer, parseAstAsync } from "vite";
 //#region src/plugins/import-environment.d.ts
@@ -91,10 +91,21 @@ type RscPluginOptions = {
    */
   enableActionEncryption?: boolean;
   /**
-   * By default, the plugin uses a build-time generated encryption key for
-   * "use server" closure argument binding.
-   * This can be overwritten by configuring `defineEncryptionKey` option,
-   * for example, to obtain a key through environment variable during runtime.
+   * JavaScript expression evaluated at runtime on the server that returns (or
+   * resolves to) a base64-encoded key for encrypting "use server" closure
+   * arguments, e.g. `'process.env.MY_ENCRYPTION_KEY'`.
+   *
+   * By default, the plugin generates a random key at build time and writes it
+   * into the build output. This option moves the key out of the build into a
+   * runtime secret, so that:
+   * - the key isn't stored in build artifacts,
+   * - it can be rotated without rebuilding, and
+   * - server instances built separately from the same source share one key.
+   *
+   * It isn't meant to keep encrypted closures valid across different versions
+   * of the app. Action ids can change when the source changes, and the
+   * encryption format may change between plugin versions.
+   *
    * cf. https://nextjs.org/docs/app/guides/data-security#overwriting-encryption-keys-advanced
    */
   defineEncryptionKey?: string;

package/dist/{plugin-CLvIS10V.js → plugin-C4C80eZm.js}

@@ -3,7 +3,7 @@ import { i as hasDirective } from "./scope-Ck0n25my.js";
 import { t as cjsModuleRunnerPlugin } from "./cjs-DhDj_zQT.js";
 import { i as toCssVirtual, n as parseIdQuery, r as parseReferenceValidationVirtual, t as parseCssVirtual } from "./shared-B6H2TbnP.js";
 import { findDirectives, transformDirectiveProxyExport, transformExpandExportAll, transformServerActionServer, transformWrapExport } from "./transforms/index.js";
-import { o as generateEncryptionKey, s as toBase64 } from "./encryption-utils-BNbYHtC4.js";
+import { o as generateEncryptionKey, s as toBase64 } from "./encryption-utils-Bmw1Q82C.js";
 import { createRpcServer } from "./utils/rpc.js";
 import { createRequire } from "node:module";
 import assert from "node:assert";
@@ -426,7 +426,7 @@ function scanBuildStripPlugin({ manager }) {
 const importGlobRE = /\bimport\.meta\.glob(?:<\w+>)?\s*\(/g;
 async function transformScanBuildStrip(code) {
 	const [imports] = esModuleLexer.parse(code);
-	let output = imports.map((e) => e.n && `import ${JSON.stringify(e.n)};\n`).filter(Boolean).join("");
+	let output = imports.map((e) => e.specifier && `import ${JSON.stringify(e.specifier)};\n`).filter(Boolean).join("");
 	if (importGlobRE.test(code)) {
 		const ast = await parseAstAsync(code);
 		walk(ast, { enter(node) {
@@ -711,7 +711,7 @@ function vitePluginRscMinimal(rscPluginOptions = {}, manager = new RscPluginMana
 function vitePluginRsc(rscPluginOptions = {}) {
 	const manager = new RscPluginManager();
 	const buildApp = async (builder) => {
-		const colors = await import("./picocolors-DCTC64Zv.js").then((m) => /* @__PURE__ */ __toESM(m.default, 1));
+		const colors = await import("./picocolors-BPyd8zCA.js").then((m) => /* @__PURE__ */ __toESM(m.default, 1));
 		const logStep = (msg) => {
 			builder.config.logger.info(colors.blue(msg));
 		};
@@ -1160,8 +1160,11 @@ export function createRpcClient(params) {
 					}
 				}
 			},
-			generateBundle(_options, bundle) {
-				if (this.environment.name === "client") {
+			generateBundle: {
+				order: "post",
+				handler(_options, bundle) {
+					if (this.environment.name !== "client") return;
+					if (manager.isScanBuild) return;
 					const rscBundle = manager.bundles["rsc"];
 					if (!manager.config.environments.rsc.build.cssCodeSplit) {
 						let cssBundleName;
@@ -1184,12 +1187,12 @@ export function createRpcClient(params) {
 						});
 					}
 					const serverResources = {};
-					const rscAssetDeps = collectAssetDeps(rscBundle);
+					const rscAssetDeps = collectAssetDeps(rscBundle).idToDeps;
 					for (const [id, meta] of Object.entries(manager.serverResourcesMetaMap)) serverResources[meta.key] = assetsURLOfDeps({
 						js: [],
 						css: rscAssetDeps[id]?.deps.css ?? []
 					}, manager);
-					const assetDeps = collectAssetDeps(bundle);
+					const { idToDeps: assetDeps, chunkToDeps } = collectAssetDeps(bundle);
 					let clientEntryUrl;
 					let clientEntryDeps;
 					const clientReferenceDeps = {};
@@ -1201,11 +1204,12 @@ export function createRpcClient(params) {
 						clientReferenceDeps[meta.referenceKey] = assetsURLOfDeps(deps, manager);
 					}
 					if (!rscPluginOptions.customClientEntry) {
-						const entry = Object.values(assetDeps).find((v) => v.chunk.name === "index" && v.chunk.isEntry);
+						const entry = [...chunkToDeps].find(([chunk]) => chunk.name === "index" && chunk.isEntry);
 						if (!entry) throw new Error(`[vite-rsc] Client build must have an entry chunk named "index". Use 'customClientEntry' option to disable this requirement.`);
-						clientEntryDeps = assetsURLOfDeps(entry.deps, manager);
+						const [entryChunk, entryDeps] = entry;
+						clientEntryDeps = assetsURLOfDeps(entryDeps, manager);
 						for (const [key, deps] of Object.entries(clientReferenceDeps)) clientReferenceDeps[key] = mergeAssetDeps(deps, clientEntryDeps);
-						clientEntryUrl = assetsURL(entry.chunk.fileName, manager);
+						clientEntryUrl = assetsURL(entryChunk.fileName, manager);
 					}
 					manager.buildAssetsManifest = {
 						clientEntryUrl,
@@ -1688,11 +1692,12 @@ function vitePluginUseServer(useServerPluginOptions, manager) {
 			if (this.environment.name === serverEnvironmentName) {
 				const transformServerActionServer_ = withRollupError(this, transformServerActionServer);
 				const enableEncryption = useServerPluginOptions.enableActionEncryption ?? true;
+				const getActionId = (name) => `${getServerReference().referenceKey}#${name}`;
 				const result = transformServerActionServer_(code, ast, {
 					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
+					encode: enableEncryption ? (value, name) => `__vite_rsc_encryption_runtime.encryptActionBoundArgs(${value}, ${JSON.stringify(getActionId(name))})` : void 0,
+					decode: enableEncryption ? (value, name) => `await __vite_rsc_encryption_runtime.decryptActionBoundArgs(${value}, ${JSON.stringify(getActionId(name))})` : void 0
 				});
 				const output = result.output;
 				if (!result || !output.hasChanged()) {
@@ -1742,7 +1747,7 @@ function vitePluginUseServer(useServerPluginOptions, manager) {
 				output.prepend(`import * as $$ReactClient from "${importSource}";\n`);
 				return {
 					code: output.toString(),
-					map: output.generateMap({ hires: "boundary" })
+					map: this.environment.mode === "build" ? { mappings: "" } : output.generateMap({ hires: "boundary" })
 				};
 			}
 		} }
@@ -1831,7 +1836,10 @@ function collectAssetDeps(bundle) {
 		chunk,
 		deps
 	};
-	return idToDeps;
+	return {
+		idToDeps,
+		chunkToDeps
+	};
 }
 function collectAssetDepsInner(fileName, bundle) {
 	const visited = /* @__PURE__ */ new Set();
@@ -1896,7 +1904,7 @@ function vitePluginRscCss(rscCssOptions = {}, manager) {
 		if (options === false) return false;
 		if (options?.filter && !options.filter(filename)) return false;
 		if (!/\.(css|less|sass|scss|styl|stylus|pcss|postcss|sss)\b/.test(code) || !/\.[tj]sx?$/.test(filename)) return false;
-		if (!esModuleLexer.parse(code)[0].some((i) => i.t === 1 && i.n && isCSSRequest(i.n))) return false;
+		if (!esModuleLexer.parse(code)[0].some((i) => i.type === "static" && i.specifier && isCSSRequest(i.specifier))) return false;
 		return (_name, meta) => !!(meta.isFunction && meta.declName && /^[A-Z]/.test(meta.declName) || meta.defaultExportIdentifierName && /^[A-Z]/.test(meta.defaultExportIdentifierName));
 	}
 	return [
@@ -2077,6 +2085,7 @@ function generateResourcesCode(depsCode, manager, options = {}) {
 			return React.createElement(React.Fragment, null, [...deps.css.map((href) => React.createElement("link", {
 				key: "css:" + href,
 				rel: "stylesheet",
+				crossOrigin: "anonymous",
 				...precedence ? { precedence } : {},
 				href,
 				"data-rsc-css-href": href

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-CKqXjp8D.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-C2nJizTd.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-CLvIS10V.js";
+import { i as vitePluginRscMinimal, n as transformRscCssExport, r as vitePluginRsc, t as getPluginApi } from "./plugin-C4C80eZm.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-D8UlANI2.js";
 import { a as registerClientReference, i as decodeReply, n as decodeAction, o as registerServerReference, r as decodeFormState, t as createTemporaryReferenceSet } from "../server-YwgjVtsE.js";
-import { t as OnClientReference } from "../client-reference-Bk5pzNGN.js";
+import { t as OnClientReference } from "../client-reference-CWbaj3vK.js";
 //#region src/rsc/server.d.ts
 export declare function renderToReadableStream<T>(data: T, options?: object, extraOptions?: {
   /**

package/dist/rsc/server.node.d.ts

@@ -1,7 +1,7 @@
 import { _ as RenderToPipeableStreamOptions, f as PipeableStream, v as RenderToReadableStreamOptions } from "../index-CROaL0MT.js";
 import { a as createServerManifest, o as loadServerAction, r as createClientManifest, s as setRequireModule } from "../rsc-D8UlANI2.js";
 import { a as decodeReplyFromBusboy, i as decodeReply, n as decodeAction, o as registerClientReference, r as decodeFormState, s as registerServerReference, t as createTemporaryReferenceSet } from "../server.node-DU77AeKU.js";
-import { t as OnClientReference } from "../client-reference-Bk5pzNGN.js";
+import { t as OnClientReference } from "../client-reference-CWbaj3vK.js";
 //#region src/rsc/server.node.d.ts
 export declare function renderToReadableStream<T>(data: T, options?: RenderToReadableStreamOptions, extraOptions?: {
   /**

package/dist/rsc/static.d.ts

@@ -1,5 +1,5 @@
 import { m as PrerenderResult, p as PrerenderOptions } from "../index-CROaL0MT.js";
-import { t as OnClientReference } from "../client-reference-Bk5pzNGN.js";
+import { t as OnClientReference } from "../client-reference-CWbaj3vK.js";
 //#region src/rsc/static.d.ts
 export declare function prerender<T>(data: T, options?: PrerenderOptions, extraOptions?: {
   /**

package/dist/rsc/static.node.d.ts

@@ -1,5 +1,5 @@
 import { g as PrerenderToNodeStreamResult, h as PrerenderToNodeStreamOptions, m as PrerenderResult, p as PrerenderOptions } from "../index-CROaL0MT.js";
-import { t as OnClientReference } from "../client-reference-Bk5pzNGN.js";
+import { t as OnClientReference } from "../client-reference-CWbaj3vK.js";
 //#region src/rsc/static.node.d.ts
 export declare function prerender<T>(data: T, options?: PrerenderOptions, extraOptions?: {
   /**

package/dist/{shared-CXQb6hk9.js → shared-DH8gaClP.js}

@@ -82,6 +82,7 @@ function preloadDeps(deps) {
 	}
 	for (const href of deps.css) ReactDOM.preinit(href, {
 		as: "style",
+		crossOrigin: "anonymous",
 		precedence: assetsManifest.cssLinkPrecedence !== false ? "vite-rsc/client-reference" : void 0
 	});
 }

package/dist/{shared-DJBuYpZL.d.ts → shared-Df9Nennr.d.ts}

@@ -1,4 +1,4 @@
-import { i as ResolvedAssetDeps } from "./plugin-CKqXjp8D.js";
+import { i as ResolvedAssetDeps } from "./plugin-C2nJizTd.js";
 //#region src/ssr/shared.d.ts
 declare function getClientEntryUrl(): string;
 /**

package/dist/ssr.d.ts

@@ -1,5 +1,5 @@
 import { l as EncodeFormActionCallback } from "./index-CROaL0MT.js";
 import { n as setRequireModule, t as createServerConsumerManifest } from "./ssr-C-U7jY5S.js";
 import { callServer, createFromReadableStream, createServerReference, createTemporaryReferenceSet, encodeReply, findSourceMapURL } from "./react/ssr.js";
-import { n as getClientEntryUrl, r as setOnClientReference, t as OnClientReference } from "./shared-DJBuYpZL.js";
+import { n as getClientEntryUrl, r as setOnClientReference, t as OnClientReference } from "./shared-Df9Nennr.js";
 export { type EncodeFormActionCallback, OnClientReference, callServer, createFromReadableStream, createServerConsumerManifest, createServerReference, createTemporaryReferenceSet, encodeReply, findSourceMapURL, getClientEntryUrl, setOnClientReference, setRequireModule };

package/dist/ssr.js

@@ -1,4 +1,4 @@
 import { createServerConsumerManifest, setRequireModule } from "./core/ssr.js";
-import { n as setOnClientReference, t as getClientEntryUrl } from "./shared-CXQb6hk9.js";
+import { n as setOnClientReference, t as getClientEntryUrl } from "./shared-DH8gaClP.js";
 import { callServer, createFromReadableStream, createServerReference, createTemporaryReferenceSet, encodeReply, findSourceMapURL } from "./react/ssr.js";
 export { callServer, createFromReadableStream, createServerConsumerManifest, createServerReference, createTemporaryReferenceSet, encodeReply, findSourceMapURL, getClientEntryUrl, setOnClientReference, setRequireModule };

package/dist/ssr.node.d.ts

@@ -1,5 +1,5 @@
 import { l as EncodeFormActionCallback } from "./index-CROaL0MT.js";
 import { n as setRequireModule, t as createServerConsumerManifest } from "./ssr-C-U7jY5S.js";
 import { callServer, createFromNodeStream, createFromReadableStream, createServerReference, createTemporaryReferenceSet, encodeReply, findSourceMapURL } from "./react/ssr.node.js";
-import { n as getClientEntryUrl, r as setOnClientReference, t as OnClientReference } from "./shared-DJBuYpZL.js";
+import { n as getClientEntryUrl, r as setOnClientReference, t as OnClientReference } from "./shared-Df9Nennr.js";
 export { type EncodeFormActionCallback, OnClientReference, callServer, createFromNodeStream, createFromReadableStream, createServerConsumerManifest, createServerReference, createTemporaryReferenceSet, encodeReply, findSourceMapURL, getClientEntryUrl, setOnClientReference, setRequireModule };

package/dist/ssr.node.js

@@ -1,4 +1,4 @@
 import { createServerConsumerManifest, setRequireModule } from "./core/ssr.js";
-import { n as setOnClientReference, t as getClientEntryUrl } from "./shared-CXQb6hk9.js";
+import { n as setOnClientReference, t as getClientEntryUrl } from "./shared-DH8gaClP.js";
 import { callServer, createFromNodeStream, createFromReadableStream, createServerReference, createTemporaryReferenceSet, encodeReply, findSourceMapURL } from "./react/ssr.node.js";
 export { callServer, createFromNodeStream, createFromReadableStream, createServerConsumerManifest, createServerReference, createTemporaryReferenceSet, encodeReply, findSourceMapURL, getClientEntryUrl, setOnClientReference, setRequireModule };

package/dist/transforms/index.d.ts

@@ -1,2 +1,2 @@
-import { A as ModuleExportSpecifier, C as TransformModuleExportEffectFilter, D as ModuleExportEntry, E as transformModuleExportEffect, F as findDirectives, I as transformHoistInlineDirective, M as TransformHoistInlineDirectiveMeta, N as TransformHoistInlineDirectiveOptions, O as ModuleExportGroup, P as TransformHoistInlineDirectiveResult, S as TransformModuleExportEffectContext, T as TransformModuleExportEffectResult, _ as transformProxyExport, a as TransformServerActionServerResult, b as TransformWrapExportResult, c as extractNames, d as rejectNonAsyncFunction, f as validateNonAsyncFunction, g as transformDirectiveProxyExport, h as TransformProxyExportResult, i as TransformServerActionServerOptions, j as scanModuleExports, k as ModuleExportMeta, l as hasDirective, m as TransformProxyExportOptions, n as TransformExpandExportAllOptions, o as transformServerActionServer, p as TransformProxyExportFilter, r as transformExpandExportAll, s as extractIdentifiers, t as TransformExpandExportAllContext, u as isDirective, v as TransformWrapExportFilter, w as TransformModuleExportEffectOptions, x as transformWrapExport, y as TransformWrapExportOptions } from "../index-XXYjyFr6.js";
+import { A as ModuleExportSpecifier, C as TransformModuleExportEffectFilter, D as ModuleExportEntry, E as transformModuleExportEffect, F as findDirectives, I as transformHoistInlineDirective, M as TransformHoistInlineDirectiveMeta, N as TransformHoistInlineDirectiveOptions, O as ModuleExportGroup, P as TransformHoistInlineDirectiveResult, S as TransformModuleExportEffectContext, T as TransformModuleExportEffectResult, _ as transformProxyExport, a as TransformServerActionServerResult, b as TransformWrapExportResult, c as extractNames, d as rejectNonAsyncFunction, f as validateNonAsyncFunction, g as transformDirectiveProxyExport, h as TransformProxyExportResult, i as TransformServerActionServerOptions, j as scanModuleExports, k as ModuleExportMeta, l as hasDirective, m as TransformProxyExportOptions, n as TransformExpandExportAllOptions, o as transformServerActionServer, p as TransformProxyExportFilter, r as transformExpandExportAll, s as extractIdentifiers, t as TransformExpandExportAllContext, u as isDirective, v as TransformWrapExportFilter, w as TransformModuleExportEffectOptions, x as transformWrapExport, y as TransformWrapExportOptions } from "../index-DFncbcyO.js";
 export { ModuleExportEntry, ModuleExportGroup, ModuleExportMeta, ModuleExportSpecifier, TransformExpandExportAllContext, TransformExpandExportAllOptions, TransformHoistInlineDirectiveMeta, TransformHoistInlineDirectiveOptions, TransformHoistInlineDirectiveResult, TransformModuleExportEffectContext, TransformModuleExportEffectFilter, TransformModuleExportEffectOptions, TransformModuleExportEffectResult, TransformProxyExportFilter, TransformProxyExportOptions, TransformProxyExportResult, TransformServerActionServerOptions, TransformServerActionServerResult, TransformWrapExportFilter, TransformWrapExportOptions, TransformWrapExportResult, extractIdentifiers, extractNames, findDirectives, hasDirective, isDirective, rejectNonAsyncFunction, scanModuleExports, transformDirectiveProxyExport, transformExpandExportAll, transformHoistInlineDirective, transformModuleExportEffect, transformProxyExport, transformServerActionServer, transformWrapExport, validateNonAsyncFunction };

package/dist/transforms/index.js

@@ -91,25 +91,26 @@ function transformHoistInlineDirective(input, viteAst, { runtime, rejectNonAsync
 			const declName = node.type === "FunctionDeclaration" && node.id.name;
 			const originalName = declName || methodInfo?.name || parent?.type === "VariableDeclarator" && parent.id.type === "Identifier" && parent.id.name || "anonymous_server_function";
 			const bindVars = getBindVars(node, scopeTree);
+			const newName = `$$hoist_${names.length}` + (originalName ? `_${originalName}` : "");
+			names.push(newName);
 			let newParams = [...bindVars.map((b) => b.root), ...node.params.map((n) => input.slice(n.start, n.end))].join(", ");
 			if (bindVars.length > 0 && options.decode) {
 				newParams = ["$$hoist_encoded", ...node.params.map((n) => input.slice(n.start, n.end))].join(", ");
-				output.appendLeft(node.body.body[0].start, `const [${bindVars.map((b) => b.root).join(",")}] = ${options.decode("$$hoist_encoded")};\n`);
+				output.appendLeft(node.body.body[0].start, `const [${bindVars.map((b) => b.root).join(",")}] = ${options.decode("$$hoist_encoded", newName)};\n`);
 			}
-			const newName = `$$hoist_${names.length}` + (originalName ? `_${originalName}` : "");
-			names.push(newName);
 			const implementationName = options.hoistRuntime ? `${newName}$$impl` : newName;
 			output.update(node.start, node.body.start, `\n;${options.noExport || options.hoistRuntime ? "" : "export "}${node.async ? "async " : ""}function${node.generator ? "*" : ""} ${implementationName}(${newParams}) `);
 			const runtimeCode = `/* #__PURE__ */ ${runtime(implementationName, newName, {
 				directiveMatch: match,
-				valueNode: node
+				valueNode: node,
+				bindVars: bindVars.map((b) => b.root)
 			})}`;
 			if (options.hoistRuntime) runtimeHoists.push(`${options.noExport ? "" : "export "}const ${newName} = ${runtimeCode};\n`);
 			output.appendLeft(node.end, `;\n/* #__PURE__ */ Object.defineProperty(${implementationName}, "name", { value: ${JSON.stringify(originalName)} });\n`);
 			output.move(node.start, node.end, input.length);
 			let newCode = options.hoistRuntime ? newName : runtimeCode;
 			if (bindVars.length > 0) {
-				const bindArgs = options.encode ? options.encode("[" + bindVars.map((b) => b.expr).join(", ") + "]") : bindVars.map((b) => b.expr).join(", ");
+				const bindArgs = options.encode ? options.encode("[" + bindVars.map((b) => b.expr).join(", ") + "]", newName) : bindVars.map((b) => b.expr).join(", ");
 				newCode = `${newCode}.bind(null, ${bindArgs})`;
 			}
 			if (methodInfo) {
@@ -534,6 +535,7 @@ function transformModuleExportEffect(input, viteAst, options) {
 * bindings, consistent with the other transform helpers.
 */
 function transformWrapExport(input, viteAst, options) {
+	if (!input.endsWith("\n")) input += "\n";
 	const output = new MagicString(input);
 	const exportNames = [];
 	const appendedCode = [];

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

@@ -1,4 +1,4 @@
 //#region src/utils/encryption-runtime.d.ts
-export declare function encryptActionBoundArgs(originalValue: unknown): Promise<string>;
-export declare function decryptActionBoundArgs(encrypted: ReturnType<typeof encryptActionBoundArgs>): Promise<unknown>;
+export declare function encryptActionBoundArgs(originalValue: unknown, actionId?: string): Promise<string>;
+export declare function decryptActionBoundArgs(encrypted: ReturnType<typeof encryptActionBoundArgs>, actionId?: string): Promise<unknown>;
 //#endregion

package/dist/utils/encryption-runtime.js

@@ -1,17 +1,20 @@
 import { n as once } from "../shared-BWJvctW6.js";
-import { a as fromBase64, i as encryptBuffer, n as concatArrayStream, r as decryptBuffer, t as arrayToStream } from "../encryption-utils-BNbYHtC4.js";
+import { a as fromBase64, i as encryptBuffer, n as concatArrayStream, r as decryptBuffer, t as arrayToStream } from "../encryption-utils-Bmw1Q82C.js";
 import { renderToReadableStream } from "../react/rsc/server.js";
 import encryptionKeySource from "virtual:vite-rsc/encryption-key";
 //#region src/utils/encryption-runtime.ts
-async function encryptActionBoundArgs(originalValue) {
+async function encryptActionBoundArgs(originalValue, actionId) {
 	const serialized = renderToReadableStream(originalValue);
 	const serializedBuffer = await concatArrayStream(serialized);
-	return encryptBuffer(serializedBuffer, await getEncryptionKey());
+	return encryptBuffer(serializedBuffer, await getEncryptionKey(), toAdditionalData(actionId));
 }
-async function decryptActionBoundArgs(encrypted) {
-	const [{ createFromReadableStream }, serializedBuffer] = await Promise.all([import("../react/rsc/client.js"), decryptBuffer(await encrypted, await getEncryptionKey())]);
+async function decryptActionBoundArgs(encrypted, actionId) {
+	const [{ createFromReadableStream }, serializedBuffer] = await Promise.all([import("../react/rsc/client.js"), decryptBuffer(await encrypted, await getEncryptionKey(), toAdditionalData(actionId))]);
 	return createFromReadableStream(arrayToStream(new Uint8Array(serializedBuffer)));
 }
+function toAdditionalData(actionId) {
+	return actionId === void 0 ? void 0 : new TextEncoder().encode(actionId);
+}
 const getEncryptionKey = /* #__PURE__ */ once(async () => {
 	const resolved = await encryptionKeySource();
 	return await crypto.subtle.importKey("raw", fromBase64(resolved), { name: "AES-GCM" }, true, ["encrypt", "decrypt"]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vitejs/plugin-rsc",
-  "version": "0.5.35",
+  "version": "0.5.37",
   "description": "React Server Components (RSC) support for Vite.",
   "keywords": [
     "react",
@@ -40,22 +40,23 @@
   },
   "dependencies": {
     "@rolldown/pluginutils": "^1.0.1",
-    "es-module-lexer": "^2.3.2",
+    "es-module-lexer": "^3.0.3",
     "estree-walker": "^3.0.3",
-    "magic-string": "^1.2.3",
+    "magic-string": "^1.4.3",
     "obug": "^3.0.0",
-    "srvx": "^0.12.7",
+    "srvx": "^1.0.5",
     "strip-literal": "^4.0.0",
     "turbo-stream": "^3.2.1",
     "vitefu": "^1.1.3"
   },
   "devDependencies": {
-    "@playwright/test": "^1.62.1",
+    "@playwright/test": "^1.63.0",
     "@tsconfig/strictest": "^2.0.8",
     "@types/estree": "^1.0.9",
-    "@types/node": "^24.13.3",
+    "@types/node": "^24.19.1",
     "@types/react": "^19.3.0",
     "@types/react-dom": "^19.3.0",
+    "@typescript/typescript6": "^6.0.2",
     "@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",
@@ -63,7 +64,7 @@
     "react": "^19.3.0",
     "react-dom": "^19.3.0",
     "react-server-dom-webpack": "^19.3.0",
-    "tinyexec": "^1.3.0",
+    "tinyexec": "^1.3.1",
     "tsdown": "^0.23.0"
   },
   "peerDependencies": {