diff --git a/.huskyrc b/.huskyrc
index 2a4718c2..914cf42e 100644
--- a/.huskyrc
+++ b/.huskyrc
@@ -1,5 +1,6 @@
 {
   "hooks": {
+    "pre-commit": "lint-staged",
     "commit-msg": "commitlint -E HUSKY_GIT_PARAMS"
   }
 }
diff --git a/.lintstagedrc b/.lintstagedrc
new file mode 100644
index 00000000..b82b2dea
--- /dev/null
+++ b/.lintstagedrc
@@ -0,0 +1,14 @@
+{
+  "*.{js,ts,tsx}": [
+    "prettier --write",
+    "git add"
+  ],
+  "*.md": [
+    "prettier --write --parser markdown",
+    "git add"
+  ],
+  "*.json": [
+    "prettier --write --parser json",
+    "git add"
+  ]
+}
diff --git a/package.json b/package.json
index f692b462..6802ba97 100644
--- a/package.json
+++ b/package.json
@@ -28,6 +28,7 @@
     "husky": "3.0.5",
     "jsdom": "13.0.0",
     "lerna": "3.5.1",
+    "lint-staged": "^9.2.5",
     "mocha": "5.2.0",
     "nyc": "13.1.0",
     "prettier": "^1.18.2",