Merge remote-tracking branch 'upstream/main' into chore-rsc-nightly

Author: github-actions[bot]

.github/workflows/ci-rsc.yml

@@ -58,7 +58,7 @@ jobs:
       - name: install rolldown
         if: ${{ matrix.rolldown }}
         run: |
-          echo 'overrides: { vite: "npm:rolldown-vite@latest" }' >> pnpm-workspace.yaml
+          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 }}
@@ -67,6 +67,6 @@ jobs:
       - 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

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,6 +44,7 @@
   },
   "devDependencies": {
     "@vitejs/react-common": "workspace:*",
+    "tsdown": "^0.12.9",
     "unbuild": "^3.5.0",
     "vite": "catalog:rolldown-vite"
   },

packages/plugin-react-oxc/package.json

@@ -12,11 +12,7 @@ import {
 import { exactRegex } from '@rolldown/pluginutils'
 
 const _dirname = dirname(fileURLToPath(import.meta.url))
-
-const refreshRuntimePath = globalThis.__IS_BUILD__
-  ? join(_dirname, 'refresh-runtime.js')
-  : // eslint-disable-next-line n/no-unsupported-features/node-builtins -- only used in dev
-    fileURLToPath(import.meta.resolve('@vitejs/react-common/refresh-runtime'))
+const refreshRuntimePath = join(_dirname, 'refresh-runtime.js')
 
 export interface Options {
   include?: string | RegExp | Array<string | RegExp>

packages/plugin-react-oxc/scripts/copyRefreshRuntime.ts

@@ -1,5 +1,5 @@
 {
-  "include": ["src", "scripts"],
+  "include": ["src"],
   "compilerOptions": {
     "outDir": "dist",
     "target": "ES2020",

packages/plugin-react-oxc/src/build.d.ts

@@ -0,0 +1,11 @@
+import { defineConfig } from 'tsdown'
+
+export default defineConfig({
+  entry: 'src/index.ts',
+  copy: [
+    {
+      from: 'node_modules/@vitejs/react-common/refresh-runtime.js',
+      to: 'dist/refresh-runtime.js',
+    },
+  ],
+})

packages/plugin-react-oxc/src/index.ts

@@ -15,8 +15,8 @@
   "type": "module",
   "private": true,
   "scripts": {
-    "dev": "tsx scripts/bundle.ts --dev",
-    "build": "tsx scripts/bundle.ts",
+    "dev": "tsdown --watch",
+    "build": "tsdown",
     "test": "playwright test"
   },
   "repository": {
@@ -40,10 +40,9 @@
     "@types/fs-extra": "^11.0.4",
     "@types/node": "^22.16.0",
     "@vitejs/react-common": "workspace:*",
-    "esbuild": "^0.25.5",
     "fs-extra": "^11.3.0",
-    "picocolors": "^1.1.1",
     "prettier": "^3.0.3",
+    "tsdown": "^0.12.9",
     "typescript": "^5.8.3"
   }
 }