@nmakarov/cli-toolkit 0.46.0 → 0.47.0

package/dist/init.js

@@ -1434,36 +1434,29 @@ var Args = class _Args {
       }
       return;
     }
-    let dotEnvPathFile = null;
-    const envSpecificFile = `.env.${this.env}`;
-    const envSpecificPath = resolve(dotEnvPath, envSpecificFile);
-    if (existsSync(envSpecificPath)) {
-      dotEnvPathFile = envSpecificPath;
-    }
-    if (!dotEnvPathFile && !this.get("dotEnvPath")) {
+    let dotEnvPathFile = resolve(dotEnvPath, dotEnvFile);
+    if (!existsSync(dotEnvPathFile) && !this.get("dotEnvPath")) {
       const examplesPath = resolve(dotEnvPath, "examples");
-      const examplesEnvSpecificPath = resolve(examplesPath, envSpecificFile);
-      if (existsSync(examplesEnvSpecificPath)) {
-        dotEnvPathFile = examplesEnvSpecificPath;
-      }
-    }
-    if (!dotEnvPathFile) {
-      dotEnvPathFile = resolve(dotEnvPath, dotEnvFile);
-      if (!existsSync(dotEnvPathFile)) {
-        if (!this.get("dotEnvPath")) {
-          const examplesPath = resolve(dotEnvPath, "examples");
-          const examplesEnvFile = resolve(examplesPath, dotEnvFile);
-          if (existsSync(examplesEnvFile)) {
-            dotEnvPathFile = examplesEnvFile;
-          } else {
-            dotEnvPathFile = resolve(dotEnvPath, "..", dotEnvFile);
-          }
-        }
+      const examplesEnvFile = resolve(examplesPath, dotEnvFile);
+      if (existsSync(examplesEnvFile)) {
+        dotEnvPathFile = examplesEnvFile;
+      } else {
+        dotEnvPathFile = resolve(dotEnvPath, "..", dotEnvFile);
       }
     }
     if (dotEnvPathFile && existsSync(dotEnvPathFile)) {
       config({ path: dotEnvPathFile, quiet: true });
     }
+    const envSpecificFile = `.env.${this.env}`;
+    const envSpecificPath = resolve(dotEnvPath, envSpecificFile);
+    if (existsSync(envSpecificPath) && envSpecificPath !== dotEnvPathFile) {
+      config({ path: envSpecificPath, quiet: true });
+    } else if (!this.get("dotEnvPath")) {
+      const examplesOverlay = resolve(dotEnvPath, "examples", envSpecificFile);
+      if (existsSync(examplesOverlay)) {
+        config({ path: examplesOverlay, quiet: true });
+      }
+    }
   }
   /**
    * Load configuration files