Merge pull request #2733 from jasongrout/prettier

Update the prettier configuration

Author: jasongrout

.eslintrc.json

@@ -3,15 +3,15 @@
   "extends": [
     "eslint:recommended",
     "plugin:@typescript-eslint/eslint-recommended",
-    "plugin:@typescript-eslint/recommended"
+    "plugin:@typescript-eslint/recommended",
+    "prettier"
   ],
   "rules": {
     "@typescript-eslint/interface-name-prefix": [
-      "error", { "prefixWithI": "always" }
-    ],
-    "@typescript-eslint/no-unused-vars": [
-      "warn", { "args": "none" }
+      "error",
+      { "prefixWithI": "always" }
     ],
+    "@typescript-eslint/no-unused-vars": ["warn", { "args": "none" }],
     "@typescript-eslint/no-use-before-define": "off",
     "@typescript-eslint/camelcase": "off",
     "@typescript-eslint/no-explicit-any": "off",

.lintstagedrc

@@ -0,0 +1,6 @@
+{
+  "**/*{.ts,.tsx,.js,.jsx,.css,.json}": [
+    "prettier --write",
+    "git add"
+  ]
+}

package.json

@@ -21,8 +21,8 @@
     "integrity2": "node buildutils/lib/integrity.js",
     "lint": "yarn && yarn run prettier && yarn run eslint",
     "lint:check": "yarn run prettier:check && yarn run eslint:check",
-    "prettier": "prettier --ignore-path .gitignore --write '**/*{.ts,.tsx,.js,.jsx,.css,.json,.md}'",
-    "prettier:check": "prettier --ignore-path .gitignore --check '**/*{.ts,.tsx,.js,.jsx,.css,.json,.md}'",
+    "prettier": "prettier --ignore-path .gitignore --write '**/*{.ts,.tsx,.js,.jsx,.css,.json}'",
+    "prettier:check": "prettier --ignore-path .gitignore --check '**/*{.ts,.tsx,.js,.jsx,.css,.json}'",
     "sort-package-json": "lerna exec --parallel sort-package-json && sort-package-json",
     "publish": "yarn run clean && yarn run build && lerna publish -m \"Publish npm packages\"",
     "update-dependency": "update-dependency --lerna",
@@ -33,9 +33,17 @@
     "@typescript-eslint/eslint-plugin": "^2.14.0",
     "@typescript-eslint/parser": "^2.14.0",
     "eslint": "^6.5.0",
-    "eslint-plugin-prettier": "^3.1.2",
+    "eslint-config-prettier": "^6.9.0",
+    "husky": "^2.3.0",
     "lerna": "^3.20.2",
+    "lint-staged": "^9.5.0",
     "prettier": "^1.19.1",
     "sort-package-json": "~1.35"
+  },
+  "husky": {
+    "hooks": {
+      "pre-commit": "lint-staged",
+      "pre-push": "yarn run integrity"
+    }
   }
 }