Skip to content

Commit 8485301

Browse files
committed
fix: disable colors in CLI only
1 parent 60bce3f commit 8485301

File tree

3 files changed

+7
-9
lines changed

3 files changed

+7
-9
lines changed

packages/vitest/src/node/cli/cac.ts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@ import type { CLIOption, CLIOptions as CLIOptionsConfig } from './cli-config'
55
import { toArray } from '@vitest/utils/helpers'
66
import cac from 'cac'
77
import { normalize } from 'pathe'
8-
import c from 'tinyrainbow'
8+
import c, { disableDefaultColors } from 'tinyrainbow'
99
import { version } from '../../../package.json' with { type: 'json' }
10+
import { isAgent } from '../../utils/env'
1011
import { benchCliOptionsConfig, cliOptionsConfig, collectCliOptionsConfig } from './cli-config'
1112
import { setupTabCompletions } from './completions'
1213

@@ -74,6 +75,10 @@ function addCliOptions(cli: CAC | Command, options: CLIOptionsConfig<any>) {
7475
}
7576

7677
export function createCLI(options: CliParseOptions = {}): CAC {
78+
if (isAgent) {
79+
disableDefaultColors()
80+
}
81+
7782
const cli = cac('vitest')
7883

7984
cli.version(version)

packages/vitest/src/node/cli/cli-config.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import type { ApiConfig } from '../types/config'
22
import type { CliOptions } from './cli-api'
33
import { defaultBrowserPort, defaultPort } from '../../constants'
4-
import { ReportersMap } from '../reporters'
54

65
type NestedOption<T, V = Extract<T, Record<string, any>>> = V extends
76
| never
@@ -141,7 +140,7 @@ export const cliOptionsConfig: VitestCLIOptions = {
141140
},
142141
reporters: {
143142
alias: 'reporter',
144-
description: `Specify reporters (${Object.keys(ReportersMap).join(', ')})`,
143+
description: `Specify reporters (default, agent, blob, verbose, dot, json, tap, tap-flat, junit, tree, hanging-process, github-actions)`,
145144
argument: '<name>',
146145
subcommands: null, // don't support custom objects
147146
array: true,

packages/vitest/src/node/core.ts

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,10 @@ import { SnapshotManager } from '@vitest/snapshot/manager'
2121
import { deepClone, deepMerge, nanoid, toArray } from '@vitest/utils/helpers'
2222
import { serializeValue } from '@vitest/utils/serialize'
2323
import { join, normalize, relative } from 'pathe'
24-
import { disableDefaultColors } from 'tinyrainbow'
2524
import { isRunnableDevEnvironment } from 'vite'
2625
import { version } from '../../package.json' with { type: 'json' }
2726
import { distDir } from '../paths'
2827
import { wildcardPatternToRegExp } from '../utils/base'
29-
import { isAgent } from '../utils/env'
3028
import { NativeModuleRunner } from '../utils/nativeModuleRunner'
3129
import { convertTasksToEvents } from '../utils/tasks'
3230
import { Traces } from '../utils/traces'
@@ -139,10 +137,6 @@ export class Vitest {
139137
cliOptions: UserConfig,
140138
options: VitestOptions = {},
141139
) {
142-
if (isAgent) {
143-
disableDefaultColors()
144-
}
145-
146140
this._cliOptions = cliOptions
147141
this.logger = new Logger(this, options.stdout, options.stderr)
148142
this.packageInstaller = options.packageInstaller || new VitestPackageInstaller()

0 commit comments

Comments
 (0)