diff --git a/.eslintrc b/.eslintrc
index 343879d2..cfda5643 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -19,5 +19,14 @@
     "react/jsx-fragments": "off",
     // Disable prefer default export
     "import/prefer-default-export": "off"
-  }
+  },
+  "overrides": [
+    {
+      "files": ["*.ts", "*.tsx"],
+      "parserOptions": {
+        "ecmaVersion": 12,
+        "project": ["./tsconfig.json"]
+      }
+    }
+  ]
 }
diff --git a/template/.eslintrc b/template/.eslintrc
index 2bb90228..3a662b3c 100644
--- a/template/.eslintrc
+++ b/template/.eslintrc
@@ -15,6 +15,16 @@
     // Disable <Fragment> => <> replacement. Feel free to change
     "react/jsx-fragments": "off",
     // Disable prefer default export
-    "import/prefer-default-export": "off"
-  }
+    "import/prefer-default-export": "off",
+    "comma-dangle": "off"
+  },
+  "overrides": [
+    {
+      "files": ["*.ts", "*.tsx"],
+      "parserOptions": {
+        "ecmaVersion": 12,
+        "project": ["./tsconfig.json"]
+      }
+    }
+  ]
 }