wip: use parseAst function from rollup

sapphi-red · Oct 5, 2023 · 19c2d76 · 19c2d76
1 parent a274f82
commit 19c2d76
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 36 deletions.
diff --git a/packages/vite/rollup.config.ts b/packages/vite/rollup.config.ts
@@ -161,6 +161,7 @@ function createNodeConfig(isProduction: boolean) {
     external: [
       'fsevents',
       'lightningcss',
+      'rollup/parseAst',
       ...Object.keys(pkg.dependencies),
       ...(isProduction ? [] : Object.keys(pkg.devDependencies)),
     ],

diff --git a/packages/vite/src/node/server/pluginContainer.ts b/packages/vite/src/node/server/pluginContainer.ts
@@ -32,7 +32,8 @@ SOFTWARE.
 import fs from 'node:fs'
 import { join } from 'node:path'
 import { performance } from 'node:perf_hooks'
-import { rollup, VERSION as rollupVersion } from 'rollup'
+import { VERSION as rollupVersion } from 'rollup'
+import { parseAst as rollupParseAst } from 'rollup/parseAst'
 import type {
   AstNode,
   AsyncPluginHooks,
@@ -152,28 +153,6 @@ export type RollupParseFunc = (
   options?: { allowReturnOutsideFunction?: boolean },
 ) => AstNode
 
-export const getRollupParseFunc = async (): Promise<RollupParseFunc> => {
-  let rollupParse!: RollupParseFunc
-  await rollup({
-    input: 'dummy',
-    plugins: [
-      {
-        name: 'get-parse',
-        resolveId(id) {
-          return id
-        },
-        load(id) {
-          return ''
-        },
-        transform(code, id) {
-          rollupParse = this.parse
-        },
-      },
-    ],
-  })
-  return rollupParse
-}
-
 export async function createPluginContainer(
   config: ResolvedConfig,
   moduleGraph?: ModuleGraph,
@@ -297,8 +276,6 @@ export async function createPluginContainer(
     }
   }
 
-  const rollupParseFunc = await getRollupParseFunc()
-
   // we should create a new context for each async hook pipeline so that the
   // active plugin in that pipeline can be tracked in a concurrency-safe manner.
   // using a class to make creating new contexts more efficient
@@ -317,7 +294,7 @@ export async function createPluginContainer(
     }
 
     parse(code: string, opts: any) {
-      return rollupParseFunc(code, opts)
+      return rollupParseAst(code, opts)
     }
 
     async resolve(

diff --git a/packages/vite/src/node/ssr/ssrTransform.ts b/packages/vite/src/node/ssr/ssrTransform.ts
@@ -12,9 +12,8 @@ import type {
 import { extract_names as extractNames } from 'periscopic'
 import { walk as eswalk } from 'estree-walker'
 import type { RawSourceMap } from '@ampproject/remapping'
+import { parseAst as rollupParseAst } from 'rollup/parseAst'
 import type { TransformResult } from '../server/transformRequest'
-import type { RollupParseFunc } from '../server/pluginContainer'
-import { getRollupParseFunc } from '../server/pluginContainer'
 import { combineSourcemaps } from '../utils'
 import { isJSONRequest } from '../plugins/json'
 
@@ -62,8 +61,6 @@ async function ssrTransformJSON(
   }
 }
 
-let rollupParseFunc: RollupParseFunc | undefined
-
 async function ssrTransformScript(
   code: string,
   inMap: SourceMap | { mappings: '' } | null,
@@ -72,13 +69,9 @@ async function ssrTransformScript(
 ): Promise<TransformResult | null> {
   const s = new MagicString(code)
 
-  if (!rollupParseFunc) {
-    rollupParseFunc = await getRollupParseFunc()
-  }
-
   let ast: any
   try {
-    ast = rollupParseFunc(code)
+    ast = rollupParseAst(code)
   } catch (err) {
     if (!err.loc || !err.loc.line) throw err
     const line = err.loc.line

diff --git a/packages/vite/tsconfig.base.json b/packages/vite/tsconfig.base.json
@@ -2,7 +2,7 @@
   "compilerOptions": {
     "target": "ES2022",
     "module": "ESNext",
-    "moduleResolution": "node",
+    "moduleResolution": "Bundler",
     "strict": true,
     "declaration": true,
     "noImplicitOverride": true,