@dotenvx/dotenvx 1.14.0 → 1.14.2

package/CHANGELOG.md

@@ -2,7 +2,19 @@
 
 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.14.0...main)
+## [Unreleased](https://github.com/dotenvx/dotenvx/compare/v1.14.2...main)
+
+## 1.14.2
+
+### Changed
+
+* swap `process.stdout.write` for `console.log` to patch up npx edge case ([#387](https://github.com/dotenvx/dotenvx/pull/387))
+
+## 1.14.1
+
+### Changed
+
+* run precommit hook only on staged files ([#380](https://github.com/dotenvx/dotenvx/pull/380))
 
 ## 1.14.0
 

package/package.json

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

package/src/cli/actions/decrypt.js

@@ -22,7 +22,7 @@ function decrypt () {
         errorCount += 1
         console.error(processedEnvFile.error.message)
       } else {
-        process.stdout.write(processedEnvFile.envSrc)
+        console.log(processedEnvFile.envSrc)
       }
     }
 

package/src/cli/actions/encrypt.js

@@ -18,7 +18,7 @@ function encrypt () {
     } = main.encrypt(options.envFile, options.key, options.excludeKey)
 
     for (const processedEnvFile of processedEnvFiles) {
-      process.stdout.write(processedEnvFile.envSrc)
+      console.log(processedEnvFile.envSrc)
     }
     process.exit(0) // exit early
   } else {

package/src/cli/actions/get.js

@@ -31,7 +31,7 @@ function get (key) {
       }
       inline = inline.trim()
 
-      process.stdout.write(inline)
+      console.log(inline)
     // json format
     } else {
       let space = 0
@@ -39,14 +39,14 @@ function get (key) {
         space = 2
       }
 
-      process.stdout.write(JSON.stringify(results, null, space))
+      console.log(JSON.stringify(results, null, space))
     }
   } else {
     if (results === undefined) {
-      process.stdout.write('')
+      console.log('')
       process.exit(1)
     } else {
-      process.stdout.write(results)
+      console.log(results)
     }
   }
 }

package/src/cli/actions/keypair.js

@@ -18,13 +18,13 @@ function keypair (key) {
       space = 2
     }
 
-    process.stdout.write(JSON.stringify(results, null, space))
+    console.log(JSON.stringify(results, null, space))
   } else {
     if (results === undefined) {
-      process.stdout.write('')
+      console.log('')
       process.exit(1)
     } else {
-      process.stdout.write(results)
+      console.log(results)
     }
   }
 }

package/src/lib/services/precommit.js

@@ -7,6 +7,7 @@ const Ls = require('../services/ls')
 const pluralize = require('./../helpers/pluralize')
 const isFullyEncrypted = require('./../helpers/isFullyEncrypted')
 const InstallPrecommitHook = require('./../helpers/installPrecommitHook')
+const childProcess = require('child_process')
 const MISSING_GITIGNORE = '.env.keys' // by default only ignore .env.keys. all other .env* files COULD be included - as long as they are encrypted
 
 class Precommit {
@@ -44,23 +45,26 @@ class Precommit {
       const lsService = new Ls(process.cwd(), undefined, this.excludeEnvFile)
       const dotenvFiles = lsService.run()
       dotenvFiles.forEach(file => {
-        // check if that file is being ignored
-        if (ig.ignores(file)) {
-          if (file === '.env.example' || file === '.env.vault') {
-            const warning = new Error(`${file} (currently ignored but should not be)`)
-            warning.help = `? add !${file} to .gitignore with [echo "!${file}" >> .gitignore]`
-            warnings.push(warning)
-          }
-        } else {
-          if (file !== '.env.example' && file !== '.env.vault') {
-            const src = fs.readFileSync(file).toString()
-            const encrypted = isFullyEncrypted(src)
+        // check if file is going to be commited
+        if (this._isFileToBeCommitted(file)) {
+          // check if that file is being ignored
+          if (ig.ignores(file)) {
+            if (file === '.env.example' || file === '.env.vault') {
+              const warning = new Error(`${file} (currently ignored but should not be)`)
+              warning.help = `? add !${file} to .gitignore with [echo "!${file}" >> .gitignore]`
+              warnings.push(warning)
+            }
+          } else {
+            if (file !== '.env.example' && file !== '.env.vault') {
+              const src = fs.readFileSync(file).toString()
+              const encrypted = isFullyEncrypted(src)
 
-            // if contents are encrypted don't raise an error
-            if (!encrypted) {
-              const error = new Error(`${file} not encrypted (or not gitignored)`)
-              error.help = `? encrypt it with [dotenvx encrypt -f ${file}] or add ${file} to .gitignore with [echo ".env*" >> .gitignore]`
-              throw error
+              // if contents are encrypted don't raise an error
+              if (!encrypted) {
+                const error = new Error(`${file} not encrypted (or not gitignored)`)
+                error.help = `? encrypt it with [dotenvx encrypt -f ${file}] or add ${file} to .gitignore with [echo ".env*" >> .gitignore]`
+                throw error
+              }
             }
           }
         }
@@ -77,6 +81,18 @@ class Precommit {
     }
   }
 
+  _isFileToBeCommitted (filePath) {
+    try {
+      const output = childProcess.execSync('git diff --cached --name-only').toString()
+      const files = output.split('\n')
+
+      return files.includes(filePath)
+    } catch (error) {
+      // consider file to be committed if there is an error (not using git)
+      return true
+    }
+  }
+
   _installPrecommitHook () {
     return new InstallPrecommitHook().run()
   }