fix(husky): revert stdin tty workaround of #766 for npm (#825)

nuxt · Jul 21, 2021 · 1520453 · 1520453
1 parent 93297e5
commit 1520453
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 8 deletions.
diff --git a/.husky/commit-msg b/.husky/commit-msg
@@ -1,4 +1,5 @@
 #!/bin/sh
 . "$(dirname "$0")/_/husky.sh"
+. "$(dirname "$0")/common.sh"
 
 yarn commitlint --edit $1
diff --git a/.husky/common.sh b/.husky/common.sh
@@ -0,0 +1,8 @@
+command_exists () {
+  command -v "$1" >/dev/null 2>&1
+}
+
+# Workaround for Windows 10, Git Bash and Yarn
+if command_exists winpty && test -t 1; then
+  exec < /dev/tty
+fi
diff --git a/.husky/pre-commit b/.husky/pre-commit
@@ -1,4 +1,5 @@
 #!/bin/sh
 . "$(dirname "$0")/_/husky.sh"
+. "$(dirname "$0")/common.sh"
 
 yarn lint && yarn test -u && git add ./packages/*/test/snapshots/*
diff --git a/packages/cna-template/template/nuxt/.husky/commit-msg b/packages/cna-template/template/nuxt/.husky/commit-msg
@@ -1,5 +1,7 @@
 #!/bin/sh
 . "$(dirname "$0")/_/husky.sh"
+<%_ if (pm === 'yarn') { _%>
 . "$(dirname "$0")/common.sh"
+<%_ } _%>
 
-<%= pmRun === 'yarn' ? 'yarn' : 'npx' %> commitlint --edit $1
+<%= pm === 'yarn' ? 'yarn' : 'npx --no-install' %> commitlint --edit $1
diff --git a/packages/cna-template/template/nuxt/.husky/common.sh b/packages/cna-template/template/nuxt/.husky/common.sh
@@ -1,4 +1,3 @@
-<%_ if (isWindows === true) { _%>
 command_exists () {
   command -v "$1" >/dev/null 2>&1
 }
@@ -7,4 +6,3 @@ command_exists () {
 if command_exists winpty && test -t 1; then
   exec < /dev/tty
 fi
-<%_ } _%>
diff --git a/packages/cna-template/template/nuxt/.husky/pre-commit b/packages/cna-template/template/nuxt/.husky/pre-commit
@@ -1,5 +1,7 @@
 #!/bin/sh
 . "$(dirname "$0")/_/husky.sh"
+<%_ if (pm === 'yarn') { _%>
 . "$(dirname "$0")/common.sh"
+<%_ } _%>
 
-<%= pmRun === 'yarn' ? 'yarn' : 'npx' %> lint-staged
+<%= pm === 'yarn' ? 'yarn' : 'npx --no-install' %> lint-staged
diff --git a/packages/create-nuxt-app/lib/saofile.js b/packages/create-nuxt-app/lib/saofile.js
@@ -5,7 +5,6 @@ const validate = require('validate-npm-package-name')
 const pkg = require('./package')
 
 const cnaTemplateDir = join(dirname(require.resolve('cna-template/package.json')))
-const isWindows = process.platform === 'win32'
 const templateDir = join(cnaTemplateDir, 'template')
 const frameworksDir = join(templateDir, 'frameworks')
 const addExecutable = filename => new Promise(
@@ -41,8 +40,7 @@ module.exports = {
       edge,
       pm,
       pmRun,
-      content,
-      isWindows
+      content
     }
   },
   actions () {
@@ -72,7 +70,7 @@ module.exports = {
         '.husky/.gitignore': husky,
         '.husky/commit-msg': commitlint,
         '.husky/pre-commit': lintStaged,
-        '.husky/common.sh': husky
+        '.husky/common.sh': husky && this.answers.pm === 'yarn'
       }
     }]