Skip to content

Commit 8cb872e

Browse files
fix(dev): run closeBundle after buildEnd failure (#23165)
1 parent 91ae134 commit 8cb872e

2 files changed

Lines changed: 74 additions & 10 deletions

File tree

‎packages/vite/src/node/server/__tests__/pluginContainer.spec.ts‎

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -477,6 +477,62 @@ describe('plugin container', () => {
477477
})
478478
})
479479
})
480+
481+
describe('closeBundle', () => {
482+
it('passes buildEnd errors to closeBundle', async () => {
483+
const buildEndError = new Error('buildEnd failed')
484+
let closeBundleError: Error | undefined
485+
const environment = await getDevEnvironment({
486+
plugins: [
487+
{
488+
name: 'failing-build-end',
489+
buildEnd() {
490+
throw buildEndError
491+
},
492+
},
493+
{
494+
name: 'close-bundle-cleanup',
495+
closeBundle(error) {
496+
closeBundleError = error
497+
},
498+
},
499+
],
500+
})
501+
502+
await expect(environment.pluginContainer.close()).rejects.toBe(
503+
buildEndError,
504+
)
505+
expect(closeBundleError).toBe(buildEndError)
506+
})
507+
508+
it('passes no error to closeBundle when buildEnd succeeds', async () => {
509+
let buildEndCalled = false
510+
let closeBundleCalled = false
511+
let closeBundleError: Error | undefined
512+
const environment = await getDevEnvironment({
513+
plugins: [
514+
{
515+
name: 'successful-build-end',
516+
buildEnd() {
517+
buildEndCalled = true
518+
},
519+
},
520+
{
521+
name: 'close-bundle-cleanup',
522+
closeBundle(error) {
523+
closeBundleCalled = true
524+
closeBundleError = error
525+
},
526+
},
527+
],
528+
})
529+
530+
await expect(environment.pluginContainer.close()).resolves.toBeUndefined()
531+
expect(buildEndCalled).toBe(true)
532+
expect(closeBundleCalled).toBe(true)
533+
expect(closeBundleError).toBeUndefined()
534+
})
535+
})
480536
})
481537

482538
async function getDevEnvironment(

‎packages/vite/src/node/server/pluginContainer.ts‎

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -646,20 +646,28 @@ class EnvironmentPluginContainer<Env extends Environment = Environment> {
646646
this._closed = true
647647
await Promise.allSettled(Array.from(this._processesing))
648648
const config = this.environment.getTopLevelConfig()
649-
await this.hookParallel(
650-
'buildEnd',
651-
(plugin) => this._getPluginContext(plugin),
652-
() => [],
653-
(plugin) =>
654-
this.environment.name === 'client' ||
655-
config.server.perEnvironmentStartEndDuringDev ||
656-
plugin.perEnvironmentStartEndDuringDev,
657-
)
649+
let buildEndError: Error | undefined
650+
try {
651+
await this.hookParallel(
652+
'buildEnd',
653+
(plugin) => this._getPluginContext(plugin),
654+
() => [],
655+
(plugin) =>
656+
this.environment.name === 'client' ||
657+
config.server.perEnvironmentStartEndDuringDev ||
658+
plugin.perEnvironmentStartEndDuringDev,
659+
)
660+
} catch (error) {
661+
buildEndError = error as Error
662+
}
658663
await this.hookParallel(
659664
'closeBundle',
660665
(plugin) => this._getPluginContext(plugin),
661-
() => [],
666+
() => [buildEndError],
662667
)
668+
if (buildEndError) {
669+
throw buildEndError
670+
}
663671
}
664672
}
665673

0 commit comments

Comments
 (0)