@vitejs/plugin-react 5.0.1 → 5.0.3

package/dist/index.js

@@ -14,22 +14,15 @@ injectIntoGlobalHook(window);
 window.$RefreshReg$ = () => {};
 window.$RefreshSig$ = () => (type) => type;`;
 const getPreambleCode = (base) => preambleCode.replace("__BASE__", base);
-const avoidSourceMapOption = Symbol();
-function addRefreshWrapper(code, map, pluginName, id, reactRefreshHost = "") {
+function addRefreshWrapper(code, pluginName, id, reactRefreshHost = "") {
 	const hasRefresh = refreshContentRE.test(code);
 	const onlyReactComp = !hasRefresh && reactCompRE.test(code);
-	const normalizedMap = map === avoidSourceMapOption ? null : map;
-	if (!hasRefresh && !onlyReactComp) return {
-		code,
-		map: normalizedMap
-	};
-	const avoidSourceMap = map === avoidSourceMapOption;
-	const newMap = typeof normalizedMap === "string" ? JSON.parse(normalizedMap) : normalizedMap;
+	if (!hasRefresh && !onlyReactComp) return void 0;
 	let newCode = code;
-	if (hasRefresh) {
-		const refreshHead = removeLineBreaksIfNeeded(`let prevRefreshReg;
-let prevRefreshSig;
+	newCode += `
 
+import * as RefreshRuntime from "${reactRefreshHost}${runtimePublicPath}";
+const inWebWorker = typeof WorkerGlobalScope !== 'undefined' && self instanceof WorkerGlobalScope;
 if (import.meta.hot && !inWebWorker) {
   if (!window.$RefreshReg$) {
     throw new Error(
@@ -37,29 +30,6 @@ if (import.meta.hot && !inWebWorker) {
     );
   }
 
-  prevRefreshReg = window.$RefreshReg$;
-  prevRefreshSig = window.$RefreshSig$;
-  window.$RefreshReg$ = RefreshRuntime.getRefreshReg(${JSON.stringify(id)});
-  window.$RefreshSig$ = RefreshRuntime.createSignatureFunctionForTransform;
-}
-
-`, avoidSourceMap);
-		newCode = `${refreshHead}${newCode}
-
-if (import.meta.hot && !inWebWorker) {
-  window.$RefreshReg$ = prevRefreshReg;
-  window.$RefreshSig$ = prevRefreshSig;
-}
-`;
-		if (newMap) newMap.mappings = ";".repeat(16) + newMap.mappings;
-	}
-	const sharedHead = removeLineBreaksIfNeeded(`import * as RefreshRuntime from "${reactRefreshHost}${runtimePublicPath}";
-const inWebWorker = typeof WorkerGlobalScope !== 'undefined' && self instanceof WorkerGlobalScope;
-
-`, avoidSourceMap);
-	newCode = `${sharedHead}${newCode}
-
-if (import.meta.hot && !inWebWorker) {
   RefreshRuntime.__hmr_import(import.meta.url).then((currentExports) => {
     RefreshRuntime.registerExportsForReactRefresh(${JSON.stringify(id)}, currentExports);
     import.meta.hot.accept((nextExports) => {
@@ -70,14 +40,10 @@ if (import.meta.hot && !inWebWorker) {
   });
 }
 `;
-	if (newMap) newMap.mappings = ";;;" + newMap.mappings;
-	return {
-		code: newCode,
-		map: newMap
-	};
-}
-function removeLineBreaksIfNeeded(code, enabled) {
-	return enabled ? code.replace(/\n/g, "") : code;
+	if (hasRefresh) newCode += `function $RefreshReg$(type, id) { return RefreshRuntime.register(type, ${JSON.stringify(id)} + ' ' + id) }
+function $RefreshSig$() { return RefreshRuntime.createSignatureFunctionForTransform(); }
+`;
+	return newCode;
 }
 
 //#endregion
