From 91777d51688e3dde6b36628d46a1d1c8e885d595 Mon Sep 17 00:00:00 2001
From: Tyler Dane <tyler@switchback.tech>
Date: Sat, 1 Nov 2025 15:10:19 -0500
Subject: [PATCH 1/4] refactor(web): improve environment file loading logic in
 webpack config

This commit refines the environment file loading logic in the webpack configuration. It updates variable names for clarity, ensures that the correct environment file is used, and enhances logging for build processes. Additionally, it maintains flexibility by allowing environment variables to be provided via process.env when the specified file is not found.
---
 packages/web/webpack.config.mjs | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/packages/web/webpack.config.mjs b/packages/web/webpack.config.mjs
index 5087a3eeb..484d33af0 100644
--- a/packages/web/webpack.config.mjs
+++ b/packages/web/webpack.config.mjs
@@ -19,21 +19,28 @@ const loadEnvFile = (envName) => {
     test: null, // test environment doesn't require env file
   };
 
-  const file = map[envName] || ".env.local";
+  const envFile = map[envName];
 
   // Skip file loading for test environment or if file is explicitly null
-  if (envName === "test" || file === null) {
+  if (envName === "test" || envFile === null) {
     console.log(
       `Skipping env file load for ${envName} environment (using process.env)`,
     );
     return;
   }
 
-  const fullPath = _resolve(_dirname, "..", "..", "packages", "backend", file);
+  const fullPath = _resolve(
+    _dirname,
+    "..",
+    "..",
+    "packages",
+    "backend",
+    envFile,
+  );
 
   if (fs.existsSync(fullPath)) {
-    console.log(`Creating a ${envName} build using ${file} ...`);
-    dotenv.config({ path: fullPath });
+    console.log(`Creating a ${envName} build using ${envFile} ...`);
+    dotenv.config({ path: fullPath, override: true });
   } else {
     // Only warn, don't exit - allow environment variables to be provided via process.env (e.g., in CI)
     console.warn(
@@ -45,7 +52,7 @@ const loadEnvFile = (envName) => {
 export default (env, argv) => {
   const IS_DEV = argv.mode === "development";
 
-  const ENVIRONMENT = argv.nodeEnv || "local";
+  const ENVIRONMENT = argv.nodeEnv;
   loadEnvFile(ENVIRONMENT);
 
   const GLOBAL_SCSS = resolvePath("src/common/styles/index.scss");

From 2131d701b66da854148eb89193800e1d3ac02c8d Mon Sep 17 00:00:00 2001
From: Tyler Dane <tyler@switchback.tech>
Date: Sat, 1 Nov 2025 15:13:05 -0500
Subject: [PATCH 2/4] Update packages/web/webpack.config.mjs

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
---
 packages/web/webpack.config.mjs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/web/webpack.config.mjs b/packages/web/webpack.config.mjs
index 484d33af0..b1dc2507a 100644
--- a/packages/web/webpack.config.mjs
+++ b/packages/web/webpack.config.mjs
@@ -52,7 +52,7 @@ const loadEnvFile = (envName) => {
 export default (env, argv) => {
   const IS_DEV = argv.mode === "development";
 
-  const ENVIRONMENT = argv.nodeEnv;
+  const ENVIRONMENT = argv.nodeEnv || 'local';
   loadEnvFile(ENVIRONMENT);
 
   const GLOBAL_SCSS = resolvePath("src/common/styles/index.scss");

From 544ff987aa014d6aca2cef3fbdf6dd96515387c6 Mon Sep 17 00:00:00 2001
From: Tyler Dane <tyler@switchback.tech>
Date: Sat, 1 Nov 2025 15:18:33 -0500
Subject: [PATCH 3/4] Update packages/web/webpack.config.mjs

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
---
 packages/web/webpack.config.mjs | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/packages/web/webpack.config.mjs b/packages/web/webpack.config.mjs
index b1dc2507a..86c3f51d3 100644
--- a/packages/web/webpack.config.mjs
+++ b/packages/web/webpack.config.mjs
@@ -21,6 +21,13 @@ const loadEnvFile = (envName) => {
 
   const envFile = map[envName];
 
+  // Handle unmapped environment names explicitly
+  if (typeof envFile === "undefined") {
+    console.error(
+      `Error: Unrecognized environment name '${envName}'. Valid options are: ${Object.keys(map).join(", ")}.`
+    );
+    return;
+  }
   // Skip file loading for test environment or if file is explicitly null
   if (envName === "test" || envFile === null) {
     console.log(

From ee8fce4089db134bcfe68185b9b2dc2e502bc7fc Mon Sep 17 00:00:00 2001
From: Tyler Dane <tyler@switchback.tech>
Date: Sat, 1 Nov 2025 15:18:39 -0500
Subject: [PATCH 4/4] Update packages/web/webpack.config.mjs

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
---
 packages/web/webpack.config.mjs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/web/webpack.config.mjs b/packages/web/webpack.config.mjs
index 86c3f51d3..b7a42ef53 100644
--- a/packages/web/webpack.config.mjs
+++ b/packages/web/webpack.config.mjs
@@ -59,7 +59,7 @@ const loadEnvFile = (envName) => {
 export default (env, argv) => {
   const IS_DEV = argv.mode === "development";
 
-  const ENVIRONMENT = argv.nodeEnv || 'local';
+  const ENVIRONMENT = argv.nodeEnv || "local";
   loadEnvFile(ENVIRONMENT);
 
   const GLOBAL_SCSS = resolvePath("src/common/styles/index.scss");