feat: merge viteConfig.test in configResolved

packages/vitest/src/node/plugins/index.ts

@@ -19,8 +19,11 @@ export async function VitestPlugin(options: UserConfig = {}, ctx = new Vitest())
  name: 'vitest',
  enforce: 'pre',
  config(viteConfig: any) {
- options = deepMerge(options, viteConfig.test || {})
- options.api = resolveApiConfig(options)
+ // preliminary merge of options to be able to create server options for vite
+ // however to allow vitest plugins to modify vitest config values
+ // this is repeated in configResolved where the config is final
+ const preOptions = deepMerge(options, viteConfig.test || {})
+ preOptions.api = resolveApiConfig(preOptions)
  return {
  clearScreen: false,
  resolve: {
@@ -29,9 +32,9 @@ export async function VitestPlugin(options: UserConfig = {}, ctx = new Vitest())
  mainFields: [],
  },
  server: {
- ...options.api,
- open: options.ui && options.open
- ? options.uiBase ?? '/__vitest__/'
+ ...preOptions.api,
+ open: preOptions.ui && preOptions.open
+ ? preOptions.uiBase ?? '/__vitest__/'
  : undefined,
  preTransformRequests: false,
  },
@@ -42,6 +45,11 @@ export async function VitestPlugin(options: UserConfig = {}, ctx = new Vitest())
  cacheDir: undefined,
  }
  },
+ async configResolved(viteConfig) {
+ // viteConfig.test is final now, merge it for real
+ options = deepMerge(options, viteConfig.test as any || {})
+ options.api = resolveApiConfig(options)
+ },
  async configureServer(server) {
  if (haveStarted)
  await ctx.report('onServerRestart')

test/global-setup/setupFiles/add-something-to-global.ts

@@ -0,0 +1,11 @@
+import { afterAll, beforeAll } from 'vitest'
+
+beforeAll(() => {
+ // @ts-expect-error type
+ global.something = 'something'
+})
+
+afterAll(() => {
+ // @ts-expect-error type
+ delete global.something
+})

test/global-setup/test/setup-files.test.ts

@@ -0,0 +1,6 @@
+
+test('something has been added to global by setupFiles entry', async() => {
+ // @ts-expect-error type
+ const result = something
+ expect(result).toBe('something')
+})

test/global-setup/vitest.config.ts

@@ -3,13 +3,19 @@
 import { defineConfig } from 'vite'
 
 export default defineConfig({
+ plugins: [{
+ name: 'a-vitest-plugin-that-changes-config',
+ config: () => ({
+ test: { setupFiles: ['./setupFiles/add-something-to-global.ts'] },
+ }),
+ }],
  test: {
  globals: true,
  globalSetup: [
- './setupFiles/default-export.js',
- './setupFiles/named-exports.js',
- './setupFiles/ts-with-imports.ts',
- './setupFiles/another-vite-instance.ts',
+ './globalSetup/default-export.js',
+ './globalSetup/named-exports.js',
+ './globalSetup/ts-with-imports.ts',
+ './globalSetup/another-vite-instance.ts',
  ],
  },
 })