@@ -127,8 +93,8 @@ function viteReact(opts = {}) {
 					refresh: command === "serve",
 					development: false
 				},
-				jsxRefreshInclude: include,
-				jsxRefreshExclude: exclude
+				jsxRefreshInclude: makeIdFiltersToMatchWithQuery(include),
+				jsxRefreshExclude: makeIdFiltersToMatchWithQuery(exclude)
 			} };
 			else return {
 				oxc: {
@@ -137,8 +103,8 @@ function viteReact(opts = {}) {
 						importSource: opts.jsxImportSource,
 						refresh: command === "serve"
 					},
-					jsxRefreshInclude: include,
-					jsxRefreshExclude: exclude
+					jsxRefreshInclude: makeIdFiltersToMatchWithQuery(include),
+					jsxRefreshExclude: makeIdFiltersToMatchWithQuery(exclude)
 				},
 				optimizeDeps: { rollupOptions: { transform: { jsx: { runtime: "automatic" } } } }
 			};
@@ -162,7 +128,7 @@ function viteReact(opts = {}) {
 			};
 			else if (typeof opts.babel !== "function") {
 				staticBabelOptions = createBabelOptions(opts.babel);
-				if (canSkipBabel(staticBabelOptions.plugins, staticBabelOptions) && skipFastRefresh && (opts.jsxRuntime === "classic" ? isProduction : true)) delete viteBabel.transform;
+				if ((isRolldownVite || skipFastRefresh) && canSkipBabel(staticBabelOptions.plugins, staticBabelOptions) && (opts.jsxRuntime === "classic" ? isProduction : true)) delete viteBabel.transform;
 			}
 		},
 		options(options) {
@@ -203,7 +169,7 @@ function viteReact(opts = {}) {
 					reactCompilerPlugin$1 = void 0;
 				}
 				const isJSX = filepath.endsWith("x");
-				const useFastRefresh = !isRolldownVite && !skipFastRefresh && !ssr && (isJSX || (opts.jsxRuntime === "classic" ? importReactRE.test(code) : code.includes(jsxImportDevRuntime) || code.includes(jsxImportRuntime)));
+				const useFastRefresh = !(isRolldownVite || skipFastRefresh) && !ssr && (isJSX || (opts.jsxRuntime === "classic" ? importReactRE.test(code) : code.includes(jsxImportDevRuntime) || code.includes(jsxImportRuntime)));
 				if (useFastRefresh) plugins.push([await loadPlugin("react-refresh/babel"), { skipEnvCheck: true }]);
 				if (opts.jsxRuntime === "classic" && isJSX) {
 					if (!isProduction) plugins.push(await loadPlugin("@babel/plugin-transform-react-jsx-self"), await loadPlugin("@babel/plugin-transform-react-jsx-source"));
@@ -212,8 +178,7 @@ function viteReact(opts = {}) {
 				const parserPlugins = [...babelOptions.parserOpts.plugins];
 				if (!filepath.endsWith(".ts")) parserPlugins.push("jsx");
 				if (tsRE.test(filepath)) parserPlugins.push("typescript");
-				const babel$1 = await loadBabel();
-				const result = await babel$1.transformAsync(code, {
+				const result = await (await loadBabel()).transformAsync(code, {
 					...babelOptions,
 					root: projectRoot,
 					filename: id,
@@ -238,7 +203,10 @@ function viteReact(opts = {}) {
 						code: result.code,
 						map: result.map
 					};
-					return addRefreshWrapper(result.code, result.map, "@vitejs/plugin-react", id, opts.reactRefreshHost);
+					return {
+						code: addRefreshWrapper(result.code, "@vitejs/plugin-react", id, opts.reactRefreshHost) ?? result.code,
+						map: result.map
+					};
 				}
 			}
 		}
@@ -255,13 +223,12 @@ function viteReact(opts = {}) {
 				const ssr = options?.ssr === true;
 				const [filepath] = id.split("?");
 				const isJSX = filepath.endsWith("x");
-				const useFastRefresh = !skipFastRefresh && !ssr && (isJSX || code.includes(jsxImportDevRuntime) || code.includes(jsxImportRuntime));
-				if (!useFastRefresh) return;
-				const { code: newCode } = addRefreshWrapper(code, avoidSourceMapOption, "@vitejs/plugin-react", id, opts.reactRefreshHost);
-				return {
+				if (!(!skipFastRefresh && !ssr && (isJSX || code.includes(jsxImportDevRuntime) || code.includes(jsxImportRuntime)))) return;
+				const newCode = addRefreshWrapper(code, "@vitejs/plugin-react", id, opts.reactRefreshHost);
+				return newCode ? {
 					code: newCode,
 					map: null
-				};
+				} : void 0;
 			}
 		}
 	};

package/dist/refresh-runtime.js

@@ -243,7 +243,7 @@ function performReactRefresh() {
   }
 }
 
-function register(type, id) {
+export function register(type, id) {
   if (type === null) {
     return
   }
@@ -564,10 +564,6 @@ function isPlainObject(obj) {
  * Plugin utils
  */
 
-export function getRefreshReg(filename) {
-  return (type, id) => register(type, filename + ' ' + id)
-}
-
 // Taken from https://github.com/pmmmwh/react-refresh-webpack-plugin/blob/main/lib/runtime/RefreshUtils.js#L141
 // This allows to resister components not detected by SWC like styled component
 export function registerExportsForReactRefresh(filename, moduleExports) {
@@ -653,10 +649,7 @@ export function validateRefreshBoundaryAndEnqueueUpdate(
 
 function predicateOnExport(ignoredExports, moduleExports, predicate) {
   for (const key in moduleExports) {
-    if (key === '__esModule') continue
     if (ignoredExports.includes(key)) continue
-    const desc = Object.getOwnPropertyDescriptor(moduleExports, key)
-    if (desc && desc.get) return key
     if (!predicate(key, moduleExports[key])) return key
   }
   return true

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vitejs/plugin-react",
-  "version": "5.0.1",
+  "version": "5.0.3",
   "license": "MIT",
   "author": "Evan You",
   "description": "The default Vite plugin for React projects",
@@ -22,7 +22,7 @@
   "type": "module",
   "exports": "./dist/index.js",
   "scripts": {
-    "dev": "tsdown --watch",
+    "dev": "tsdown --watch ./src --watch ../common",
     "build": "tsdown",
     "prepublishOnly": "npm run build",
     "test-unit": "vitest run"
@@ -40,10 +40,10 @@
   },
   "homepage": "https://github.com/vitejs/vite-plugin-react/tree/main/packages/plugin-react#readme",
   "dependencies": {
-    "@babel/core": "^7.28.3",
+    "@babel/core": "^7.28.4",
     "@babel/plugin-transform-react-jsx-self": "^7.27.1",
     "@babel/plugin-transform-react-jsx-source": "^7.27.1",
-    "@rolldown/pluginutils": "1.0.0-beta.32",
+    "@rolldown/pluginutils": "1.0.0-beta.35",
     "@types/babel__core": "^7.20.5",
     "react-refresh": "^0.17.0"
   },
@@ -52,11 +52,11 @@
   },
   "devDependencies": {
     "@vitejs/react-common": "workspace:*",
-    "babel-plugin-react-compiler": "19.1.0-rc.2",
+    "babel-plugin-react-compiler": "19.1.0-rc.3",
     "react": "^19.1.1",
     "react-dom": "^19.1.1",
-    "rolldown": "1.0.0-beta.32",
-    "tsdown": "^0.14.1",
+    "rolldown": "1.0.0-beta.35",
+    "tsdown": "^0.14.2",
     "vitest": "^3.2.4"
   }
 }