From fb0656a089fbf6109df8a64ec3c6b976ff43d343 Mon Sep 17 00:00:00 2001 From: Ivan Demchuk Date: Mon, 24 Jan 2022 10:56:31 +0200 Subject: [PATCH 1/2] fix: do not merge options multiple times --- packages/vitest/src/node/config.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/vitest/src/node/config.ts b/packages/vitest/src/node/config.ts index 67c820bea11c..524393978f18 100644 --- a/packages/vitest/src/node/config.ts +++ b/packages/vitest/src/node/config.ts @@ -56,7 +56,7 @@ export function resolveConfig( const globals = options?.global ?? options.globals const resolved = { - ...deepMerge(options, viteConfig.test || {}), + ...options, root: viteConfig.root, globals, global: globals, From 55eb976ea278316496d9fb782909b1507303bdb1 Mon Sep 17 00:00:00 2001 From: Ivan Demchuk Date: Mon, 24 Jan 2022 11:15:25 +0200 Subject: [PATCH 2/2] chore: fix lint warning --- packages/vitest/src/node/config.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/vitest/src/node/config.ts b/packages/vitest/src/node/config.ts index 524393978f18..b4fe29077db3 100644 --- a/packages/vitest/src/node/config.ts +++ b/packages/vitest/src/node/config.ts @@ -4,7 +4,7 @@ import type { ResolvedConfig as ResolvedViteConfig, UserConfig as ViteUserConfig import type { ApiConfig, ResolvedConfig, UserConfig } from '../types' import { defaultExclude, defaultInclude, defaultPort } from '../constants' import { resolveC8Options } from '../coverage' -import { deepMerge, toArray } from '../utils' +import { toArray } from '../utils' export function resolveApiConfig( options: Options,