Merge pull request #185 from AthennaIO/develop

chore(artisan): verify --env flag
AthennaIO · Feb 23, 2024 · 1bbfcb7 · 1bbfcb7
2 parents 93b7065 + 9333a80
commit 1bbfcb7
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@athenna/artisan",
-  "version": "4.33.0",
+  "version": "4.34.0",
   "description": "The Athenna CLI application. Built on top of commander and inspired in @adonisjs/ace.",
   "license": "MIT",
   "author": "João Lenon <lenon@athenna.io>",

diff --git a/src/artisan/ArtisanImpl.ts b/src/artisan/ArtisanImpl.ts
@@ -189,13 +189,16 @@ export class ArtisanImpl {
     }
 
     const { env, loadApp, stayAlive, environments } = Options.create(command, {
-      env: process.env.APP_ENV || process.env.NODE_ENV,
+      env: undefined,
       loadApp: false,
       stayAlive: false,
       environments: ['console']
     })
 
-    if (env) {
+    const hasEnvSet =
+      Env('APP_ENV') || Env('NODE_ENV') || process.argv.includes('--env')
+
+    if (env && !hasEnvSet) {
       process.env.APP_ENV = env
       process.env.NODE_ENV = env
     }