Skip to content

Commit

Permalink
Update Angular 18
Browse files Browse the repository at this point in the history
Update Angular 18, Clarity 17, ngrx, luxon
Update typescript, eslint, prettier, cypress
Resolves #1972
  • Loading branch information
oodamien committed Dec 18, 2024
1 parent cd98bc0 commit 41a6560
Show file tree
Hide file tree
Showing 109 changed files with 16,152 additions and 13,541 deletions.
72 changes: 16 additions & 56 deletions ui/.eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,28 +1,21 @@
{
"root": true,
"ignorePatterns": [
"dist",
"coverage"
],
"ignorePatterns": [],
"parserOptions": {
"ecmaVersion": 2020
"ecmaVersion": "latest"
},
"overrides": [
{
"files": [
"*.ts"
],
"files": ["*.ts"],
"parserOptions": {
"project": [
"src/tsconfig.app.json",
"src/tsconfig.spec.json"
],
"project": ["src/tsconfig.app.json", "src/tsconfig.spec.json", "cypress/tsconfig.json"],
"createDefaultProgram": true
},
"extends": [
"plugin:@angular-eslint/recommended",
"eslint:recommended",
"plugin:@typescript-eslint/recommended",
"plugin:@angular-eslint/recommended",
"plugin:@angular-eslint/template/process-inline-templates",
"plugin:prettier/recommended"
],
"rules": {
Expand All @@ -49,29 +42,15 @@
"prefer-rest-params": "off",
"@typescript-eslint/no-this-alias": "off",
"no-shadow": "off",
"@typescript-eslint/no-shadow": [
"error"
],
"@typescript-eslint/no-shadow": ["error"],
"@typescript-eslint/explicit-member-accessibility": [
"off",
{
"accessibility": "explicit"
}
],
"@typescript-eslint/indent": "off",
"@typescript-eslint/member-delimiter-style": [
"error",
{
"multiline": {
"delimiter": "semi",
"requireLast": true
},
"singleline": {
"delimiter": "semi",
"requireLast": false
}
}
],
"@typescript-eslint/member-delimiter-style": "off",
"@typescript-eslint/member-ordering": "off",
"@typescript-eslint/naming-convention": "off",
"@typescript-eslint/no-empty-function": "off",
Expand All @@ -86,24 +65,15 @@
"@typescript-eslint/no-non-null-assertion": "error",
"@typescript-eslint/no-unused-expressions": "error",
"@typescript-eslint/prefer-function-type": "error",
"@typescript-eslint/semi": [
"error",
"always"
],
"@typescript-eslint/type-annotation-spacing": "error",
"@typescript-eslint/semi": "off",
"@typescript-eslint/type-annotation-spacing": "off",
"@typescript-eslint/unified-signatures": "error",
"arrow-body-style": "error",
"brace-style": [
"error",
"1tbs"
],
"brace-style": ["error", "1tbs"],
"constructor-super": "error",
"curly": "error",
"eol-last": "error",
"eqeqeq": [
"error",
"smart"
],
"eqeqeq": ["error", "smart"],
"guard-for-in": "error",
"id-blacklist": "off",
"id-match": "off",
Expand Down Expand Up @@ -141,10 +111,7 @@
"no-eval": "error",
"no-fallthrough": "error",
"no-new-wrappers": "error",
"no-restricted-imports": [
"error",
"rxjs/Rx"
],
"no-restricted-imports": ["error", "rxjs/Rx"],
"no-trailing-spaces": "error",
"no-undef-init": "error",
"no-underscore-dangle": "off",
Expand All @@ -156,21 +123,14 @@
"error",
"always",
{
"markers": [
"/"
]
"markers": ["/"]
}
]
}
},
{
"files": [
"*.html"
],
"extends": [
"plugin:@angular-eslint/template/recommended",
"plugin:prettier/recommended"
],
"files": ["*.html"],
"extends": ["plugin:@angular-eslint/template/recommended", "plugin:prettier/recommended"],
"rules": {}
}
]
Expand Down
29 changes: 8 additions & 21 deletions ui/angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,12 @@
"inlineCritical": false
}
},
"assets": [
"src/favicon.ico",
"src/assets",
"src/logout-success-oauth.html"
],
"assets": ["src/favicon.ico", "src/assets", "src/logout-success-oauth.html"],
"styles": [
"node_modules/@cds/core/global.min.css",
"node_modules/@cds/core/styles/theme.dark.min.css",
"node_modules/@clr/ui/clr-ui.min.css",
"node_modules/@clr/icons/clr-icons.css",
"node_modules/@clr/ui/clr-ui.css",
"src/styles.scss"
],
"scripts": [
Expand Down Expand Up @@ -126,24 +124,15 @@
"polyfills": "src/polyfills.ts",
"tsConfig": "src/tsconfig.spec.json",
"karmaConfig": "src/karma.conf.js",
"styles": [
"src/styles.scss"
],
"styles": ["src/styles.scss"],
"scripts": [],
"assets": [
"src/favicon.ico",
"src/assets",
"src/logout-success-oauth.html"
]
"assets": ["src/favicon.ico", "src/assets", "src/logout-success-oauth.html"]
}
},
"lint": {
"builder": "@angular-eslint/builder:lint",
"options": {
"lintFilePatterns": [
"src/app/**/*.ts",
"src/app/**/*.html"
]
"lintFilePatterns": ["src/app/**/*.ts", "src/app/**/*.html"]
}
},
"cypress-run": {
Expand Down Expand Up @@ -198,9 +187,7 @@
"lint": {
"builder": "@angular-eslint/builder:lint",
"options": {
"lintFilePatterns": [
"cypress/**/*.ts"
]
"lintFilePatterns": ["cypress/**/*.ts"]
}
},
"cypress-run": {
Expand Down
Loading

0 comments on commit 41a6560

Please sign in to comment.