@dotenvx/dotenvx 0.32.0 → 0.33.0

package/README.md

@@ -260,6 +260,19 @@ More examples
   see [platform guides](https://dotenvx.com/docs#platforms)
 
   </details>
+* <details><summary>Process Managers</summary><br>
+
+  ```js
+  // pm2
+  "scripts": {
+    "start": "dotenvx run -- pm2-runtime start ecosystem.config.js --env production"
+  },
+  ```
+
+  see [process manager guides](https://dotenvx.com/docs#process-managers)
+
+  </details>
+
 * <details><summary>npx</summary><br>
 
   ```sh
@@ -354,12 +367,12 @@ More examples
 
 ## Multiple Environments
 
-> Create a `.env.production` file and use `--env-file` to load it. It's straightforward, yet flexible.
+> Create a `.env.production` file and use `-f` to load it. It's straightforward, yet flexible.
 ```sh
 $ echo "HELLO=production" > .env.production
 $ echo "console.log('Hello ' + process.env.HELLO)" > index.js
 
-$ dotenvx run --env-file=.env.production -- node index.js
+$ dotenvx run -f .env.production -- node index.js
 [dotenvx][info] loading env (1) from .env.production
 Hello production
 > ^^
@@ -374,7 +387,7 @@ More examples
 
   $ echo "HELLO=World" > .env
 
-  $ dotenvx run --env-file=.env.local --env-file=.env -- node index.js
+  $ dotenvx run -f .env.local -f .env -- node index.js
   [dotenvx][info] loading env (1) from .env.local,.env
   Hello local
   ```
@@ -388,7 +401,7 @@ More examples
 
   $ echo "HELLO=World" > .env
 
-  $ dotenvx run --env-file=.env.local --env-file=.env --overload -- node index.js
+  $ dotenvx run -f .env.local -f .env --overload -- node index.js
   [dotenvx][info] loading env (1) from .env.local,.env
   Hello World
   ```
@@ -398,7 +411,7 @@ More examples
   ```sh
   $ echo "HELLO=production" > .env.production
 
-  $ dotenvx run --env-file=.env.production --verbose -- node index.js
+  $ dotenvx run -f .env.production --verbose -- node index.js
   [dotenvx][verbose] injecting env from /path/to/.env.production
   [dotenvx][verbose] HELLO set
   [dotenvx][info] loading env (1) from .env.production
@@ -410,7 +423,7 @@ More examples
   ```sh
   $ echo "HELLO=production" > .env.production
 
-  $ dotenvx run --env-file=.env.production --debug -- node index.js
+  $ dotenvx run -f .env.production --debug -- node index.js
   [dotenvx][debug] configuring options
   [dotenvx][debug] {"envFile":[".env.production"]}
   [dotenvx][verbose] injecting env from /path/to/.env.production
@@ -432,7 +445,7 @@ More examples
   ```sh
   $ echo "HELLO=production" > .env.production
 
-  $ dotenvx run --env-file=.env.production --quiet -- node index.js
+  $ dotenvx run -f .env.production --quiet -- node index.js
   Hello production
   ```
 
@@ -444,7 +457,7 @@ More examples
   ```sh
   $ echo "HELLO=production" > .env.production
 
-  $ dotenvx run --env-file=.env.production --log-level=error -- node index.js
+  $ dotenvx run -f .env.production --log-level=error -- node index.js
   Hello production
   ```
 

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.32.0",
+  "version": "0.33.0",
   "name": "@dotenvx/dotenvx",
   "description": "a better dotenv–from the creator of `dotenv`",
   "author": "@motdotla",

package/src/cli/actions/decrypt.js

@@ -57,7 +57,8 @@ async function decrypt () {
       const decrypted = libDecrypt(ciphertext, value.trim())
 
       // envFilename
-      let envFilename = `.env.${environment}`
+      // replace _ with . to support filenames like .env.development.local
+      let envFilename = `.env.${environment.replace('_', '.')}`
       if (environment === 'development') {
         envFilename = '.env'
       }

package/src/cli/dotenvx.js

@@ -12,7 +12,7 @@ const packageJson = require('./../lib/helpers/packageJson')
 const notice = new UpdateNotice()
 notice.check()
 if (notice.update) {
-  logger.warn(`Update available ${notice.packageVersion} → ${notice.latestVersion}\nchangelog: https://dotenvx.com/changelog`)
+  logger.warn(`Update available ${notice.packageVersion} → ${notice.latestVersion} changelog: https://dotenvx.com/changelog`)
 }
 
 // for use with run

package/src/lib/helpers/dotenvKeys.js

@@ -1,6 +1,7 @@
-const path = require('path')
 const crypto = require('crypto')
 
+const guessEnvironment = require('./guessEnvironment')
+
 class DotenvKeys {
   constructor (envFilepaths = [], dotenvKeys = {}) {
     this.envFilepaths = envFilepaths // pass .env* filepaths to be encrypted
@@ -12,7 +13,7 @@ class DotenvKeys {
     const existingKeys = new Set()
 
     for (const filepath of this.envFilepaths) {
-      const environment = this._guessEnvironment(filepath)
+      const environment = guessEnvironment(filepath)
       const key = `DOTENV_KEY_${environment.toUpperCase()}`
 
       let value = this.dotenvKeys[key]
@@ -46,18 +47,6 @@ class DotenvKeys {
     }
   }
 
-  _guessEnvironment (filepath) {
-    const filename = path.basename(filepath)
-    const parts = filename.split('.')
-    const possibleEnvironment = parts[2] // ['', 'env', environment', 'previous']
-
-    if (!possibleEnvironment || possibleEnvironment.length === 0) {
-      return 'development'
-    }
-
-    return possibleEnvironment
-  }
-
   _generateDotenvKey (environment) {
     const rand = crypto.randomBytes(32).toString('hex')
 

package/src/lib/helpers/guessEnvironment.js

@@ -3,13 +3,23 @@ const path = require('path')
 function guessEnvironment (filepath) {
   const filename = path.basename(filepath)
   const parts = filename.split('.')
-  const possibleEnvironment = parts[2] // ['', 'env', environment', 'previous']
+  const possibleEnvironmentList = [...parts.slice(2)]
 
-  if (!possibleEnvironment || possibleEnvironment.length === 0) {
+  if (possibleEnvironmentList.length === 0) {
     return 'development'
   }
 
-  return possibleEnvironment
+  if (possibleEnvironmentList.length === 1) {
+    return possibleEnvironmentList[0]
+  }
+
+  if (
+    possibleEnvironmentList.length === 2
+  ) {
+    return possibleEnvironmentList.join('_')
+  }
+
+  return possibleEnvironmentList.slice(0, 2).join('_')
 }
 
 module.exports = guessEnvironment