Skip to content

Commit b61653e

Browse files
committed
Merge remote-tracking branch 'upstream/main' into issue-3170
2 parents 7a57777 + a59cdfd commit b61653e

File tree

3,025 files changed

+283984
-73943
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,025 files changed

+283984
-73943
lines changed

.editorconfig

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@ trim_trailing_whitespace = false
1515

1616
[*.ts]
1717
quote_type = single
18+
ij_typescript_enforce_trailing_comma = whenmultiline
19+
20+
[*.js]
21+
ij_javascript_enforce_trailing_comma = whenmultiline
1822

1923
[*.json5]
2024
ij_json_keep_blank_lines_in_code = 3

.eslintrc.json

Lines changed: 64 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +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",
15-
"eslint-plugin-jsonc",
14+
"@stylistic",
1615
"dspace-angular-ts",
1716
"dspace-angular-html"
1817
],
@@ -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": [
@@ -161,6 +160,9 @@
161160
]
162161
}
163162
],
163+
"@angular-eslint/prefer-standalone": [
164+
"error"
165+
],
164166
"@angular-eslint/no-attribute-decorator": "error",
165167
"@angular-eslint/no-output-native": "warn",
166168
"@angular-eslint/no-output-on-prefix": "warn",
@@ -173,15 +175,16 @@
173175
"ignoreParameters": true
174176
}
175177
],
176-
"@typescript-eslint/quotes": [
178+
"@angular-eslint/prefer-inject": "off",
179+
"@stylistic/quotes": [
177180
"error",
178181
"single",
179182
{
180183
"avoidEscape": true,
181184
"allowTemplateLiterals": true
182185
}
183186
],
184-
"@typescript-eslint/semi": "error",
187+
"@stylistic/semi": "error",
185188
"@typescript-eslint/no-shadow": "error",
186189
"@typescript-eslint/dot-notation": "error",
187190
"@typescript-eslint/consistent-type-definitions": "error",
@@ -204,9 +207,9 @@
204207
]
205208
}
206209
],
207-
"@typescript-eslint/type-annotation-spacing": "error",
210+
"@stylistic/type-annotation-spacing": "error",
208211
"@typescript-eslint/unified-signatures": "error",
209-
"@typescript-eslint/ban-types": "error",
212+
"@typescript-eslint/no-restricted-types": "error",
210213
"@typescript-eslint/no-floating-promises": "warn",
211214
"@typescript-eslint/no-misused-promises": "warn",
212215
"@typescript-eslint/restrict-plus-operands": "warn",
@@ -221,6 +224,7 @@
221224
"@typescript-eslint/no-unsafe-call": "off",
222225
"@typescript-eslint/no-unsafe-argument": "off",
223226
"@typescript-eslint/no-unsafe-return": "off",
227+
"@typescript-eslint/no-redundant-type-constituents": "off",
224228
"@typescript-eslint/restrict-template-expressions": "off",
225229
"@typescript-eslint/require-await": "off",
226230
"@typescript-eslint/no-base-to-string": [
@@ -233,7 +237,7 @@
233237
}
234238
],
235239

236-
"deprecation/deprecation": "warn",
240+
"@typescript-eslint/no-deprecated": "warn",
237241

238242
"simple-import-sort/imports": "error",
239243
"simple-import-sort/exports": "error",
@@ -251,19 +255,62 @@
251255
"forceSingleLine": true
252256
}
253257
],
258+
"import/enforce-node-protocol-usage": [
259+
"error",
260+
"always"
261+
],
254262

255263
"unused-imports/no-unused-imports": "error",
256264
"lodash/import-scope": [
257265
"error",
258266
"method"
259267
],
260268

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

263271
// Custom DSpace Angular rules
264-
"dspace-angular-ts/themed-component-classes": "error",
272+
"dspace-angular-ts/alias-imports": [
273+
"error",
274+
{
275+
"aliases": [
276+
{
277+
"package": "rxjs",
278+
"imported": "of",
279+
"local": "of"
280+
}
281+
]
282+
}
283+
],
284+
"dspace-angular-ts/no-default-standalone-value": "error",
265285
"dspace-angular-ts/themed-component-selectors": "error",
266-
"dspace-angular-ts/themed-component-usages": "error"
286+
"dspace-angular-ts/themed-component-usages": "error",
287+
"dspace-angular-ts/themed-decorators": [
288+
"off",
289+
{
290+
"decorators": {
291+
"listableObjectComponent": 3,
292+
"rendersSectionForMenu": 2
293+
}
294+
}
295+
],
296+
"dspace-angular-ts/themed-wrapper-no-input-defaults": "error",
297+
"dspace-angular-ts/unique-decorators": [
298+
"off",
299+
{
300+
"decorators": [
301+
"listableObjectComponent"
302+
]
303+
}
304+
],
305+
"dspace-angular-ts/sort-standalone-imports": [
306+
"error",
307+
{
308+
"locale": "en-US",
309+
"maxItems": 0,
310+
"indent": 2,
311+
"trailingComma": true
312+
}
313+
]
267314
}
268315
},
269316
{
@@ -303,10 +350,13 @@
303350
"*.json5"
304351
],
305352
"extends": [
306-
"plugin:jsonc/recommended-with-jsonc"
353+
"plugin:jsonc/recommended-with-json5"
307354
],
308355
"rules": {
309-
"no-irregular-whitespace": "error",
356+
// The ESLint core no-irregular-whitespace rule doesn't work well in JSON
357+
// See: https://ota-meshi.github.io/eslint-plugin-jsonc/rules/no-irregular-whitespace.html
358+
"no-irregular-whitespace": "off",
359+
"jsonc/no-irregular-whitespace": "error",
310360
"no-trailing-spaces": "error",
311361
"jsonc/comma-dangle": [
312362
"error",

0 commit comments

Comments
 (0)