diff --git a/.eslintrc.yml b/.eslintrc.yml
index c440d70e..ed4cb1b0 100644
--- a/.eslintrc.yml
+++ b/.eslintrc.yml
@@ -12,9 +12,12 @@ extends:
 
 parser: '@typescript-eslint/parser'
 
-parserOptions:
-  project: tsconfig.eslint.json
-  sourceType: module
+ignorePatterns:
+  - node_modules/
+  - dist/
+  - '**/rollup.config.js'
+  - '**/scripts/*.ts'
+  - '*d.ts'
 
 plugins:
   - '@typescript-eslint'
@@ -24,18 +27,18 @@ rules:
   import/no-default-export: error
   import/prefer-default-export: off
   '@typescript-eslint/explicit-function-return-type': off
-
-overrides:
-  - files:
-      - 'test/**/*.ts'
-    rules:
-      import/no-unresolved: 0
+  import/no-extraneous-dependencies:
+    - error
+    - devDependencies:
+        - '**/test/**/*.ts'
+  import/extensions:
+    - error
+    - never
+    - json: always
 
 settings:
   import/resolver:
     node:
       extensions:
         - .js
-        - .jsx
         - .ts
-        - .tsx
diff --git a/.lintstagedrc.yml b/.lintstagedrc.yml
index edbb7d0b..6c67790c 100644
--- a/.lintstagedrc.yml
+++ b/.lintstagedrc.yml
@@ -1,7 +1,4 @@
-'*.{ts, !(generate).ts}':
+'*.{ts,js,json,md,yml}':
   - 'prettier --write'
+'*.{ts,js}':
   - 'eslint --fix'
-  - 'git add'
-'*.{json, md, yml, js}':
-  - 'prettier --write'
-  - 'git add'