From db14ab714dfe258a7c0a023d63873e793c4e07aa Mon Sep 17 00:00:00 2001 From: Hiroshi Ogawa Date: Fri, 7 Mar 2025 16:37:13 +0900 Subject: [PATCH] fix: cleanup vitest in public `resolveConfig` API (#7623) --- packages/vitest/src/node/plugins/publicConfig.ts | 1 + test/config/test/browser-configs.test.ts | 6 ++++-- test/config/test/override.test.ts | 3 ++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/packages/vitest/src/node/plugins/publicConfig.ts b/packages/vitest/src/node/plugins/publicConfig.ts index fc34b7acc..f58038b69 100644 --- a/packages/vitest/src/node/plugins/publicConfig.ts +++ b/packages/vitest/src/node/plugins/publicConfig.ts @@ -49,6 +49,7 @@ export async function resolveConfig( updatedOptions, config, ) + await vitest.close() return { viteConfig: config, vitestConfig, diff --git a/test/config/test/browser-configs.test.ts b/test/config/test/browser-configs.test.ts index 827594c03..cb5062dd8 100644 --- a/test/config/test/browser-configs.test.ts +++ b/test/config/test/browser-configs.test.ts @@ -1,10 +1,12 @@ import type { ViteUserConfig } from 'vitest/config' import type { UserConfig, VitestOptions } from 'vitest/node' -import { expect, test } from 'vitest' +import { expect, onTestFinished, test } from 'vitest' import { createVitest } from 'vitest/node' async function vitest(cliOptions: UserConfig, configValue: UserConfig = {}, viteConfig: ViteUserConfig = {}, vitestOptions: VitestOptions = {}) { - return await createVitest('test', { ...cliOptions, watch: false }, { ...viteConfig, test: configValue as any }, vitestOptions) + const vitest = await createVitest('test', { ...cliOptions, watch: false }, { ...viteConfig, test: configValue as any }, vitestOptions) + onTestFinished(() => vitest.close()) + return vitest } test('assignes names as browsers', async () => { diff --git a/test/config/test/override.test.ts b/test/config/test/override.test.ts index ceb4158aa..19691dc00 100644 --- a/test/config/test/override.test.ts +++ b/test/config/test/override.test.ts @@ -1,6 +1,6 @@ import type { UserConfig as ViteUserConfig } from 'vite' import type { UserConfig } from 'vitest/node' -import { describe, expect, it } from 'vitest' +import { describe, expect, it, onTestFinished } from 'vitest' import { extraInlineDeps } from 'vitest/config' import { createVitest, parseCLI } from 'vitest/node' @@ -8,6 +8,7 @@ type VitestOptions = Parameters[3] async function vitest(cliOptions: UserConfig, configValue: UserConfig = {}, viteConfig: ViteUserConfig = {}, vitestOptions: VitestOptions = {}) { const vitest = await createVitest('test', { ...cliOptions, watch: false }, { ...viteConfig, test: configValue as any }, vitestOptions) + onTestFinished(() => vitest.close()) return vitest } -- 2.51.2