From 69486fde19beb11b6a960a453132a95398e9c781 Mon Sep 17 00:00:00 2001
From: Brad Zacher <brad.zacher@gmail.com>
Date: Fri, 19 Apr 2019 10:08:19 -0700
Subject: [PATCH] chore: simplify git hooks

---
 .huskyrc     |  5 ++---
 package.json | 16 +++++++++-------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/.huskyrc b/.huskyrc
index a3f3f7002ed4..687c2614bf8a 100644
--- a/.huskyrc
+++ b/.huskyrc
@@ -1,8 +1,7 @@
 {
   "hooks": {
-    "pre-commit": [
-        "yarn test && lint-staged"
-    ],
+    "pre-commit": "yarn pre-commit",
+    "pre-push": "yarn pre-push",
     "commit-msg": "commitlint -E HUSKY_GIT_PARAMS"
   }
 }
diff --git a/package.json b/package.json
index 87f47a22a52c..f0f5a45beef1 100644
--- a/package.json
+++ b/package.json
@@ -17,19 +17,21 @@
     "url": "https://github.com/typescript-eslint/typescript-eslint/issues"
   },
   "scripts": {
-    "postinstall": "lerna bootstrap && yarn build && lerna link",
-    "test": "lerna run test --parallel",
     "build": "lerna run build",
     "clean": "lerna clean && lerna run clean",
-    "typecheck": "lerna run typecheck",
-    "lint": "eslint . --ext .js,.ts",
-    "lint-fix": "eslint . --ext .js,.ts --fix",
     "cz": "git-cz",
-    "check-format": "prettier --list-different \"./**/*.{ts,js,json,md}\"",
+    "generate-contributors": "yarn ts-node ./tools/generate-contributors.ts && yarn all-contributors generate",
     "format": "prettier --write \"./**/*.{ts,js,json,md}\"",
+    "format-check": "prettier --list-different \"./**/*.{ts,js,json,md}\"",
     "integration-tests": "docker-compose -f tests/integration/docker-compose.yml up",
     "kill-integration-test-containers": "docker-compose -f tests/integration/docker-compose.yml down -v --rmi local",
-    "generate-contributors": "yarn ts-node ./tools/generate-contributors.ts && yarn all-contributors generate"
+    "lint": "eslint . --ext .js,.ts",
+    "lint-fix": "eslint . --ext .js,.ts --fix",
+    "pre-commit": "yarn lint-staged",
+    "pre-push": "yarn lint && yarn typecheck && yarn format-check",
+    "postinstall": "lerna bootstrap && yarn build && lerna link",
+    "test": "lerna run test --parallel",
+    "typecheck": "lerna run typecheck"
   },
   "config": {
     "commitizen": {