@vitejs/plugin-rsc 0.4.26 → 0.4.28

package/README.md

@@ -168,6 +168,11 @@ export default async function handler(request: Request): Promise<Response> {
     },
   })
 }
+
+// add `import.meta.hot.accept` to handle server module change efficiently
+if (import.meta.hot) {
+  import.meta.hot.accept()
+}
 ```
 
 - [`entry.ssr.tsx`](./examples/starter/src/framework/entry.ssr.tsx)
@@ -355,6 +360,8 @@ import.meta.hot.on('rsc:update', async () => {
 
 ### `@vitejs/plugin-rsc`
 
+- Type: `rsc: (options?: RscPluginOptions) => Plugin[]`;
+
 ```js
 import rsc from '@vitejs/plugin-rsc'
 import { defineConfig } from 'vite'
@@ -390,8 +397,15 @@ export default defineConfig({
       // for example, to obtain a key through environment variable during runtime.
       // cf. https://nextjs.org/docs/app/guides/data-security#overwriting-encryption-keys-advanced
       defineEncryptionKey: 'process.env.MY_ENCRYPTION_KEY',
+
+      // see `RscPluginOptions` for full options ...
     }),
   ],
+  // the same options can be also specified via top-level `rsc` property.
+  // this allows other plugin to set options via `config` hook.
+  rsc: {
+    // ...
+  },
 })
 ```
 
@@ -508,6 +522,26 @@ export default function myRscFrameworkPlugin() {
 }
 ```
 
