From a18c1d6e0b3abe68bb7dd086cd7a62a3be04f0f0 Mon Sep 17 00:00:00 2001
From: Alex Martzios <alexandros.martzios@gmail.com>
Date: Tue, 9 Jul 2024 14:53:00 +0300
Subject: [PATCH] [angular-18 | WIP] upgrade angular core and cli to v18

---
 package.json          | 30 ++++++++++----------
 src/app/app.module.ts | 64 ++++++++++++++++++++-----------------------
 2 files changed, 44 insertions(+), 50 deletions(-)

diff --git a/package.json b/package.json
index 45fd18f..264f4bd 100644
--- a/package.json
+++ b/package.json
@@ -21,19 +21,19 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "^17.3.11",
+    "@angular/animations": "^18.0.6",
     "@angular/cdk": "^17.3.10",
-    "@angular/common": "^17.3.11",
-    "@angular/compiler": "^17.3.11",
-    "@angular/core": "^17.3.11",
-    "@angular/forms": "^17.3.11",
-    "@angular/localize": "^17.3.11",
+    "@angular/common": "^18.0.6",
+    "@angular/compiler": "^18.0.6",
+    "@angular/core": "^18.0.6",
+    "@angular/forms": "^18.0.6",
+    "@angular/localize": "^18.0.6",
     "@angular/material": "^17.3.10",
-    "@angular/platform-browser": "^17.3.11",
-    "@angular/platform-browser-dynamic": "^17.3.11",
-    "@angular/platform-server": "^17.3.11",
-    "@angular/router": "^17.3.11",
-    "@angular/ssr": "^17.3.8",
+    "@angular/platform-browser": "^18.0.6",
+    "@angular/platform-browser-dynamic": "^18.0.6",
+    "@angular/platform-server": "^18.0.6",
+    "@angular/router": "^18.0.6",
+    "@angular/ssr": "^18.0.7",
     "clipboard": "^1.5.16",
     "core-js": "^2.5.4",
     "express": "^4.15.2",
@@ -47,10 +47,10 @@
     "zone.js": "~0.14.0"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "^17.3.8",
-    "@angular/cli": "^17.3.8",
-    "@angular/compiler-cli": "^17.3.11",
-    "@angular/language-service": "^17.3.11",
+    "@angular-devkit/build-angular": "^18.0.7",
+    "@angular/cli": "^18.0.7",
+    "@angular/compiler-cli": "^18.0.6",
+    "@angular/language-service": "^18.0.6",
     "@types/compression": "^1.7.0",
     "@types/express": "^4.17.0",
     "@types/jasmine": "~3.6.0",
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 7f47ef5..5d29e3b 100755
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -3,7 +3,7 @@ import {SharedModule} from './shared/shared.module';
 import {BrowserModule} from '@angular/platform-browser';
 import {BrowserAnimationsModule} from '@angular/platform-browser/animations';
 import {CommonModule} from '@angular/common';
-import {HTTP_INTERCEPTORS, HttpClientModule} from '@angular/common/http';
+import { HTTP_INTERCEPTORS, provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
 import {AppComponent} from './app.component';
 import {NavigationBarModule} from './openaireLibrary/sharedComponents/navigationBar.module';
 import {CookieLawModule} from './openaireLibrary/sharedComponents/cookie-law/cookie-law.module';
@@ -19,39 +19,33 @@ import {ConfigurationService} from "./openaireLibrary/utils/configuration/config
 import {RouteReuseStrategy} from '@angular/router';
 import {CustomRouteReuseStrategy} from './openaireLibrary/shared/custom-route-reuse-strategy';
 
-@NgModule({
-  imports: [
-    SharedModule,
-    BrowserAnimationsModule,
-    CommonModule,
-    HttpClientModule,
-    ErrorModule,
-    NavigationBarModule, FeedbackModule, BottomModule,
-    CookieLawModule,
-    BrowserAnimationsModule,
-    BrowserModule,
-    AppRoutingModule
-  ],
-  declarations: [AppComponent, OpenaireErrorPageComponent],
-  exports: [AppComponent],
-  providers: [
-    ConfigurationService,
-    {provide: RouteReuseStrategy, useClass: CustomRouteReuseStrategy},
-    {provide: APP_ID, useValue: 'eosc'},
-    {
-      provide: HTTP_INTERCEPTORS,
-      useClass: HttpInterceptorService,
-      multi: true
-    },
-    {
-      provide: HTTP_INTERCEPTORS,
-      useClass: ErrorInterceptorService,
-      multi: true
-    },
-    [{provide: HTTP_INTERCEPTORS, useClass: TimeoutInterceptor, multi: true}],
-    [{provide: DEFAULT_TIMEOUT, useValue: 30000}]
-  ],
-  bootstrap: [AppComponent]
-})
+@NgModule({ declarations: [AppComponent, OpenaireErrorPageComponent],
+    exports: [AppComponent],
+    bootstrap: [AppComponent], imports: [SharedModule,
+        BrowserAnimationsModule,
+        CommonModule,
+        ErrorModule,
+        NavigationBarModule, FeedbackModule, BottomModule,
+        CookieLawModule,
+        BrowserAnimationsModule,
+        BrowserModule,
+        AppRoutingModule], providers: [
+        ConfigurationService,
+        { provide: RouteReuseStrategy, useClass: CustomRouteReuseStrategy },
+        { provide: APP_ID, useValue: 'eosc' },
+        {
+            provide: HTTP_INTERCEPTORS,
+            useClass: HttpInterceptorService,
+            multi: true
+        },
+        {
+            provide: HTTP_INTERCEPTORS,
+            useClass: ErrorInterceptorService,
+            multi: true
+        },
+        [{ provide: HTTP_INTERCEPTORS, useClass: TimeoutInterceptor, multi: true }],
+        [{ provide: DEFAULT_TIMEOUT, useValue: 30000 }],
+        provideHttpClient(withInterceptorsFromDi())
+    ] })
 export class AppModule {
 }