@vitejs/plugin-rsc 0.4.14 → 0.4.15

package/dist/index.js

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

package/dist/{plugin-6e6xZIb7.js → plugin-_STtCzuL.js}

@@ -13,7 +13,7 @@ import { createRequestListener } from "@mjackson/node-fetch-server";
 import * as esModuleLexer from "es-module-lexer";
 import MagicString from "magic-string";
 import { defaultServerConditions, isCSSRequest, normalizePath, parseAstAsync } from "vite";
-import { crawlFrameworkPkgs } from "vitefu";
+import { crawlFrameworkPkgs, findClosestPkgJsonPath } from "vitefu";
 import { walk } from "estree-walker";
 import { analyze, extract_names } from "periscopic";
 
@@ -798,9 +798,30 @@ globalThis.AsyncLocalStorage = __viteRscAyncHooks.AsyncLocalStorage;
 		...vitePluginFindSourceMapURL(),
 		...vitePluginRscCss({ rscCssTransform: rscPluginOptions.rscCssTransform }),
 		...rscPluginOptions.validateImports !== false ? [validateImportPlugin()] : [],
-		scanBuildStripPlugin()
+		scanBuildStripPlugin(),
+		detectNonOptimizedCjsPlugin()
 	];
 }
+function detectNonOptimizedCjsPlugin() {
+	return {
+		name: "rsc:detect-non-optimized-cjs",
+		apply: "serve",
+		async transform(code, id) {
+			if (id.includes("/node_modules/") && !id.startsWith(this.environment.config.cacheDir) && /\b(require|exports)\b/.test(code)) {
+				id = parseIdQuery(id).filename;
+				let isEsm = id.endsWith(".mjs");
+				if (id.endsWith(".js")) {
+					const pkgJsonPath = await findClosestPkgJsonPath(path.dirname(id));
+					if (pkgJsonPath) {
+						const pkgJson = JSON.parse(fs.readFileSync(pkgJsonPath, "utf-8"));
+						isEsm = pkgJson.type === "module";
+					}
+				}
+				if (!isEsm) this.warn(`[vite-rsc] found non-optimized CJS dependency in '${this.environment.name}' environment. It is recommended to manually add the dependency to 'environments.${this.environment.name}.optimizeDeps.include'.`);
+			}
+		}
+	};
+}
 function scanBuildStripPlugin() {
 	return {
 		name: "rsc:scan-strip",
@@ -1267,7 +1288,7 @@ function vitePluginRscCss(rscCssOptions) {
 		};
 	}
 	function getRscCssTransformFilter({ id, code }) {
-		const { query } = parseIdQuery(id);
+		const { filename, query } = parseIdQuery(id);
 		if ("vite-rsc-css-export" in query) {
 			const value = query["vite-rsc-css-export"];
 			if (value) {
@@ -1278,8 +1299,8 @@ function vitePluginRscCss(rscCssOptions) {
 		}
 		const options = rscCssOptions?.rscCssTransform;
 		if (options === false) return false;
-		if (options?.filter && !options.filter(id)) return false;
-		if (id.includes("/node_modules/") || !/\.[tj]sx$/.test(id)) return false;
+		if (options?.filter && !options.filter(filename)) return false;
+		if (!/\.(css|less|sass|scss|styl|stylus|pcss|postcss|sss)\b/.test(code) || !/\.[tj]sx?$/.test(filename)) return false;
 		const result = esModuleLexer.parse(code);
 		if (!result[0].some((i) => i.t === 1 && i.n && isCSSRequest(i.n))) return false;
 		return (_name, meta) => !!(meta.isFunction && meta.declName && /^[A-Z]/.test(meta.declName) || meta.defaultExportIdentifierName && /^[A-Z]/.test(meta.defaultExportIdentifierName));

package/dist/plugin.js

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

package/package.json

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