@dotenvx/dotenvx 1.6.4 → 1.6.5

package/CHANGELOG.md

@@ -2,7 +2,13 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
-## [Unreleased](https://github.com/dotenvx/dotenvx/compare/v1.6.4...main)
+## [Unreleased](https://github.com/dotenvx/dotenvx/compare/v1.6.5...main)
+
+## 1.6.5
+
+### Changed
+
+* 🐞 patch `chomp` for interpolation. strip ending newline (was stripping first found newline) ([#322](https://github.com/dotenvx/dotenvx/pull/322))
 
 ## 1.6.4
 

package/README.md

@@ -267,6 +267,16 @@ More examples
   Hello World
   ```
 
+  </details>
+* <details><summary>Fish 🐠</summary><br>
+
+  ```sh
+  $ echo "HELLO=World" > .env
+
+  $ dotenvx run --quiet -- sh -c 'echo Hello $HELLO'
+  Hello World
+  ```
+
   </details>
 * <details><summary>Cron ⏰</summary><br>
 

package/package.json

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

package/src/cli/dotenvx.js

@@ -108,13 +108,32 @@ const decryptAction = require('./actions/decrypt')
 program.command('decrypt')
   .description('convert encrypted .env file(s) to plain .env file(s)')
   .option('-f, --env-file <paths...>', 'path(s) to your env file(s)')
-  .option('-k, --key <keys...>', 'keys(s) to encrypt (default: all keys in file)')
+  .option('-k, --key <keys...>', 'keys(s) to decrypt (default: all keys in file)')
   .option('--stdout', 'send to stdout')
   .action(decryptAction)
 
+// dotenvx help
+program.command('help [command]')
+  .description('display help for command')
+  .action((command) => {
+    if (command) {
+      const subCommand = program.commands.find(c => c.name() === command)
+      if (subCommand) {
+        subCommand.outputHelp()
+      } else {
+        program.outputHelp()
+      }
+    } else {
+      program.outputHelp()
+    }
+  })
+
 // dotenvx ext
 program.addCommand(require('./commands/ext'))
 
+//
+// DEPRECATED or MOVED
+//
 const lsAction = require('./actions/ext/ls')
 program.command('ls')
   .description('DEPRECATED: moved to [dotenvx ext ls]')
@@ -137,7 +156,6 @@ program.command('genexample')
     genexampleAction.apply(this, args)
   })
 
-// dotenvx gitignore
 const gitignoreAction = require('./actions/ext/gitignore')
 program.command('gitignore')
   .description('DEPRECATED: moved to [dotenvx ext gitignore]')
@@ -148,7 +166,6 @@ program.command('gitignore')
     gitignoreAction.apply(this, args)
   })
 
-// dotenvx prebuild
 const prebuildAction = require('./actions/ext/prebuild')
 program.command('prebuild')
   .description('DEPRECATED: moved to [dotenvx ext prebuild]')
@@ -159,7 +176,6 @@ program.command('prebuild')
     prebuildAction.apply(this, args)
   })
 
-// dotenvx precommit
 const precommitAction = require('./actions/ext/precommit')
 program.command('precommit')
   .description('DEPRECATED: moved to [dotenvx ext precommit]')
@@ -171,7 +187,6 @@ program.command('precommit')
     precommitAction.apply(this, args)
   })
 
-// dotenvx scan
 const scanAction = require('./actions/ext/scan')
 program.command('scan')
   .description('DEPRECATED: moved to [dotenvx ext scan]')
@@ -181,28 +196,13 @@ program.command('scan')
     scanAction.apply(this, args)
   })
 
-program.command('help [command]')
-  .description('display help for command')
-  .action((command) => {
-    if (command) {
-      const subCommand = program.commands.find(c => c.name() === command)
-      if (subCommand) {
-        subCommand.outputHelp()
-      } else {
-        program.outputHelp()
-      }
-    } else {
-      program.outputHelp()
-    }
-  })
-
 // overide helpInformation to hide DEPRECATED commands
 program.helpInformation = function () {
   const originalHelp = Command.prototype.helpInformation.call(this)
   const lines = originalHelp.split('\n')
 
   // Filter out the hidden command from the help output
-  const filteredLines = lines.filter(line => !line.includes('DEPRECATED'))
+  const filteredLines = lines.filter(line => !line.includes('DEPRECATED') && !line.includes('help [command]'))
 
   return filteredLines.join('\n')
 }

package/src/lib/helpers/dotenvEval.js

@@ -1,7 +1,7 @@
 const { execSync } = require('child_process')
 
 function _chomp (value) {
-  return value.replace(/\r?\n|\r/, '')
+  return value.replace(/[\r\n]+$/, '')
 }
 
 function interpolate (value, processEnv, parsed) {