Skip to content

Commit 25cb2cb

Browse files
Merge branch 'main' into css-navbar-fixes_contribute-main
2 parents 42b5e3e + 993c89a commit 25cb2cb

File tree

3,002 files changed

+195303
-45137
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

3,002 files changed

+195303
-45137
lines changed

.eslintrc.json

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
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",
14+
"@stylistic",
1515
"dspace-angular-ts",
1616
"dspace-angular-html"
1717
],
@@ -37,7 +37,7 @@
3737
"plugin:@typescript-eslint/recommended-requiring-type-checking",
3838
"plugin:@angular-eslint/recommended",
3939
"plugin:@angular-eslint/template/process-inline-templates",
40-
"plugin:rxjs/recommended"
40+
"plugin:@smarttools/rxjs/recommended-legacy"
4141
],
4242
"rules": {
4343
"indent": [
@@ -70,7 +70,6 @@
7070
"error",
7171
{
7272
"allow": [
73-
"log",
7473
"warn",
7574
"dir",
7675
"timeLog",
@@ -175,15 +174,16 @@
175174
"ignoreParameters": true
176175
}
177176
],
178-
"@typescript-eslint/quotes": [
177+
"@angular-eslint/prefer-inject": "off",
178+
"@stylistic/quotes": [
179179
"error",
180180
"single",
181181
{
182182
"avoidEscape": true,
183183
"allowTemplateLiterals": true
184184
}
185185
],
186-
"@typescript-eslint/semi": "error",
186+
"@stylistic/semi": "error",
187187
"@typescript-eslint/no-shadow": "error",
188188
"@typescript-eslint/dot-notation": "error",
189189
"@typescript-eslint/consistent-type-definitions": "error",
@@ -206,9 +206,9 @@
206206
]
207207
}
208208
],
209-
"@typescript-eslint/type-annotation-spacing": "error",
209+
"@stylistic/type-annotation-spacing": "error",
210210
"@typescript-eslint/unified-signatures": "error",
211-
"@typescript-eslint/ban-types": "error",
211+
"@typescript-eslint/no-restricted-types": "error",
212212
"@typescript-eslint/no-floating-promises": "warn",
213213
"@typescript-eslint/no-misused-promises": "warn",
214214
"@typescript-eslint/restrict-plus-operands": "warn",
@@ -223,6 +223,7 @@
223223
"@typescript-eslint/no-unsafe-call": "off",
224224
"@typescript-eslint/no-unsafe-argument": "off",
225225
"@typescript-eslint/no-unsafe-return": "off",
226+
"@typescript-eslint/no-redundant-type-constituents": "off",
226227
"@typescript-eslint/restrict-template-expressions": "off",
227228
"@typescript-eslint/require-await": "off",
228229
"@typescript-eslint/no-base-to-string": [
@@ -235,7 +236,7 @@
235236
}
236237
],
237238

238-
"deprecation/deprecation": "warn",
239+
"@typescript-eslint/no-deprecated": "warn",
239240

240241
"simple-import-sort/imports": "error",
241242
"simple-import-sort/exports": "error",
@@ -253,14 +254,18 @@
253254
"forceSingleLine": true
254255
}
255256
],
257+
"import/enforce-node-protocol-usage": [
258+
"error",
259+
"always"
260+
],
256261

257262
"unused-imports/no-unused-imports": "error",
258263
"lodash/import-scope": [
259264
"error",
260265
"method"
261266
],
262267

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

265270
// Custom DSpace Angular rules
266271
"dspace-angular-ts/alias-imports": [
@@ -275,7 +280,7 @@
275280
]
276281
}
277282
],
278-
"dspace-angular-ts/themed-component-classes": "error",
283+
"dspace-angular-ts/no-default-standalone-value": "error",
279284
"dspace-angular-ts/themed-component-selectors": "error",
280285
"dspace-angular-ts/themed-component-usages": "error",
281286
"dspace-angular-ts/themed-decorators": [

0 commit comments

Comments
 (0)