@vitejs/plugin-rsc 0.5.27 → 0.5.28

package/README.md

@@ -444,14 +444,31 @@ export default defineConfig({
 
 ## RSC runtime (react-server-dom) API
 
-### `@vitejs/plugin-rsc/rsc`
+### `@vitejs/plugin-rsc/rsc/server`
 
-This module re-exports RSC runtime API provided by `react-server-dom/server.edge` and `react-server-dom/client.edge` such as:
+This module provides Vite-integrated RSC runtime APIs based on
+`react-server-dom/server.edge` for use in the RSC environment:
 
 - `renderToReadableStream`: RSC serialization (React VDOM -> RSC stream)
-- `createFromReadableStream`: RSC deserialization (RSC stream -> React VDOM). This is also available on rsc environment itself. For example, it allows saving serialized RSC and deserializing it for later use.
-- `decodeAction/decodeReply/decodeFormState/loadServerAction/createTemporaryReferenceSet`
-- `encodeReply/createClientTemporaryReferenceSet`
+- `decodeAction/decodeReply/decodeFormState/loadServerAction`
+- `registerClientReference/registerServerReference`
+- `createTemporaryReferenceSet`
+
+### `@vitejs/plugin-rsc/rsc/client`
+
+This module provides Vite-integrated RSC runtime APIs based on
+`react-server-dom/client.edge` for use in the RSC environment:
+
+- `createFromReadableStream`: RSC deserialization (RSC stream -> React VDOM)
+- `encodeReply`
+- `createClientTemporaryReferenceSet`
+
+Together, these APIs allow a React VDOM to be serialized, saved as an RSC stream, and later deserialized within the same `rsc` environment.
+
+### `@vitejs/plugin-rsc/rsc`
+
+This module re-exports `@vitejs/plugin-rsc/rsc/server` and
+`@vitejs/plugin-rsc/rsc/client`.
 
 #### Vite-specific extension: `renderToReadableStream` (experimental)
 
@@ -479,17 +496,23 @@ function renderToReadableStream<T>(
 
 ### `@vitejs/plugin-rsc/ssr`
 
-This module re-exports RSC runtime API provided by `react-server-dom/client.edge`
+This module provides Vite-integrated RSC runtime APIs based on
+`react-server-dom/client.edge` for use in the SSR environment:
 
-- `createFromReadableStream`: RSC deserialization (RSC stream -> React VDOM)
+- `createFromReadableStream`: Deserializes an RSC stream into a React VDOM
+- `encodeReply`: Serializes server function arguments
+- `createTemporaryReferenceSet`: Creates a temporary reference set shared by deserialization and reply serialization
 
 ### `@vitejs/plugin-rsc/browser`
 
-This module re-exports RSC runtime API provided by `react-server-dom/client.browser`
+This module provides Vite-integrated RSC runtime APIs based on
+`react-server-dom/client.browser` for use in the browser environment:
 
-- `createFromReadableStream`: RSC deserialization (RSC stream -> React VDOM)
-- `createFromFetch`: a robust way of `createFromReadableStream((await fetch("...")).body)`
-- `encodeReply/setServerCallback`: server function related...
+- `createFromReadableStream`: Deserializes an RSC stream into a React VDOM
+- `createFromFetch`: Deserializes an RSC response from a fetch promise
+- `encodeReply`: Serializes server function arguments
+- `createTemporaryReferenceSet`: Creates a temporary reference set shared by deserialization and reply serialization
+- `setServerCallback`: Configures how server functions are called
 
 ## Tips
 
@@ -667,13 +690,6 @@ Note that while there are official npm packages [`server-only`](https://www.npmj
 
 This build-time validation is enabled by default and can be disabled by setting `validateImports: false` in the plugin options.
 
-## Architecture Documentation
-
-For developers interested in the internal architecture:
-
-- **[docs/architecture.md](docs/architecture.md)** - Build pipeline, data flow, and key components
-- **[docs/bundler-comparison.md](docs/bundler-comparison.md)** - How different bundlers approach RSC
-
 ## Credits
 
 This project builds on fundamental techniques and insights from pioneering Vite RSC implementations.

package/dist/browser.d.ts

@@ -1,4 +1,4 @@
-import { n as CallServerCallback } from "./index-BrXJaflA.js";
-import { t as setRequireModule } from "./browser-C_qguV-a.js";
+import { n as CallServerCallback } from "./index-CqNlZcWp.js";
+import { t as setRequireModule } from "./browser-DI_Wyg5Y.js";
 import { callServer, createFromFetch, createFromReadableStream, createServerReference, createTemporaryReferenceSet, encodeReply, findSourceMapURL, setServerCallback } from "./react/browser.js";
-export { CallServerCallback, callServer, createFromFetch, createFromReadableStream, createServerReference, createTemporaryReferenceSet, encodeReply, findSourceMapURL, setRequireModule, setServerCallback };
+export { type CallServerCallback, callServer, createFromFetch, createFromReadableStream, createServerReference, createTemporaryReferenceSet, encodeReply, findSourceMapURL, setRequireModule, setServerCallback };

package/dist/{cjs-BspwazE6.js → cjs-Cxg_7upE.js}

@@ -1,6 +1,6 @@
-import { t as createDebug } from "./dist-rz-Bnebz.js";
-import { t as buildScopeTree } from "./scope-Bwt9GVLP.js";
-import { n as parseIdQuery } from "./shared-DeahDSXi.js";
+import { t as createDebug } from "./dist-uqdtSkzK.js";
+import { t as buildScopeTree } from "./scope-Do08R7C2.js";
+import { n as parseIdQuery } from "./shared-B6H2TbnP.js";
 import fs from "node:fs";
 import path from "node:path";
 import { fileURLToPath, pathToFileURL } from "node:url";

package/dist/client-BrwlzXgg.d.ts

@@ -0,0 +1,19 @@
+import { a as CreateFromReadableStreamEdgeOptions, c as EncodeReplyFunction, r as ClientTemporaryReferenceSet } from "./index-CqNlZcWp.js";
+//#region src/react/rsc/client.d.ts
+declare function createFromReadableStream<T>(stream: ReadableStream<Uint8Array>, options?: CreateFromReadableStreamEdgeOptions, extraOptions?: {
+  /**
+   * Preserve server references for re-serialization without loading their modules.
+   * Preserved references cannot be invoked in the current RSC environment.
+   *
+   * Disabled by default because this API also decodes bound server action
+   * arguments, which must revive references as callable implementations.
+   *
+   * @experimental
+   * @default false
+   */
+  preserveServerReferences?: boolean;
+}): Promise<T>;
+declare const encodeReply: EncodeReplyFunction;
+declare const createClientTemporaryReferenceSet: () => ClientTemporaryReferenceSet;
+//#endregion
+export { createFromReadableStream as n, encodeReply as r, createClientTemporaryReferenceSet as t };

package/dist/core/browser.d.ts

@@ -1,2 +1,2 @@
-import { t as setRequireModule } from "../browser-C_qguV-a.js";
+import { t as setRequireModule } from "../browser-DI_Wyg5Y.js";
 export { setRequireModule };

package/dist/core/browser.js

@@ -1,5 +1,5 @@
-import { n as memoize } from "../dist-rz-Bnebz.js";
-import { a as setInternalRequire, i as removeReferenceCacheTag } from "../shared-BVLpj0Y8.js";
+import { n as memoize } from "../dist-uqdtSkzK.js";
+import { a as removeReferenceCacheTag, o as setInternalRequire } from "../shared-Y4B6DJ99.js";
 //#region src/core/browser.ts
 let init = false;
 function setRequireModule(options) {

package/dist/core/plugin.d.ts

@@ -1,5 +1,4 @@
 import { Plugin } from "vite";
-
 //#region src/core/plugin.d.ts
 declare function vitePluginRscCore(): Plugin[];
 //#endregion

package/dist/core/rsc.d.ts

@@ -1,20 +1,2 @@
-import { c as ModuleMap, t as BundlerConfig } from "../index-BrXJaflA.js";
-
-//#region src/core/rsc.d.ts
-declare function setRequireModule(options: {
-  load: (id: string) => unknown;
-}): void;
-declare function loadServerAction(id: string): Promise<Function>;
-declare function createServerManifest(): BundlerConfig;
-declare function createServerDecodeClientManifest(): ModuleMap;
-declare function createClientManifest(options?: {
-  /**
-  * @internal
-  */
-  onClientReference?: (metadata: {
-    id: string;
-    name: string;
-  }) => void;
-}): BundlerConfig;
-//#endregion
+import { a as setRequireModule, i as loadServerAction, n as createServerDecodeClientManifest, r as createServerManifest, t as createClientManifest } from "../rsc-CGkkhLG3.js";
 export { createClientManifest, createServerDecodeClientManifest, createServerManifest, loadServerAction, setRequireModule };

package/dist/core/rsc.js

@@ -1,5 +1,5 @@
-import { i as tinyassert, n as memoize } from "../dist-rz-Bnebz.js";
-import { a as setInternalRequire, i as removeReferenceCacheTag, n as SERVER_REFERENCE_PREFIX, r as createReferenceCacheTag, t as SERVER_DECODE_CLIENT_PREFIX } from "../shared-BVLpj0Y8.js";
+import { i as tinyassert, n as memoize } from "../dist-uqdtSkzK.js";
+import { a as removeReferenceCacheTag, i as createReferenceCacheTag, n as SERVER_REFERENCE_PREFIX, o as setInternalRequire, r as SERVER_REFERENCE_PRESERVE_PREFIX, t as SERVER_DECODE_CLIENT_PREFIX } from "../shared-Y4B6DJ99.js";
 import * as ReactServer from "@vitejs/plugin-rsc/vendor/react-server-dom/server.edge";
 //#region src/core/rsc.ts
 let init = false;
@@ -11,6 +11,21 @@ function setRequireModule(options) {
 		return options.load(removeReferenceCacheTag(id));
 	};
 	globalThis.__vite_rsc_server_require__ = memoize(async (id) => {
+		if (id.startsWith("$$preserve:")) {
+			id = id.slice(SERVER_REFERENCE_PRESERVE_PREFIX.length);
+			id = removeReferenceCacheTag(id);
+			const target = {};
+			const getOrCreateServerReference = (name) => {
+				return target[name] ??= ReactServer.registerServerReference(() => {
+					throw new Error(`Unexpectedly decoded server reference '${id}#${name}' is called on server`);
+				}, id, name);
+			};
+			return new Proxy(target, { getOwnPropertyDescriptor(_target, name) {
+				if (typeof name !== "string" || name === "then") return Reflect.getOwnPropertyDescriptor(target, name);
+				getOrCreateServerReference(name);
+				return Reflect.getOwnPropertyDescriptor(target, name);
+			} });
+		}
 		if (id.startsWith("$$decode-client:")) {
 			id = id.slice(SERVER_DECODE_CLIENT_PREFIX.length);
 			id = removeReferenceCacheTag(id);
@@ -34,7 +49,8 @@ async function loadServerAction(id) {
 	const [file, name] = id.split("#");
 	return (await requireModule(file))[name];
 }
-function createServerManifest() {
+function createServerManifest(options) {
+	const prefix = options?.preserveServerReferences ? SERVER_REFERENCE_PRESERVE_PREFIX : "";
 	const cacheTag = import.meta.env.DEV ? createReferenceCacheTag() : "";
 	return new Proxy({}, { get(_target, $$id, _receiver) {
 		tinyassert(typeof $$id === "string");
@@ -42,7 +58,7 @@ function createServerManifest() {
 		tinyassert(id);
 		tinyassert(name);
 		return {
-			id: SERVER_REFERENCE_PREFIX + id + cacheTag,
+			id: SERVER_REFERENCE_PREFIX + prefix + id + cacheTag,
 			name,
 			chunks: [],
 			async: true

package/dist/core/ssr.d.ts

@@ -1,5 +1,4 @@
-import { u as ServerConsumerManifest } from "../index-BrXJaflA.js";
-
+import { d as ServerConsumerManifest } from "../index-CqNlZcWp.js";
 //#region src/core/ssr.d.ts
 declare function setRequireModule(options: {
   load: (id: string) => unknown;

package/dist/core/ssr.js

@@ -1,5 +1,5 @@
-import { n as memoize } from "../dist-rz-Bnebz.js";
-import { a as setInternalRequire, i as removeReferenceCacheTag } from "../shared-BVLpj0Y8.js";
+import { n as memoize } from "../dist-uqdtSkzK.js";
+import { a as removeReferenceCacheTag, o as setInternalRequire } from "../shared-Y4B6DJ99.js";
 //#region src/core/ssr.ts
 let init = false;
 function setRequireModule(options) {

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

@@ -52,7 +52,7 @@ async function generateEncryptionKey() {
 	return new Uint8Array(exported);
 }
 async function encryptBuffer(data, key) {
-	const iv = crypto.getRandomValues(new Uint8Array(16));
+	const iv = crypto.getRandomValues(/* @__PURE__ */ new Uint8Array(16));
 	const encrypted = await crypto.subtle.encrypt({
 		name: "AES-GCM",
 		iv

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

@@ -1,5 +1,4 @@
 import MagicString from "magic-string";
-
 //#region ../../node_modules/.pnpm/@types+estree@1.0.9/node_modules/@types/estree/index.d.ts
 // This definition file follows a somewhat unusual format. ESTree allows
 // runtime type checks based on the `type` parameter. In order to explain this
@@ -84,7 +83,8 @@ interface Directive extends BaseNode {
 interface BaseFunction extends BaseNode {
   params: Pattern[];
   generator?: boolean | undefined;
-  async?: boolean | undefined; // The body is either BlockStatement or Expression because arrow functions
+  async?: boolean | undefined;
+  // The body is either BlockStatement or Expression because arrow functions
   // can have a body that's either. FunctionDeclarations and
   // FunctionExpressions have only BlockStatement bodies.
   body: BlockStatement | Expression;
@@ -405,7 +405,8 @@ interface TemplateElement extends BaseNode {
   type: "TemplateElement";
   tail: boolean;
   value: {
-    /** It is null when the template literal is tagged and the text has an invalid escape (e.g. - tag`\unicode and \u{55}`) */cooked?: string | null | undefined;
+    /** It is null when the template literal is tagged and the text has an invalid escape (e.g. - tag`\unicode and \u{55}`) */
+    cooked?: string | null | undefined;
     raw: string;
   };
 }
@@ -525,11 +526,7 @@ interface AwaitExpression extends BaseExpression {
 }
 //#endregion
 //#region src/transforms/hoist.d.ts
-declare function transformHoistInlineDirective(input: string, ast: Program, {
-  runtime,
-  rejectNonAsyncFunction,
-  ...options
-}: {
+declare function transformHoistInlineDirective(input: string, ast: Program, { runtime, rejectNonAsyncFunction, ...options }: {
   runtime: (value: string, name: string, meta: {
     directiveMatch: RegExpMatchArray;
   }) => string;
@@ -546,8 +543,33 @@ declare function findDirectives(ast: Program, directive: string): Literal[];
 //#endregion
 //#region src/transforms/wrap-export.d.ts
 type ExportMeta = {
+  /**
+   * The local declaration name when statically available.
+   *
+   * - `"Page"` for `export function Page() {}`
+   * - `"Page"` for `export const Page = () => {}`
+   * - `undefined` for `export default () => {}`
+   * - `undefined` for `export { Page }`
+   */
   declName?: string;
+  /**
+   * Whether the exported value is statically known to be a function.
+   *
+   * - `true` for `export const Page = () => {}`
+   * - `false` for `export const value = 1`
+   * - `undefined` for `export const value = getValue()`
+   * - `undefined` for `export default Page`
+   */
   isFunction?: boolean;
+  /**
+   * The local identifier referenced by a default export.
+   * The RSC CSS transform uses this to detect a component by its capitalized
+   * local name and preserve that name on the generated wrapper.
+   *
+   * - `"Page"` for `const Page = () => {}; export default Page`
+   * - `undefined` for `export default function Page() {}`
+   * - `undefined` for `export default () => {}`
+   */
   defaultExportIdentifierName?: string;
 };
 type TransformWrapExportFilter = (name: string, meta: ExportMeta) => boolean;
@@ -564,16 +586,17 @@ declare function transformWrapExport(input: string, ast: Program, options: Trans
 //#endregion
 //#region src/transforms/proxy-export.d.ts
 type TransformProxyExportOptions = {
-  /** Required for source map and `keep` options */code?: string;
+  /** Required for source map and `keep` options */
+  code?: string;
   runtime: (name: string, meta?: {
     value: string;
   }) => string;
   ignoreExportAllDeclaration?: boolean;
   rejectNonAsyncFunction?: boolean;
   /**
-  * escape hatch for Waku's `allowServer`
-  * @default false
-  */
+   * escape hatch for Waku's `allowServer`
+   * @default false
+   */
   keep?: boolean;
 };
 declare function transformDirectiveProxyExport(ast: Program, options: {

package/dist/{index-BrXJaflA.d.ts → index-CqNlZcWp.d.ts}

@@ -35,6 +35,7 @@ interface RenderToReadableStreamOptions {
 interface CreateFromReadableStreamBrowserOptions {
   callServer?: CallServerCallback;
   debugChannel?: DebugChannel;
+  encodeFormAction?: EncodeFormActionCallback;
   endTime?: number;
   environmentName?: string;
   replayConsoleLogs?: boolean;
@@ -43,6 +44,7 @@ interface CreateFromReadableStreamBrowserOptions {
 }
 interface CreateFromReadableStreamEdgeOptions {
   debugChannel?: DebugChannel;
+  encodeFormAction?: EncodeFormActionCallback;
   endTime?: number;
   environmentName?: string;
   nonce?: string;
@@ -58,6 +60,15 @@ interface EncodeReplyOptions {
   temporaryReferences?: ClientTemporaryReferenceSet;
   signal?: AbortSignal;
 }
+type EncodeFormActionCallback = (id: string, args: Promise<unknown[]>) => ReactCustomFormAction;
+type ReactCustomFormAction = {
+  name?: string;
+  action?: string;
+  encType?: string;
+  method?: string;
+  target?: string;
+  data?: FormData | null;
+};
 type EncodeReplyFunction = (value: unknown[], options?: EncodeReplyOptions) => Promise<string | FormData>;
 type DecodeReplyFunction = (body: string | FormData, options?: DecodeReplyOptions) => Promise<unknown[]>;
 type DebugChannel = {
@@ -67,4 +78,4 @@ type DebugChannel = {
 type ServerTemporaryReferenceSet = unknown;
 type ClientTemporaryReferenceSet = unknown;
 //#endregion
-export { CreateFromReadableStreamEdgeOptions as a, ModuleMap as c, ServerTemporaryReferenceSet as d, CreateFromReadableStreamBrowserOptions as i, RenderToReadableStreamOptions as l, CallServerCallback as n, DecodeReplyFunction as o, ClientTemporaryReferenceSet as r, EncodeReplyFunction as s, BundlerConfig as t, ServerConsumerManifest as u };
+export { CreateFromReadableStreamEdgeOptions as a, EncodeReplyFunction as c, ServerConsumerManifest as d, ServerTemporaryReferenceSet as f, CreateFromReadableStreamBrowserOptions as i, ModuleMap as l, CallServerCallback as n, DecodeReplyFunction as o, ClientTemporaryReferenceSet as r, EncodeFormActionCallback as s, BundlerConfig as t, RenderToReadableStreamOptions as u };

package/dist/index.d.ts

@@ -1,2 +1,2 @@
-import { c as getPluginApi, r as PluginApi, s as RscPluginOptions, u as vitePluginRsc } from "./plugin-Bm-Fb4g7.js";
+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 };

package/dist/index.js

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

package/dist/{picocolors-CEw5D0BV.js → picocolors-DFVOi1sR.js}

@@ -1,7 +1,9 @@
-import { a as __commonJSMin } from "./plugin-BK29Va7z.js";
+import { a as __commonJSMin } from "./plugin-BOTpkess.js";
 //#region ../../node_modules/.pnpm/picocolors@1.1.1/node_modules/picocolors/picocolors.js
 var require_picocolors = /* @__PURE__ */ __commonJSMin(((exports, module) => {
-	let p = process || {}, argv = p.argv || [], env = p.env || {};
+	let p = process || {};
+	let argv = p.argv || [];
+	let env = p.env || {};
 	let isColorSupported = !(!!env.NO_COLOR || argv.includes("--no-color")) && (!!env.FORCE_COLOR || argv.includes("--color") || p.platform === "win32" || (p.stdout || {}).isTTY && env.TERM !== "dumb" || !!env.CI);
 	let formatter = (open, close, replace = open) => (input) => {
 		let string = "" + input, index = string.indexOf(close, open.length);

package/dist/{plugin-BK29Va7z.js → plugin-BOTpkess.js}

@@ -1,10 +1,10 @@
-import { t as createDebug } from "./dist-rz-Bnebz.js";
+import { t as createDebug } from "./dist-uqdtSkzK.js";
 import vitePluginRscCore from "./core/plugin.js";
-import { i as hasDirective } from "./scope-Bwt9GVLP.js";
-import { t as cjsModuleRunnerPlugin } from "./cjs-BspwazE6.js";
-import { i as toCssVirtual, n as parseIdQuery, r as parseReferenceValidationVirtual, t as parseCssVirtual } from "./shared-DeahDSXi.js";
+import { i as hasDirective } from "./scope-Do08R7C2.js";
+import { t as cjsModuleRunnerPlugin } from "./cjs-Cxg_7upE.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-CRBgMeBq.js";
+import { o as generateEncryptionKey, s as toBase64 } from "./encryption-utils-BNbYHtC4.js";
 import { createRpcServer } from "./utils/rpc.js";
 import { createRequire } from "node:module";
 import assert from "node:assert";
@@ -605,15 +605,24 @@ function vitePluginRscMinimal(rscPluginOptions = {}, manager = new RscPluginMana
 			apply: "serve",
 			load: {
 				filter: { id: prefixRegex("\0virtual:vite-rsc/reference-validation?") },
-				handler(id, _options) {
+				async handler(id, _options) {
 					if (id.startsWith("\0virtual:vite-rsc/reference-validation?")) {
 						const parsed = parseReferenceValidationVirtual(id);
 						assert(parsed);
+						assert(this.environment.mode === "dev");
 						if (parsed.type === "client") {
 							if (Object.values(manager.clientReferenceMetaMap).find((meta) => meta.referenceKey === parsed.id)) return `export {}`;
 						}
 						if (parsed.type === "server") {
-							if (Object.values(manager.serverReferenceMetaMap).find((meta) => meta.referenceKey === parsed.id)) return `export {}`;
+							let meta = Object.values(manager.serverReferenceMetaMap).find((meta) => meta.referenceKey === 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);
+							}
+							if (meta) return `export {}`;
 						}
 						this.error(`[vite-rsc] invalid ${parsed.type} reference '${parsed.id}'`);
 					}
@@ -627,7 +636,7 @@ function vitePluginRscMinimal(rscPluginOptions = {}, manager = new RscPluginMana
 function vitePluginRsc(rscPluginOptions = {}) {
 	const manager = new RscPluginManager();
 	const buildApp = async (builder) => {
-		const colors = await import("./picocolors-CEw5D0BV.js").then((m) => /* @__PURE__ */ __toESM(m.default, 1));
+		const colors = await import("./picocolors-DFVOi1sR.js").then((m) => /* @__PURE__ */ __toESM(m.default, 1));
 		const logStep = (msg) => {
 			builder.config.logger.info(colors.blue(msg));
 		};
@@ -1096,6 +1105,7 @@ export function createRpcClient(params) {
 					}, manager);
 					const assetDeps = collectAssetDeps(bundle);
 					let bootstrapScriptContent = "";
+					let clientEntryDeps;
 					const clientReferenceDeps = {};
 					for (const meta of Object.values(manager.clientReferenceMetaMap)) {
 						const deps = assetDeps[meta.groupChunkId]?.deps ?? {
@@ -1107,14 +1117,15 @@ export function createRpcClient(params) {
 					if (!rscPluginOptions.customClientEntry) {
 						const entry = Object.values(assetDeps).find((v) => v.chunk.name === "index" && v.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.`);
-						const entryDeps = assetsURLOfDeps(entry.deps, manager);
-						for (const [key, deps] of Object.entries(clientReferenceDeps)) clientReferenceDeps[key] = mergeAssetDeps(deps, entryDeps);
+						clientEntryDeps = assetsURLOfDeps(entry.deps, manager);
+						for (const [key, deps] of Object.entries(clientReferenceDeps)) clientReferenceDeps[key] = mergeAssetDeps(deps, clientEntryDeps);
 						const entryUrl = assetsURL(entry.chunk.fileName, manager);
 						if (typeof entryUrl === "string") bootstrapScriptContent = `import(${JSON.stringify(entryUrl)})`;
 						else bootstrapScriptContent = new RuntimeAsset(`"import(" + JSON.stringify(${entryUrl.runtime}) + ")"`);
 					}
 					manager.buildAssetsManifest = {
 						bootstrapScriptContent,
+						clientEntryDeps,
 						clientReferenceDeps,
 						serverResources,
 						cssLinkPrecedence: rscPluginOptions.cssLinkPrecedence
@@ -1316,7 +1327,7 @@ function vitePluginUseClient(useClientPluginOptions, manager) {
 					exportNames,
 					renderedExports: []
 				};
-				const importSource = resolvePackage(`${PKG_NAME}/react/rsc`);
+				const importSource = resolvePackage(`${PKG_NAME}/react/rsc/server`);
 				output.prepend(`import * as $$ReactServer from "${importSource}";\n`);
 				return {
 					code: output.toString(),
@@ -1423,6 +1434,8 @@ function vitePluginUseClient(useClientPluginOptions, manager) {
 					if (this.environment.name === serverEnvironmentName && bareImportRE.test(source) && !(source === "client-only" || source === "server-only")) {
 						const resolved = await this.resolve(source, importer, options);
 						if (resolved && resolved.id.includes("/node_modules/")) {
+							const resolvedAtRoot = await this.resolve(source, void 0, options);
+							if (!resolvedAtRoot || resolvedAtRoot.id !== resolved.id) return;
 							packageSources.set(resolved.id, source);
 							return resolved;
 						}
@@ -1608,7 +1621,7 @@ function vitePluginUseServer(useServerPluginOptions, manager) {
 					referenceKey: getNormalizedId(),
 					exportNames: "names" in result ? result.names : result.exportNames
 				};
-				const importSource = resolvePackage(`${PKG_NAME}/react/rsc`);
+				const importSource = resolvePackage(`${PKG_NAME}/react/rsc/server`);
 				output.prepend(`import * as $$ReactServer from "${importSource}";\n`);
 				if (enableEncryption) {
 					const importSource = resolvePackage(`${PKG_NAME}/utils/encryption-runtime`);
@@ -1637,7 +1650,8 @@ function vitePluginUseServer(useServerPluginOptions, manager) {
 					referenceKey: getNormalizedId(),
 					exportNames: result.exportNames
 				};
-				const importSource = resolvePackage(`${PKG_NAME}/react/${this.environment.name === browserEnvironmentName ? "browser" : "ssr"}`);
+				const name = this.environment.name === browserEnvironmentName ? "browser" : "ssr";
+				const importSource = resolvePackage(`${PKG_NAME}/react/${name}`);
 				output.prepend(`import * as $$ReactClient from "${importSource}";\n`);
 				return {
 					code: output.toString(),
@@ -1718,8 +1732,8 @@ function assetsURLOfDeps(deps, manager) {
 }
 function mergeAssetDeps(a, b) {
 	return {
-		js: [...new Set([...a.js, ...b.js])],
-		css: [...new Set([...a.css, ...b.css])]
+		js: [.../* @__PURE__ */ new Set([...a.js, ...b.js])],
+		css: [.../* @__PURE__ */ new Set([...a.css, ...b.css])]
 	};
 }
 function collectAssetDeps(bundle) {