@vitejs/plugin-rsc 0.5.12 → 0.5.14

package/dist/index.js

@@ -1,5 +1,5 @@
 import "./cjs-DH9Oa3zy.js";
-import { r as vitePluginRsc, t as getPluginApi } from "./plugin-BY6tsuyx.js";
+import { r as vitePluginRsc, t as getPluginApi } from "./plugin-Ch1dPqbr.js";
 import "./transforms-D4jDIHgD.js";
 import "./rpc-DbBe389F.js";
 

package/dist/{plugin-BY6tsuyx.js → plugin-Ch1dPqbr.js}

@@ -374,6 +374,9 @@ const require = createRequire(import.meta.url);
 function resolvePackage(name) {
 	return pathToFileURL(require.resolve(name)).href;
 }
+/**
+* @experimental
+*/
 var RscPluginManager = class {
 	server;
 	config;
@@ -391,6 +394,13 @@ var RscPluginManager = class {
 	toRelativeId(id) {
 		return normalizePath(path.relative(this.config.root, id));
 	}
+	writeAssetsManifest(environmentNames) {
+		const assetsManifestCode = `export default ${serializeValueWithRuntime(this.buildAssetsManifest)}`;
+		for (const name of environmentNames) {
+			const manifestPath = path.join(this.config.environments[name].build.outDir, BUILD_ASSETS_MANIFEST_NAME);
+			fs.writeFileSync(manifestPath, assetsManifestCode);
+		}
+	}
 };
 /** @experimental */
 function getPluginApi(config) {
@@ -471,9 +481,13 @@ function vitePluginRsc(rscPluginOptions = {}) {
 			manager.stabilize();
 			logStep("[4/4] build client environment...");
 			await builder.build(builder.environments.client);
-			writeAssetsManifest(["rsc"]);
+			manager.writeAssetsManifest(["rsc"]);
 			return;
 		}
+		const rscOutDir = builder.environments.rsc.config.build.outDir;
+		const ssrOutDir = builder.environments.ssr.config.build.outDir;
+		const rscInsideSsr = path.normalize(rscOutDir).startsWith(path.normalize(ssrOutDir) + path.sep);
+		const tempRscOutDir = path.join(builder.config.root, "node_modules", ".vite-rsc-temp", "rsc");
 		manager.isScanBuild = true;
 		builder.environments.rsc.config.build.write = false;
 		builder.environments.ssr.config.build.write = false;
@@ -486,20 +500,23 @@ function vitePluginRsc(rscPluginOptions = {}) {
 		builder.environments.ssr.config.build.write = true;
 		logStep("[3/5] build rsc environment...");
 		await builder.build(builder.environments.rsc);
+		if (rscInsideSsr) {
+			if (fs.existsSync(tempRscOutDir)) fs.rmSync(tempRscOutDir, { recursive: true });
+			fs.mkdirSync(path.dirname(tempRscOutDir), { recursive: true });
+			fs.renameSync(rscOutDir, tempRscOutDir);
+		}
 		manager.stabilize();
 		logStep("[4/5] build client environment...");
 		await builder.build(builder.environments.client);
 		logStep("[5/5] build ssr environment...");
 		await builder.build(builder.environments.ssr);
-		writeAssetsManifest(["ssr", "rsc"]);
-	};
-	function writeAssetsManifest(environmentNames) {
-		const assetsManifestCode = `export default ${serializeValueWithRuntime(manager.buildAssetsManifest)}`;
-		for (const name of environmentNames) {
-			const manifestPath = path.join(manager.config.environments[name].build.outDir, BUILD_ASSETS_MANIFEST_NAME);
-			fs.writeFileSync(manifestPath, assetsManifestCode);
+		if (rscInsideSsr) {
+			if (fs.existsSync(rscOutDir)) fs.rmSync(rscOutDir, { recursive: true });
+			fs.mkdirSync(path.dirname(rscOutDir), { recursive: true });
+			fs.renameSync(tempRscOutDir, rscOutDir);
 		}
-	}
+		manager.writeAssetsManifest(["ssr", "rsc"]);
+	};
 	let hasReactServerDomWebpack = false;
 	return [
 		{
@@ -583,7 +600,7 @@ function vitePluginRsc(rscPluginOptions = {}) {
 							}
 						}
 					},
-					builder: {
+					builder: rscPluginOptions.customBuildApp ? void 0 : {
 						sharedPlugins: true,
 						sharedConfigBuild: true,
 						async buildApp(builder) {
@@ -596,6 +613,7 @@ function vitePluginRsc(rscPluginOptions = {}) {
 				if (Number(vite.version.split(".")[0]) >= 7) rscPluginOptions.useBuildAppHook ??= true;
 			},
 			buildApp: { async handler(builder) {
+				if (rscPluginOptions.customBuildApp) return;
 				if (rscPluginOptions.useBuildAppHook) await buildApp(builder);
 			} },
 			configureServer(server) {
@@ -882,7 +900,7 @@ export function createRpcClient(params) {
 						css: rscAssetDeps[id]?.deps.css ?? []
 					}, manager);
 					const assetDeps = collectAssetDeps(bundle);
-					const entry = Object.values(assetDeps).find((v) => v.chunk.name === "index");
+					const entry = Object.values(assetDeps).find((v) => v.chunk.name === "index" && v.chunk.isEntry);
 					assert(entry);
 					const entryUrl = assetsURL(entry.chunk.fileName, manager);
 					const clientReferenceDeps = {};

package/dist/plugin.d.ts

@@ -17,6 +17,9 @@ type ServerRerferenceMeta = {
   referenceKey: string;
   exportNames: string[];
 };
+/**
+* @experimental
+*/
 declare class RscPluginManager {
   server: ViteDevServer;
   config: ResolvedConfig;
@@ -31,6 +34,7 @@ declare class RscPluginManager {
   }>;
   stabilize(): void;
   toRelativeId(id: string): string;
+  writeAssetsManifest(environmentNames: string[]): void;
 }
 type RscPluginOptions = {
   /**
@@ -80,6 +84,13 @@ type RscPluginOptions = {
   */
   useBuildAppHook?: boolean;
   /**
+  * Skip the default buildApp orchestration for downstream frameworks
+  * to implement custom build pipelines using `getPluginApi()`.
+  * @experimental
+  * @default false
+  */
+  customBuildApp?: boolean;
+  /**
   * Custom environment configuration
   * @experimental
   * @default { browser: 'client', ssr: 'ssr', rsc: 'rsc' }

package/dist/plugin.js

@@ -1,5 +1,5 @@
 import "./cjs-DH9Oa3zy.js";
-import { i as vitePluginRscMinimal, n as transformRscCssExport, r as vitePluginRsc, t as getPluginApi } from "./plugin-BY6tsuyx.js";
+import { i as vitePluginRscMinimal, n as transformRscCssExport, r as vitePluginRsc, t as getPluginApi } from "./plugin-Ch1dPqbr.js";
 import "./transforms-D4jDIHgD.js";
 import "./rpc-DbBe389F.js";
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vitejs/plugin-rsc",
-  "version": "0.5.12",
+  "version": "0.5.14",
   "description": "React Server Components (RSC) support for Vite.",
   "keywords": [
     "react",