From acd8f5acd6ab6ab8932ca44043a4dd74b2b07b0d Mon Sep 17 00:00:00 2001 From: yoho Date: Fri, 21 Oct 2022 01:47:29 +0800 Subject: [PATCH 1/2] fix: cli-path --- packages/vitest/src/node/cli.ts | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/packages/vitest/src/node/cli.ts b/packages/vitest/src/node/cli.ts index 2650ca6481c5..bf2e73984ced 100644 --- a/packages/vitest/src/node/cli.ts +++ b/packages/vitest/src/node/cli.ts @@ -1,3 +1,4 @@ +import { normalize } from 'pathe' import cac from 'cac' import c from 'picocolors' import { version } from '../../package.json' @@ -79,22 +80,22 @@ async function runRelated(relatedFiles: string[] | string, argv: CliOptions): Pr async function watch(cliFilters: string[], options: CliOptions): Promise { options.watch = true - await start('test', cliFilters, options) + await start('test', cliFilters.map(normalize), options) } async function run(cliFilters: string[], options: CliOptions): Promise { options.run = true - await start('test', cliFilters, options) + await start('test', cliFilters.map(normalize), options) } async function benchmark(cliFilters: string[], options: CliOptions): Promise { console.warn(c.yellow('Benchmarking is an experimental feature.\nBreaking changes might not follow semver, please pin Vitest\'s version when using it.')) - await start('benchmark', cliFilters, options) + await start('benchmark', cliFilters.map(normalize), options) } async function start(mode: VitestRunMode, cliFilters: string[], options: CliOptions): Promise { try { - if (await startVitest(mode, cliFilters, options) === false) + if (await startVitest(mode, cliFilters.map(normalize), options) === false) process.exit() } catch (e) { From 5626151142bfa9991605a2ea2fb23941322d60e0 Mon Sep 17 00:00:00 2001 From: yoho Date: Fri, 21 Oct 2022 10:33:41 +0800 Subject: [PATCH 2/2] feat: normalizeOptions --- packages/vitest/src/node/cli.ts | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/packages/vitest/src/node/cli.ts b/packages/vitest/src/node/cli.ts index bf2e73984ced..2b09917730df 100644 --- a/packages/vitest/src/node/cli.ts +++ b/packages/vitest/src/node/cli.ts @@ -80,22 +80,29 @@ async function runRelated(relatedFiles: string[] | string, argv: CliOptions): Pr async function watch(cliFilters: string[], options: CliOptions): Promise { options.watch = true - await start('test', cliFilters.map(normalize), options) + await start('test', cliFilters, options) } async function run(cliFilters: string[], options: CliOptions): Promise { options.run = true - await start('test', cliFilters.map(normalize), options) + await start('test', cliFilters, options) } async function benchmark(cliFilters: string[], options: CliOptions): Promise { console.warn(c.yellow('Benchmarking is an experimental feature.\nBreaking changes might not follow semver, please pin Vitest\'s version when using it.')) - await start('benchmark', cliFilters.map(normalize), options) + await start('benchmark', cliFilters, options) +} + +function normalizeOptions(argv: CliOptions): CliOptions { + argv.root = argv.root && normalize(argv.root) + argv.config = argv.config && normalize(argv.config) + argv.dir = argv.dir && normalize(argv.dir) + return argv } async function start(mode: VitestRunMode, cliFilters: string[], options: CliOptions): Promise { try { - if (await startVitest(mode, cliFilters.map(normalize), options) === false) + if (await startVitest(mode, cliFilters.map(normalize), normalizeOptions(options)) === false) process.exit() } catch (e) {