chore: use rolldown-plugin-dts for dts bundling

sapphi-red · sapphi-red · commit accd13797797 · 2025-05-19T14:46:05.000+09:00
diff --git a/packages/vite/package.json b/packages/vite/package.json
@@ -76,7 +76,7 @@
     "build-bundle": "rolldown --config rollup.config.ts",
     "build-types": "pnpm build-types-temp && pnpm build-types-roll && pnpm build-types-check",
     "build-types-temp": "tsc --emitDeclarationOnly --outDir temp -p src/node/tsconfig.build.json",
-    "build-types-roll": "NODE_OPTIONS='--import tsx' rollup --config rollup.dts.config.ts && premove temp",
+    "build-types-roll": "rolldown --config rollup.dts.config.ts && premove temp",
     "build-types-check": "tsc --project tsconfig.check.json",
     "typecheck": "tsc --noEmit && tsc --noEmit -p src/node",
     "lint": "eslint --cache --ext .ts src/**",
@@ -100,6 +100,7 @@
     "@babel/parser": "^7.27.2",
     "@jridgewell/trace-mapping": "^0.3.25",
     "@oxc-project/runtime": "^0.70.0",
+    "@oxc-project/types": "^0.70.0",
     "@polka/compression": "^1.0.0-next.25",
     "@rollup/plugin-alias": "^5.1.1",
     "@rollup/plugin-commonjs": "^28.0.3",
@@ -141,7 +142,7 @@
     "postcss-modules": "^6.0.1",
     "resolve.exports": "^2.0.3",
     "rolldown": "^1.0.0-beta.9",
-    "rollup-plugin-dts": "^6.2.1",
+    "rolldown-plugin-dts": "^0.13.2",
     "rollup-plugin-license": "^3.6.0",
     "sass": "^1.88.0",
     "sass-embedded": "^1.88.0",
diff --git a/packages/vite/rollup.dts.config.ts b/packages/vite/rollup.dts.config.ts
@@ -1,12 +1,23 @@
 import { readFileSync } from 'node:fs'
 import { fileURLToPath } from 'node:url'
-import { findStaticImports } from 'mlly'
-import { defineConfig } from 'rollup'
-import type { Plugin, PluginContext, RenderedChunk } from 'rollup'
-import dts from 'rollup-plugin-dts'
-import { parse } from '@babel/parser'
+import { defineConfig } from 'rolldown'
+import type {
+  OutputChunk,
+  Plugin,
+  PluginContext,
+  RenderedChunk,
+} from 'rolldown'
+import { parseAst } from 'rolldown/parseAst'
+import { dts } from 'rolldown-plugin-dts'
+import { parse as parseWithBabel } from '@babel/parser'
 import { walk } from 'estree-walker'
 import MagicString from 'magic-string'
+import type {
+  Directive,
+  ModuleExportName,
+  Program,
+  Statement,
+} from '@oxc-project/types'
 
 const depTypesDir = new URL('./src/types/', import.meta.url)
 const pkg = JSON.parse(
@@ -32,7 +43,7 @@ export default defineConfig({
     format: 'esm',
   },
   external,
-  plugins: [patchTypes(), dts({ respectExternal: true })],
+  plugins: [patchTypes(), dts({ dtsInput: true })],
 })
 
 // Taken from https://stackoverflow.com/a/36328890
@@ -47,22 +58,50 @@ const identifierWithTrailingDollarRE = /\b(\w+)\$\d+\b/g
  */
 const identifierReplacements: Record<string, Record<string, string>> = {
   rollup: {
-    Plugin$1: 'rollup.Plugin',
-    PluginContext$1: 'rollup.PluginContext',
-    MinimalPluginContext$1: 'rollup.MinimalPluginContext',
-    TransformResult$1: 'rollup.TransformResult',
+    Plugin$2: 'Rollup.Plugin',
+    TransformResult$1: 'Rollup.TransformResult',
   },
   esbuild: {
     TransformResult$2: 'esbuild_TransformResult',
     TransformOptions$1: 'esbuild_TransformOptions',
     BuildOptions$1: 'esbuild_BuildOptions',
   },
+  'node:http': {
+    // https://github.com/rolldown/rolldown/issues/4324
+    http$1: 'http_1',
+    http$2: 'http_2',
+    http$3: 'http_3',
+    Server$1: 'http.Server',
+    IncomingMessage$1: 'http.IncomingMessage',
+  },
   'node:https': {
-    Server$1: 'HttpsServer',
-    ServerOptions$1: 'HttpsServerOptions',
+    Server$2: 'HttpsServer',
+    ServerOptions$2: 'HttpsServerOptions',
+  },
+  'vite/module-runner': {
+    FetchResult$1: 'moduleRunner_FetchResult',
+  },
+  '../../types/hmrPayload.js': {
+    CustomPayload$1: 'hmrPayload_CustomPayload',
+    HotPayload$1: 'hmrPayload_HotPayload',
+  },
+  '../../types/customEvent.js': {
+    InferCustomEventPayload$1: 'hmrPayload_InferCustomEventPayload',
+  },
+  '../../types/internal/lightningcssOptions.js': {
+    LightningCSSOptions$1: 'lightningcssOptions_LightningCSSOptions',
   },
 }
 
