fix(optimizer): repsect alias in pre-bundling

fix #1674
vitejs · Jan 23, 2021 · 2824d06 · 2824d06
1 parent 93da168
commit 2824d06
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/packages/vite/src/node/optimizer/esbuildDepPlugin.ts b/packages/vite/src/node/optimizer/esbuildDepPlugin.ts
@@ -5,13 +5,15 @@ import { ResolvedConfig } from '..'
 import chalk from 'chalk'
 import { deepImportRE, isBuiltin } from '../utils'
 import { tryNodeResolve } from '../plugins/resolve'
+import { PluginContainer } from '../server/pluginContainer'
 
 const externalTypes = ['css', 'vue', 'svelte', ...knownAssetTypes]
 
 export function esbuildDepPlugin(
   qualified: Record<string, string>,
   config: ResolvedConfig,
-  transitiveOptimized: Record<string, true>
+  transitiveOptimized: Record<string, true>,
+  aliasResolver: PluginContainer
 ): Plugin {
   return {
     name: 'vite:dep-pre-bundle',
@@ -32,7 +34,7 @@ export function esbuildDepPlugin(
         }
       )
 
-      build.onResolve({ filter: /^[\w@]/ }, ({ path: id, importer }) => {
+      build.onResolve({ filter: /^[\w@]/ }, async ({ path: id, importer }) => {
         // ensure esbuild uses our resolved entires of optimized deps in all
         // cases
         if (id in qualified) {
@@ -44,6 +46,8 @@ export function esbuildDepPlugin(
           const deepMatch = id.match(deepImportRE)
           const pkgId = deepMatch ? deepMatch[1] || deepMatch[2] : id
           transitiveOptimized[pkgId] = true
+
+          id = (await aliasResolver.resolveId(id))?.id || id
           const resolved = tryNodeResolve(
             id,
             path.dirname(importer),

diff --git a/packages/vite/src/node/optimizer/index.ts b/packages/vite/src/node/optimizer/index.ts
@@ -239,7 +239,14 @@ export async function optimizeDeps(
     define: {
       'process.env.NODE_ENV': '"development"'
     },
-    plugins: [esbuildDepPlugin(qualified, config, data.transitiveOptimized)]
+    plugins: [
+      esbuildDepPlugin(
+        qualified,
+        config,
+        data.transitiveOptimized,
+        aliasResolver
+      )
+    ]
   })
 
   const meta = JSON.parse(fs.readFileSync(esbuildMetaPath, 'utf-8'))