fix husky.sh syntax error

typicode · Feb 12, 2020 · 015f3aa · 015f3aa
1 parent 7791433
commit 015f3aa
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/sh/husky.sh b/sh/husky.sh
@@ -35,7 +35,7 @@ hookIsDefined () {
     .huskyrc \
     .huskyrc.json \
     .huskyrc.yaml \
-    .huskyrc.yml \
+    .huskyrc.yml
 }
 
 huskyVersion="0.0.0"
@@ -55,7 +55,10 @@ fi
 debug "Current working directory is $(pwd)"
 
 # Skip fast if hookName is not defined
-if ! hookIsDefined; then
+# Don't skip if .huskyrc.js or .huskyrc.config.js are used as the heuristic could
+# fail due to the dynamic aspect of JS. For example:
+# `"pre-" + "commit"` or `require('./config/hooks')`)
+if [ ! -f .huskyrc.js ] && [ ! -f .huskyrc.config.js ] && ! hookIsDefined; then
   debug "$hookName config not found, skipping hook"
   exit 0
 fi