From e3f9c7fedc3e11b49e68498c6a579e7b44213c88 Mon Sep 17 00:00:00 2001 From: Fiete Ostkamp Date: Tue, 24 Sep 2024 14:27:20 +0200 Subject: Update Angular to 15 Issue-ID: PORTALNG-122 Change-Id: Ieb7190f9510975c9cea69696ba82966f48993e6c Signed-off-by: Fiete Ostkamp --- .browserslistrc | 7 ------- angular.json | 8 ++++++++ package.json | 48 +++++++++++++++++++++---------------------- src/app/app-routing.module.ts | 2 +- src/test.ts | 15 -------------- tsconfig.json | 13 +++++++----- 6 files changed, 41 insertions(+), 52 deletions(-) delete mode 100644 .browserslistrc diff --git a/.browserslistrc b/.browserslistrc deleted file mode 100644 index 16e3010..0000000 --- a/.browserslistrc +++ /dev/null @@ -1,7 +0,0 @@ -last 1 Chrome version -last 1 Firefox version -last 2 Edge major versions -last 2 Safari major versions -last 2 iOS major versions -Firefox ESR -not IE 11 # Angular supports IE 11 only as an opt-in. To opt-in, remove the 'not' prefix on this line. \ No newline at end of file diff --git a/angular.json b/angular.json index 2e5b6ae..339a24b 100644 --- a/angular.json +++ b/angular.json @@ -147,5 +147,13 @@ "schematicCollections": [ "@angular-eslint/schematics" ] + }, + "schematics": { + "@angular-eslint/schematics:application": { + "setParserOptionsProject": true + }, + "@angular-eslint/schematics:library": { + "setParserOptionsProject": true + } } } diff --git a/package.json b/package.json index 8222ab4..b9cdf9d 100644 --- a/package.json +++ b/package.json @@ -21,22 +21,22 @@ }, "private": true, "dependencies": { - "@angular/animations": "14.3.0", - "@angular/cdk": "13.3.9", - "@angular/common": "14.3.0", - "@angular/compiler": "14.3.0", - "@angular/core": "14.3.0", - "@angular/forms": "14.3.0", - "@angular/localize": "14.3.0", - "@angular/platform-browser": "14.3.0", - "@angular/platform-browser-dynamic": "14.3.0", - "@angular/router": "14.3.0", - "@ng-bootstrap/ng-bootstrap": "13.1.1", + "@angular/animations": "15.2.10", + "@angular/cdk": "14.2.7", + "@angular/common": "15.2.10", + "@angular/compiler": "15.2.10", + "@angular/core": "15.2.10", + "@angular/forms": "15.2.10", + "@angular/localize": "15.2.10", + "@angular/platform-browser": "15.2.10", + "@angular/platform-browser-dynamic": "15.2.10", + "@angular/router": "15.2.10", + "@ng-bootstrap/ng-bootstrap": "14.2.0", "@ngx-translate/core": "14.0.0", "@ngx-translate/http-loader": "7.0.0", - "@popperjs/core": "2.11.5", + "@popperjs/core": "^2.11.6", "angular-oauth2-oidc": "14.0.1", - "bootstrap": "5.2.0", + "bootstrap": "5.2.3", "license-report": "5.0.2", "lodash": "4.17.21", "rxjs": "~7.4.0", @@ -44,23 +44,23 @@ "zone.js": "0.11.5" }, "devDependencies": { - "@angular-devkit/build-angular": "14.2.13", - "@angular-eslint/builder": "14.4.0", - "@angular-eslint/eslint-plugin": "14.4.0", - "@angular-eslint/eslint-plugin-template": "14.4.0", - "@angular-eslint/schematics": "14.4.0", - "@angular-eslint/template-parser": "14.4.0", - "@angular/cli": "14.2.13", - "@angular/compiler-cli": "14.3.0", + "@angular-devkit/build-angular": "15.2.11", + "@angular-eslint/builder": "15.2.1", + "@angular-eslint/eslint-plugin": "15.2.1", + "@angular-eslint/eslint-plugin-template": "15.2.1", + "@angular-eslint/schematics": "15.2.1", + "@angular-eslint/template-parser": "15.2.1", + "@angular/cli": "15.2.11", + "@angular/compiler-cli": "15.2.10", "@openapitools/openapi-generator-cli": "^2.6.0", "@types/jasmine": "~3.6.0", "@types/jasminewd2": "2.0.3", "@types/lodash": "4.14.188", "@types/node": "18.0.0", "@types/uuid": "^8.3.4", - "@typescript-eslint/eslint-plugin": "^5.36.2", - "@typescript-eslint/parser": "^5.36.2", - "eslint": "^8.23.0", + "@typescript-eslint/eslint-plugin": "^5.43.0", + "@typescript-eslint/parser": "^5.43.0", + "eslint": "^8.28.0", "git-format-staged": "3.0.0", "husky": "8.0.1", "jasmine-core": "~4.0.0", diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 0f5a50e..d4e4d7c 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -49,7 +49,7 @@ const routes: Routes = [ ]; @NgModule({ - imports: [RouterModule.forRoot(routes, { relativeLinkResolution: 'legacy', onSameUrlNavigation: 'reload' })], + imports: [RouterModule.forRoot(routes, { onSameUrlNavigation: 'reload' })], exports: [RouterModule], }) export class AppRoutingModule {} diff --git a/src/test.ts b/src/test.ts index 36b9be6..c64afa3 100644 --- a/src/test.ts +++ b/src/test.ts @@ -23,20 +23,5 @@ import 'zone.js/testing'; import { getTestBed } from '@angular/core/testing'; import { BrowserDynamicTestingModule, platformBrowserDynamicTesting } from '@angular/platform-browser-dynamic/testing'; -declare const require: { - context( - path: string, - deep?: boolean, - filter?: RegExp, - ): { - keys(): string[]; - (id: string): T; - }; -}; - // First, initialize the Angular testing environment. getTestBed().initTestEnvironment(BrowserDynamicTestingModule, platformBrowserDynamicTesting()); -// Then we find all the tests. -const context = require.context('./', true, /\.spec\.ts$/); -// And load the modules. -context.keys().forEach(context); diff --git a/tsconfig.json b/tsconfig.json index c155a6b..9cdbb46 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -14,15 +14,18 @@ "module": "es2020", "moduleResolution": "node", "importHelpers": true, - "target": "es2020", - "lib": ["es2020", "dom"], + "target": "ES2022", + "lib": [ + "es2020", + "dom" + ], "resolveJsonModule": true, - "esModuleInterop": true + "esModuleInterop": true, + "useDefineForClassFields": false }, "angularCompilerOptions": { "strictInjectionParameters": true, "strictTemplates": true, - "fullTemplateTypeCheck": true, - "enableIvy": true + "fullTemplateTypeCheck": true } } -- cgit 1.2.3-korg