Skip to content

Commit ad7fdfb

Browse files
committed
chore: use parseAst from rolldown directly
1 parent aa8e869 commit ad7fdfb

File tree

9 files changed

+12
-51
lines changed

9 files changed

+12
-51
lines changed

packages/vite/src/node/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import type * as Rollup from 'rolldown'
22

33
export type { Rollup }
4-
export { parseAst, parseAstAsync } from './parseAst'
4+
export { parseAst, parseAstAsync } from 'rolldown/parseAst'
55
export {
66
defineConfig,
77
loadConfigFromFile,

packages/vite/src/node/parseAst.ts

Lines changed: 0 additions & 30 deletions
This file was deleted.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import path from 'node:path'
22
import MagicString from 'magic-string'
33
import { stripLiteral } from 'strip-literal'
44
import type { RolldownPlugin } from 'rolldown'
5-
import { parseAst } from '../parseAst'
5+
import { parseAst } from 'rolldown/parseAst'
66
import type { ResolvedConfig } from '../config'
77
import {
88
injectQuery,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import MagicString from 'magic-string'
33
import { init, parse as parseImports } from 'es-module-lexer'
44
import type { ImportSpecifier } from 'es-module-lexer'
55
import { dynamicImportToGlob } from '@rollup/plugin-dynamic-import-vars'
6-
import { parseAst } from '../parseAst'
6+
import { parseAst } from 'rolldown/parseAst'
77
import type { Plugin } from '../plugin'
88
import type { ResolvedConfig } from '../config'
99
import { CLIENT_ENTRY } from '../constants'

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ import type { StaticImport } from 'mlly'
1313
import { ESM_STATIC_IMPORT_RE, parseStaticImport } from 'mlly'
1414
import { makeLegalIdentifier } from '@rollup/pluginutils'
1515
import type { PartialResolvedId, RollupError } from 'rolldown'
16-
import type { Identifier, Literal } from 'estree'
17-
import { parseAst } from '../parseAst'
16+
import type { Identifier, Literal, Program } from 'estree'
17+
import { parseAst } from 'rolldown/parseAst'
1818
import {
1919
CLIENT_DIR,
2020
CLIENT_PUBLIC_PATH,
@@ -987,7 +987,7 @@ export function transformCjsImport(
987987
importer: string,
988988
config: ResolvedConfig,
989989
): string | undefined {
990-
const node = parseAst(importExp).body[0]
990+
const node = (parseAst(importExp) as Program).body[0]
991991

992992
// `export * from '...'` may cause unexpected problem, so give it a warning
993993
if (

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import MagicString from 'magic-string'
1616
import { stringifyQuery } from 'ufo'
1717
import type { GeneralImportGlobOptions } from 'types/importGlob'
1818
import { escapePath, glob } from 'tinyglobby'
19-
import { parseAstAsync } from '../parseAst'
19+
import { parseAstAsync } from 'rolldown/parseAst'
2020
import type { Plugin } from '../plugin'
2121
import type { EnvironmentModuleNode } from '../server/moduleGraph'
2222
import type { ResolvedConfig } from '../config'

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ import type { RolldownPlugin, RollupError } from 'rolldown'
44
import type { RollupAstNode } from 'rollup'
55
import { stripLiteral } from 'strip-literal'
66
import type { Expression, ExpressionStatement } from 'estree'
7+
import { parseAstAsync } from 'rolldown/parseAst'
78
import type { ResolvedConfig } from '../config'
89
import { evalValue, injectQuery, transformStableResult } from '../utils'
910
import { createBackCompatIdResolver } from '../idResolver'
1011
import type { ResolveIdFn } from '../idResolver'
1112
import { cleanUrl, slash } from '../../shared/utils'
12-
import { parseAstAsync } from '../parseAst'
1313
import type { WorkerType } from './worker'
1414
import { WORKER_FILE_ID, workerFileToUrl } from './worker'
1515
import { fileToUrl } from './asset'

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

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,8 @@ import { TraceMap, originalPositionFor } from '@jridgewell/trace-mapping'
6262
import MagicString from 'magic-string'
6363
import type { FSWatcher } from 'dep-types/chokidar'
6464
import colors from 'picocolors'
65-
import { parseAst as rolldownParseAst } from '../parseAst'
65+
import { parseAst as rolldownParseAst } from 'rolldown/parseAst'
66+
import type { Program } from '@oxc-project/types'
6667
import type { Plugin } from '../plugin'
6768
import {
6869
combineSourcemaps,
@@ -121,10 +122,6 @@ export function throwClosedServerError(): never {
121122
throw err
122123
}
123124

124-
// NOTE: add a env var to use parseAst from rollup for now
125-
const useLegacyParseAst = !!process.env.VITE_USE_LEGACY_PARSE_AST
126-
let legacyParseAst: typeof import('rollup/parseAst').parseAst
127-
128125
export interface PluginContainerOptions {
129126
cwd?: string
130127
output?: OutputOptions
@@ -149,9 +146,6 @@ export async function createEnvironmentPluginContainer(
149146
watcher,
150147
autoStart,
151148
)
152-
if (useLegacyParseAst) {
153-
legacyParseAst = await import('rollup/parseAst').then((mod) => mod.parseAst)
154-
}
155149
await container.resolveRollupOptions()
156150
return container
157151
}
@@ -625,10 +619,7 @@ class PluginContext
625619
super(_container.minimalContext.meta, _container.environment)
626620
}
627621

628-
parse(code: string, opts: any) {
629-
if (useLegacyParseAst) {
630-
return legacyParseAst(code, opts)
631-
}
622+
parse(code: string, opts: any): Program {
632623
return rolldownParseAst(code, opts)
633624
}
634625

packages/vite/src/node/ssr/ssrTransform.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import type {
1818
import { extract_names as extractNames } from 'periscopic'
1919
import { walk as eswalk } from 'estree-walker'
2020
import type { RawSourceMap } from '@ampproject/remapping'
21-
import { parseAstAsync as rolldownParseAstAsync } from '../parseAst'
21+
import { parseAstAsync as rolldownParseAstAsync } from 'rolldown/parseAst'
2222
import type { TransformResult } from '../server/transformRequest'
2323
import {
2424
combineSourcemaps,

0 commit comments

Comments
 (0)