@vitejs/plugin-react 4.3.2 → 4.3.4

package/dist/index.cjs

@@ -198,7 +198,7 @@ function viteReact(opts = {}) {
         // Required for esbuild.jsxDev to provide correct line numbers
         // This crates issues the react compiler because the re-order is too important
         // People should use @babel/plugin-transform-react-jsx-development to get back good line numbers
-        retainLines: hasCompiler(plugins) ? false : !isProduction && isJSX && opts.jsxRuntime !== "classic",
+        retainLines: getReactCompilerPlugin(plugins) != null ? false : !isProduction && isJSX && opts.jsxRuntime !== "classic",
         parserOpts: {
           ...babelOptions.parserOpts,
           sourceType: "module",
@@ -207,6 +207,8 @@ function viteReact(opts = {}) {
         },
         generatorOpts: {
           ...babelOptions.generatorOpts,
+          // import attributes parsing available without plugin since 7.26
+          importAttributesKeyword: "with",
           decoratorsBeforeExport: true
         },
         plugins,
@@ -225,10 +227,17 @@ function viteReact(opts = {}) {
       }
     }
   };
-  const dependencies = ["react", jsxImportDevRuntime, jsxImportRuntime];
+  const dependencies = [
+    "react",
+    "react-dom",
+    jsxImportDevRuntime,
+    jsxImportRuntime
+  ];
   const staticBabelPlugins = typeof opts.babel === "object" ? opts.babel?.plugins ?? [] : [];
-  if (hasCompilerWithDefaultRuntime(staticBabelPlugins)) {
-    dependencies.push("react/compiler-runtime");
+  const reactCompilerPlugin = getReactCompilerPlugin(staticBabelPlugins);
+  if (reactCompilerPlugin != null) {
+    const reactCompilerRuntimeModule = getReactCompilerRuntimeModule(reactCompilerPlugin);
+    dependencies.push(reactCompilerRuntimeModule);
   }
   const viteReactRefresh = {
     name: "vite:react-refresh",
@@ -313,15 +322,21 @@ function createBabelOptions(rawOptions) {
 function defined(value) {
   return value !== void 0;
 }
-function hasCompiler(plugins) {
-  return plugins.some(
+function getReactCompilerPlugin(plugins) {
+  return plugins.find(
     (p) => p === "babel-plugin-react-compiler" || Array.isArray(p) && p[0] === "babel-plugin-react-compiler"
   );
 }
-function hasCompilerWithDefaultRuntime(plugins) {
-  return plugins.some(
-    (p) => p === "babel-plugin-react-compiler" || Array.isArray(p) && p[0] === "babel-plugin-react-compiler" && p[1]?.runtimeModule === void 0
-  );
+function getReactCompilerRuntimeModule(plugin) {
+  let moduleName = "react/compiler-runtime";
+  if (Array.isArray(plugin)) {
+    if (plugin[1]?.target === "17" || plugin[1]?.target === "18") {
+      moduleName = "react-compiler-runtime";
+    } else if (typeof plugin[1]?.runtimeModule === "string") {
+      moduleName = plugin[1]?.runtimeModule;
+    }
+  }
+  return moduleName;
 }
 
 module.exports = viteReact;

package/dist/index.mjs

@@ -190,7 +190,7 @@ function viteReact(opts = {}) {
         // Required for esbuild.jsxDev to provide correct line numbers
         // This crates issues the react compiler because the re-order is too important
         // People should use @babel/plugin-transform-react-jsx-development to get back good line numbers
-        retainLines: hasCompiler(plugins) ? false : !isProduction && isJSX && opts.jsxRuntime !== "classic",
+        retainLines: getReactCompilerPlugin(plugins) != null ? false : !isProduction && isJSX && opts.jsxRuntime !== "classic",
         parserOpts: {
           ...babelOptions.parserOpts,
           sourceType: "module",
@@ -199,6 +199,8 @@ function viteReact(opts = {}) {
         },
         generatorOpts: {
           ...babelOptions.generatorOpts,
+          // import attributes parsing available without plugin since 7.26
+          importAttributesKeyword: "with",
           decoratorsBeforeExport: true
         },
         plugins,
@@ -217,10 +219,17 @@ function viteReact(opts = {}) {
       }
     }
   };
-  const dependencies = ["react", jsxImportDevRuntime, jsxImportRuntime];
+  const dependencies = [
+    "react",
+    "react-dom",
+    jsxImportDevRuntime,
+    jsxImportRuntime
+  ];
   const staticBabelPlugins = typeof opts.babel === "object" ? opts.babel?.plugins ?? [] : [];
-  if (hasCompilerWithDefaultRuntime(staticBabelPlugins)) {
-    dependencies.push("react/compiler-runtime");
+  const reactCompilerPlugin = getReactCompilerPlugin(staticBabelPlugins);
+  if (reactCompilerPlugin != null) {
+    const reactCompilerRuntimeModule = getReactCompilerRuntimeModule(reactCompilerPlugin);
+    dependencies.push(reactCompilerRuntimeModule);
   }
   const viteReactRefresh = {
     name: "vite:react-refresh",
@@ -305,15 +314,21 @@ function createBabelOptions(rawOptions) {
 function defined(value) {
   return value !== void 0;
 }
-function hasCompiler(plugins) {
-  return plugins.some(
+function getReactCompilerPlugin(plugins) {
+  return plugins.find(
     (p) => p === "babel-plugin-react-compiler" || Array.isArray(p) && p[0] === "babel-plugin-react-compiler"
   );
 }
-function hasCompilerWithDefaultRuntime(plugins) {
-  return plugins.some(
-    (p) => p === "babel-plugin-react-compiler" || Array.isArray(p) && p[0] === "babel-plugin-react-compiler" && p[1]?.runtimeModule === void 0
-  );
+function getReactCompilerRuntimeModule(plugin) {
+  let moduleName = "react/compiler-runtime";
+  if (Array.isArray(plugin)) {
+    if (plugin[1]?.target === "17" || plugin[1]?.target === "18") {
+      moduleName = "react-compiler-runtime";
+    } else if (typeof plugin[1]?.runtimeModule === "string") {
+      moduleName = plugin[1]?.runtimeModule;
+    }
+  }
+  return moduleName;
 }
 
 export { viteReact as default };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vitejs/plugin-react",
-  "version": "4.3.2",
+  "version": "4.3.4",
   "license": "MIT",
   "author": "Evan You",
   "contributors": [
@@ -38,14 +38,14 @@
   },
   "homepage": "https://github.com/vitejs/vite-plugin-react/tree/main/packages/plugin-react#readme",
   "dependencies": {
-    "@babel/core": "^7.25.2",
-    "@babel/plugin-transform-react-jsx-self": "^7.24.7",
-    "@babel/plugin-transform-react-jsx-source": "^7.24.7",
+    "@babel/core": "^7.26.0",
+    "@babel/plugin-transform-react-jsx-self": "^7.25.9",
+    "@babel/plugin-transform-react-jsx-source": "^7.25.9",
     "@types/babel__core": "^7.20.5",
     "react-refresh": "^0.14.2"
   },
   "peerDependencies": {
-    "vite": "^4.2.0 || ^5.0.0"
+    "vite": "^4.2.0 || ^5.0.0 || ^6.0.0"
   },
   "devDependencies": {
     "unbuild": "^2.0.0"