Skip to content

Commit 7f6fd24

Browse files
committed
merge typescript override into main config
1 parent 3501aa3 commit 7f6fd24

File tree

2 files changed

+6
-26
lines changed

2 files changed

+6
-26
lines changed

eslintrc.js

Lines changed: 6 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ export default {
3737
"import/parsers": {
3838
"@typescript-eslint/parser": [".js", ".jsx", ".ts", ".tsx"],
3939
},
40+
"import/resolver": "typescript",
4041
"react": { // used by eslint-plugin-react
4142
version: "19",
4243
},
@@ -56,22 +57,6 @@ export default {
5657
"!.storybook",
5758
],
5859
"overrides": [
59-
{
60-
files: ["**/*.ts"],
61-
rules: {
62-
"no-array-constructor": [0],
63-
"no-implied-eval": [0],
64-
"no-redeclare": [0], // for overloads
65-
"no-unused-vars": [0],
66-
"no-use-before-define": [0],
67-
"require-await": [0],
68-
},
69-
settings: {
70-
"import/resolver": {
71-
"typescript": true,
72-
},
73-
}
74-
},
7560
{
7661
files: ["**/*.d.ts"],
7762
rules: {
@@ -588,7 +573,7 @@ export default {
588573
"multiline-comment-style": [0],
589574
"new-cap": [0],
590575
"no-alert": [0],
591-
"no-array-constructor": [2],
576+
"no-array-constructor": [0],
592577
"no-async-promise-executor": [0],
593578
"no-await-in-loop": [0],
594579
"no-bitwise": [0],
@@ -632,7 +617,7 @@ export default {
632617
"no-global-assign": [2],
633618
"no-implicit-coercion": [2],
634619
"no-implicit-globals": [0],
635-
"no-implied-eval": [2],
620+
"no-implied-eval": [0],
636621
"no-import-assign": [2],
637622
"no-inline-comments": [0],
638623
"no-inner-declarations": [2],
@@ -667,7 +652,7 @@ export default {
667652
"no-promise-executor-return": [0],
668653
"no-proto": [2],
669654
"no-prototype-builtins": [2],
670-
"no-redeclare": [2],
655+
"no-redeclare": [0],
671656
"no-regex-spaces": [2],
672657
"no-restricted-exports": [0],
673658
"no-restricted-globals": [2, ...restrictedGlobals],
@@ -702,8 +687,8 @@ export default {
702687
"no-unused-expressions": [2],
703688
"no-unused-labels": [2],
704689
"no-unused-private-class-members": [2],
705-
"no-unused-vars": [2, {"vars": "all", "args": "all", "caughtErrors": "all", "ignoreRestSiblings": false, "argsIgnorePattern": "^_", "varsIgnorePattern": "^_[^_]*$", "caughtErrorsIgnorePattern": "^_", "destructuredArrayIgnorePattern": "^_"}],
706-
"no-use-before-define": [2, {"functions": false, "classes": true, "variables": true, "allowNamedExports": true}],
690+
"no-unused-vars": [0],
691+
"no-use-before-define": [0],
707692
"no-useless-backreference": [2],
708693
"no-useless-call": [2],
709694
"no-useless-catch": [2],

index.ts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,6 @@ const common: Linter.Config = {
104104
};
105105

106106
const [
107-
tsOverride,
108107
dtsOverride,
109108
workerOverride,
110109
testOverride,
@@ -119,10 +118,6 @@ export default [
119118
files: [...jsExts, ...tsExts].map(ext => `**/*${ext}`),
120119
rules: baseRules,
121120
} satisfies Linter.Config, {arrayExtend: true}),
122-
deepMerge(common, {
123-
files: tsOverride.files,
124-
rules: tsOverride.rules,
125-
} satisfies Linter.Config, {arrayExtend: true}),
126121
deepMerge(common, {
127122
files: dtsOverride.files,
128123
rules: dtsOverride.rules,

0 commit comments

Comments
 (0)