diff --git a/packages/vite/src/node/server/__tests__/pluginContainer.spec.ts b/packages/vite/src/node/server/__tests__/pluginContainer.spec.ts index 99af8546dedd18..88a3dfbcabe066 100644 --- a/packages/vite/src/node/server/__tests__/pluginContainer.spec.ts +++ b/packages/vite/src/node/server/__tests__/pluginContainer.spec.ts @@ -428,6 +428,62 @@ describe('plugin container', () => { }) }) }) + + describe('closeBundle', () => { + it('passes buildEnd errors to closeBundle', async () => { + const buildEndError = new Error('buildEnd failed') + let closeBundleError: Error | undefined + const environment = await getDevEnvironment({ + plugins: [ + { + name: 'failing-build-end', + buildEnd() { + throw buildEndError + }, + }, + { + name: 'close-bundle-cleanup', + closeBundle(error) { + closeBundleError = error + }, + }, + ], + }) + + await expect(environment.pluginContainer.close()).rejects.toBe( + buildEndError, + ) + expect(closeBundleError).toBe(buildEndError) + }) + + it('passes no error to closeBundle when buildEnd succeeds', async () => { + let buildEndCalled = false + let closeBundleCalled = false + let closeBundleError: Error | undefined + const environment = await getDevEnvironment({ + plugins: [ + { + name: 'successful-build-end', + buildEnd() { + buildEndCalled = true + }, + }, + { + name: 'close-bundle-cleanup', + closeBundle(error) { + closeBundleCalled = true + closeBundleError = error + }, + }, + ], + }) + + await expect(environment.pluginContainer.close()).resolves.toBeUndefined() + expect(buildEndCalled).toBe(true) + expect(closeBundleCalled).toBe(true) + expect(closeBundleError).toBeUndefined() + }) + }) }) async function getDevEnvironment( diff --git a/packages/vite/src/node/server/pluginContainer.ts b/packages/vite/src/node/server/pluginContainer.ts index 081b57d4476bf6..9f5a24ab186e4e 100644 --- a/packages/vite/src/node/server/pluginContainer.ts +++ b/packages/vite/src/node/server/pluginContainer.ts @@ -646,20 +646,28 @@ class EnvironmentPluginContainer { this._closed = true await Promise.allSettled(Array.from(this._processesing)) const config = this.environment.getTopLevelConfig() - await this.hookParallel( - 'buildEnd', - (plugin) => this._getPluginContext(plugin), - () => [], - (plugin) => - this.environment.name === 'client' || - config.server.perEnvironmentStartEndDuringDev || - plugin.perEnvironmentStartEndDuringDev, - ) + let buildEndError: Error | undefined + try { + await this.hookParallel( + 'buildEnd', + (plugin) => this._getPluginContext(plugin), + () => [], + (plugin) => + this.environment.name === 'client' || + config.server.perEnvironmentStartEndDuringDev || + plugin.perEnvironmentStartEndDuringDev, + ) + } catch (error) { + buildEndError = error as Error + } await this.hookParallel( 'closeBundle', (plugin) => this._getPluginContext(plugin), - () => [], + () => [buildEndError], ) + if (buildEndError) { + throw buildEndError + } } }