fix: await scanner (#11242)

vitejs · Dec 7, 2022 · 52a6732 · 52a6732
1 parent 8043fe4
commit 52a6732
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/packages/vite/src/node/optimizer/optimizer.ts b/packages/vite/src/node/optimizer/optimizer.ts
@@ -161,10 +161,16 @@ async function createDepsOptimizer(
   let firstRunCalled = !!cachedMetadata
 
   let postScanOptimizationResult: Promise<DepOptimizationResult> | undefined
+  let discoverProjectDependenciesPromise:
+    | Promise<Record<string, string>>
+    | undefined
 
   let optimizingNewDeps: Promise<DepOptimizationResult> | undefined
   async function close() {
     closed = true
+    await discoverProjectDependenciesPromise?.catch(() => {
+      /* ignore error for scanner because it's not important */
+    })
     await postScanOptimizationResult
     await optimizingNewDeps
   }
@@ -202,7 +208,9 @@ async function createDepsOptimizer(
         try {
           debug(colors.green(`scanning for dependencies...`))
 
-          const deps = await discoverProjectDependencies(config)
+          discoverProjectDependenciesPromise =
+            discoverProjectDependencies(config)
+          const deps = await discoverProjectDependenciesPromise
 
           debug(
             colors.green(

diff --git a/playground/multiple-entrypoints/__tests__/multiple-entrypoints.spec.ts b/playground/multiple-entrypoints/__tests__/multiple-entrypoints.spec.ts
@@ -1,7 +1,7 @@
 import { expect, test } from 'vitest'
 import { getColor, page, untilUpdated } from '~utils'
 
-test.skip('should have css applied on second dynamic import', async () => {
+test('should have css applied on second dynamic import', async () => {
   await untilUpdated(() => page.textContent('.content'), 'Initial', true)
   await page.click('.b')