Merge branch 'main' into test-stable-react-chunks

Author: hi-ogawa

.github/renovate.json5

@@ -36,12 +36,14 @@
     // manually bumping
     "node",
 
-    "generouted", // testing lib shipping JSX (new version ship transpiled JS)
-
     // breaking changes
     "source-map", // `source-map:v0.7.0+` needs more investigation
     "kill-port", // `kill-port:^2.0.0 has perf issues (#8392)
 
     "prettier", // waiting for stable choice on ternaries
+
+    // plugin-rsc
+    "react-router",
+    "@react-router/dev",
   ],
 }

.github/workflows/ci-rsc.yml

@@ -31,18 +31,21 @@ jobs:
       - run: pnpm -C packages/plugin-rsc test
 
   test-e2e:
-    name: test-rsc (${{ matrix.os }} / ${{ matrix.browser }})
+    name: test-rsc (${{ matrix.os }} / ${{ matrix.browser }}) ${{ matrix.rolldown == true && '(rolldown)' || '' }}
     runs-on: ${{ matrix.os }}
     strategy:
-      # TODO: shard?
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
         browser: [chromium]
+        rolldown: [false]
         include:
           - os: ubuntu-latest
             browser: firefox
           - os: macos-latest
             browser: webkit
+          - os: ubuntu-latest
+            browser: chromium
+            rolldown: true
       fail-fast: false
     steps:
       - uses: actions/checkout@v4
@@ -52,13 +55,18 @@ jobs:
       - uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
       - run: pnpm i
       - run: pnpm build
+      - name: install rolldown
+        if: ${{ matrix.rolldown }}
+        run: |
+          sed -i '/^overrides:/a\  vite: "npm:rolldown-vite@latest"' pnpm-workspace.yaml
+          pnpm i --no-frozen-lockfile
       - run: pnpm -C packages/plugin-rsc exec playwright install ${{ matrix.browser }}
       - run: pnpm -C packages/plugin-rsc test-e2e-ci --project=${{ matrix.browser }}
         env:
           TEST_ISOLATED: true
       - uses: actions/upload-artifact@v4
         if: always()
         with:
-          name: test-results-${{ matrix.os }}-${{ matrix.browser }}
+          name: test-results-${{ matrix.os }}-${{ matrix.browser }}${{ matrix.rolldown == true && '-rolldown' || '' }}
           path: |
             packages/plugin-rsc/test-results

.github/workflows/publish.yml

@@ -55,8 +55,17 @@ jobs:
         env:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
 
-      - if: steps.tag.outputs.isAlpha == 'false'
+      - if: steps.tag.outputs.isAlpha == 'false' && steps.tag.outputs.pkgName != 'plugin-rsc'
         uses: ArnaudBarre/github-release@4fa6eafe8e2449c7c1c5a91ae50de4ee34db0b40 # v1.5.0
         with:
           path: packages/${{ steps.tag.outputs.pkgName }}/CHANGELOG.md
           tag-name: ${{ github.ref_name }}
+
+      - if: steps.tag.outputs.isAlpha == 'false' && steps.tag.outputs.pkgName == 'plugin-rsc'
+        uses: yyx990803/release-tag@master
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag_name: ${{ github.ref }}
+          body: |
+            Please refer to [CHANGELOG.md](https://github.com/vitejs/vite-plugin-react/blob/${{ github.ref_name }}/packages/${{ steps.tag.outputs.pkgName }}/CHANGELOG.md) for details.

CONTRIBUTING.md

@@ -13,12 +13,10 @@ This repo is a monorepo using pnpm workspaces. The package manager used to insta
 - Checkout a topic branch from a base branch (e.g. `main`), and merge back against that branch.
 
 - If adding a new feature:
-
   - Add accompanying test case.
   - Provide a convincing reason to add this feature. Ideally, you should open a suggestion issue first, and have it approved before working on it.
 
 - If fixing a bug:
-
   - If you are resolving a special issue, add `(fix #xxxx[,#xxxx])` (#xxxx is the issue id) in your PR title for a better release log (e.g. `fix: update entities encoding/decoding (fix #3899)`).
   - Provide a detailed description of the bug in the PR. Live demo preferred.
   - Add appropriate test coverage if applicable.

package.json

@@ -39,14 +39,14 @@
     "@vitejs/release-scripts": "^1.6.0",
     "eslint": "^9.30.1",
     "eslint-plugin-import-x": "^4.16.1",
-    "eslint-plugin-n": "^17.20.0",
+    "eslint-plugin-n": "^17.21.0",
     "eslint-plugin-regexp": "^2.9.0",
     "fs-extra": "^11.3.0",
     "globals": "^16.3.0",
     "lint-staged": "^15.5.2",
     "picocolors": "^1.1.1",
     "playwright-chromium": "^1.53.2",
-    "prettier": "^3.0.3",
+    "prettier": "^3.6.2",
     "simple-git-hooks": "^2.13.0",
     "tsx": "^4.20.3",
     "typescript": "^5.8.3",
@@ -70,15 +70,5 @@
     "playground/**/__tests__/**/*.ts": [
       "eslint --cache --fix"
     ]
-  },
-  "pnpm": {
-    "packageExtensions": {
-      "generouted": {
-        "peerDependencies": {
-          "react": "*",
-          "react-router-dom": "*"
-        }
-      }
-    }
   }
 }

packages/plugin-react-oxc/CHANGELOG.md

@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+### Return `Plugin[]` instead of `PluginOption[]`
+
 ## 0.2.3 (2025-06-16)
 
 ### Disable refresh transform when `server.hmr: false` is set [#502](https://github.com/vitejs/vite-plugin-react/pull/502)

packages/plugin-react-oxc/build.config.ts

@@ -20,11 +20,11 @@
     "dist"
   ],
   "type": "module",
-  "types": "./dist/index.d.mts",
-  "exports": "./dist/index.mjs",
+  "types": "./dist/index.d.ts",
+  "exports": "./dist/index.js",
   "scripts": {
-    "dev": "unbuild --stub",
-    "build": "unbuild && tsx scripts/copyRefreshRuntime.ts",
+    "dev": "tsdown --watch",
+    "build": "tsdown",
     "prepublishOnly": "npm run build"
   },
   "engines": {
@@ -44,10 +44,11 @@
   },
   "devDependencies": {
     "@vitejs/react-common": "workspace:*",
+    "tsdown": "^0.12.9",
     "unbuild": "^3.5.0",
     "vite": "catalog:rolldown-vite"
   },
   "dependencies": {
-    "@rolldown/pluginutils": "1.0.0-beta.23"
+    "@rolldown/pluginutils": "1.0.0-beta.24"
   }
 }