+## Typescript
+
+Types for global API are defined in `@vitejs/plugin-rsc/types`. For example, you can add it to `tsconfig.json` to have types for `import.meta.viteRsc` APIs:
+
+```json
+{
+  "compilerOptions": {
+    "types": ["vite/client", "@vitejs/plugin-rsc/types"]
+  }
+}
+```
+
+```ts
+import.meta.viteRsc.loadModule
+//                  ^^^^^^^^^^
+// <T>(environmentName: string, entryName: string) => Promise<T>
+```
+
+See also [Vite documentation](https://vite.dev/guide/api-hmr.html#intellisense-for-typescript) for `vite/client` types.
+
 ## Credits
 
 This project builds on fundamental techniques and insights from pioneering Vite RSC implementations.

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { RscPluginOptions, vitePluginRsc } from "./plugin-DmahacLo.js";
+import { PluginApi, RscPluginOptions, getPluginApi, vitePluginRsc } from "./plugin-BFcMxUSS.js";
 import MagicString from "magic-string";
 import { Program } from "estree";
 
@@ -21,4 +21,4 @@ declare function transformHoistInlineDirective(input: string, ast: Program, {
   names: string[];
 };
 //#endregion
-export { type RscPluginOptions, vitePluginRsc as default, transformHoistInlineDirective };
+export { type PluginApi, type RscPluginOptions, vitePluginRsc as default, getPluginApi, transformHoistInlineDirective };

package/dist/index.js

@@ -1,8 +1,8 @@
 import "./dist-DiJnRA1C.js";
 import "./plugin-CZbI4rhS.js";
-import { transformHoistInlineDirective, vitePluginRsc } from "./plugin-uOrnsu6L.js";
+import { getPluginApi, transformHoistInlineDirective, vitePluginRsc } from "./plugin-iKgvucKS.js";
 import "./encryption-utils-BDwwcMVT.js";
 import "./rpc-tGuLT8PD.js";
 import "./shared-BWHxNw3Q.js";
 
-export { vitePluginRsc as default, transformHoistInlineDirective };
+export { vitePluginRsc as default, getPluginApi, transformHoistInlineDirective };

package/dist/{plugin-DmahacLo.d.ts → plugin-BFcMxUSS.d.ts}

@@ -88,7 +88,7 @@ type RscPluginOptions = {
   /**
   * use `Plugin.buildApp` hook (introduced on Vite 7) instead of `builder.buildApp` configuration
   * for better composability with other plugins.
-  * @default false
+  * @default true since Vite 7
   */
   useBuildAppHook?: boolean;
   /**
@@ -117,6 +117,11 @@ type RscPluginOptions = {
     serverChunk: string;
   }) => string | undefined;
 };
+type PluginApi = {
+  manager: RscPluginManager;
+};
+/** @experimental */
+declare function getPluginApi(config: Pick<ResolvedConfig, "plugins">): PluginApi | undefined;
 /** @experimental */
 declare function vitePluginRscMinimal(rscPluginOptions?: RscPluginOptions, manager?: RscPluginManager): Plugin[];
 declare function vitePluginRsc(rscPluginOptions?: RscPluginOptions): Plugin[];
@@ -151,4 +156,4 @@ declare function transformRscCssExport(options: {
   output: MagicString;
 } | undefined>;
 //#endregion
-export { AssetDeps, AssetsManifest, ResolvedAssetDeps, ResolvedAssetsManifest, type RscPluginManager, RscPluginOptions, transformRscCssExport, vitePluginRsc, vitePluginRscMinimal };
+export { AssetDeps, AssetsManifest, PluginApi, ResolvedAssetDeps, ResolvedAssetsManifest, type RscPluginManager, RscPluginOptions, getPluginApi, transformRscCssExport, vitePluginRsc, vitePluginRscMinimal };

package/dist/{plugin-uOrnsu6L.js → plugin-iKgvucKS.js}

@@ -675,11 +675,17 @@ var RscPluginManager = class {
 	}
 };
 /** @experimental */
+function getPluginApi(config) {
+	const plugin = config.plugins.find((p) => p.name === "rsc:minimal");
+	return plugin?.api;
+}
+/** @experimental */
 function vitePluginRscMinimal(rscPluginOptions = {}, manager = new RscPluginManager()) {
 	return [
 		{
 			name: "rsc:minimal",
 			enforce: "pre",
+			api: { manager },
 			async config() {
 				await esModuleLexer.init;
 			},
@@ -703,7 +709,8 @@ function vitePluginRscMinimal(rscPluginOptions = {}, manager = new RscPluginMana
 		...vitePluginRscCore(),
 		...vitePluginUseClient(rscPluginOptions, manager),
 		...vitePluginUseServer(rscPluginOptions, manager),
-		...vitePluginDefineEncryptionKey(rscPluginOptions)
+		...vitePluginDefineEncryptionKey(rscPluginOptions),
+		scanBuildStripPlugin({ manager })
 	];
 }
 function vitePluginRsc(rscPluginOptions = {}) {
@@ -749,6 +756,7 @@ function vitePluginRsc(rscPluginOptions = {}) {
 		{
 			name: "rsc",
 			async config(config, env) {
+				if (config.rsc) Object.assign(rscPluginOptions, vite.mergeConfig(config.rsc, rscPluginOptions));
 				const result = await crawlFrameworkPkgs({
 					root: process.cwd(),
 					isBuild: env.command === "build",
@@ -767,7 +775,7 @@ function vitePluginRsc(rscPluginOptions = {}) {
 					...result.ssr.noExternal.sort()
 				];
 				return {
-					appType: "custom",
+					appType: config.appType ?? "custom",
 					define: { "import.meta.env.__vite_rsc_build__": JSON.stringify(env.command === "build") },
 					environments: {
 						client: {
@@ -825,11 +833,18 @@ function vitePluginRsc(rscPluginOptions = {}) {
 					builder: {
 						sharedPlugins: true,
 						sharedConfigBuild: true,
-						buildApp: rscPluginOptions.useBuildAppHook ? void 0 : buildApp
+						async buildApp(builder) {
+							if (!rscPluginOptions.useBuildAppHook) await buildApp(builder);
+						}
 					}
 				};
 			},
-			buildApp: rscPluginOptions.useBuildAppHook ? buildApp : void 0,
+			configResolved() {
+				if (Number(vite.version.split(".")[0]) >= 7) rscPluginOptions.useBuildAppHook ??= true;
+			},
+			buildApp: { async handler(builder) {
+				if (rscPluginOptions.useBuildAppHook) await buildApp(builder);
+			} },
 			configureServer(server) {
 				globalThis.__viteRscDevServer = server;
 				const oldSend = server.environments.client.hot.send;
@@ -1011,8 +1026,8 @@ function vitePluginRsc(rscPluginOptions = {}) {
 		},
 		{
 			name: "vite-rsc-load-module-dev-proxy",
-			apply: () => !!rscPluginOptions.loadModuleDevProxy,
 			configureServer(server) {
+				if (!rscPluginOptions.loadModuleDevProxy) return;
 				async function createHandler(url) {
 					const { environmentName, entryName } = Object.fromEntries(url.searchParams);
 					assert(environmentName);
@@ -1184,7 +1199,10 @@ import.meta.hot.on("rsc:update", () => {
 		...vitePluginRscMinimal(rscPluginOptions, manager),
 		...vitePluginFindSourceMapURL(),
 		...vitePluginRscCss(rscPluginOptions, manager),
-		...rscPluginOptions.validateImports !== false ? [validateImportPlugin()] : [],
+		{
+			...validateImportPlugin(),
+			apply: () => rscPluginOptions.validateImports !== false
+		},
 		scanBuildStripPlugin({ manager }),
 		...cjsModuleRunnerPlugin(),
 		...globalAsyncLocalStoragePlugin()
@@ -1476,7 +1494,7 @@ function vitePluginDefineEncryptionKey(useServerPluginOptions) {
 		},
 		renderChunk(code, chunk) {
 			if (code.includes(KEY_PLACEHOLDER)) {
-				assert.equal(this.environment.name, "rsc");
+				assert.equal(this.environment.name, serverEnvironmentName);
 				emitEncryptionKey = true;
 				const normalizedPath = normalizeRelativePath(path.relative(path.join(chunk.fileName, ".."), KEY_FILE));
 				const replacement = `import(${JSON.stringify(normalizedPath)}).then(__m => __m.default)`;
@@ -1485,7 +1503,7 @@ function vitePluginDefineEncryptionKey(useServerPluginOptions) {
 			}
 		},
 		writeBundle() {
-			if (this.environment.name === "rsc" && emitEncryptionKey) fs.writeFileSync(path.join(this.environment.config.build.outDir, KEY_FILE), `export default ${defineEncryptionKey};\n`);
+			if (this.environment.name === serverEnvironmentName && emitEncryptionKey) fs.writeFileSync(path.join(this.environment.config.build.outDir, KEY_FILE), `export default ${defineEncryptionKey};\n`);
 		}
 	}];
 }
@@ -1961,4 +1979,4 @@ function __vite_rsc_wrap_css__(value, name) {
 }
 
 //#endregion
-export { transformHoistInlineDirective, transformRscCssExport, vitePluginRsc, vitePluginRscMinimal };
+export { getPluginApi, transformHoistInlineDirective, transformRscCssExport, vitePluginRsc, vitePluginRscMinimal };

package/dist/plugin.d.ts

@@ -1,2 +1,2 @@
-import { AssetDeps, AssetsManifest, ResolvedAssetDeps, ResolvedAssetsManifest, RscPluginManager, RscPluginOptions, transformRscCssExport, vitePluginRsc, vitePluginRscMinimal } from "./plugin-DmahacLo.js";
-export { AssetDeps, AssetsManifest, ResolvedAssetDeps, ResolvedAssetsManifest, RscPluginManager, RscPluginOptions, vitePluginRsc as default, transformRscCssExport, vitePluginRscMinimal };
+import { AssetDeps, AssetsManifest, PluginApi, ResolvedAssetDeps, ResolvedAssetsManifest, RscPluginManager, RscPluginOptions, getPluginApi, transformRscCssExport, vitePluginRsc, vitePluginRscMinimal } from "./plugin-BFcMxUSS.js";
+export { AssetDeps, AssetsManifest, PluginApi, ResolvedAssetDeps, ResolvedAssetsManifest, RscPluginManager, RscPluginOptions, vitePluginRsc as default, getPluginApi, transformRscCssExport, vitePluginRscMinimal };

package/dist/plugin.js

@@ -1,8 +1,8 @@
 import "./dist-DiJnRA1C.js";
 import "./plugin-CZbI4rhS.js";
-import { transformRscCssExport, vitePluginRsc, vitePluginRscMinimal } from "./plugin-uOrnsu6L.js";
+import { getPluginApi, transformRscCssExport, vitePluginRsc, vitePluginRscMinimal } from "./plugin-iKgvucKS.js";
 import "./encryption-utils-BDwwcMVT.js";
 import "./rpc-tGuLT8PD.js";
 import "./shared-BWHxNw3Q.js";
 
-export { vitePluginRsc as default, transformRscCssExport, vitePluginRscMinimal };
+export { vitePluginRsc as default, getPluginApi, transformRscCssExport, vitePluginRscMinimal };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vitejs/plugin-rsc",
-  "version": "0.4.26",
+  "version": "0.4.28",
   "description": "React Server Components (RSC) support for Vite.",
   "keywords": [
     "vite",
@@ -52,8 +52,8 @@
     "@tsconfig/strictest": "^2.0.5",
     "@types/estree": "^1.0.8",
     "@types/node": "^22.18.0",
-    "@types/react": "^19.1.11",
-    "@types/react-dom": "^19.1.8",
+    "@types/react": "^19.1.12",
+    "@types/react-dom": "^19.1.9",
     "@vitejs/plugin-react": "workspace:*",
     "react": "^19.1.1",
     "react-dom": "^19.1.1",

package/types/index.d.ts

@@ -16,4 +16,11 @@ declare global {
   }
 }
 
+declare module 'vite' {
+  interface UserConfig {
+    /** Options for `@vitejs/plugin-rsc` */
+    rsc?: import('@vitejs/plugin-rsc').RscPluginOptions
+  }
+}
+
 export {}