add .cjs suport (#754)

typicode · Sep 7, 2020 · 6eb57f0 · 6eb57f0
1 parent e5531f1
commit 6eb57f0
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 32 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -52,7 +52,7 @@
     "chalk": "^4.0.0",
     "ci-info": "^2.0.0",
     "compare-versions": "^3.6.0",
-    "cosmiconfig": "^6.0.0",
+    "cosmiconfig": "^7.0.0",
     "find-versions": "^3.2.0",
     "opencollective-postinstall": "^2.0.2",
     "pkg-dir": "^4.2.0",

diff --git a/sh/husky.sh b/sh/husky.sh
@@ -58,7 +58,7 @@ debug "Current working directory is $(pwd)"
 # 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 husky.config.js ] && ! hookIsDefined; then
+if [ ! -f .huskyrc.js ] && [ ! -f huskyrc.cjs ] && [ ! -f husky.config.js ] && [ ! -f husky.config.cjs ] && ! hookIsDefined; then
   debug "$hookName config not found, skipping hook"
   exit 0
 fi

diff --git a/src/installer/__tests__/__snapshots__/scripts.ts.snap b/src/installer/__tests__/__snapshots__/scripts.ts.snap
@@ -87,7 +87,7 @@ debug \\"Current working directory is $(pwd)\\"
 # 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 husky.config.js ] && ! hookIsDefined; then
+if [ ! -f .huskyrc.js ] && [ ! -f huskyrc.cjs ] && [ ! -f husky.config.js ] && [ ! -f husky.config.cjs ] && ! hookIsDefined; then
   debug \\"$hookName config not found, skipping hook\\"
   exit 0
 fi