fix: always honor process.env.LINGUI_CONFIG (#1447)

lingui · Feb 20, 2023 · 4aa80de · 4aa80de
1 parent 469a1ff
commit 4aa80de
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/packages/cli/src/lingui-extract-template.ts b/packages/cli/src/lingui-extract-template.ts
@@ -56,7 +56,7 @@ if (require.main === module) {
   const options = program.opts<CliOptions>()
 
   const config = getConfig({
-    configPath: options.config || process.env.LINGUI_CONFIG,
+    configPath: options.config,
   })
 
   const result = command(config, {

diff --git a/packages/cli/src/lingui-extract.ts b/packages/cli/src/lingui-extract.ts
@@ -119,7 +119,7 @@ if (require.main === module) {
   const options = program.opts<CliOptions>()
 
   const config = getConfig({
-    configPath: options.config || process.env.LINGUI_CONFIG,
+    configPath: options.config,
   })
 
   let hasErrors = false

diff --git a/packages/conf/src/getConfig.ts b/packages/conf/src/getConfig.ts
@@ -49,6 +49,8 @@ export function getConfig({
     },
   })
 
+  configPath = configPath || process.env.LINGUI_CONFIG
+
   const result = configExists(configPath)
     ? configExplorer.load(configPath)
     : configExplorer.search(defaultRootDir)

diff --git a/packages/macro/src/index.ts b/packages/macro/src/index.ts
@@ -34,7 +34,7 @@ function getConfig(_config?: LinguiConfigNormalized) {
     config = _config
   }
   if (!config) {
-    config = loadConfig({ configPath: process.env.LINGUI_CONFIG })
+    config = loadConfig()
   }
   return config
 }