From 3e0392e355271fdc6607d7a285c16f4b4582d6a9 Mon Sep 17 00:00:00 2001 From: sapphi-red Date: Wed, 7 Dec 2022 21:23:01 +0900 Subject: [PATCH 1/3] fix: await scanner --- packages/vite/src/node/optimizer/optimizer.ts | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/packages/vite/src/node/optimizer/optimizer.ts b/packages/vite/src/node/optimizer/optimizer.ts index 7653e9ae87a3fa..0061ab9d128d40 100644 --- a/packages/vite/src/node/optimizer/optimizer.ts +++ b/packages/vite/src/node/optimizer/optimizer.ts @@ -161,10 +161,14 @@ async function createDepsOptimizer( let firstRunCalled = !!cachedMetadata let postScanOptimizationResult: Promise | undefined + let discoverProjectDependenciesPromise: + | Promise> + | undefined let optimizingNewDeps: Promise | undefined async function close() { closed = true + await discoverProjectDependenciesPromise await postScanOptimizationResult await optimizingNewDeps } @@ -202,7 +206,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( From 8a500518ec92d6ebeef95f2732703dbfc2f8f59f Mon Sep 17 00:00:00 2001 From: sapphi-red Date: Wed, 7 Dec 2022 21:28:55 +0900 Subject: [PATCH 2/3] fix: await scanner --- packages/vite/src/node/optimizer/optimizer.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/vite/src/node/optimizer/optimizer.ts b/packages/vite/src/node/optimizer/optimizer.ts index 0061ab9d128d40..a791f8a1dd45b5 100644 --- a/packages/vite/src/node/optimizer/optimizer.ts +++ b/packages/vite/src/node/optimizer/optimizer.ts @@ -168,7 +168,9 @@ async function createDepsOptimizer( let optimizingNewDeps: Promise | undefined async function close() { closed = true - await discoverProjectDependenciesPromise + await discoverProjectDependenciesPromise?.catch(() => { + /* ignore error for scanner because it's not important */ + }) await postScanOptimizationResult await optimizingNewDeps } From 2eba63996b28bb5646bcf55d2fe4d6e53225ac39 Mon Sep 17 00:00:00 2001 From: sapphi-red Date: Wed, 7 Dec 2022 21:32:27 +0900 Subject: [PATCH 3/3] test: don't skip multiple-entrypoints playground --- .../multiple-entrypoints/__tests__/multiple-entrypoints.spec.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/playground/multiple-entrypoints/__tests__/multiple-entrypoints.spec.ts b/playground/multiple-entrypoints/__tests__/multiple-entrypoints.spec.ts index 71b93a4fa97281..8215fb8f301fab 100644 --- 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')