@vitejs/plugin-rsc 0.4.19 → 0.4.20

package/dist/{browser-DIa4fISB.js → browser-QU10IP0-.js}

@@ -18,4 +18,5 @@ function withTrailingSlash(path) {
 	return path;
 }
 
-//#endregion
+//#endregion
+export {  };

package/dist/browser.js

@@ -2,6 +2,6 @@ import "./dist-DiJnRA1C.js";
 import "./shared-CEyKoKAb.js";
 import { setRequireModule } from "./browser-BhJd-Orx.js";
 import { callServer, createFromFetch, createFromReadableStream, createServerReference, createTemporaryReferenceSet, encodeReply, findSourceMapURL, setServerCallback } from "./browser-D8OPzpF5.js";
-import "./browser-DIa4fISB.js";
+import "./browser-QU10IP0-.js";
 
 export { callServer, createFromFetch, createFromReadableStream, createServerReference, createTemporaryReferenceSet, encodeReply, findSourceMapURL, setRequireModule, setServerCallback };

package/dist/extra/browser.js

@@ -2,7 +2,7 @@ import "../dist-DiJnRA1C.js";
 import "../shared-CEyKoKAb.js";
 import "../browser-BhJd-Orx.js";
 import { createFromFetch, createFromReadableStream, createTemporaryReferenceSet, encodeReply, setServerCallback } from "../browser-D8OPzpF5.js";
-import "../browser-DIa4fISB.js";
+import "../browser-QU10IP0-.js";
 import { rscStream } from "../client-C1J4FCf5.js";
 import React from "react";
 import ReactDomClient from "react-dom/client";

package/dist/extra/rsc.js

@@ -4,7 +4,7 @@ import "../encryption-utils-BDwwcMVT.js";
 import { loadServerAction } from "../rsc-BfBPoIV8.js";
 import { createTemporaryReferenceSet, decodeAction, decodeFormState, decodeReply, renderToReadableStream } from "../rsc-VjVw_i-M.js";
 import "../encryption-runtime-CJUalqt3.js";
-import "../rsc-CGUEQCnf.js";
+import "../rsc-BwEwbLG4.js";
 import { Fragment, jsx, jsxs } from "react/jsx-runtime";
 
 //#region src/extra/rsc.tsx

package/dist/extra/ssr.js

@@ -2,7 +2,7 @@ import "../dist-DiJnRA1C.js";
 import "../shared-CEyKoKAb.js";
 import "../ssr--rFiBtws.js";
 import { createFromReadableStream } from "../ssr-BEKKb_cw.js";
-import "../ssr-BuzPa0Go.js";
+import "../ssr-BMTRhW5g.js";
 import { injectRSCPayload } from "../server-D0-DavPP.js";
 import React from "react";
 import { jsx } from "react/jsx-runtime";

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { RscPluginOptions, vitePluginRsc } from "./plugin-CYYsF3qY.js";
+import { RscPluginOptions, vitePluginRsc } from "./plugin-BQszG7oj.js";
 import MagicString from "magic-string";
 import { Program } from "estree";
 

package/dist/index.js

@@ -1,6 +1,6 @@
 import "./dist-DiJnRA1C.js";
 import "./plugin-CZbI4rhS.js";
-import { transformHoistInlineDirective, vitePluginRsc } from "./plugin-Cu7_zbmH.js";
+import { transformHoistInlineDirective, vitePluginRsc } from "./plugin-DYOxE_xg.js";
 import "./encryption-utils-BDwwcMVT.js";
 import "./rpc-tGuLT8PD.js";
 import "./vite-utils-Vzd7cqfv.js";

package/dist/{plugin-CYYsF3qY.d.ts → plugin-BQszG7oj.d.ts}