+// type names that are declared
+const ignoreConfusingTypeNames = [
+  'Plugin$1',
+  'PluginContext$1',
+  'MinimalPluginContext$1',
+  'ServerOptions$1',
+  'TransformPluginContext$1',
+]
+
 /**
  * Patch the types files before passing to dts plugin
  * 1. Resolve `dep-types/*` and `types/*` imports
@@ -74,47 +113,102 @@ const identifierReplacements: Record<string, Record<string, string>> = {
 function patchTypes(): Plugin {
   return {
     name: 'patch-types',
-    resolveId(id) {
-      // Dep types should be bundled
-      if (id.startsWith('dep-types/')) {
-        const fileUrl = new URL(
-          `./${id.slice('dep-types/'.length)}.d.ts`,
-          depTypesDir,
-        )
-        return fileURLToPath(fileUrl)
-      }
-      // Ambient types are unbundled and externalized
-      if (id.startsWith('types/')) {
-        return {
-          id: '../../' + (id.endsWith('.js') ? id : id + '.js'),
-          external: true,
+    resolveId: {
+      order: 'pre',
+      handler(id) {
+        // Dep types should be bundled
+        if (id.startsWith('dep-types/')) {
+          const fileUrl = new URL(
+            `./${id.slice('dep-types/'.length)}.d.ts`,
+            depTypesDir,
+          )
+          return fileURLToPath(fileUrl)
         }
-      }
+        // Ambient types are unbundled and externalized
+        if (id.startsWith('types/')) {
+          return {
+            id: '../../' + (id.endsWith('.js') ? id : id + '.js'),
+            external: true,
+          }
+        }
+      },
     },
-    renderChunk(code, chunk) {
-      if (
-        chunk.fileName.startsWith('module-runner') ||
-        // index and moduleRunner have a common chunk "moduleRunnerTransport"
-        chunk.fileName.startsWith('moduleRunnerTransport') ||
-        chunk.fileName.startsWith('types.d-')
-      ) {
-        validateRunnerChunk.call(this, chunk)
-      } else {
-        validateChunkImports.call(this, chunk)
-        code = replaceConfusingTypeNames.call(this, code, chunk)
-        code = stripInternalTypes.call(this, code, chunk)
-        code = cleanUnnecessaryComments(code)
+    generateBundle(_opts, bundle) {
+      for (const chunk of Object.values(bundle)) {
+        if (chunk.type !== 'chunk') continue
+
+        const ast = parseAst(chunk.code, { lang: 'ts', sourceType: 'module' })
+        const importBindings = getAllImportBindings(ast)
+        if (
+          chunk.fileName.startsWith('module-runner') ||
+          // index and moduleRunner have a common chunk "moduleRunnerTransport"
+          chunk.fileName.startsWith('moduleRunnerTransport') ||
+          chunk.fileName.startsWith('types.d-')
+        ) {
+          validateRunnerChunk.call(this, chunk, importBindings)
+        } else {
+          validateChunkImports.call(this, chunk, importBindings)
+          replaceConfusingTypeNames.call(this, chunk, importBindings)
+          stripInternalTypes.call(this, chunk)
+          cleanUnnecessaryComments(chunk)
+        }
       }
-      return code
     },
   }
 }
 
+function stringifyModuleExportName(node: ModuleExportName): string {
+  if (node.type === 'Identifier') {
+    return node.name
+  }
+  return node.value
+}
+
+type ImportBindings = { id: string; bindings: string[]; locals: string[] }
+
+function getImportBindings(
+  node: Directive | Statement,
+): ImportBindings | undefined {
+  if (node.type === 'ImportDeclaration') {
+    return {
+      id: node.source.value,
+      bindings: node.specifiers.map((s) =>
+        s.type === 'ImportDefaultSpecifier'
+          ? 'default'
+          : s.type === 'ImportNamespaceSpecifier'
+            ? '*'
+            : stringifyModuleExportName(s.imported),
+      ),
+      locals: node.specifiers.map((s) => s.local.name),
+    }
+  }
+  if (node.type === 'ExportNamedDeclaration') {
+    if (!node.source) return undefined
+    return {
+      id: node.source.value,
+      bindings: node.specifiers.map((s) => stringifyModuleExportName(s.local)),
+      locals: [],
+    }
+  }
+  if (node.type === 'ExportAllDeclaration') {
+    if (!node.source) return undefined
+    return { id: node.source.value, bindings: ['*'], locals: [] }
+  }
+}
+
+function getAllImportBindings(ast: Program): ImportBindings[] {
+  return ast.body.flatMap((node) => getImportBindings(node) ?? [])
+}
+
 /**
  * Runner chunk should only import local dependencies to stay lightweight
  */
