Merge pull request increments#29 from increments/add-lint-staged

ohakutsu · web-flow · commit 6126a037fc6b · 2023-07-19T12:26:03.000+09:00
Add lint-staged
diff --git a/.husky/pre-commit b/.husky/pre-commit
@@ -1,5 +1,4 @@
 #!/usr/bin/env sh
 . "$(dirname -- "$0")/_/husky.sh"
 
-yarn run format
-yarn run lint
+yarn run lint-staged
diff --git a/package.json b/package.json
@@ -40,6 +40,7 @@
     "html-webpack-plugin": "^5.5.0",
     "husky": "^8.0.3",
     "jest": "^29.4.3",
+    "lint-staged": "^13.2.3",
     "npm-run-all": "^4.1.5",
     "prettier": "^2.8.4",
     "react": "^18.2.0",
@@ -59,9 +60,11 @@
     "dev:client": "webpack --watch",
     "dev:server": "tsc --build --watch",
     "dev": "run-p dev:*",
-    "format": "eslint --fix . && prettier --write .",
+    "format": "eslint --fix . && prettier --list-different --write .",
     "lint": "run-p lint:*",
+    "lint:prettier:fix": "prettier --list-different --ignore-unknown --write",
     "lint:prettier": "prettier --check .",
+    "lint:eslint:fix": "eslint --fix",
     "lint:eslint": "eslint .",
     "lint:typecheck": "tsc --noEmit",
     "prepare": "husky install",
@@ -82,5 +85,13 @@
   "packageManager": "yarn@1.22.19",
   "engines": {
     "node": ">=18.0.0"
+  },
+  "lint-staged": {
+    "*.{js,ts,tsx}": [
+      "yarn run lint:eslint:fix"
+    ],
+    "*": [
+      "yarn run lint:prettier:fix"
+    ]
   }
 }
diff --git a/yarn.lock b/yarn.lock
