@nmakarov/cli-toolkit 0.44.0 → 0.47.0

package/dist/init.cjs

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