Updated to Angular 18

Fraunhofer-AISEC · Jun 6, 2024 · 8a86c27 · 8a86c27
1 parent 955caa6
commit 8a86c27
Show file tree

Hide file tree

Showing 10 changed files with 1,794 additions and 5,345 deletions.
diff --git a/ids-webconsole/build.gradle.kts b/ids-webconsole/build.gradle.kts
@@ -88,6 +88,7 @@ node {
     // This is important for a hassle-free build without pre-installed yarn!
     // To disable, pass -PnodeDownload=false to gradle!
     download.set(findProperty("nodeDownload")?.toString()?.toBoolean() ?: true)
+    version.set("20.14.0")
 }
 
 val yarnInstall by tasks.registering(YarnTask::class) {

diff --git a/...ain/angular/.yarn/releases/yarn-4.1.1.cjs → ...ain/angular/.yarn/releases/yarn-4.2.2.cjs b/...ain/angular/.yarn/releases/yarn-4.1.1.cjs → ...ain/angular/.yarn/releases/yarn-4.2.2.cjs
diff --git a/ids-webconsole/src/main/angular/.yarnrc.yml b/ids-webconsole/src/main/angular/.yarnrc.yml
@@ -1,3 +1,3 @@
 nodeLinker: node-modules
 
-yarnPath: .yarn/releases/yarn-4.1.1.cjs
+yarnPath: .yarn/releases/yarn-4.2.2.cjs
diff --git a/ids-webconsole/src/main/angular/angular.json b/ids-webconsole/src/main/angular/angular.json
@@ -9,11 +9,12 @@
       "projectType": "application",
       "architect": {
         "build": {
-          "builder": "@angular-devkit/build-angular:browser",
+          "builder": "@angular/build:application",
           "options": {
-            "outputPath": "dist",
+            "outputPath": {
+              "base": "dist"
+            },
             "index": "src/index.html",
-            "main": "src/main.ts",
             "tsConfig": "src/tsconfig.json",
             "assets": [
               "src/images",
@@ -33,12 +34,11 @@
               "node_modules/viz.js/full.render.js",
               "node_modules/svg-pan-zoom/dist/svg-pan-zoom.js"
             ],
-            "vendorChunk": true,
             "extractLicenses": false,
-            "buildOptimizer": false,
             "sourceMap": true,
             "optimization": false,
-            "namedChunks": true
+            "namedChunks": true,
+            "browser": "src/main.ts"
           },
           "configurations": {
             "production": {
@@ -53,20 +53,22 @@
               "sourceMap": false,
               "namedChunks": false,
               "extractLicenses": true,
-              "vendorChunk": false,
-              "buildOptimizer": true,
               "fileReplacements": [
                 {
                   "replace": "src/environments/environment.ts",
                   "with": "src/environments/environment.prod.ts"
                 }
-              ]
+              ],
+              "outputPath": {
+                "base": "../../../build/resources/main",
+                "browser": "www"
+              }
             }
           },
           "defaultConfiguration": ""
         },
         "serve": {
-          "builder": "@angular-devkit/build-angular:dev-server",
+          "builder": "@angular/build:dev-server",
           "options": {
             "proxyConfig": "proxy.conf.json",
             "buildTarget": "trusted-connector-ui:build"
@@ -78,7 +80,7 @@
           }
         },
         "extract-i18n": {
-          "builder": "@angular-devkit/build-angular:extract-i18n",
+          "builder": "@angular/build:extract-i18n",
           "options": {
             "buildTarget": "trusted-connector-ui:build"
           }

diff --git a/ids-webconsole/src/main/angular/package.json b/ids-webconsole/src/main/angular/package.json
@@ -4,48 +4,51 @@
   "license": "SEE LICENSE IN license.txt",
   "angular-cli": {},
   "scripts": {
-    "bundle": "ng build --configuration production --no-progress --output-path=\"../../../build/resources/main/www\""
+    "bundle": "ng build --configuration production --no-progress"
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "^17.3.0",
-    "@angular/common": "^17.3.0",
-    "@angular/core": "^17.3.0",
-    "@angular/forms": "^17.3.0",
-    "@angular/platform-browser": "^17.3.0",
-    "@angular/platform-browser-dynamic": "^17.3.0",
-    "@angular/platform-server": "^17.3.0",
-    "@angular/router": "^17.3.0",
-    "core-js": "^3.36.0",
+    "@angular/animations": "^18.0.2",
+    "@angular/common": "^18.0.2",
+    "@angular/core": "^18.0.2",
+    "@angular/forms": "^18.0.2",
+    "@angular/platform-browser": "^18.0.2",
+    "@angular/platform-browser-dynamic": "^18.0.2",
+    "@angular/platform-server": "^18.0.2",
+    "@angular/router": "^18.0.2",
+    "core-js": "^3.37.1",
     "deep-equal": "^2.2.3",
     "jquery": "^3.7.1",
     "material-design-lite": "^1.3.0",
     "ngx-logger": "^5.0.12",
-    "rxjs": "^6.6.7",
+    "rxjs": "^7.8.1",
     "svg-pan-zoom": "^3.6.1",
-    "tslib": "^2.6.2",
+    "tslib": "^2.6.3",
     "viz.js": "^2.1.2",
-    "zone.js": "~0.14.4"
+    "zone.js": "~0.14.6"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "^17.3.0",
-    "@angular-eslint/builder": "^17.3.0",
-    "@angular-eslint/eslint-plugin": "^17.3.0",
-    "@angular-eslint/eslint-plugin-template": "^17.3.0",
-    "@angular-eslint/schematics": "^17.3.0",
-    "@angular-eslint/template-parser": "^17.3.0",
-    "@angular/cli": "^17.3.0",
-    "@angular/compiler": "^17.3.0",
-    "@angular/compiler-cli": "^17.3.0",
-    "@types/node": "^18.19.24",
-    "@typescript-eslint/eslint-plugin": "^5.62.0",
-    "@typescript-eslint/parser": "^5.62.0",
-    "@typescript-eslint/typescript-estree": "^5.62.0",
-    "eslint": "^8.57.0",
+    "@angular-devkit/core": "^18.0.3",
+    "@angular-devkit/schematics": "^18.0.3",
+    "@angular-eslint/builder": "^18.0.1",
+    "@angular-eslint/eslint-plugin": "^18.0.1",
+    "@angular-eslint/eslint-plugin-template": "^18.0.1",
+    "@angular-eslint/schematics": "^18.0.1",
+    "@angular-eslint/template-parser": "^18.0.1",
+    "@angular/build": "^18.0.3",
+    "@angular/cli": "^18.0.3",
+    "@angular/compiler": "^18.0.2",
+    "@angular/compiler-cli": "^18.0.2",
+    "@types/node": "^20.14.2",
+    "@typescript-eslint/eslint-plugin": "^7.12.0",
+    "@typescript-eslint/parser": "^7.12.0",
+    "@typescript-eslint/typescript-estree": "^7.12.0",
+    "@typescript-eslint/utils": "^7.12.0",
+    "eslint": "^8",
     "eslint-plugin-import": "^2.29.1",
-    "eslint-plugin-jsdoc": "^40.3.0",
+    "eslint-plugin-jsdoc": "^48.2.8",
     "eslint-plugin-prefer-arrow": "^1.2.3",
-    "typescript": "^5.4.2"
+    "typescript": "^5.4.5"
   },
-  "packageManager": "yarn@4.1.1"
+  "packageManager": "yarn@4.2.2"
 }
diff --git a/ids-webconsole/src/main/angular/src/app/app.module.ts b/ids-webconsole/src/main/angular/src/app/app.module.ts
@@ -1,4 +1,4 @@
-import { HttpClientModule, HTTP_INTERCEPTORS } from '@angular/common/http';
+import { HTTP_INTERCEPTORS, provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
 import { LoggerModule, NgxLoggerLevel } from 'ngx-logger';
 import { NgModule, NO_ERRORS_SCHEMA } from '@angular/core';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
@@ -55,18 +55,7 @@ import { UserCardComponent } from './users/user-card.component';
 import { NewIdentityESTComponent } from './keycerts/identitynewest.component';
 import { ESTService } from './keycerts/est-service';
 
-@NgModule({
-    imports: [
-        BrowserModule,
-        routing,
-        HttpClientModule,
-        FormsModule,
-        ReactiveFormsModule,
-        LoggerModule.forRoot({
-            level: NgxLoggerLevel.DEBUG
-        })
-    ],
-    declarations: [
+@NgModule({ declarations: [
         AppComponent,
         AppsSearchComponent,
         DashboardComponent,
@@ -101,7 +90,18 @@ import { ESTService } from './keycerts/est-service';
         UsersComponent,
         NewIdentityESTComponent
     ],
-    providers: [
+    bootstrap: [
+        AppComponent
+    ],
+    schemas: [
+        NO_ERRORS_SCHEMA
+    ], imports: [BrowserModule,
+        routing,
+        FormsModule,
+        ReactiveFormsModule,
+        LoggerModule.forRoot({
+            level: NgxLoggerLevel.DEBUG
+        })], providers: [
         HTTP_PROVIDER,
         AppService,
         RouteService,
@@ -123,14 +123,8 @@ import { ESTService } from './keycerts/est-service';
             useClass: JwtInterceptor,
             multi: true
         },
-        UserService
-    ],
-    bootstrap: [
-        AppComponent
-    ],
-    schemas: [
-        NO_ERRORS_SCHEMA
-    ]
-})
+        UserService,
+        provideHttpClient(withInterceptorsFromDi())
+    ] })
 export class AppModule {
 }
diff --git a/ids-webconsole/src/main/angular/src/main.ts b/ids-webconsole/src/main/angular/src/main.ts
@@ -3,7 +3,7 @@ import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
 
 import { AppModule } from './app/app.module';
 import { environment } from './environments/environment';
-import './polyfills.ts';
+import './polyfills';
 
 if (environment.production) {
   enableProdMode();

diff --git a/ids-webconsole/src/main/angular/src/tsconfig.json b/ids-webconsole/src/main/angular/src/tsconfig.json
@@ -25,6 +25,6 @@
     "polyfills.ts"
   ],
   "include": [
-    "src/**/*.d.ts"
+    "**/*.ts"
   ]
-}
+}
diff --git a/ids-webconsole/src/main/angular/tsconfig.json b/ids-webconsole/src/main/angular/tsconfig.json
@@ -1,4 +1,7 @@
 {
+  "compilerOptions": {
+    "esModuleInterop": true
+  },
   "files": [],
   "references": [
     {