feat(template): update to husky v6

package.json

@@ -24,7 +24,7 @@
     "@nuxtjs/eslint-config": "^6.0.0",
     "ava": "^3.15.0",
     "eslint": "^7.22.0",
-    "husky": "^5.1.3",
+    "husky": "^6.0.0",
     "lerna": "^4.0.0",
     "stylelint": "^13.12.0",
     "stylelint-config-standard": "^21.0.0"

packages/cna-template/template/nuxt/.husky/.gitignore

@@ -0,0 +1 @@
+_

packages/cna-template/template/nuxt/.husky/commit-msg

@@ -0,0 +1,4 @@
+#!/bin/sh
+. "$(dirname "$0")/_/husky.sh"
+
+<%= pmRun %> commitlint --edit $1

packages/cna-template/template/nuxt/.husky/pre-commit

@@ -0,0 +1,4 @@
+#!/bin/sh
+. "$(dirname "$0")/_/husky.sh"
+
+<%= pmRun %> lint-staged

packages/cna-template/template/nuxt/package.js

@@ -32,9 +32,7 @@ module.exports = {
       delete pkg.devDependencies['eslint-plugin-vue']
     }
     if (!lintStaged) {
-      delete pkg.husky
       delete pkg['lint-staged']
-      delete pkg.devDependencies.husky
       delete pkg.devDependencies['lint-staged']
     }
     if (!stylelint) {
@@ -53,10 +51,13 @@ module.exports = {
       delete pkg.devDependencies.prettier
     }
     if (!commitlint) {
-      lintStaged && delete pkg.husky.hooks['commit-msg']
       delete pkg.devDependencies['@commitlint/config-conventional']
       delete pkg.devDependencies['@commitlint/cli']
     }
+    if (!lintStaged && !commitlint) {
+      delete pkg.devDependencies.husky
+      delete pkg.scripts.postinstall
+    }
 
     const lintScript = Object.values(lintScripts).join(' && ')
     if (lintScript) {

packages/cna-template/template/nuxt/package.json

@@ -5,18 +5,13 @@
     "start": "nuxt start",
     "generate": "nuxt generate",
     "lint:js": "eslint --ext \".js,.vue\" --ignore-path .gitignore .",
-    "lint:style": "stylelint \"**/*.{vue,css}\" --ignore-path .gitignore"
+    "lint:style": "stylelint \"**/*.{vue,css}\" --ignore-path .gitignore",
+    "postinstall": "husky install"
   },
   "lint-staged": {
     "*.{js,vue}": "eslint",
     "*.{css,vue}": "stylelint"
   },
-  "husky": {
-    "hooks": {
-      "commit-msg": "commitlint -E HUSKY_GIT_PARAMS",
-      "pre-commit": "lint-staged"
-    }
-  },
   "dependencies": {
     "@nuxt/content": "^1.14.0",
     "@nuxtjs/axios": "^5.13.1",
@@ -39,7 +34,7 @@
     "eslint-plugin-nuxt": "^2.0.0",
     "eslint-plugin-prettier": "^3.3.1",
     "eslint-plugin-vue": "^7.7.0",
-    "husky": "^4.3.8",
+    "husky": "^6.0.0",
     "lint-staged": "^10.5.4",
     "prettier": "^2.2.1",
     "stylelint": "^13.12.0",

packages/create-nuxt-app/lib/saofile.js

@@ -1,11 +1,15 @@
 const { dirname, join, relative } = require('path')
+const fs = require('fs')
 const spawn = require('cross-spawn')
 const validate = require('validate-npm-package-name')
 const pkg = require('./package')
 
 const cnaTemplateDir = join(dirname(require.resolve('cna-template/package.json')))
 const templateDir = join(cnaTemplateDir, 'template')
 const frameworksDir = join(templateDir, 'frameworks')
+const addExecutable = filename => new Promise(
+  resolve => fs.chmod(filename, 0o755, resolve)
+)
 
 module.exports = {
   prompts: require('./prompts'),
@@ -50,14 +54,22 @@ module.exports = {
     })
     validation.errors && validation.errors.length && process.exit(1)
 
+    const { linter } = this.answers
+    const eslint = linter.includes('eslint')
+    const lintStaged = eslint && linter.includes('lintStaged')
+    const commitlint = linter.includes('commitlint')
+
     const actions = [{
       type: 'add',
       files: '**',
       templateDir: join(templateDir, 'nuxt'),
       filters: {
         'static/icon.png': 'features.includes("pwa")',
         'content/hello.md': 'features.includes("content")',
-        'pages/content.vue': 'features.includes("content")'
+        'pages/content.vue': 'features.includes("content")',
+        '.husky/.gitignore': lintStaged || commitlint,
+        '.husky/commit-msg': commitlint,
+        '.husky/pre-commit': lintStaged
       }
     }]
 
@@ -144,6 +156,14 @@ module.exports = {
       this.gitInit()
     }
 
+    const huskyDir = join(this.outDir, '.husky')
+    if (this.answers.linter.includes('lintStaged')) {
+      await addExecutable(join(huskyDir, 'pre-commit'))
+    }
+    if (this.answers.linter.includes('commitlint')) {
+      await addExecutable(join(huskyDir, 'commit-msg'))
+    }
+
     await this.npmInstall({ npmClient: this.answers.pm })
 
     if (this.answers.linter.includes('eslint')) {