refactor: use parseAst from rolldown (#81)

* refactor: use parseAst from rolldown other than ssrTransform
* refactor: use parseAst from rolldown for ssrTransform
* chore: remove `rollup/parseAst` from bundle config

Author: sapphi-red

packages/vite/rollup.config.ts

@@ -110,10 +110,10 @@ const nodeConfig = defineConfig({
   external: [
     /^vite\//,
     'fsevents',
-    'rollup/parseAst',
+    'rolldown/parseAst',
+    'rolldown/experimental',
     /^tsx\//,
     /^#/,
-    'rolldown/experimental',
     ...Object.keys(pkg.dependencies),
     ...Object.keys(pkg.peerDependencies),
   ],
@@ -191,7 +191,7 @@ const moduleRunnerConfig = defineConfig({
   external: [
     'fsevents',
     'lightningcss',
-    'rollup/parseAst',
+    'rolldown/parseAst',
     ...Object.keys(pkg.dependencies),
   ],
   plugins: [

packages/vite/rollup.dts.config.ts

@@ -16,7 +16,7 @@ const pkg = JSON.parse(
 const external = [
   /^node:*/,
   /^vite\//,
-  'rollup/parseAst',
+  'rolldown/parseAst',
   'rolldown/experimental',
   ...Object.keys(pkg.dependencies),
   ...Object.keys(pkg.peerDependencies),

packages/vite/src/node/__tests__/plugins/assetImportMetaUrl.spec.ts

@@ -1,5 +1,4 @@
 import { describe, expect, test } from 'vitest'
-import { parseAst } from 'rollup/parseAst'
 import { assetImportMetaUrlPlugin } from '../../plugins/assetImportMetaUrl'
 import { resolveConfig } from '../../config'
 import { PartialEnvironment } from '../../baseEnvironment'
@@ -12,7 +11,7 @@ async function createAssetImportMetaurlPluginTransform() {
   return async (code: string) => {
     // @ts-expect-error transform.handler should exist
     const result = await instance.transform.handler.call(
-      { environment, parse: parseAst },
+      { environment },
       code,
       'foo.ts',
     )

packages/vite/src/node/index.ts

@@ -1,7 +1,7 @@
 import type * as Rollup from 'rolldown'
 
 export type { Rollup }
-export { parseAst, parseAstAsync } from 'rollup/parseAst'
+export { parseAst, parseAstAsync } from './parseAst'
 export {
   defineConfig,
   loadConfigFromFile,

packages/vite/src/node/parseAst.ts

@@ -0,0 +1,104 @@
+import MagicString, {
+  type SourceMap,
+  type SourceMapOptions,
+} from 'magic-string'
+import {
+  type ParseResult,
+  parseAst as rolldownParseAst,
+  parseAstAsync as rolldownParseAstAsync,
+} from 'rolldown/parseAst'
+
+// TODO: move this compat layer to Rolldown
+
+const parseAstGeneric = (
+  code: string,
+  opts?: any,
+  filename?: string,
+): ParseResult => {
+  const result = rolldownParseAst(filename ?? 'file.js', code, {
+    sourceType: 'module',
+    lang: 'js',
+    ...opts,
+  })
+  if (result.errors.length > 0) {
+    throw new AggregateError(result.errors)
+  }
+
+  return result
+}
+
+export const parseAstGenericAsync = async (
+  code: string,
+  opts?: any,
+  filename?: string,
+): Promise<ParseResult> => {
+  const result = await rolldownParseAstAsync(filename ?? 'file.js', code, {
+    sourceType: 'module',
+    lang: 'js',
+    ...opts,
+  })
+  if (result.errors.length > 0) {
+    throw new AggregateError(result.errors)
+  }
+
+  return result
+}
+
+export class MagicStringWrapper {
+  private oxcMs: ParseResult['magicString']
+  private ms: MagicString
+
+  constructor(s: ParseResult['magicString']) {
+    this.oxcMs = s
+    this.ms = new MagicString(s.toString())
+  }
+
+  private getO(pos: number): number {
+    return this.oxcMs.getUtf16ByteOffset(pos)
+  }
+
+  append(str: string): void {
+    this.ms.append(str)
+  }
+
+  appendLeft(start: number, str: string): void {
+    this.ms.appendLeft(this.getO(start), str)
+  }
+
+  prependRight(start: number, str: string): void {
+    this.ms.prependRight(this.getO(start), str)
+  }
+
+  update(start: number, end: number, str: string): void {
+    this.ms.update(this.getO(start), this.getO(end), str)
+  }
+
+  move(start: number, end: number, index: number): void {
+    this.ms.move(this.getO(start), this.getO(end), this.getO(index))
+  }
+
+  remove(start: number, end: number): void {
+    this.ms.remove(this.getO(start), this.getO(end))
+  }
+
+  generateMap(options: SourceMapOptions): SourceMap {
+    return this.ms.generateMap(options)
+  }
+
+  toString(): string {
+    return this.ms.toString()
+  }
+}
+
+export const parseAst = (code: string, opts?: any, filename?: string): any => {
+  return parseAstGeneric(code, opts, filename).program
+}
+
+export const parseAstAsync = async (
+  code: string,
+  opts?: any,
+  filename?: string,
+): Promise<any> => {
+  const result = await parseAstGenericAsync(code, opts, filename)
+  return result.program
+}

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

@@ -1,8 +1,8 @@
 import path from 'node:path'
 import MagicString from 'magic-string'
 import { stripLiteral } from 'strip-literal'
-import { parseAst } from 'rollup/parseAst'
 import type { RolldownPlugin } from 'rolldown'
+import { parseAst } from '../parseAst'
 import type { ResolvedConfig } from '../config'
 import {
   injectQuery,

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

@@ -2,8 +2,8 @@ import { posix } from 'node:path'
 import MagicString from 'magic-string'
 import { init, parse as parseImports } from 'es-module-lexer'
 import type { ImportSpecifier } from 'es-module-lexer'
-import { parseAst } from 'rollup/parseAst'
 import { dynamicImportToGlob } from '@rollup/plugin-dynamic-import-vars'
+import { parseAst } from '../parseAst'
 import type { Plugin } from '../plugin'
 import type { ResolvedConfig } from '../config'
 import { CLIENT_ENTRY } from '../constants'

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

@@ -9,12 +9,12 @@ import type {
   ImportSpecifier,
 } from 'es-module-lexer'
 import { init, parse as parseImports } from 'es-module-lexer'
-import { parseAst } from 'rollup/parseAst'
 import type { StaticImport } from 'mlly'
 import { ESM_STATIC_IMPORT_RE, parseStaticImport } from 'mlly'
 import { makeLegalIdentifier } from '@rollup/pluginutils'
 import type { PartialResolvedId, RollupError } from 'rolldown'
 import type { Identifier, Literal } from 'estree'
+import { parseAst } from '../parseAst'
 import {
   CLIENT_DIR,
   CLIENT_PUBLIC_PATH,
@@ -970,7 +970,8 @@ export function transformCjsImport(
     node.type === 'ImportDeclaration' ||
     node.type === 'ExportNamedDeclaration'
   ) {
-    if (!node.specifiers.length) {
+    // NOTE: node.specifiers can be null in OXC: https://github.com/oxc-project/oxc/issues/2854#issuecomment-2595115817
+    if (!node.specifiers?.length) {
       return `import "${url}"`
     }
 

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

@@ -15,8 +15,8 @@ import type { CustomPluginOptions, RollupError } from 'rolldown'
 import MagicString from 'magic-string'
 import { stringifyQuery } from 'ufo'
 import type { GeneralImportGlobOptions } from 'types/importGlob'
-import { parseAstAsync } from 'rollup/parseAst'
 import { escapePath, glob } from 'tinyglobby'
+import { parseAstAsync } from '../parseAst'
 import type { Plugin } from '../plugin'
 import type { EnvironmentModuleNode } from '../server/moduleGraph'
 import type { ResolvedConfig } from '../config'

packages/vite/src/node/server/pluginContainer.ts

@@ -32,7 +32,6 @@ SOFTWARE.
 import fs from 'node:fs'
 import { join } from 'node:path'
 import { performance } from 'node:perf_hooks'
-import { parseAst as rollupParseAst } from 'rollup/parseAst'
 import type {
   AsyncPluginHooks,
   CustomPluginOptions,
@@ -62,6 +61,7 @@ import { TraceMap, originalPositionFor } from '@jridgewell/trace-mapping'
 import MagicString from 'magic-string'
 import type { FSWatcher } from 'dep-types/chokidar'
 import colors from 'picocolors'
+import { parseAst as rolldownParseAst } from '../parseAst'
 import type { Plugin } from '../plugin'
 import {
   combineSourcemaps,
@@ -578,7 +578,7 @@ class PluginContext
   }
 
   parse(code: string, opts: any) {
-    return rollupParseAst(code, opts)
+    return rolldownParseAst(code, opts)
   }
 
   async resolve(