diff --git a/packages/vitest/src/constants.ts b/packages/vitest/src/constants.ts index 913a436ac0b4..0fffb9ca639f 100644 --- a/packages/vitest/src/constants.ts +++ b/packages/vitest/src/constants.ts @@ -49,6 +49,7 @@ export const configDefaults: UserConfig = Object.freeze({ isolate: true, watchIgnore: [/\/node_modules\//, /\/dist\//], update: false, + run: !!process.env.CI, watch: !process.env.CI, reporters: ['default'], silent: false, diff --git a/packages/vitest/src/node/cli.ts b/packages/vitest/src/node/cli.ts index f8522e0c41af..e9b7de56708c 100644 --- a/packages/vitest/src/node/cli.ts +++ b/packages/vitest/src/node/cli.ts @@ -35,7 +35,7 @@ cli cli .command('run [...filters]') - .action(run) + .action((cliFilters: string[], argv: UserConfig) => run(cliFilters, { ...argv, run: true, watch: false })) cli .command('related [...filters]') @@ -43,26 +43,22 @@ cli cli .command('watch [...filters]') - .action(dev) + .action(run) cli .command('dev [...filters]') - .action(dev) + .action(run) cli .command('[...filters]') - .action(dev) + .action(run) cli.parse() async function runRelated(relatedFiles: string[] | string, argv: UserConfig) { argv.related = relatedFiles argv.passWithNoTests ??= true - await dev([], argv) -} - -async function dev(cliFilters: string[], argv: UserConfig) { - await run(cliFilters, argv) + await run([], argv) } async function run(cliFilters: string[], options: UserConfig) { diff --git a/packages/vitest/src/node/plugins/index.ts b/packages/vitest/src/node/plugins/index.ts index b5f1f0b24dc9..d89f8d2cf8a0 100644 --- a/packages/vitest/src/node/plugins/index.ts +++ b/packages/vitest/src/node/plugins/index.ts @@ -57,7 +57,7 @@ export async function VitestPlugin(options: UserConfig = {}, ctx = new Vitest()) options, ) options.api = resolveApiConfig(options) - options.watch = options.watch && !options.run + options.watch &&= !options.run process.env.BASE_URL ??= viteConfig.base process.env.MODE ??= viteConfig.mode