From 4aa80de3feac211580b3683c0c1f525b2005d3fd Mon Sep 17 00:00:00 2001
From: Timofei Iatsenko <ty@time.sc>
Date: Mon, 20 Feb 2023 09:51:29 +0100
Subject: [PATCH] fix: always honor `process.env.LINGUI_CONFIG` (#1447)

---
 packages/cli/src/lingui-extract-template.ts | 2 +-
 packages/cli/src/lingui-extract.ts          | 2 +-
 packages/conf/src/getConfig.ts              | 2 ++
 packages/macro/src/index.ts                 | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/packages/cli/src/lingui-extract-template.ts b/packages/cli/src/lingui-extract-template.ts
index b9244dd29..21bebe3b9 100644
--- 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
index 41b8a4dd5..2c8b8819b 100644
--- 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
index dcc7e2945..9871f9d42 100644
--- 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
index b8142ef37..ca11cf22a 100644
--- 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
 }