@realtimex/email-automator 2.3.4 → 2.3.5

package/api/src/config/index.ts

@@ -15,16 +15,26 @@ function findPackageRoot(startDir: string): string {
         }
         current = dirname(current);
     }
-    return process.cwd(); // Fallback
+    return process.cwd();
 }
 
-const packageRoot = findPackageRoot(__dirname);
-
-// 1. Try to load from current working directory (where npx is run)
-dotenv.config({ path: join(process.cwd(), '.env') });
+function loadEnvironment() {
+    const cwdEnv = join(process.cwd(), '.env');
+    const rootEnv = join(findPackageRoot(__dirname), '.env');
+
+    if (existsSync(cwdEnv)) {
+        console.log(`📝 Loading environment from CWD: ${cwdEnv}`);
+        dotenv.config({ path: cwdEnv, override: true });
+    } else if (existsSync(rootEnv)) {
+        console.log(`📝 Loading environment from Root: ${rootEnv}`);
+        dotenv.config({ path: rootEnv, override: true });
+    } else {
+        // Just run default dotenv config in case it's in a standard location
+        dotenv.config();
+    }
+}
 
-// 2. Fallback to package root
-dotenv.config({ path: join(packageRoot, '.env') });
+loadEnvironment();
 
 function parseArgs(args: string[]): { port: number | null, noUi: boolean } {
     const portIndex = args.indexOf('--port');

package/dist/api/src/config/index.js

@@ -13,13 +13,25 @@ function findPackageRoot(startDir) {
         }
         current = dirname(current);
     }
-    return process.cwd(); // Fallback
+    return process.cwd();
 }
-const packageRoot = findPackageRoot(__dirname);
-// 1. Try to load from current working directory (where npx is run)
-dotenv.config({ path: join(process.cwd(), '.env') });
-// 2. Fallback to package root
-dotenv.config({ path: join(packageRoot, '.env') });
+function loadEnvironment() {
+    const cwdEnv = join(process.cwd(), '.env');
+    const rootEnv = join(findPackageRoot(__dirname), '.env');
+    if (existsSync(cwdEnv)) {
+        console.log(`📝 Loading environment from CWD: ${cwdEnv}`);
+        dotenv.config({ path: cwdEnv, override: true });
+    }
+    else if (existsSync(rootEnv)) {
+        console.log(`📝 Loading environment from Root: ${rootEnv}`);
+        dotenv.config({ path: rootEnv, override: true });
+    }
+    else {
+        // Just run default dotenv config in case it's in a standard location
+        dotenv.config();
+    }
+}
+loadEnvironment();
 function parseArgs(args) {
     const portIndex = args.indexOf('--port');
     let port = null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@realtimex/email-automator",
-  "version": "2.3.4",
+  "version": "2.3.5",
   "type": "module",
   "main": "dist/api/server.js",
   "bin": {