From c9821171866a5a66ce5b7f0b8a414de48dbcdc7e Mon Sep 17 00:00:00 2001
From: Harminder Virk <virk.officials@gmail.com>
Date: Wed, 29 Jan 2025 14:22:50 +0530
Subject: [PATCH] fix: always load .env file alongside the environment specific
 file (#11188)

---
 .changeset/shiny-monkeys-sell.md           |  5 +++++
 packages/core/utils/src/common/load-env.ts | 11 +++++++----
 2 files changed, 12 insertions(+), 4 deletions(-)
 create mode 100644 .changeset/shiny-monkeys-sell.md

diff --git a/.changeset/shiny-monkeys-sell.md b/.changeset/shiny-monkeys-sell.md
new file mode 100644
index 0000000000..0e0ef742d5
--- /dev/null
+++ b/.changeset/shiny-monkeys-sell.md
@@ -0,0 +1,5 @@
+---
+"@medusajs/utils": patch
+---
+
+fix: always load .env file alongside the environment specific file
diff --git a/packages/core/utils/src/common/load-env.ts b/packages/core/utils/src/common/load-env.ts
index a6724362cf..bd635d3aff 100644
--- a/packages/core/utils/src/common/load-env.ts
+++ b/packages/core/utils/src/common/load-env.ts
@@ -12,14 +12,17 @@ const KNOWN_ENVIRONMENTS = ["staging", "production", "test"]
  * - Loads ".env.production" when "environment=production".
  * - Loads ".env.test" when "environment=test".
  *
+ * The ".env" file is always loaded alongside the environment
+ * specific .env file.
+ *
  * This method does not return any value and updates the "process.env"
  * object instead.
  */
 export function loadEnv(environment: string, envDir: string) {
-  const fileToLoad = KNOWN_ENVIRONMENTS.includes(environment)
-    ? `.env.${environment}`
-    : ".env"
+  const filesToLoad = KNOWN_ENVIRONMENTS.includes(environment)
+    ? [`.env.${environment}`, ".env"].map((file) => join(envDir, file))
+    : [join(envDir, ".env")]
   try {
-    expand(dotenv.config({ path: join(envDir, fileToLoad) }))
+    expand(dotenv.config({ path: filesToLoad }))
   } catch {}
 }