From c1b24486e9e4b0192b9ea881d475a40b45f27d09 Mon Sep 17 00:00:00 2001
From: beajer <919060679@qq.com>
Date: Thu, 9 Apr 2020 14:24:09 +0800
Subject: [PATCH] chore: add lint-staged

---
 .editorconfig  | 16 ++++++++++++++++
 .eslintrc.json | 19 ++++++++++---------
 package.json   | 15 +++++++++++++++
 3 files changed, 41 insertions(+), 9 deletions(-)
 create mode 100644 .editorconfig

diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 00000000..7e3649ac
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,16 @@
+# http://editorconfig.org
+root = true
+
+[*]
+indent_style = space
+indent_size = 2
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.md]
+trim_trailing_whitespace = false
+
+[Makefile]
+indent_style = tab
diff --git a/.eslintrc.json b/.eslintrc.json
index b99546e3..c92b1527 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -1,12 +1,13 @@
 {
-    "parserOptions": {
-        "ecmaVersion": 6,
-        "sourceType": "module",
-        "ecmaFeatures": {
-            "jsx": true
-        }
-    },
-    "rules": {
-        "semi": 2
+  "parserOptions": {
+    "ecmaVersion": 6,
+    "sourceType": "module",
+    "ecmaFeatures": {
+      "jsx": true
     }
+  },
+  "rules": {
+    "semi": 2
+  },
+  "extends": ["plugin:prettier/recommended"]
 }
diff --git a/package.json b/package.json
index 067ade4e..84e1c615 100644
--- a/package.json
+++ b/package.json
@@ -34,6 +34,9 @@
     "del": "^4.1.1",
     "electron": "1.8.4",
     "electron-packager": "7.1.0",
+    "eslint": "^6.8.0",
+    "eslint-config-prettier": "^6.10.1",
+    "eslint-plugin-prettier": "^3.1.2",
     "font-awesome": "^4.7.0",
     "gulp": "~3.5.5",
     "gulp-angular-templatecache": "^1.1.0",
@@ -42,15 +45,18 @@
     "gulp-connect": "^1.0.7",
     "gulp-jshint": "~1.5.0",
     "gulp-load-plugins": "~0.4.0",
+    "husky": "^4.2.3",
     "jquery": "^2.2.3",
     "jquery.qrcode": "^1.0.3",
     "karma": "^0.12.1",
     "karma-chrome-launcher": "^0.1.2",
     "karma-jasmine": "^0.1.5",
+    "lint-staged": "^10.1.2",
     "minimist": "^1.2.0",
     "mocha": "~2.4.5",
     "moment": "^2.19.2",
     "npm-run-all": "^4.0.2",
+    "prettier": "^2.0.4",
     "shelljs": "~0.7.0",
     "should": "~9.0.0",
     "showdown": "^1.4.2",
@@ -68,5 +74,14 @@
     "nodemailer": "4.0.1",
     "nodemailer-smtp-transport": "2.7.4",
     "request": "^2.83.0"
+  },
+  "husky": {
+    "hooks": {
+      "pre-commit": "lint-staged"
+    }
+  },
+  "lint-staged": {
+    "*.js": "eslint --fix",
+    "*.{js,css,md}": "prettier --write"
   }
 }