@dotenvx/dotenvx 1.14.0 → 1.14.1

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.14.0...main)
+## [Unreleased](https://github.com/dotenvx/dotenvx/compare/v1.14.1...main)
+
+## 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.1",
   "name": "@dotenvx/dotenvx",
   "description": "a better dotenv–from the creator of `dotenv`",
   "author": "@motdotla",

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()
   }