fix: await init rollup/parseAst in buildStart

vitejs · Jan 18, 2024 · ad32d57 · ad32d57
1 parent 63e2c1b
commit ad32d57
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/packages/vite/src/node/plugins/assetImportMetaUrl.ts b/packages/vite/src/node/plugins/assetImportMetaUrl.ts
@@ -5,7 +5,6 @@ import type { Plugin } from '../plugin'
 import type { ResolvedConfig } from '../config'
 import type { ResolveFn } from '../'
 import {
-  initRollupParseAst,
   injectQuery,
   isParentDirectory,
   slash,
@@ -56,8 +55,6 @@ export function assetImportMetaUrlPlugin(config: ResolvedConfig): Plugin {
           /\bnew\s+URL\s*\(\s*('[^']+'|"[^"]+"|`[^`]+`)\s*,\s*import\.meta\.url\s*(?:,\s*)?\)/dg
         const cleanString = stripLiteral(code)
 
-        await initRollupParseAst()
-
         let match: RegExpExecArray | null
         while ((match = assetImportMetaUrlRE.exec(cleanString))) {
           const [[startIndex, endIndex], [urlStart, urlEnd]] = match.indices!

diff --git a/packages/vite/src/node/server/pluginContainer.ts b/packages/vite/src/node/server/pluginContainer.ts
@@ -68,6 +68,7 @@ import {
   createDebugger,
   ensureWatchedFile,
   generateCodeFrame,
+  initRollupParseAst,
   isExternalUrl,
   isObject,
   normalizePath,
@@ -164,6 +165,8 @@ export async function createPluginContainer(
   const { getSortedPluginHooks, getSortedPlugins } =
     createPluginHookUtils(plugins)
 
+  const initRollupParseAstPromise = initRollupParseAst()
+
   const seenResolves: Record<string, true | undefined> = {}
   const debugResolve = createDebugger('vite:resolve')
   const debugPluginResolve = createDebugger('vite:plugin-resolve', {
@@ -655,6 +658,7 @@ export async function createPluginContainer(
     getModuleInfo,
 
     async buildStart() {
+      await initRollupParseAstPromise
       await handleHookPromise(
         hookParallel(
           'buildStart',