Skip to content

Commit 46fd60d

Browse files
authored
Merge pull request #4823 from alexandrevryghem/eslint-9-upgrade
Eslint 9 upgrade
2 parents 0d4aaea + 034c467 commit 46fd60d

File tree

6 files changed

+204
-794
lines changed

6 files changed

+204
-794
lines changed

.eslintrc.json

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,10 @@
55
"@angular-eslint/eslint-plugin",
66
"eslint-plugin-import",
77
"eslint-plugin-jsdoc",
8-
"eslint-plugin-deprecation",
98
"unused-imports",
109
"eslint-plugin-lodash",
1110
"eslint-plugin-jsonc",
12-
"eslint-plugin-rxjs",
11+
"@smarttools/rxjs",
1312
"eslint-plugin-simple-import-sort",
1413
"eslint-plugin-import-newlines",
1514
"@stylistic",
@@ -38,7 +37,7 @@
3837
"plugin:@typescript-eslint/recommended-requiring-type-checking",
3938
"plugin:@angular-eslint/recommended",
4039
"plugin:@angular-eslint/template/process-inline-templates",
41-
"plugin:rxjs/recommended"
40+
"plugin:@smarttools/rxjs/recommended-legacy"
4241
],
4342
"rules": {
4443
"indent": [
@@ -237,7 +236,7 @@
237236
}
238237
],
239238

240-
"deprecation/deprecation": "warn",
239+
"@typescript-eslint/no-deprecated": "warn",
241240

242241
"simple-import-sort/imports": "error",
243242
"simple-import-sort/exports": "error",
@@ -266,7 +265,7 @@
266265
"method"
267266
],
268267

269-
"rxjs/no-nested-subscribe": "off", // todo: go over _all_ cases
268+
"@smarttools/rxjs/no-nested-subscribe": "off", // todo: go over _all_ cases
270269

271270
// Custom DSpace Angular rules
272271
"dspace-angular-ts/alias-imports": [

lint/src/util/typescript.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,11 @@ export type AnyRuleContext = RuleContext<string, unknown[]>;
2424
*/
2525
export function getFilename(context: AnyRuleContext): string {
2626
// TSESLint claims this is deprecated, but the suggested alternative is undefined (could be a version mismatch between ESLint and TSESlint?)
27-
// eslint-disable-next-line deprecation/deprecation
2827
return toUnixStylePath(context.getFilename());
2928
}
3029

3130
export function getSourceCode(context: AnyRuleContext): SourceCode {
3231
// TSESLint claims this is deprecated, but the suggested alternative is undefined (could be a version mismatch between ESLint and TSESlint?)
33-
// eslint-disable-next-line deprecation/deprecation
3432
return context.getSourceCode();
3533
}
3634

0 commit comments

Comments
 (0)