Skip to content

Commit 6ee2f47

Browse files
committed
fix(upgrade): upgraded angular to 21
1 parent 79e7732 commit 6ee2f47

7 files changed

Lines changed: 7192 additions & 8215 deletions

File tree

angular.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
"outputPath": "dist/osf",
2222
"index": "src/index.html",
2323
"browser": "src/main.ts",
24-
"polyfills": ["zone.js"],
2524
"tsConfig": "tsconfig.app.json",
2625
"inlineStyleLanguage": "scss",
2726
"allowedCommonJsDependencies": [

eslint.config.js

Lines changed: 29 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
// @ts-check
22
const eslint = require('@eslint/js');
3+
const { defineConfig } = require('eslint/config');
34
const tseslint = require('typescript-eslint');
45
const angular = require('angular-eslint');
6+
57
const pluginImport = require('eslint-plugin-import');
68
const pluginSimpleImportSort = require('eslint-plugin-simple-import-sort');
79
const pluginUnusedImports = require('eslint-plugin-unused-imports');
810
const eslintPluginPrettierRecommended = require('eslint-plugin-prettier/recommended');
9-
const angularEslintTemplate = require('@angular-eslint/eslint-plugin-template');
10-
const angularTemplateParser = require('@angular-eslint/template-parser');
1111

12-
module.exports = tseslint.config(
12+
module.exports = defineConfig(
1313
{
1414
files: ['**/*.ts'],
1515
extends: [
1616
eslint.configs.recommended,
17-
...tseslint.configs.recommended,
18-
...tseslint.configs.stylistic,
19-
...angular.configs.tsRecommended,
17+
tseslint.configs.recommended,
18+
tseslint.configs.stylistic,
19+
angular.configs.tsRecommended,
2020
eslintPluginPrettierRecommended,
2121
],
2222
processor: angular.processInlineTemplates,
@@ -27,7 +27,6 @@ module.exports = tseslint.config(
2727
},
2828
rules: {
2929
'@typescript-eslint/no-unused-vars': ['error', { argsIgnorePattern: '^_', varsIgnorePattern: '^_' }],
30-
3130
'@angular-eslint/directive-selector': [
3231
'error',
3332
{
@@ -58,7 +57,7 @@ module.exports = tseslint.config(
5857
['^ngx-', '^@ngx', '^ng-'],
5958

6059
// Third-party packages (primeng)
61-
['^@primeng', '^primeng'],
60+
['^@primeng', '^primeng', '^@primeuix', '^primeuix'],
6261

6362
// RxJS packages (rxjs or @rxjs/...)
6463
['^rxjs', '^rxjs/operators'],
@@ -86,26 +85,29 @@ module.exports = tseslint.config(
8685
},
8786
},
8887
{
89-
files: ['**/*.html'],
90-
languageOptions: {
91-
parser: angularTemplateParser,
92-
},
93-
extends: [...angular.configs.templateRecommended, ...angular.configs.templateAccessibility],
88+
files: ['src/app/**/*.html'],
89+
extends: [
90+
angular.configs.templateRecommended,
91+
angular.configs.templateAccessibility,
92+
eslintPluginPrettierRecommended,
93+
],
9494
rules: {
95-
'@angular-eslint/template/banana-in-box': ['error'],
96-
'@angular-eslint/template/eqeqeq': ['error'],
97-
'@angular-eslint/template/no-negated-async': ['error'],
98-
'@angular-eslint/template/alt-text': ['error'],
99-
'@angular-eslint/template/click-events-have-key-events': ['error'],
100-
'@angular-eslint/template/elements-content': ['error'],
101-
'@angular-eslint/template/interactive-supports-focus': ['error'],
102-
'@angular-eslint/template/label-has-associated-control': ['error'],
103-
'@angular-eslint/template/mouse-events-have-key-events': ['error'],
104-
'@angular-eslint/template/no-autofocus': ['error'],
105-
'@angular-eslint/template/no-distracting-elements': ['error'],
106-
'@angular-eslint/template/role-has-required-aria': ['error'],
107-
'@angular-eslint/template/table-scope': ['error'],
108-
'@angular-eslint/template/valid-aria': ['error'],
95+
'@angular-eslint/template/banana-in-box': 'error',
96+
'@angular-eslint/template/eqeqeq': 'error',
97+
'@angular-eslint/template/no-negated-async': 'error',
98+
'@angular-eslint/template/prefer-control-flow': 'error',
99+
100+
'@angular-eslint/template/alt-text': 'error',
101+
'@angular-eslint/template/click-events-have-key-events': 'error',
102+
'@angular-eslint/template/elements-content': 'error',
103+
'@angular-eslint/template/interactive-supports-focus': 'error',
104+
'@angular-eslint/template/label-has-associated-control': 'error',
105+
'@angular-eslint/template/mouse-events-have-key-events': 'error',
106+
'@angular-eslint/template/no-autofocus': 'error',
107+
'@angular-eslint/template/no-distracting-elements': 'error',
108+
'@angular-eslint/template/role-has-required-aria': 'error',
109+
'@angular-eslint/template/table-scope': 'error',
110+
'@angular-eslint/template/valid-aria': 'error',
109111
},
110112
},
111113
{

0 commit comments

Comments
 (0)