Merge branch 'main' into chore-rsc-nightly

Author: hi-ogawa

.github/workflows/publish.yml

@@ -50,9 +50,7 @@ jobs:
         run: pnpm build
 
       - name: Publish package
-        run: pnpm run ci-publish ${{ github.ref_name }}
-        env:
-          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+        run: npm i -g npm@^11.5.2 && pnpm run ci-publish ${{ github.ref_name }}
 
       - if: steps.tag.outputs.isAlpha == 'false' && steps.tag.outputs.pkgName != 'plugin-rsc'
         uses: ArnaudBarre/github-release@4fa6eafe8e2449c7c1c5a91ae50de4ee34db0b40 # v1.5.0

packages/plugin-react-oxc/CHANGELOG.md

@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 0.4.2 (2025-09-17)
+
 ### Perf: simplify refresh wrapper generation ([#835](https://github.com/vitejs/vite-plugin-react/pull/835))
 
 ## 0.4.1 (2025-08-19)

packages/plugin-react-oxc/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vitejs/plugin-react-oxc",
-  "version": "0.4.1",
+  "version": "0.4.2",
   "license": "MIT",
   "author": "Evan You",
   "contributors": [

packages/plugin-react-swc/CHANGELOG.md

@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 4.1.0 (2025-09-17)
+
 ### Set SWC cacheRoot options
 
 This is set to `{viteCacheDir}/swc` and override the default of `.swc`.

packages/plugin-react-swc/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vitejs/plugin-react-swc",
-  "version": "4.0.1",
+  "version": "4.1.0",
   "license": "MIT",
   "author": "Arnaud Barré (https://github.com/ArnaudBarre)",
   "description": "Speed up your Vite dev server with SWC",

packages/plugin-react/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+## 5.0.3 (2025-09-17)
+
+### HMR did not work for components imported with queries with rolldown-vite ([#872](https://github.com/vitejs/vite-plugin-react/pull/872))
+
 ### Perf: simplify refresh wrapper generation ([#835](https://github.com/vitejs/vite-plugin-react/pull/835))
 
 ## 5.0.2 (2025-08-28)

packages/plugin-react/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vitejs/plugin-react",
-  "version": "5.0.2",
+  "version": "5.0.3",
   "license": "MIT",
   "author": "Evan You",
   "description": "The default Vite plugin for React projects",

packages/plugin-react/src/index.ts

@@ -144,8 +144,8 @@ export default function viteReact(opts: Options = {}): Plugin[] {
                 // if development is enabled and those properties are already present
                 development: false,
               },
-              jsxRefreshInclude: include,
-              jsxRefreshExclude: exclude,
+              jsxRefreshInclude: makeIdFiltersToMatchWithQuery(include),
+              jsxRefreshExclude: makeIdFiltersToMatchWithQuery(exclude),
             },
           }
         } else {
@@ -156,8 +156,8 @@ export default function viteReact(opts: Options = {}): Plugin[] {
                 importSource: opts.jsxImportSource,
                 refresh: command === 'serve',
               },
-              jsxRefreshInclude: include,
-              jsxRefreshExclude: exclude,
+              jsxRefreshInclude: makeIdFiltersToMatchWithQuery(include),
+              jsxRefreshExclude: makeIdFiltersToMatchWithQuery(exclude),
             },
             optimizeDeps: {
               rollupOptions: { transform: { jsx: { runtime: 'automatic' } } },

packages/plugin-rsc/CHANGELOG.md

@@ -1,3 +1,23 @@
+## <small>[0.4.31](https://github.com/vitejs/vite-plugin-react/compare/[email protected]@0.4.31) (2025-09-17)</small>
+### Bug Fixes
+
+* **rsc:** fix plugin name in `client-only` error message ([#862](https://github.com/vitejs/vite-plugin-react/issues/862)) ([0f2fbc7](https://github.com/vitejs/vite-plugin-react/commit/0f2fbc7c1fe2b6228864c5b424cea2309323fb67))
+* **rsc:** remove server style when css import is removed ([#849](https://github.com/vitejs/vite-plugin-react/issues/849)) ([4ae3f18](https://github.com/vitejs/vite-plugin-react/commit/4ae3f184eaa3e7fe559ccaf67c35e17a6e7fefa0))
+* **rsc:** show import chain for server-only and client-only import error ([#867](https://github.com/vitejs/vite-plugin-react/issues/867)) ([ba16c34](https://github.com/vitejs/vite-plugin-react/commit/ba16c34f6b70e68f29bff110c6906829ec3b2e8d))
+
+### Documentation
+
+* **rsc:** mention `validateImports` option for build time `server-only` and `client-only` validation ([#858](https://github.com/vitejs/vite-plugin-react/issues/858)) ([a96a6b2](https://github.com/vitejs/vite-plugin-react/commit/a96a6b2ef0afc1cc914885d4514865711d978fbf))
+* **rsc:** separate "Tips" section ([#864](https://github.com/vitejs/vite-plugin-react/issues/864)) ([32cfa5f](https://github.com/vitejs/vite-plugin-react/commit/32cfa5fe1e9c255e59a29c14d1b8585772f7b61e))
+
+### Miscellaneous Chores
+
+* **rsc:** add missing rsc-html-stream dep (fix [#857](https://github.com/vitejs/vite-plugin-react/issues/857)) ([#868](https://github.com/vitejs/vite-plugin-react/issues/868)) ([c30cf1a](https://github.com/vitejs/vite-plugin-react/commit/c30cf1a7db312a2643de426c7ac13479ce90289a))
+
+### Tests
+
+* **rsc:** tweak assertions for rolldown-vite ([#869](https://github.com/vitejs/vite-plugin-react/issues/869)) ([a2a287a](https://github.com/vitejs/vite-plugin-react/commit/a2a287aef6be302a771b8f7c512f190578412685))
+
 ## <small>[0.4.30](https://github.com/vitejs/vite-plugin-react/compare/[email protected]@0.4.30) (2025-09-15)</small>
 ### Features
 

packages/plugin-rsc/e2e/basic.test.ts

@@ -855,31 +855,42 @@ function defineTest(f: Fixture) {
         'rgb(255, 165, 0)',
       )
 
-      // remove css import
       const editor = f.createEditor('src/routes/style-server/server.tsx')
-      editor.edit((s) =>
-        s.replaceAll(`import './server.css'`, `/* import './server.css' */`),
-      )
+
+      // removing and adding new css works via hmr
+      {
+        await using _ = await expectNoReload(page)
+
+        // remove css import
+        editor.edit((s) =>
+          s.replaceAll(`import './server.css'`, `/* import './server.css' */`),
+        )
+        await expect(page.locator('.test-style-server')).toHaveCSS(
+          'color',
+          'rgb(0, 0, 0)',
+        )
+
+        // add new css
+        editor.edit((s) =>
+          s.replaceAll(`/* import './server.css' */`, `import './server2.css'`),
+        )
+        await expect(page.locator('.test-style-server')).toHaveCSS(
+          'color',
+          'rgb(0, 255, 165)',
+        )
+      }
+
+      // TODO: React doesn't re-inert same css link. so manual reload is required.
+      editor.reset()
       await page.waitForTimeout(100)
       await expect(async () => {
-        // TODO: shouldn't require reload
         await page.reload()
         await expect(page.locator('.test-style-server')).toHaveCSS(
           'color',
-          'rgb(0, 0, 0)',
+          'rgb(255, 165, 0)',
           { timeout: 10 },
         )
       }).toPass()
-
-      // adding css works without reload
-      await waitForHydration(page)
-      await using _ = await expectNoReload(page)
-
-      editor.reset()
-      await expect(page.locator('.test-style-server')).toHaveCSS(
-        'color',
-        'rgb(255, 165, 0)',
-      )
     })
 
     testNoJs('adding/removing css server @nojs', async ({ page }) => {