Merge branch 'master' into ng15

maxisam · Apr 10, 2023 · 9eaca49 · 9eaca49
2 parents 6e85966 + 72c7ec4
commit 9eaca49
Show file tree

Hide file tree

Showing 3 changed files with 124 additions and 75 deletions.
diff --git a/.husky/pre-commit b/.husky/pre-commit
@@ -0,0 +1,4 @@
+#!/usr/bin/env sh
+. "$(dirname -- "$0")/_/husky.sh"
+
+yarn lint-staged
diff --git a/package.json b/package.json
@@ -5,6 +5,7 @@
         "node": ">=14.20.0"
     },
     "scripts": {
+        "prepare": "husky install",
         "ng": "ng",
         "prettier": "prettier --write \"**/*.{json,md,ts,html,component.html}\"",
         "start": "ng serve",
@@ -53,30 +54,24 @@
         "eslint": "^8.28.0",
         "eslint-config-prettier": "^8.3.0",
         "eslint-plugin-prettier": "^4.0.0",
-        "husky": "7.0.4",
+        "husky": "8.0.3",
         "jasmine-core": "~3.10.1",
         "jasmine-spec-reporter": "~7.0.0",
         "karma": "~6.3.9",
         "karma-chrome-launcher": "~3.1.0",
         "karma-coverage-istanbul-reporter": "~3.0.3",
         "karma-jasmine": "~4.0.1",
         "karma-jasmine-html-reporter": "^1.7.0",
-        "lint-staged": "12.0.2",
         "ng-packagr": "^15.1.2",
+        "lint-staged": "13.1.1",
         "prettier": "2.4.1",
         "protractor": "~7.0.0",
         "ts-node": "~10.4.0",
         "typescript": "~4.8.4"
     },
-    "husky": {
-        "hooks": {
-            "pre-commit": "lint-staged"
-        }
-    },
     "lint-staged": {
         "*.{json,md,ts,html,component.html}": [
-            "prettier --write",
-            "git add"
+            "prettier --write"
         ]
     }
 }