From cad16cda36dc568979d8f62ebe69dd879d57f505 Mon Sep 17 00:00:00 2001 From: Leo Date: Wed, 5 Aug 2026 13:14:07 +0800 Subject: [PATCH 1/2] fix(dev): run closeBundle after buildEnd failure --- .../__tests__/pluginContainer-close.spec.ts | 74 +++++++++++++++++++ .../vite/src/node/server/pluginContainer.ts | 28 ++++--- 2 files changed, 92 insertions(+), 10 deletions(-) create mode 100644 packages/vite/src/node/server/__tests__/pluginContainer-close.spec.ts diff --git a/packages/vite/src/node/server/__tests__/pluginContainer-close.spec.ts b/packages/vite/src/node/server/__tests__/pluginContainer-close.spec.ts new file mode 100644 index 00000000000000..5045f3a224f93c --- /dev/null +++ b/packages/vite/src/node/server/__tests__/pluginContainer-close.spec.ts @@ -0,0 +1,74 @@ +import { expect, it } from 'vitest' +import type { UserConfig } from '../../config' +import { resolveConfig } from '../../config' +import { DevEnvironment } from '../environment' + +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( + inlineConfig?: UserConfig, +): Promise { + const config = await resolveConfig( + { configFile: false, ...inlineConfig }, + 'serve', + ) + + // @ts-expect-error This plugin requires a ViteDevServer instance. + config.plugins = config.plugins.filter( + (plugin) => !plugin.name.includes('pre-alias'), + ) + + const environment = new DevEnvironment('client', config, { hot: true }) + await environment.init() + return environment +} 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 + } } } From b077cd171d4aa71e012ed5f887850b7b9a04b1e3 Mon Sep 17 00:00:00 2001 From: sapphi-red Date: Thu, 6 Aug 2026 12:50:56 +0900 Subject: [PATCH 2/2] chore: move tests --- .../__tests__/pluginContainer-close.spec.ts | 74 ------------------- .../server/__tests__/pluginContainer.spec.ts | 56 ++++++++++++++ 2 files changed, 56 insertions(+), 74 deletions(-) delete mode 100644 packages/vite/src/node/server/__tests__/pluginContainer-close.spec.ts diff --git a/packages/vite/src/node/server/__tests__/pluginContainer-close.spec.ts b/packages/vite/src/node/server/__tests__/pluginContainer-close.spec.ts deleted file mode 100644 index 5045f3a224f93c..00000000000000 --- a/packages/vite/src/node/server/__tests__/pluginContainer-close.spec.ts +++ /dev/null @@ -1,74 +0,0 @@ -import { expect, it } from 'vitest' -import type { UserConfig } from '../../config' -import { resolveConfig } from '../../config' -import { DevEnvironment } from '../environment' - -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( - inlineConfig?: UserConfig, -): Promise { - const config = await resolveConfig( - { configFile: false, ...inlineConfig }, - 'serve', - ) - - // @ts-expect-error This plugin requires a ViteDevServer instance. - config.plugins = config.plugins.filter( - (plugin) => !plugin.name.includes('pre-alias'), - ) - - const environment = new DevEnvironment('client', config, { hot: true }) - await environment.init() - return environment -} 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(