@vitejs/plugin-rsc 0.5.32 → 0.5.34

package/dist/{plugin-C27mwbgw.js → plugin-Cbs9j6lP.js}

@@ -1,7 +1,7 @@
 import { t as createDebug } from "./dist-uqdtSkzK.js";
 import vitePluginRscCore from "./core/plugin.js";
-import { i as hasDirective } from "./scope-Do08R7C2.js";
-import { t as cjsModuleRunnerPlugin } from "./cjs-Cxg_7upE.js";
+import { i as hasDirective } from "./scope-Bdx33sQv.js";
+import { t as cjsModuleRunnerPlugin } from "./cjs-AWVWfddx.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";
@@ -489,11 +489,7 @@ function aggregateClaims(importId, claims) {
 			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);
-		}
+		for (const name of claim.exportNames) if (!exportOwners.get(name)) exportOwners.set(name, claimOwner);
 	}
 	assert(aggregate);
 	aggregate.exportNames = [...exportOwners.keys()].sort();
@@ -714,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-CKiBgsDn.js").then((m) => /* @__PURE__ */ __toESM(m.default, 1));
+		const colors = await import("./picocolors-391UXIDd.js").then((m) => /* @__PURE__ */ __toESM(m.default, 1));
 		const logStep = (msg) => {
 			builder.config.logger.info(colors.blue(msg));
 		};
