feat: update rolldown (#415)

Author: sapphi-red

packages/vite/package.json

@@ -24,6 +24,7 @@
       "types": "./client.d.ts"
     },
     "./module-runner": "./dist/node/module-runner.js",
+    "./internal": "./dist/node/internal.js",
     "./dist/client/*": "./dist/client/*",
     "./types/*": {
       "types": "./types/*"
@@ -81,11 +82,12 @@
   },
   "//": "READ CONTRIBUTING.md to understand what to put under deps vs. devDeps!",
   "dependencies": {
+    "@oxc-project/runtime": "0.89.0",
     "fdir": "^6.5.0",
     "lightningcss": "^1.30.1",
     "picomatch": "^4.0.3",
     "postcss": "^8.5.6",
-    "rolldown": "1.0.0-beta.37",
+    "rolldown": "1.0.0-beta.38",
     "tinyglobby": "^0.2.15"
   },
   "optionalDependencies": {
@@ -95,9 +97,9 @@
     "@babel/parser": "^7.28.4",
     "@jridgewell/remapping": "^2.3.5",
     "@jridgewell/trace-mapping": "^0.3.30",
-    "@oxc-project/types": "0.87.0",
+    "@oxc-project/types": "0.89.0",
     "@polka/compression": "^1.0.0-next.25",
-    "@rolldown/pluginutils": "^1.0.0-beta.37",
+    "@rolldown/pluginutils": "^1.0.0-beta.38",
     "@rollup/plugin-alias": "^5.1.1",
     "@rollup/plugin-commonjs": "^28.0.6",
     "@rollup/plugin-dynamic-import-vars": "2.1.4",

packages/vite/rolldown.config.ts

@@ -74,6 +74,7 @@ const nodeConfig = defineConfig({
   input: {
     index: path.resolve(__dirname, 'src/node/index.ts'),
     cli: path.resolve(__dirname, 'src/node/cli.ts'),
+    internal: path.resolve(__dirname, 'src/node/internalIndex.ts'),
   },
   resolve: {
     alias: {

packages/vite/rolldown.dts.config.ts

@@ -36,6 +36,7 @@ export default defineConfig({
   input: {
     index: './src/node/index.ts',
     'module-runner': './src/module-runner/index.ts',
+    internal: './src/node/internalIndex.ts',
   },
   output: {
     dir: './dist/node',
@@ -305,43 +306,46 @@ function replaceConfusingTypeNames(
   chunk: OutputChunk,
   importBindings: ImportBindings[],
 ) {
-  for (const modName in identifierReplacements) {
-    const imp = importBindings.filter((imp) => imp.id === modName)
-    // Validate that `identifierReplacements` is not outdated if there's no match
-    if (imp.length === 0) {
-      this.warn(
-        `${chunk.fileName} does not import "${modName}" for replacement`,
-      )
-      process.exitCode = 1
-      continue
-    }
-
-    const replacements = identifierReplacements[modName]
-    for (const id in replacements) {
+  const isInternalEntry = chunk.fileName.startsWith('internal.')
+  if (!isInternalEntry) {
+    for (const modName in identifierReplacements) {
+      const imp = importBindings.filter((imp) => imp.id === modName)
       // Validate that `identifierReplacements` is not outdated if there's no match
-      if (!imp.some((i) => i.locals.includes(id))) {
+      if (imp.length === 0) {
         this.warn(
-          `${chunk.fileName} does not import "${id}" from "${modName}" for replacement`,
+          `${chunk.fileName} does not import "${modName}" for replacement`,
         )
         process.exitCode = 1
         continue
       }
 
-      const betterId = replacements[id]
-      const regexEscapedId = escapeRegex(id)
-      // If the better id accesses a namespace, the existing `Foo as Foo$1`
-      // named import cannot be replaced with `Foo as Namespace.Foo`, so we
-      // pre-emptively remove the whole named import
-      if (betterId.includes('.')) {
+      const replacements = identifierReplacements[modName]
+      for (const id in replacements) {
+        // Validate that `identifierReplacements` is not outdated if there's no match
+        if (!imp.some((i) => i.locals.includes(id))) {
+          this.warn(
+            `${chunk.fileName} does not import "${id}" from "${modName}" for replacement`,
+          )
+          process.exitCode = 1
+          continue
+        }
+
+        const betterId = replacements[id]
+        const regexEscapedId = escapeRegex(id)
+        // If the better id accesses a namespace, the existing `Foo as Foo$1`
+        // named import cannot be replaced with `Foo as Namespace.Foo`, so we
+        // pre-emptively remove the whole named import
+        if (betterId.includes('.')) {
+          chunk.code = chunk.code.replace(
+            new RegExp(`\\b\\w+\\b as ${regexEscapedId},?\\s?`),
+            '',
+          )
+        }
         chunk.code = chunk.code.replace(
-          new RegExp(`\\b\\w+\\b as ${regexEscapedId},?\\s?`),
-          '',
+          new RegExp(`\\b${regexEscapedId}\\b`, 'g'),
+          betterId,
         )
       }
-      chunk.code = chunk.code.replace(
-        new RegExp(`\\b${regexEscapedId}\\b`, 'g'),
-        betterId,
-      )
     }
   }
 
@@ -361,16 +365,21 @@ function replaceConfusingTypeNames(
     )
     process.exitCode = 1
   }
-  const notUsedConfusingTypeNames = ignoreConfusingTypeNames.filter(
-    (id) => !identifiers.includes(id),
-  )
-  // Validate that `identifierReplacements` is not outdated if there's no match
-  if (notUsedConfusingTypeNames.length) {
-    const notUsedStr = notUsedConfusingTypeNames
-      .map((id) => `\n- ${id}`)
-      .join('')
-    this.warn(`${chunk.fileName} contains unused identifier names${notUsedStr}`)
-    process.exitCode = 1
+
+  if (!isInternalEntry) {
+    const notUsedConfusingTypeNames = ignoreConfusingTypeNames.filter(
+      (id) => !identifiers.includes(id),
+    )
+    // Validate that `identifierReplacements` is not outdated if there's no match
+    if (notUsedConfusingTypeNames.length) {
+      const notUsedStr = notUsedConfusingTypeNames
+        .map((id) => `\n- ${id}`)
+        .join('')
+      this.warn(
+        `${chunk.fileName} contains unused identifier names${notUsedStr}`,
+      )
+      process.exitCode = 1
+    }
   }
 }
 

packages/vite/src/node/internalIndex.ts

@@ -0,0 +1 @@
+export { reactRefreshWrapperPlugin } from 'rolldown/experimental'

packages/vite/src/node/plugins/oxc.ts

@@ -1,6 +1,5 @@
 import path from 'node:path'
 import url from 'node:url'
-import { createRequire } from 'node:module'
 import type {
   TransformOptions as OxcTransformOptions,
   TransformResult as OxcTransformResult,
@@ -28,7 +27,7 @@ import type { Plugin } from '../plugin'
 import { cleanUrl } from '../../shared/utils'
 import { type Environment, perEnvironmentPlugin } from '..'
 import type { ViteDevServer } from '../server'
-import { JS_TYPES_RE } from '../constants'
+import { JS_TYPES_RE, VITE_PACKAGE_DIR } from '../constants'
 import type { Logger } from '../logger'
 import type { ESBuildOptions, TSCompilerOptions } from './esbuild'
 import { loadTsconfigJsonForFile } from './esbuild'
@@ -306,9 +305,7 @@ export function oxcPlugin(config: ResolvedConfig): Plugin {
         jsxRefreshInclude,
         jsxRefreshExclude,
         isServerConsumer: environment.config.consumer === 'server',
-        runtimeResolveBase: normalizePath(
-          url.fileURLToPath(/** #__KEEP__ */ import.meta.url),
-        ),
+        runtimeResolveBase: '', // not used
         jsxInject,
         transformOptions,
       })
@@ -376,9 +373,8 @@ export function oxcPlugin(config: ResolvedConfig): Plugin {
 
     return result
   }
-  const require = createRequire(/** #__KEEP__ */ import.meta.url)
   const runtimeResolveBase = normalizePath(
-    require.resolve('rolldown/package.json'),
+    path.join(VITE_PACKAGE_DIR, 'package.json'),
   )
 
   let server: ViteDevServer
@@ -388,17 +384,23 @@ export function oxcPlugin(config: ResolvedConfig): Plugin {
     configureServer(_server) {
       server = _server
     },
-    resolveId: {
-      filter: {
-        id: prefixRegex('@oxc-project/runtime/'),
-      },
-      async handler(id, _importer, opts) {
-        // @oxc-project/runtime imports will be injected by Oxc transform
-        // since it's injected by the transform, @oxc-project/runtime should be resolved to the one Rolldown depends on
-        const resolved = await this.resolve(id, runtimeResolveBase, opts)
-        return resolved
-      },
-    },
+    // @oxc-project/runtime resolution is handled by rolldown in build
+    ...(config.command === 'serve'
+      ? {
+          resolveId: {
+            filter: {
+              id: prefixRegex('@oxc-project/runtime/'),
+            },
+            async handler(id, _importer, opts) {
+              // @oxc-project/runtime imports will be injected by Oxc transform
+              // since it's injected by the transform, @oxc-project/runtime should be resolved to the one Vite depends on
+              const resolved = await this.resolve(id, runtimeResolveBase, opts)
+              return resolved
+            },
+            order: 'pre',
+          },
+        }
+      : {}),
     async transform(code, id) {
       if (filter(id) || filter(cleanUrl(id)) || jsxRefreshFilter?.(id)) {
         const modifiedOxcTransformOptions = getModifiedOxcTransformOptions(

playground/package.json

@@ -10,6 +10,6 @@
     "convert-source-map": "^2.0.0",
     "css-color-names": "^1.0.1",
     "kill-port": "^1.6.1",
-    "rolldown": "1.0.0-beta.37"
+    "rolldown": "1.0.0-beta.38"
   }
 }