diff --git a/.circleci/config.yml b/.circleci/config.yml
index 1f142b6..7384ee6 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -10,6 +10,7 @@ jobs:
       - run:
           name: install node
           command: yarn global add node-gyp && yarn install
+      - run: yarn lint
       - run: yarn format:check
       - run: yarn test:ci
       - save_cache:
diff --git a/package.json b/package.json
index 822d1ee..fa7a2b6 100644
--- a/package.json
+++ b/package.json
@@ -41,11 +41,26 @@
     "autoprefixer": "10.2.5",
     "husky": "5.1.3",
     "prettier": "2.2.1",
-    "pretty-quick": "3.1.0"
+    "lint-staged": "^9.4.1",
+    "pretty-quick": "3.1.0",
+    "tslint": "5.20.0",
+    "tslint-config-prettier": "^1.18.0"
   },
   "husky": {
     "hooks": {
-      "pre-commit": "pretty-quick --staged"
+      "pre-commit": "lint-staged"
+
     }
+  },
+  "lint-staged": {
+    "*.ts": [
+      "prettier --write",
+      "tslint -p tsconfig.json -c tslint.json",
+      "git add"
+    ],
+    "*.{js,json,md}": [
+      "prettier --write",
+      "git add"
+    ]
   }
 }