@@ -28,6 +28,7 @@ type RscPluginOptions = {
   rscCssTransform?: false | {
     filter?: (id: string) => boolean;
   };
+  /** @deprecated use "DEBUG=vite-env:*" to see warnings. */
   ignoredPackageWarnings?: (string | RegExp)[];
   /**
   * This option allows customizing how client build copies assets from server build.

package/dist/{plugin-Cu7_zbmH.js → plugin-DYOxE_xg.js}

@@ -328,7 +328,8 @@ function parseIdQuery(id) {
 function transformCjsToEsm(code, ast) {
 	const output = new MagicString(code);
 	const analyzed = analyze(ast);
-	let parentNodes = [];
+	const parentNodes = [];
+	const hoistedCodes = [];
 	let hoistIndex = 0;
 	walk(ast, {
 		enter(node) {
@@ -346,7 +347,7 @@ function transformCjsToEsm(code, ast) {
 				} else {
 					const hoisted = `__cjs_to_esm_hoist_${hoistIndex}`;
 					const importee = code.slice(node.arguments[0].start, node.arguments[0].end);
-					output.prepend(`const ${hoisted} = await import(${importee});\n`);
+					hoistedCodes.push(`const ${hoisted} = await import(${importee});\n`);
 					output.update(node.start, node.end, hoisted);
 					hoistIndex++;
 				}
@@ -356,6 +357,7 @@ function transformCjsToEsm(code, ast) {
 			parentNodes.pop();
 		}
 	});
+	for (const hoisted of hoistedCodes.reverse()) output.prepend(hoisted);
 	output.prepend(`const exports = {}; const module = { exports };\n`);
 	return { output };
 }
@@ -971,6 +973,13 @@ function vitePluginUseClient(useClientPluginOptions) {
 	const bareImportRE = /^(?![a-zA-Z]:)[\w@](?!.*:\/\/)/;
 	const serverEnvironmentName = useClientPluginOptions.environment?.rsc ?? "rsc";
 	const browserEnvironmentName = useClientPluginOptions.environment?.browser ?? "client";
+	function warnInoncistentClientOptimization(ctx, id) {
+		const { depsOptimizer } = server.environments.client;
+		if (depsOptimizer) {
+			for (const dep of Object.values(depsOptimizer.metadata.optimized)) if (dep.src === id) ctx.warn("client component dependency is inconsistently optimized. It's recommended to add the dependency to 'optimizeDeps.exclude'.");
+		}
+	}
+	const debug$1 = createDebug("vite-rsc:use-client");
 	return [
 		{
 			name: "rsc:use-client",
@@ -983,9 +992,10 @@ function vitePluginUseClient(useClientPluginOptions) {
 				let referenceKey;
 				const packageSource = packageSources.get(id);
 				if (!packageSource && this.environment.mode === "dev" && id.includes("/node_modules/")) {
-					const ignored = useClientPluginOptions.ignoredPackageWarnings?.some((pattern) => pattern instanceof RegExp ? pattern.test(id) : id.includes(`/node_modules/${pattern}/`));
-					if (!ignored) this.warn(`[vite-rsc] detected an internal client boundary created by a package imported on rsc environment`);
-					importId = `/@id/__x00__virtual:vite-rsc/client-in-server-package-proxy/${encodeURIComponent(cleanUrl(id))}`;
+					debug$1(`internal client reference created through a package imported in '${this.environment.name}' environment: ${id}`);
+					id = cleanUrl(id);
+					warnInoncistentClientOptimization(this, id);
+					importId = `/@id/__x00__virtual:vite-rsc/client-in-server-package-proxy/${encodeURIComponent(id)}`;
 					referenceKey = importId;
 				} else if (packageSource) if (this.environment.mode === "dev") {
 					importId = `/@id/__x00__virtual:vite-rsc/client-package-proxy/${packageSource}`;
@@ -1141,6 +1151,7 @@ function vitePluginDefineEncryptionKey(useServerPluginOptions) {
 function vitePluginUseServer(useServerPluginOptions) {
 	const serverEnvironmentName = useServerPluginOptions.environment?.rsc ?? "rsc";
 	const browserEnvironmentName = useServerPluginOptions.environment?.browser ?? "client";
+	const debug$1 = createDebug("vite-rsc:use-server");
 	return [{
 		name: "rsc:use-server",
 		async transform(code, id) {
@@ -1150,8 +1161,7 @@ function vitePluginUseServer(useServerPluginOptions) {
 			const getNormalizedId = () => {
 				if (!normalizedId_) {
 					if (this.environment.mode === "dev" && id.includes("/node_modules/")) {
-						const ignored = useServerPluginOptions.ignoredPackageWarnings?.some((pattern) => pattern instanceof RegExp ? pattern.test(id) : id.includes(`/node_modules/${pattern}/`));
-						if (!ignored) this.warn(`[vite-rsc] detected an internal server function created by a package imported on ${this.environment.name} environment`);
+						debug$1(`internal server reference created through a package imported in ${this.environment.name} environment: ${id}`);
 						id = cleanUrl(id);
 					}
 					if (config.command === "build") normalizedId_ = hashString(path.relative(config.root, id));
@@ -1551,7 +1561,25 @@ function vitePluginRscCss(rscCssOptions) {
 					}
 				}
 			}
-		}
+		},
+		createVirtualPlugin("vite-rsc/remove-duplicate-server-css", async function() {
+			assert.equal(this.environment.mode, "dev");
+			function removeFn() {
+				document.querySelectorAll("link[rel='stylesheet']").forEach((node) => {
+					if (node instanceof HTMLElement && node.dataset.precedence?.startsWith("vite-rsc/")) node.remove();
+				});
+			}
+			return `\
+"use client"
+import React from "react";
+export default function RemoveDuplicateServerCss() {
+  React.useEffect(() => {
+    (${removeFn.toString()})();
+  }, []);
+  return null;
+}
+`;
+		})
 	];
 }
 function invalidteModuleById(environment, id) {
@@ -1570,25 +1598,36 @@ function collectModuleDependents(mods) {
 	return [...visited];
 }
 function generateResourcesCode(depsCode) {
-	const ResourcesFn = (React, deps) => {
+	const ResourcesFn = (React, deps, RemoveDuplicateServerCss) => {
 		return function Resources() {
-			return React.createElement(React.Fragment, null, [...deps.css.map((href) => React.createElement("link", {
-				key: "css:" + href,
-				rel: "stylesheet",
-				precedence: "vite-rsc/importer-resources",
-				href
-			})), ...deps.js.map((href) => React.createElement("script", {
-				key: "js:" + href,
-				type: "module",
-				async: true,
-				src: href
-			}))]);
+			return React.createElement(React.Fragment, null, [
+				...deps.css.map((href) => React.createElement("link", {
+					key: "css:" + href,
+					rel: "stylesheet",
+					precedence: "vite-rsc/importer-resources",
+					href
+				})),
+				...deps.js.map((href) => React.createElement("script", {
+					key: "js:" + href,
+					type: "module",
+					async: true,
+					src: href
+				})),
+				RemoveDuplicateServerCss && React.createElement(RemoveDuplicateServerCss, { key: "remove-duplicate-css" })
+			]);
 		};
 	};
 	return `
-    import __vite_rsc_react__ from "react";
-    export const Resources = (${ResourcesFn.toString()})(__vite_rsc_react__, ${depsCode});
-  `;
+import __vite_rsc_react__ from "react";
+
+${config.command === "serve" ? `import RemoveDuplicateServerCss from "virtual:vite-rsc/remove-duplicate-server-css";` : `const RemoveDuplicateServerCss = undefined;`}
+
+export const Resources = (${ResourcesFn.toString()})(
+  __vite_rsc_react__,
+  ${depsCode},
+  RemoveDuplicateServerCss,
+);
+`;
 }
 async function transformRscCssExport(options) {
 	if (hasDirective(options.ast.body, "use client")) return;

package/dist/plugin.d.ts

@@ -1,2 +1,2 @@
-import { AssetDeps, AssetsManifest, ResolvedAssetDeps, ResolvedAssetsManifest, RscPluginOptions, __fix_cloudflare, findSourceMapURL, transformRscCssExport, vitePluginFindSourceMapURL, vitePluginRsc, vitePluginRscCss, vitePluginRscMinimal } from "./plugin-CYYsF3qY.js";
+import { AssetDeps, AssetsManifest, ResolvedAssetDeps, ResolvedAssetsManifest, RscPluginOptions, __fix_cloudflare, findSourceMapURL, transformRscCssExport, vitePluginFindSourceMapURL, vitePluginRsc, vitePluginRscCss, vitePluginRscMinimal } from "./plugin-BQszG7oj.js";
 export { AssetDeps, AssetsManifest, ResolvedAssetDeps, ResolvedAssetsManifest, RscPluginOptions, __fix_cloudflare, vitePluginRsc as default, findSourceMapURL, transformRscCssExport, vitePluginFindSourceMapURL, vitePluginRscCss, vitePluginRscMinimal };

package/dist/plugin.js

@@ -1,6 +1,6 @@
 import "./dist-DiJnRA1C.js";
 import "./plugin-CZbI4rhS.js";
-import { __fix_cloudflare, findSourceMapURL, transformRscCssExport, vitePluginFindSourceMapURL, vitePluginRsc, vitePluginRscCss, vitePluginRscMinimal } from "./plugin-Cu7_zbmH.js";
+import { __fix_cloudflare, findSourceMapURL, transformRscCssExport, vitePluginFindSourceMapURL, vitePluginRsc, vitePluginRscCss, vitePluginRscMinimal } from "./plugin-DYOxE_xg.js";
 import "./encryption-utils-BDwwcMVT.js";
 import "./rpc-tGuLT8PD.js";
 import "./vite-utils-Vzd7cqfv.js";

package/dist/{rsc-CGUEQCnf.js → rsc-BwEwbLG4.js}

@@ -17,4 +17,5 @@ function initialize() {
 	} });
 }
 
-//#endregion
+//#endregion
+export {  };

package/dist/rsc.js

@@ -4,6 +4,6 @@ import "./encryption-utils-BDwwcMVT.js";
 import { createClientManifest, createServerManifest, loadServerAction, setRequireModule } from "./rsc-BfBPoIV8.js";
 import { createClientTemporaryReferenceSet, createFromReadableStream, createTemporaryReferenceSet, decodeAction, decodeFormState, decodeReply, encodeReply, registerClientReference, registerServerReference, renderToReadableStream } from "./rsc-VjVw_i-M.js";
 import { decryptActionBoundArgs, encryptActionBoundArgs } from "./encryption-runtime-CJUalqt3.js";
-import "./rsc-CGUEQCnf.js";
+import "./rsc-BwEwbLG4.js";
 
 export { createClientManifest, createClientTemporaryReferenceSet, createFromReadableStream, createServerManifest, createTemporaryReferenceSet, decodeAction, decodeFormState, decodeReply, decryptActionBoundArgs, encodeReply, encryptActionBoundArgs, loadServerAction, registerClientReference, registerServerReference, renderToReadableStream, setRequireModule };

package/dist/{ssr-BuzPa0Go.js → ssr-BMTRhW5g.js}

@@ -49,4 +49,5 @@ function preloadDeps(deps) {
 	});
 }
 
-//#endregion
+//#endregion
+export {  };

package/dist/ssr.js

@@ -2,6 +2,6 @@ import "./dist-DiJnRA1C.js";
 import "./shared-CEyKoKAb.js";
 import { createServerConsumerManifest, setRequireModule } from "./ssr--rFiBtws.js";
 import { callServer, createFromReadableStream, createServerReference, findSourceMapURL } from "./ssr-BEKKb_cw.js";
-import "./ssr-BuzPa0Go.js";
+import "./ssr-BMTRhW5g.js";
 
 export { callServer, createFromReadableStream, createServerConsumerManifest, createServerReference, findSourceMapURL, setRequireModule };

package/package.json

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