Skip to content

Commit

Permalink
fix: do not merge options multiple times (fix #616) (#618)
Browse files Browse the repository at this point in the history
  • Loading branch information
Demivan committed Jan 24, 2022
1 parent b9d092b commit be388c9
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions packages/vitest/src/node/config.ts
Expand Up @@ -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 extends ApiConfig & UserConfig>(
options: Options,
Expand Down Expand Up @@ -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,
Expand Down

0 comments on commit be388c9

Please sign in to comment.