Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 56 additions & 0 deletions packages/vite/src/node/server/__tests__/pluginContainer.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
28 changes: 18 additions & 10 deletions packages/vite/src/node/server/pluginContainer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -646,20 +646,28 @@ class EnvironmentPluginContainer<Env extends Environment = Environment> {
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
}
}
}

Expand Down