Skip to content

Commit 01c0645

Browse files
authored
Merge branch 'DSpace:main' into Search_sidebar_overflows
2 parents 57b49f4 + d769d15 commit 01c0645

2,815 files changed

Lines changed: 96212 additions & 45949 deletions

File tree

Some content is hidden

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

.eslintrc.json

Lines changed: 16 additions & 10 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": [
@@ -175,15 +175,16 @@
175175
"ignoreParameters": true
176176
}
177177
],
178-
"@typescript-eslint/quotes": [
178+
"@angular-eslint/prefer-inject": "off",
179+
"@stylistic/quotes": [
179180
"error",
180181
"single",
181182
{
182183
"avoidEscape": true,
183184
"allowTemplateLiterals": true
184185
}
185186
],
186-
"@typescript-eslint/semi": "error",
187+
"@stylistic/semi": "error",
187188
"@typescript-eslint/no-shadow": "error",
188189
"@typescript-eslint/dot-notation": "error",
189190
"@typescript-eslint/consistent-type-definitions": "error",
@@ -206,9 +207,9 @@
206207
]
207208
}
208209
],
209-
"@typescript-eslint/type-annotation-spacing": "error",
210+
"@stylistic/type-annotation-spacing": "error",
210211
"@typescript-eslint/unified-signatures": "error",
211-
"@typescript-eslint/ban-types": "error",
212+
"@typescript-eslint/no-restricted-types": "error",
212213
"@typescript-eslint/no-floating-promises": "warn",
213214
"@typescript-eslint/no-misused-promises": "warn",
214215
"@typescript-eslint/restrict-plus-operands": "warn",
@@ -223,6 +224,7 @@
223224
"@typescript-eslint/no-unsafe-call": "off",
224225
"@typescript-eslint/no-unsafe-argument": "off",
225226
"@typescript-eslint/no-unsafe-return": "off",
227+
"@typescript-eslint/no-redundant-type-constituents": "off",
226228
"@typescript-eslint/restrict-template-expressions": "off",
227229
"@typescript-eslint/require-await": "off",
228230
"@typescript-eslint/no-base-to-string": [
@@ -235,7 +237,7 @@
235237
}
236238
],
237239

238-
"deprecation/deprecation": "warn",
240+
"@typescript-eslint/no-deprecated": "warn",
239241

240242
"simple-import-sort/imports": "error",
241243
"simple-import-sort/exports": "error",
@@ -253,14 +255,18 @@
253255
"forceSingleLine": true
254256
}
255257
],
258+
"import/enforce-node-protocol-usage": [
259+
"error",
260+
"always"
261+
],
256262

257263
"unused-imports/no-unused-imports": "error",
258264
"lodash/import-scope": [
259265
"error",
260266
"method"
261267
],
262268

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

265271
// Custom DSpace Angular rules
266272
"dspace-angular-ts/alias-imports": [
@@ -275,7 +281,7 @@
275281
]
276282
}
277283
],
278-
"dspace-angular-ts/themed-component-classes": "error",
284+
"dspace-angular-ts/no-default-standalone-value": "error",
279285
"dspace-angular-ts/themed-component-selectors": "error",
280286
"dspace-angular-ts/themed-component-usages": "error",
281287
"dspace-angular-ts/themed-decorators": [

0 commit comments

Comments
 (0)