Skip to content

Commit ef2d0bd

Browse files
committed
Merge branch 'dev' into typescript
2 parents dcc979d + bff08b2 commit ef2d0bd

File tree

3 files changed

+46
-6
lines changed

3 files changed

+46
-6
lines changed

.eslintrc.js

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ module.exports = {
2222
// "@babel",
2323
'prefer-arrow',
2424
'@typescript-eslint',
25+
'unused-imports',
2526
'eslint-plugin-tsdoc',
2627
],
2728
globals: {
@@ -64,6 +65,19 @@ module.exports = {
6465
classPropertiesAllowed: false,
6566
},
6667
],
68+
'no-unused-vars': 'off',
69+
'@typescript-eslint/no-unused-vars': 'off',
70+
'unused-imports/no-unused-imports': 'error',
71+
'unused-imports/no-unused-vars': [
72+
'error',
73+
{
74+
vars: 'all',
75+
// varsIgnorePattern: '^_',
76+
varsIgnorePattern: '^Window$',
77+
args: 'after-used',
78+
argsIgnorePattern: '^_',
79+
},
80+
],
6781
'no-alert': 0,
6882
'no-console': 0,
6983
'tsdoc/syntax': 'warn',
@@ -105,12 +119,6 @@ module.exports = {
105119
},
106120
],
107121
'@typescript-eslint/no-explicit-any': 0,
108-
'@typescript-eslint/no-unused-vars': [
109-
'error',
110-
{
111-
varsIgnorePattern: '^Window$',
112-
},
113-
],
114122
'@typescript-eslint/prefer-nullish-coalescing': 'error',
115123
'@typescript-eslint/prefer-optional-chain': 'error',
116124
'prettier/prettier': 'error',

package-lock.json

Lines changed: 31 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@
6565
"eslint-plugin-prettier": "^4.0.0",
6666
"eslint-plugin-react": "^7.29.4",
6767
"eslint-plugin-tsdoc": "^0.2.16",
68+
"eslint-plugin-unused-imports": "^2.0.0",
6869
"eslint-webpack-plugin": "^3.1.1",
6970
"fork-ts-checker-notifier-webpack-plugin": "^6.0.0",
7071
"fork-ts-checker-webpack-plugin": "^7.2.8",

0 commit comments

Comments
 (0)