Skip to content

Commit

Permalink
fix: reporters resolving, close #721
Browse files Browse the repository at this point in the history
  • Loading branch information
antfu committed Feb 10, 2022
1 parent 837711d commit f9353f4
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 8 deletions.
2 changes: 1 addition & 1 deletion packages/vitest/src/constants.ts
Expand Up @@ -49,7 +49,7 @@ export const configDefaults: UserConfig = Object.freeze({
isolate: true,
watchIgnore: [/\/node_modules\//, /\/dist\//],
update: false,
reporters: ['default'],
reporters: [],
silent: false,
api: false,
ui: false,
Expand Down
8 changes: 8 additions & 0 deletions packages/vitest/src/node/config.ts
Expand Up @@ -105,5 +105,13 @@ export function resolveConfig(
if (options.related)
resolved.related = toArray(options.related).map(file => resolve(resolved.root, file))

resolved.reporters = Array.from(new Set([
...toArray(resolved.reporters),
// @ts-expect-error from CLI
...toArray(resolved.reporter),
])).filter(Boolean)
if (!resolved.reporters.length)
resolved.reporters.push('default')

return resolved
}
8 changes: 2 additions & 6 deletions packages/vitest/src/node/core.ts
Expand Up @@ -8,7 +8,7 @@ import type { ArgumentsType, Reporter, ResolvedConfig, UserConfig } from '../typ
import { SnapshotManager } from '../integrations/snapshot/manager'
import { deepMerge, hasFailed, noop, slash, toArray } from '../utils'
import { cleanCoverage, reportCoverage } from '../integrations/coverage'
import { DefaultReporter, ReportersMap } from './reporters'
import { ReportersMap } from './reporters'
import { createPool } from './pool'
import type { WorkerPool } from './pool'
import { StateManager } from './state'
Expand Down Expand Up @@ -60,8 +60,7 @@ export class Vitest {
this.config = resolved
this.state = new StateManager()
this.snapshot = new SnapshotManager(resolved)
// @ts-expect-error cli type
this.reporters = toArray(resolved.reporters || resolved.reporter)
this.reporters = resolved.reporters
.map((i) => {
if (typeof i === 'string') {
const Reporter = ReportersMap[i]
Expand All @@ -72,9 +71,6 @@ export class Vitest {
return i
})

if (!this.reporters.length)
this.reporters.push(new DefaultReporter())

if (this.config.watch)
this.registerWatcher()

Expand Down
4 changes: 3 additions & 1 deletion packages/vitest/src/types/config.ts
Expand Up @@ -316,7 +316,7 @@ export interface UserConfig extends InlineConfig {
related?: string[] | string
}

export interface ResolvedConfig extends Omit<Required<UserConfig>, 'config' | 'filters' | 'coverage' | 'testNamePattern' | 'related' | 'api'> {
export interface ResolvedConfig extends Omit<Required<UserConfig>, 'config' | 'filters' | 'coverage' | 'testNamePattern' | 'related' | 'api' | 'reporters'> {
base?: string

config?: string
Expand All @@ -327,5 +327,7 @@ export interface ResolvedConfig extends Omit<Required<UserConfig>, 'config' | 'f
coverage: ResolvedC8Options
snapshotOptions: SnapshotStateOptions

reporters: (Reporter | BuiltinReporters)[]

api?: ApiConfig
}

0 comments on commit f9353f4

Please sign in to comment.