Skip to content

Commit 63567c7

Browse files
authored
chore(optimizer): add debug log when waiting for dep before init (#23566)
1 parent e8990c4 commit 63567c7

3 files changed

Lines changed: 16 additions & 9 deletions

File tree

‎packages/vite/src/node/optimizer/index.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ export type ExportsData = {
5757

5858
export interface DepsOptimizer {
5959
init: () => Promise<void>
60+
initState: 'idle' | 'initializing' | 'initialized'
6061

6162
metadata: DepOptimizationMetadata
6263
scanProcessing?: Promise<void>

‎packages/vite/src/node/optimizer/optimizer.ts‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ export function createDepsOptimizer(
5858

5959
const depsOptimizer: DepsOptimizer = {
6060
init,
61+
initState: 'idle',
6162
metadata,
6263
registerMissingImport,
6364
run: () => debouncedProcessing(0),
@@ -154,10 +155,9 @@ export function createDepsOptimizer(
154155
])
155156
}
156157

157-
let initState: 'idle' | 'initializing' | 'initialized' = 'idle'
158158
async function init() {
159-
if (initState !== 'idle') return
160-
initState = 'initializing'
159+
if (depsOptimizer.initState !== 'idle') return
160+
depsOptimizer.initState = 'initializing'
161161

162162
const cachedMetadata = await loadCachedDepOptimizationMetadata(environment)
163163

@@ -283,7 +283,7 @@ export function createDepsOptimizer(
283283
})
284284
}
285285
}
286-
initState = 'initialized'
286+
depsOptimizer.initState = 'initialized'
287287
}
288288

289289
function startNextDiscoveredBatch() {
@@ -583,7 +583,7 @@ export function createDepsOptimizer(
583583
// A module can be transformed between `createServer()` and `server.listen()`,
584584
// which discovers a dep before `init()` runs. Starting a run here would race
585585
// with `init()` resetting the metadata and crash in `commitProcessing`.
586-
if (initState === 'initialized' && !waitingForCrawlEnd) {
586+
if (depsOptimizer.initState === 'initialized' && !waitingForCrawlEnd) {
587587
// Debounced rerun, let other missing dependencies be discovered before
588588
// the running next optimizeDeps
589589
debouncedProcessing()
@@ -753,8 +753,9 @@ export function createDepsOptimizer(
753753
export function createExplicitDepsOptimizer(
754754
environment: DevEnvironment,
755755
): DepsOptimizer {
756-
const depsOptimizer = {
756+
const depsOptimizer: DepsOptimizer = {
757757
metadata: initDepsOptimizerMetadata(environment),
758+
initState: 'idle',
758759
isOptimizedDepFile: createIsOptimizedDepFile(environment),
759760
isOptimizedDepUrl: createIsOptimizedDepUrl(environment),
760761
getOptimizedDepId: (depInfo: OptimizedDepInfo) =>
@@ -774,12 +775,12 @@ export function createExplicitDepsOptimizer(
774775
options: environment.config.optimizeDeps,
775776
}
776777

777-
let inited = false
778778
async function init() {
779-
if (inited) return
780-
inited = true
779+
if (depsOptimizer.initState !== 'idle') return
780+
depsOptimizer.initState = 'initializing'
781781

782782
depsOptimizer.metadata = await optimizeExplicitEnvironmentDeps(environment)
783+
depsOptimizer.initState = 'initialized'
783784
}
784785

785786
return depsOptimizer

‎packages/vite/src/node/plugins/optimizedDeps.ts‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,11 @@ export function optimizedDepsPlugin(): Plugin {
6262
}
6363
try {
6464
// This is an entry point, it may still not be bundled
65+
if (info.processing && depsOptimizer.initState === 'idle') {
66+
debug?.(
67+
`transforming ${colors.cyan(file)} is waiting for the dependency optimizer to initialize`,
68+
)
69+
}
6570
await info.processing
6671
} catch {
6772
// If the refresh has not happened after timeout, Vite considers

0 commit comments

Comments
 (0)