-function validateRunnerChunk(this: PluginContext, chunk: RenderedChunk) {
-  for (const [id, bindings] of Object.entries(chunk.importedBindings)) {
+function validateRunnerChunk(
+  this: PluginContext,
+  chunk: RenderedChunk,
+  importBindings: ImportBindings[],
+) {
+  for (const { id, bindings } of importBindings) {
     if (
       !id.startsWith('./') &&
       !id.startsWith('../') &&
@@ -133,9 +227,13 @@ function validateRunnerChunk(this: PluginContext, chunk: RenderedChunk) {
 /**
  * Validate that chunk imports do not import dev deps
  */
-function validateChunkImports(this: PluginContext, chunk: RenderedChunk) {
+function validateChunkImports(
+  this: PluginContext,
+  chunk: RenderedChunk,
+  importBindings: ImportBindings[],
+) {
   const deps = Object.keys(pkg.dependencies)
-  for (const [id, bindings] of Object.entries(chunk.importedBindings)) {
+  for (const { id, bindings } of importBindings) {
     if (
       !id.startsWith('./') &&
       !id.startsWith('../') &&
@@ -163,17 +261,13 @@ function validateChunkImports(this: PluginContext, chunk: RenderedChunk) {
  */
 function replaceConfusingTypeNames(
   this: PluginContext,
-  code: string,
-  chunk: RenderedChunk,
+  chunk: OutputChunk,
+  importBindings: ImportBindings[],
 ) {
-  const imports = findStaticImports(code)
-
   for (const modName in identifierReplacements) {
-    const imp = imports.find(
-      (imp) => imp.specifier === modName && imp.imports.includes('{'),
-    )
+    const imp = importBindings.filter((imp) => imp.id === modName)
     // Validate that `identifierReplacements` is not outdated if there's no match
-    if (!imp) {
+    if (imp.length === 0) {
       this.warn(
         `${chunk.fileName} does not import "${modName}" for replacement`,
       )
@@ -184,7 +278,7 @@ function replaceConfusingTypeNames(
     const replacements = identifierReplacements[modName]
     for (const id in replacements) {
       // Validate that `identifierReplacements` is not outdated if there's no match
-      if (!imp.imports.includes(id)) {
+      if (!imp.some((i) => i.locals.includes(id))) {
         this.warn(
           `${chunk.fileName} does not import "${id}" from "${modName}" for replacement`,
         )
@@ -198,17 +292,23 @@ function replaceConfusingTypeNames(
       // named import cannot be replaced with `Foo as Namespace.Foo`, so we
       // pre-emptively remove the whole named import
       if (betterId.includes('.')) {
-        code = code.replace(
+        chunk.code = chunk.code.replace(
           new RegExp(`\\b\\w+\\b as ${regexEscapedId},?\\s?`),
           '',
         )
       }
-      code = code.replace(new RegExp(`\\b${regexEscapedId}\\b`, 'g'), betterId)
+      chunk.code = chunk.code.replace(
+        new RegExp(`\\b${regexEscapedId}\\b`, 'g'),
+        betterId,
+      )
     }
   }
 
   const unreplacedIds = unique(
-    Array.from(code.matchAll(identifierWithTrailingDollarRE), (m) => m[0]),
+    Array.from(
+      chunk.code.matchAll(identifierWithTrailingDollarRE),
+      (m) => m[0],
+    ).filter((id) => !ignoreConfusingTypeNames.includes(id)),
   )
   if (unreplacedIds.length) {
     const unreplacedStr = unreplacedIds.map((id) => `\n- ${id}`).join('')
@@ -217,23 +317,18 @@ function replaceConfusingTypeNames(
     )
     process.exitCode = 1
   }
-
-  return code
 }
 
 /**
  * While we already enable `compilerOptions.stripInternal`, some internal comments
  * like internal parameters are still not stripped by TypeScript, so we run another
  * pass here.
  */
-function stripInternalTypes(
-  this: PluginContext,
-  code: string,
-  chunk: RenderedChunk,
-) {
-  if (code.includes('@internal')) {
-    const s = new MagicString(code)
-    const ast = parse(code, {
+function stripInternalTypes(this: PluginContext, chunk: OutputChunk) {
+  if (chunk.code.includes('@internal')) {
+    const s = new MagicString(chunk.code)
+    // need to parse with babel to get the comments
+    const ast = parseWithBabel(chunk.code, {
       plugins: ['typescript'],
       sourceType: 'module',
     })
@@ -246,15 +341,13 @@ function stripInternalTypes(
       },
     })
 
-    code = s.toString()
+    chunk.code = s.toString()
 
-    if (code.includes('@internal')) {
+    if (chunk.code.includes('@internal')) {
       this.warn(`${chunk.fileName} has unhandled @internal declarations`)
       process.exitCode = 1
     }
   }
-
-  return code
 }
 
 /**
@@ -283,8 +376,8 @@ function removeInternal(s: MagicString, node: any): boolean {
   return false
 }
 
-function cleanUnnecessaryComments(code: string) {
-  return code
+function cleanUnnecessaryComments(chunk: OutputChunk) {
+  chunk.code = chunk.code
     .replace(multilineCommentsRE, (m) => {
       return licenseCommentsRE.test(m) ? '' : m
     })
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
