@vitejs/plugin-rsc 0.4.33 → 0.4.34

package/README.md

@@ -561,6 +561,10 @@ 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.
 
+### `react-server-dom-webpack`
+
+Currently `@vitejs/plugin-rsc` includes a vendored version of `react-server-dom-webpack`. However, when `react-server-dom-webpack` is installed in user project's dependencies, the plugin will automatically use it instead. This allows you to stay up-to-date with the latest React Server Components runtime without waiting for plugin updates.
+
 ## Credits
 
 This project builds on fundamental techniques and insights from pioneering Vite RSC implementations.

package/dist/index.js

@@ -3,7 +3,7 @@ import "./plugin-CZbI4rhS.js";
 import "./transforms-CpF3zNE0.js";
 import "./encryption-utils-BDwwcMVT.js";
 import "./rpc-CUvSZurk.js";
-import { getPluginApi, vitePluginRsc } from "./plugin-BDLEZ1UW.js";
+import { getPluginApi, vitePluginRsc } from "./plugin-BLedJFh7.js";
 import "./cjs-BamOAUgw.js";
 import "./shared-n-ykEs15.js";
 

package/dist/{plugin-BDLEZ1UW.js → plugin-BLedJFh7.js}

@@ -423,27 +423,31 @@ function vitePluginRsc(rscPluginOptions = {}) {
 			fs.writeFileSync(manifestPath, assetsManifestCode);
 		}
 	}
+	let hasReactServerDomWebpack = false;
 	return [
 		{
 			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",
+					isFrameworkPkgByJson(pkgJson) {
+						if ([PKG_NAME, "react-dom"].includes(pkgJson.name)) return;
+						const deps = pkgJson["peerDependencies"];
+						return deps && "react" in deps;
+					}
+				});
 				const noExternal = [
 					"react",
 					"react-dom",
 					"server-only",
 					"client-only",
 					PKG_NAME,
-					...(await crawlFrameworkPkgs({
-						root: process.cwd(),
-						isBuild: env.command === "build",
-						isFrameworkPkgByJson(pkgJson) {
-							if ([PKG_NAME, "react-dom"].includes(pkgJson.name)) return;
-							const deps = pkgJson["peerDependencies"];
-							return deps && "react" in deps;
-						}
-					})).ssr.noExternal.sort()
+					...result.ssr.noExternal.sort()
 				];
+				hasReactServerDomWebpack = result.ssr.noExternal.includes("react-server-dom-webpack");
+				const reactServerDomPackageName = hasReactServerDomWebpack ? "react-server-dom-webpack" : REACT_SERVER_DOM_NAME;
 				return {
 					appType: config.appType ?? "custom",
 					define: { "import.meta.env.__vite_rsc_build__": JSON.stringify(env.command === "build") },
@@ -454,7 +458,7 @@ function vitePluginRsc(rscPluginOptions = {}) {
 								rollupOptions: { input: rscPluginOptions.entries?.client && { index: rscPluginOptions.entries.client } }
 							},
 							optimizeDeps: {
-								include: ["react-dom/client", `${REACT_SERVER_DOM_NAME}/client.browser`],
+								include: ["react-dom/client", `${reactServerDomPackageName}/client.browser`],
 								exclude: [PKG_NAME]
 							}
 						},
@@ -473,7 +477,7 @@ function vitePluginRsc(rscPluginOptions = {}) {
 									"react/jsx-dev-runtime",
 									"react-dom/server.edge",
 									"react-dom/static.edge",
-									`${REACT_SERVER_DOM_NAME}/client.edge`
+									`${reactServerDomPackageName}/client.edge`
 								],
 								exclude: [PKG_NAME]
 							}
@@ -495,8 +499,8 @@ function vitePluginRsc(rscPluginOptions = {}) {
 									"react-dom",
 									"react/jsx-runtime",
 									"react/jsx-dev-runtime",
-									`${REACT_SERVER_DOM_NAME}/server.edge`,
-									`${REACT_SERVER_DOM_NAME}/client.edge`
+									`${reactServerDomPackageName}/server.edge`,
+									`${reactServerDomPackageName}/client.edge`
 								],
 								exclude: [PKG_NAME]
 							}
@@ -630,6 +634,21 @@ function vitePluginRsc(rscPluginOptions = {}) {
 				}
 			}
 		},
+		{
+			name: "rsc:react-server-dom-webpack-alias",
+			resolveId: {
+				order: "pre",
+				async handler(source, importer, options) {
+					if (hasReactServerDomWebpack && source.startsWith(`${PKG_NAME}/vendor/react-server-dom/`)) {
+						const newSource = source.replace(`${PKG_NAME}/vendor/react-server-dom`, "react-server-dom-webpack");
+						return await this.resolve(newSource, importer, {
+							...options,
+							skipSelf: true
+						});
+					}
+				}
+			}
+		},
 		{
 			name: "rsc:load-ssr-module",
 			transform(code) {

package/dist/plugin.js

@@ -3,7 +3,7 @@ import "./plugin-CZbI4rhS.js";
 import "./transforms-CpF3zNE0.js";
 import "./encryption-utils-BDwwcMVT.js";
 import "./rpc-CUvSZurk.js";
-import { getPluginApi, transformRscCssExport, vitePluginRsc, vitePluginRscMinimal } from "./plugin-BDLEZ1UW.js";
+import { getPluginApi, transformRscCssExport, vitePluginRsc, vitePluginRscMinimal } from "./plugin-BLedJFh7.js";
 import "./cjs-BamOAUgw.js";
 import "./shared-n-ykEs15.js";
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vitejs/plugin-rsc",
-  "version": "0.4.33",
+  "version": "0.4.34",
   "description": "React Server Components (RSC) support for Vite.",
   "keywords": [
     "vite",
@@ -67,6 +67,12 @@
   "peerDependencies": {
     "react": "*",
     "react-dom": "*",
+    "react-server-dom-webpack": "*",
     "vite": "*"
+  },
+  "peerDependenciesMeta": {
+    "react-server-dom-webpack": {
+      "optional": true
+    }
   }
 }