@@ -1149,8 +1145,9 @@ export function createRpcClient(params) {
 					if (id === "\0virtual:vite-rsc/assets-manifest") {
 						assert(this.environment.name !== "client");
 						assert(this.environment.mode === "dev");
+						const entryUrl = assetsURL("@id/__x00__" + VIRTUAL_ENTRIES.browser, manager);
 						const manifest = {
-							bootstrapScriptContent: `import(${serializeValueWithRuntime(assetsURL("@id/__x00__" + VIRTUAL_ENTRIES.browser, manager))})`,
+							clientEntryUrl: rscPluginOptions.customClientEntry ? void 0 : entryUrl,
 							clientReferenceDeps: {},
 							cssLinkPrecedence: rscPluginOptions.cssLinkPrecedence
 						};
@@ -1188,7 +1185,7 @@ export function createRpcClient(params) {
 						css: rscAssetDeps[id]?.deps.css ?? []
 					}, manager);
 					const assetDeps = collectAssetDeps(bundle);
-					let bootstrapScriptContent = "";
+					let clientEntryUrl;
 					let clientEntryDeps;
 					const clientReferenceDeps = {};
 					for (const meta of Object.values(manager.clientReferenceMetaMap)) {
@@ -1203,12 +1200,10 @@ export function createRpcClient(params) {
 						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);
 						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}) + ")"`);
+						clientEntryUrl = assetsURL(entry.chunk.fileName, manager);
 					}
 					manager.buildAssetsManifest = {
-						bootstrapScriptContent,
+						clientEntryUrl,
 						clientEntryDeps,
 						clientReferenceDeps,
 						serverResources,
@@ -1225,13 +1220,6 @@ export function createRpcClient(params) {
 				}
 			}
 		},
-		createVirtualPlugin("vite-rsc/bootstrap-script-content", function() {
-			assert(this.environment.name !== "client");
-			return `\
-import assetsManifest from "virtual:vite-rsc/assets-manifest";
-export default assetsManifest.bootstrapScriptContent;
-`;
-		}),
 		{
 			name: "rsc:bootstrap-script-content",
 			transform: {
@@ -1245,7 +1233,7 @@ export default assetsManifest.bootstrapScriptContent;
 						const [argStart, argEnd] = match.indices[1];
 						const argCode = code.slice(argStart, argEnd).trim();
 						assert(evalValue(argCode), `[vite-rsc] expected 'loadBootstrapScriptContent("index")' but got ${argCode}`);
-						let replacement = `Promise.resolve(__vite_rsc_assets_manifest.bootstrapScriptContent)`;
+						let replacement = `Promise.resolve("import(" + JSON.stringify(__vite_rsc_assets_manifest.clientEntryUrl) + ")")`;
 						const [start, end] = match.indices[0];
 						output.overwrite(start, end, replacement);
 					}

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-DqLpibhH.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-CKqXjp8D.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-C27mwbgw.js";
+import { i as vitePluginRscMinimal, n as transformRscCssExport, r as vitePluginRsc, t as getPluginApi } from "./plugin-Cbs9j6lP.js";
 export { vitePluginRsc as default, getPluginApi, transformRscCssExport, vitePluginRscMinimal };

package/dist/plugins/cjs.js

@@ -1,2 +1,2 @@
-import { t as cjsModuleRunnerPlugin } from "../cjs-Cxg_7upE.js";
+import { t as cjsModuleRunnerPlugin } from "../cjs-AWVWfddx.js";
 export { cjsModuleRunnerPlugin };

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-Dy7j0iU8.js";
+import { t as OnClientReference } from "../client-reference-DEZtXTv1.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-Dy7j0iU8.js";
+import { t as OnClientReference } from "../client-reference-DEZtXTv1.js";
 //#region src/rsc/static.d.ts
 declare function prerender<T>(data: T, options?: RenderToReadableStreamOptions, extraOptions?: {
   /**

package/dist/{scope-Do08R7C2.js → scope-Bdx33sQv.js}

@@ -1,8 +1,11 @@
 import { i as tinyassert } from "./dist-uqdtSkzK.js";
 import { walk } from "estree-walker";
 //#region src/transforms/utils.ts
-function hasDirective(body, directive) {
-	return !!body.find((stmt) => stmt.type === "ExpressionStatement" && stmt.expression.type === "Literal" && typeof stmt.expression.value === "string" && stmt.expression.value === directive);
+function isDirective(node) {
+	return node.type === "ExpressionStatement" && "directive" in node;
+}
+function hasDirective(viteBody, directive) {
+	return viteBody.some((stmt) => isDirective(stmt) && stmt.directive === directive);
 }
 function extractNames(param) {
 	return extractIdentifiers(param).map((n) => n.name);
@@ -34,8 +37,10 @@ function extractIdentifiers(param, nodes = []) {
 	return nodes;
 }
 function validateNonAsyncFunction(opts, node) {
-	if (!opts.rejectNonAsyncFunction) return;
-	if (node.type === "ClassDeclaration" || node.type === "ClassExpression" || (node.type === "FunctionDeclaration" || node.type === "FunctionExpression" || node.type === "ArrowFunctionExpression") && !node.async) throw Object.assign(/* @__PURE__ */ new Error(`unsupported non async function`), { pos: node.start });
+	if (node.type === "Literal" || node.type === "ObjectExpression" || node.type === "ArrayExpression" || node.type === "ClassDeclaration" || node.type === "ClassExpression" || (node.type === "FunctionDeclaration" || node.type === "FunctionExpression" || node.type === "ArrowFunctionExpression") && !node.async) rejectNonAsyncFunction(opts, node.start);
+}
+function rejectNonAsyncFunction(opts, pos) {
+	if (opts.rejectNonAsyncFunction) throw Object.assign(/* @__PURE__ */ new Error(`unsupported non async function`), { pos });
 }
 //#endregion
 //#region src/transforms/scope.ts
@@ -174,4 +179,4 @@ function getOutermostBindableReference(id, parentStack) {
 	return current;
 }
 //#endregion
-export { validateNonAsyncFunction as a, hasDirective as i, extractIdentifiers as n, extractNames as r, buildScopeTree as t };
+export { isDirective as a, hasDirective as i, extractIdentifiers as n, rejectNonAsyncFunction as o, extractNames as r, validateNonAsyncFunction as s, buildScopeTree as t };

package/dist/ssr.d.ts

@@ -1,8 +1,9 @@
 import { s as EncodeFormActionCallback } from "./index-C5IY2S-e.js";
 import { createServerConsumerManifest, setRequireModule } from "./core/ssr.js";
-import { i as ResolvedAssetDeps } from "./plugin-DqLpibhH.js";
+import { i as ResolvedAssetDeps } from "./plugin-CKqXjp8D.js";
 import { callServer, createFromReadableStream, createServerReference, createTemporaryReferenceSet, encodeReply, findSourceMapURL } from "./react/ssr.js";
 //#region src/ssr.d.ts
+declare function getClientEntryUrl(): string;
 /**
  * Callback type for client reference dependency notifications.
  * Called during SSR when a client component's dependencies are loaded.
@@ -19,4 +20,4 @@ type OnClientReference = (reference: {
  */
 declare function setOnClientReference(callback: OnClientReference | undefined): void;
 //#endregion
-export { type EncodeFormActionCallback, OnClientReference, callServer, createFromReadableStream, createServerConsumerManifest, createServerReference, createTemporaryReferenceSet, encodeReply, findSourceMapURL, setOnClientReference, setRequireModule };
+export { type EncodeFormActionCallback, OnClientReference, callServer, createFromReadableStream, createServerConsumerManifest, createServerReference, createTemporaryReferenceSet, encodeReply, findSourceMapURL, getClientEntryUrl, setOnClientReference, setRequireModule };

package/dist/ssr.js

@@ -5,6 +5,11 @@ import * as clientReferences from "virtual:vite-rsc/client-references";
 import * as ReactDOM from "react-dom";
 import assetsManifest from "virtual:vite-rsc/assets-manifest";
 //#region src/ssr.tsx
+function getClientEntryUrl() {
+	const url = assetsManifest.clientEntryUrl;
+	if (!url) throw new Error(`[vite-rsc] getClientEntryUrl() cannot be used with the 'customClientEntry' option`);
+	return url;
+}
 let onClientReference;
 /**
 * Register a callback to be notified when client reference dependencies are loaded.
@@ -82,4 +87,4 @@ function preloadDeps(deps) {
 	});
 }
 //#endregion
-export { callServer, createFromReadableStream, createServerConsumerManifest, createServerReference, createTemporaryReferenceSet, encodeReply, findSourceMapURL, setOnClientReference, setRequireModule };
+export { callServer, createFromReadableStream, createServerConsumerManifest, createServerReference, createTemporaryReferenceSet, encodeReply, findSourceMapURL, getClientEntryUrl, setOnClientReference, setRequireModule };

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-COzKOTR1.js";
-export { TransformExpandExportAllContext, TransformExpandExportAllOptions, TransformProxyExportOptions, TransformWrapExportFilter, TransformWrapExportOptions, extractIdentifiers, extractNames, findDirectives, hasDirective, transformDirectiveProxyExport, transformExpandExportAll, transformHoistInlineDirective, transformProxyExport, transformServerActionServer, transformWrapExport, validateNonAsyncFunction };
+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";
+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 };