Upgrade husky and lint-staged

Closes #205.
niksy · Mar 25, 2024 · 7e72bef · 7e72bef
1 parent accd71a
commit 7e72bef
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 16 deletions.
diff --git a/.husky/pre-commit b/.husky/pre-commit
@@ -0,0 +1 @@
+npx lint-staged
diff --git a/.huskyrc b/.huskyrc
diff --git a/generators/app/index.js b/generators/app/index.js
@@ -616,7 +616,7 @@ export default class extends Generator {
 		cp('eslintrc', '.eslintrc');
 		cp('gitignore', '.gitignore');
 		cp('npmrc', '.npmrc');
-		cp('huskyrc', '.huskyrc');
+		cp('husky', '.husky');
 		cp('lintstagedrc', '.lintstagedrc');
 
 		// Remove old references

diff --git a/generators/app/templates/_package.json b/generators/app/templates/_package.json
@@ -36,6 +36,7 @@
     "test": "test"
   },<% } %>
   "scripts": {
+  	"prepare": "if [[ -x \"$(command -v husky)\" ]]; then husky; fi",
     "release": "np --no-release-draft",<% if ( changelog ) { %>
     "version": "if [ $(git rev-parse --abbrev-ref HEAD) == 'master' ]; then sed -i '' '/\\[unreleased\\]:/d' CHANGELOG.md && version-changelog CHANGELOG.md && changelog-verify CHANGELOG.md && git add CHANGELOG.md; else echo; fi"<% if ( githubRelease ) { %>,
     "postpublish": "GITHUB_TOKEN=$GITHUB_RELEASE_TOKEN github-release-from-changelog"<% } %>,<% } %><% if ( (automatedTests && browserModule && !sassModule) || manualTests || integrationTests ) { %>
@@ -63,8 +64,8 @@
   },
   "devDependencies": {
     "@istanbuljs/esm-loader-hook": "^0.2.0",
-    "husky": "^4.3.0",
-    "lint-staged": "^10.4.2",
+    "husky": "^9.0.11",
+    "lint-staged": "^15.2.2",
     "np": "^7.6.0",<% if ( prettier ) { %>
     "prettier": "^2.4.0",<% } %>
     "eslint": "^8.5.0",

diff --git a/generators/app/templates/husky/pre-commit b/generators/app/templates/husky/pre-commit
@@ -0,0 +1 @@
+npx lint-staged
diff --git a/generators/app/templates/huskyrc b/generators/app/templates/huskyrc
diff --git a/package.json b/package.json
@@ -15,6 +15,7 @@
     "README.md"
   ],
   "scripts": {
+    "prepare": "if [[ -x \"$(command -v husky)\" ]]; then husky; fi",
     "lint": "eslint '{generators/app/index,test/index}.js'",
     "release": "np --no-release-draft",
     "prerelease": "npm run lint",
@@ -37,8 +38,8 @@
     "eslint-config-nitpick": "^11.1.0",
     "eslint-config-prettier": "^8.3.0",
     "eslint-plugin-prettier": "^4.0.0",
-    "husky": "^4.3.0",
-    "lint-staged": "^10.4.2",
+    "husky": "^9.0.11",
+    "lint-staged": "^15.2.2",
     "mocha": "^9.1.3",
     "nodemon": "^2.0.6",
     "np": "^7.6.0",

diff --git a/test/index.js b/test/index.js
@@ -28,7 +28,7 @@ describe('New project', function () {
 			'.eslintrc',
 			'.gitignore',
 			'.npmrc',
-			'.huskyrc',
+			'.husky',
 			'.lintstagedrc',
 			'index.js',
 			'LICENSE.md',