chore: merge main

Author: sapphi-red

README.md

@@ -20,6 +20,7 @@ See [`@vitejs/plugin-react` documentation](packages/plugin-react/README.md) and
 | Package                                               | Version (click for changelogs)                                                                                                             |
 | ----------------------------------------------------- | :----------------------------------------------------------------------------------------------------------------------------------------- |
 | [@vitejs/plugin-react](packages/plugin-react)         | [![plugin-react version](https://img.shields.io/npm/v/@vitejs/plugin-react.svg?label=%20)](packages/plugin-react/CHANGELOG.md)             |
+| [@vitejs/plugin-react-oxc](packages/plugin-react-oxc) | [![plugin-react-oxc version](https://img.shields.io/npm/v/@vitejs/plugin-react-oxc.svg?label=%20)](packages/plugin-react-oxc/CHANGELOG.md) |
 | [@vitejs/plugin-react-swc](packages/plugin-react-swc) | [![plugin-react-swc version](https://img.shields.io/npm/v/@vitejs/plugin-react-swc.svg?label=%20)](packages/plugin-react-swc/CHANGELOG.md) |
 
 ## License

package.json

@@ -5,7 +5,7 @@
   "engines": {
     "node": "^14.18.0 || >=16.0.0"
   },
-  "packageManager": "pnpm@10.9.0",
+  "packageManager": "pnpm@10.11.1",
   "homepage": "https://github.com/vitejs/vite-plugin-react/",
   "keywords": [
     "frontend",
@@ -33,26 +33,26 @@
     "ci-publish": "tsx scripts/publishCI.ts"
   },
   "devDependencies": {
-    "@eslint/js": "^9.25.1",
+    "@eslint/js": "^9.28.0",
     "@types/fs-extra": "^11.0.4",
-    "@types/node": "^22.15.2",
+    "@types/node": "^22.15.30",
     "@vitejs/release-scripts": "^1.5.0",
-    "eslint": "^9.25.1",
-    "eslint-plugin-import-x": "^4.11.0",
-    "eslint-plugin-n": "^17.17.0",
-    "eslint-plugin-regexp": "^2.7.0",
+    "eslint": "^9.28.0",
+    "eslint-plugin-import-x": "^4.15.1",
+    "eslint-plugin-n": "^17.19.0",
+    "eslint-plugin-regexp": "^2.8.0",
     "fs-extra": "^11.3.0",
-    "globals": "^16.0.0",
-    "lint-staged": "^15.5.1",
+    "globals": "^16.2.0",
+    "lint-staged": "^15.5.2",
     "picocolors": "^1.1.1",
     "playwright-chromium": "^1.52.0",
     "prettier": "^3.0.3",
     "simple-git-hooks": "^2.13.0",
-    "tsx": "^4.19.3",
+    "tsx": "^4.19.4",
     "typescript": "^5.8.3",
-    "typescript-eslint": "^8.31.0",
+    "typescript-eslint": "^8.33.1",
     "vite": "^6.3.3",
-    "vitest": "^3.1.2"
+    "vitest": "^3.2.2"
   },
   "simple-git-hooks": {
     "pre-commit": "pnpm exec lint-staged --concurrent false"

packages/common/refresh-utils.ts

@@ -1,12 +1,12 @@
 export const runtimePublicPath = '/@react-refresh'
 
 const reactCompRE = /extends\s+(?:React\.)?(?:Pure)?Component/
-const refreshContentRE = /\$Refresh(?:Reg|Sig)\$\(/
+const refreshContentRE = /\$RefreshReg\$\(/
 
 // NOTE: this is exposed publicly via plugin-react
 export const preambleCode = `import { injectIntoGlobalHook } from "__BASE__${runtimePublicPath.slice(
   1,
-)}"
+)}";
 injectIntoGlobalHook(window);
 window.$RefreshReg$ = () => {};
 window.$RefreshSig$ = () => (type) => type;`

packages/plugin-react-oxc/CHANGELOG.md

@@ -2,10 +2,28 @@
 
 ## Unreleased
 
-### Add `filter` for rolldown-vite
+## 0.2.2 (2025-06-10)
+
+### Add Vite 7-beta to peerDependencies range [#497](https://github.com/vitejs/vite-plugin-react/pull/497)
+
+React plugins are compatible with Vite 7, this removes the warning when testing the beta.
+
+## 0.2.1 (2025-06-03)
+
+### Add explicit semicolon in preambleCode [#485](https://github.com/vitejs/vite-plugin-react/pull/485)
+
+This fixes an edge case when using HTML minifiers that strips line breaks aggressively.
+
+## 0.2.0 (2025-05-23)
+
+### Add `filter` for rolldown-vite [#470](https://github.com/vitejs/vite-plugin-react/pull/470)
 
 Added `filter` so that it is more performant when running this plugin with rolldown-powered version of Vite.
 
+### Skip HMR for JSX files with hooks [#480](https://github.com/vitejs/vite-plugin-react/pull/480)
+
+This removes the HMR warning for hooks with JSX.
+
 ## 0.1.1 (2025-04-10)
 
 ## 0.1.0 (2025-04-09)

packages/plugin-react-oxc/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vitejs/plugin-react-oxc",
-  "version": "0.1.1",
+  "version": "0.2.2",
   "license": "MIT",
   "author": "Evan You",
   "contributors": [
@@ -40,14 +40,14 @@
   },
   "homepage": "https://github.com/vitejs/vite-plugin-react/tree/main/packages/plugin-react#readme",
   "peerDependencies": {
-    "vite": "^6.3.0"
+    "vite": "^6.3.0 || ^7.0.0-beta.0"
   },
   "devDependencies": {
     "@vitejs/react-common": "workspace:*",
     "unbuild": "^3.5.0",
     "vite": "catalog:rolldown-vite"
   },
   "dependencies": {
-    "@rolldown/pluginutils": "1.0.0-beta.9"
+    "@rolldown/pluginutils": "1.0.0-beta.11"
   }
 }

packages/plugin-react-swc/CHANGELOG.md

@@ -2,14 +2,40 @@
 
 ## Unreleased
 
-### Add `filter` for rolldown-vite
+## 3.10.2 (2025-06-10)
+
+### Suggest `@vitejs/plugin-react-oxc` if rolldown-vite is detected [#491](https://github.com/vitejs/vite-plugin-react/pull/491)
+
+Emit a log which recommends `@vitejs/plugin-react-oxc` when `rolldown-vite` is detected to improve performance and use Oxc under the hood. The warning can be disabled by setting `disableOxcRecommendation: false` in the plugin options.
+
+### Use `optimizeDeps.rollupOptions` instead of `optimizeDeps.esbuildOptions` for rolldown-vite [#489](https://github.com/vitejs/vite-plugin-react/pull/489)
+
+This suppresses the warning about `optimizeDeps.esbuildOptions` being deprecated in rolldown-vite.
+
+### Add Vite 7-beta to peerDependencies range [#497](https://github.com/vitejs/vite-plugin-react/pull/497)
+
+React plugins are compatible with Vite 7, this removes the warning when testing the beta.
+
+## 3.10.1 (2025-06-03)
+
+### Add explicit semicolon in preambleCode [#485](https://github.com/vitejs/vite-plugin-react/pull/485)
+
+This fixes an edge case when using HTML minifiers that strips line breaks aggressively.
+
+## 3.10.0 (2025-05-23)
+
+### Add `filter` for rolldown-vite [#470](https://github.com/vitejs/vite-plugin-react/pull/470)
 
 Added `filter` so that it is more performant when running this plugin with rolldown-powered version of Vite.
 
-### Skip HMR preamble in Vitest browser mode
+### Skip HMR preamble in Vitest browser mode [#478](https://github.com/vitejs/vite-plugin-react/pull/478)
 
 This was causing annoying `Sourcemap for "/@react-refresh" points to missing source files` and is unnecessary in test mode.
 
+### Skip HMR for JSX files with hooks [#480](https://github.com/vitejs/vite-plugin-react/pull/480)
+
+This removes the HMR warning for hooks with JSX.
+
 ## 3.9.0 (2025-04-15)
 
 ### Make compatible with rolldown-vite

packages/plugin-react-swc/README.md

@@ -117,6 +117,14 @@ react({
 })
 ```
 
+### disableOxcRecommendation
+
+If set, disables the recommendation to use `@vitejs/plugin-react-oxc` (which is shown when `rolldown-vite` is detected and neither `swc` plugins are used nor the `swc` options are mutated).
+
+```ts
+react({ disableOxcRecommendation: true })
+```
+
 ## Consistent components exports
 
 For React refresh to work correctly, your file should only export React components. The best explanation I've read is the one from the [Gatsby docs](https://www.gatsbyjs.com/docs/reference/local-development/fast-refresh/#how-it-works).

packages/plugin-react-swc/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vitejs/plugin-react-swc",
-  "version": "3.9.0",
+  "version": "3.10.2",
   "license": "MIT",
   "author": "Arnaud Barré (https://github.com/ArnaudBarre)",
   "description": "Speed up your Vite dev server with SWC",
@@ -29,18 +29,18 @@
   },
   "homepage": "https://github.com/vitejs/vite-plugin-react/tree/main/packages/plugin-react-swc#readme",
   "dependencies": {
-    "@rolldown/pluginutils": "1.0.0-beta.9",
-    "@swc/core": "^1.11.22"
+    "@rolldown/pluginutils": "1.0.0-beta.11",
+    "@swc/core": "^1.11.31"
   },
   "peerDependencies": {
-    "vite": "^4 || ^5 || ^6"
+    "vite": "^4 || ^5 || ^6 || ^7.0.0-beta.0"
   },
   "devDependencies": {
     "@playwright/test": "^1.52.0",
     "@types/fs-extra": "^11.0.4",
-    "@types/node": "^22.15.2",
+    "@types/node": "^22.15.30",
     "@vitejs/react-common": "workspace:*",
-    "esbuild": "^0.25.3",
+    "esbuild": "^0.25.5",
     "fs-extra": "^11.3.0",
     "picocolors": "^1.1.1",
     "prettier": "^3.0.3",

packages/plugin-react-swc/playground/base-path/package.json

@@ -12,8 +12,8 @@
     "react-dom": "^19.1.0"
   },
   "devDependencies": {
-    "@types/react": "^19.1.2",
-    "@types/react-dom": "^19.1.2",
+    "@types/react": "^19.1.6",
+    "@types/react-dom": "^19.1.6",
     "@vitejs/plugin-react-swc": "../../dist"
   }
 }

packages/plugin-react-swc/playground/class-components/package.json

@@ -12,8 +12,8 @@
     "react-dom": "^19.1.0"
   },
   "devDependencies": {
-    "@types/react": "^19.1.2",
-    "@types/react-dom": "^19.1.2",
+    "@types/react": "^19.1.6",
+    "@types/react-dom": "^19.1.6",
     "@vitejs/plugin-react-swc": "../../dist"
   }
 }