From e4188198273fb0d4ef5b7851dba79117ec0522fc Mon Sep 17 00:00:00 2001 From: Guo Yunhe Date: Mon, 14 Nov 2022 22:29:46 +0800 Subject: [PATCH] fix: search file path when no --config option --- bin/cli.js | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/bin/cli.js b/bin/cli.js index 293f56a1..1e35e69c 100755 --- a/bin/cli.js +++ b/bin/cli.js @@ -53,7 +53,7 @@ import i18nTransform from '../dist/transform.js' let config = {} try { - const result = await lilconfig(pkg.name, { + const configReader = lilconfig(pkg.name, { searchPlaces: [ `${pkg.name}.config.js`, `${pkg.name}.config.json`, @@ -67,7 +67,13 @@ import i18nTransform from '../dist/transform.js' '.yaml': yamlConfigLoader, '.yml': yamlConfigLoader, }, - }).load(program.opts().config) + }) + let result + if (program.opts().config) { + result = await configReader.load(program.opts().config) + } else { + result = await configReader.search() + } config = result.config } catch (err) { if (err.code === 'MODULE_NOT_FOUND') { @@ -117,16 +123,19 @@ import i18nTransform from '../dist/transform.js' } } + let basePath = process.cwd() + + if (program.opts().config) { + basePath = path.dirname(path.resolve(program.opts().config)) + } + globs = config.input.map(function (s) { var negate = '' if (s.startsWith('!')) { negate = '!' s = s.substr(1) } - return ( - negate + - path.resolve(path.dirname(path.resolve(program.opts().config)), s) - ) + return negate + path.resolve(basePath, s) }) }