From 66edaec475144bb807adcf16e0261f578651bc04 Mon Sep 17 00:00:00 2001
From: Hans Li <lizihan0328@gmail.com>
Date: Wed, 31 Mar 2021 11:00:02 -0700
Subject: [PATCH] :arrow_up: Upgrade husky and eslint-config-prettier

---
 .husky/.gitignore   |  1 +
 .husky/commit-msg   |  4 ++++
 .husky/pre-commit   |  4 ++++
 .husky/pre-push     |  4 ++++
 client/.eslintrc.js |  2 +-
 package.json        | 14 ++++----------
 yarn.lock           |  8 ++++----
 7 files changed, 22 insertions(+), 15 deletions(-)
 create mode 100644 .husky/.gitignore
 create mode 100755 .husky/commit-msg
 create mode 100755 .husky/pre-commit
 create mode 100755 .husky/pre-push

diff --git a/.husky/.gitignore b/.husky/.gitignore
new file mode 100644
index 00000000..31354ec1
--- /dev/null
+++ b/.husky/.gitignore
@@ -0,0 +1 @@
+_
diff --git a/.husky/commit-msg b/.husky/commit-msg
new file mode 100755
index 00000000..d71a03b9
--- /dev/null
+++ b/.husky/commit-msg
@@ -0,0 +1,4 @@
+#!/bin/sh
+. "$(dirname "$0")/_/husky.sh"
+
+yarn commitlint --edit $1
diff --git a/.husky/pre-commit b/.husky/pre-commit
new file mode 100755
index 00000000..de26dc12
--- /dev/null
+++ b/.husky/pre-commit
@@ -0,0 +1,4 @@
+#!/bin/sh
+. "$(dirname "$0")/_/husky.sh"
+
+lint-staged
diff --git a/.husky/pre-push b/.husky/pre-push
new file mode 100755
index 00000000..f077c917
--- /dev/null
+++ b/.husky/pre-push
@@ -0,0 +1,4 @@
+#!/bin/sh
+. "$(dirname "$0")/_/husky.sh"
+
+yarn test
diff --git a/client/.eslintrc.js b/client/.eslintrc.js
index 370b3dba..aeae72f2 100644
--- a/client/.eslintrc.js
+++ b/client/.eslintrc.js
@@ -7,7 +7,7 @@ module.exports = {
     jest: true,
   },
 
-  extends: ['airbnb', 'prettier', 'prettier/react'],
+  extends: ['airbnb', 'prettier'],
 
   parserOptions: {
     ecmaVersion: 2018,
diff --git a/package.json b/package.json
index 6ef91426..2fcd1951 100644
--- a/package.json
+++ b/package.json
@@ -32,7 +32,8 @@
     "build:clean": "rm -rf ./static ./dist",
     "dev:server": "nodemon example.js",
     "dev:client": "NODE_ENV=development webpack-dev-server --hot --client-log-level warning --progress --port 4888",
-    "test": "NODE_ENV=test jest --coverage --collectCoverageFrom=**/*.{js,jsx}"
+    "test": "NODE_ENV=test jest --coverage --collectCoverageFrom=**/*.{js,jsx}",
+    "prepare": "husky install"
   },
   "lint-staged": {
     "*.{js,jsx}": [
@@ -40,13 +41,6 @@
       "eslint --fix"
     ]
   },
-  "husky": {
-    "hooks": {
-      "pre-commit": "lint-staged",
-      "commit-msg": "commitlint -E HUSKY_GIT_PARAMS",
-      "pre-push": "yarn test"
-    }
-  },
   "dependencies": {
     "body-parser": "^1.19.0",
     "express": "4.17.1",
@@ -76,13 +70,13 @@
     "enzyme-to-json": "3.6.1",
     "eslint": "7.23.0",
     "eslint-config-airbnb": "18.2.1",
-    "eslint-config-prettier": "7.2.0",
+    "eslint-config-prettier": "8.1.0",
     "eslint-plugin-import": "2.22.1",
     "eslint-plugin-jsx-a11y": "6.4.1",
     "eslint-plugin-prettier": "3.3.1",
     "eslint-plugin-react": "7.23.1",
     "eslint-plugin-react-hooks": "4.2.0",
-    "husky": "6.0.0",
+    "husky": "^6.0.0",
     "jest": "26.6.3",
     "lint-staged": "10.5.4",
     "nodemon": "2.0.7",
diff --git a/yarn.lock b/yarn.lock
index 887ef799..c46d29d4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4680,10 +4680,10 @@ eslint-config-airbnb@18.2.1:
     object.assign "^4.1.2"
     object.entries "^1.1.2"
 
-eslint-config-prettier@7.2.0:
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-7.2.0.tgz#f4a4bd2832e810e8cc7c1411ec85b3e85c0c53f9"
-  integrity sha512-rV4Qu0C3nfJKPOAhFujFxB7RMP+URFyQqqOZW9DMRD7ZDTFyjaIlETU3xzHELt++4ugC0+Jm084HQYkkJe+Ivg==
+eslint-config-prettier@8.1.0:
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.1.0.tgz#4ef1eaf97afe5176e6a75ddfb57c335121abc5a6"
+  integrity sha512-oKMhGv3ihGbCIimCAjqkdzx2Q+jthoqnXSP+d86M9tptwugycmTFdVR4IpLgq2c4SHifbwO90z2fQ8/Aio73yw==
 
 eslint-import-resolver-node@^0.3.4:
   version "0.3.4"