Angular 18 upgrade

LarsBergqvist · Nov 2, 2024 · 9d675a1 · 9d675a1
1 parent 3bd91ce
commit 9d675a1
Show file tree

Hide file tree

Showing 3 changed files with 2,767 additions and 2,015 deletions.
diff --git a/package.json b/package.json
@@ -12,31 +12,31 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "^17.2.4",
+    "@angular/animations": "^18.2.10",
     "@angular/cdk": "^17.0.0",
-    "@angular/common": "^17.2.4",
-    "@angular/compiler": "^17.2.4",
-    "@angular/core": "^17.2.4",
-    "@angular/forms": "^17.2.4",
-    "@angular/platform-browser": "^17.2.4",
-    "@angular/platform-browser-dynamic": "^17.2.4",
-    "@angular/router": "^17.2.4",
-    "@angular/service-worker": "^17.2.4",
+    "@angular/common": "^18.2.10",
+    "@angular/compiler": "^18.2.10",
+    "@angular/core": "^18.2.10",
+    "@angular/forms": "^18.2.10",
+    "@angular/platform-browser": "^18.2.10",
+    "@angular/platform-browser-dynamic": "^18.2.10",
+    "@angular/router": "^18.2.10",
+    "@angular/service-worker": "^18.2.10",
     "ng": "^0.0.0",
     "ol": "7.1.0",
     "primeflex": "^2.0.0",
     "primeicons": "^6.0.0",
     "primeng": "^17.0.0",
     "rxjs": "^7.4",
     "tslib": "^2.3.0",
-    "zone.js": "~0.14.4"
+    "zone.js": "~0.14.10"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "^17.2.3",
-    "@angular/cli": "^17.2.3",
-    "@angular/compiler-cli": "^17.2.4",
-    "@angular/language-service": "^17.2.4",
-    "@angular/localize": "^17.2.4",
+    "@angular-devkit/build-angular": "^18.2.11",
+    "@angular/cli": "^18.2.11",
+    "@angular/compiler-cli": "^18.2.10",
+    "@angular/language-service": "^18.2.10",
+    "@angular/localize": "^18.2.10",
     "@types/jasmine": "~3.10.3",
     "@types/jasminewd2": "~2.0.3",
     "@types/node": "^20.0.0",
@@ -50,6 +50,6 @@
     "karma-jasmine-html-reporter": "^1.5.0",
     "karma-junit-reporter": "^2.0.1",
     "tslint": "~6.1.0",
-    "typescript": "~5.3.3"
+    "typescript": "~5.5.4"
   }
 }
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
@@ -3,7 +3,7 @@ import { NgModule } from '@angular/core';
 
 import { AppRoutingModule } from './app-routing.module';
 import { AppComponent } from './app.component';
-import { HttpClientModule, HTTP_INTERCEPTORS } from '@angular/common/http';
+import { HTTP_INTERCEPTORS, provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
 import { ToolbarModule } from 'primeng/toolbar';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { SidebarModule } from 'primeng/sidebar';
@@ -28,8 +28,7 @@ import { MapSidebarComponent } from './components/map/map-sidebar.component';
 import { RadioButtonModule } from 'primeng/radiobutton';
 import { InfoSideBarComponent } from './components/traffic-info/info-sidebar.component';
 
-@NgModule({
-    declarations: [
+@NgModule({ declarations: [
         MapComponent,
         AppComponent,
         TrafficMessagesComponent,
@@ -38,10 +37,8 @@ import { InfoSideBarComponent } from './components/traffic-info/info-sidebar.com
         InfoCardComponent,
         InfoSideBarComponent
     ],
-    imports: [
-        BrowserModule,
+    bootstrap: [AppComponent], imports: [BrowserModule,
         AppRoutingModule,
-        HttpClientModule,
         ToolbarModule,
         BrowserAnimationsModule,
         SidebarModule,
@@ -55,18 +52,15 @@ import { InfoSideBarComponent } from './components/traffic-info/info-sidebar.com
         AccordionModule,
         ServiceWorkerModule.register('ngsw-worker.js', {
             enabled: environment.production
-        })
-    ],
-    providers: [
+        })], providers: [
         MessageService,
         LoggingService,
         {
             provide: HTTP_INTERCEPTORS,
             useClass: HttpInterceptorService,
             multi: true,
             deps: [MessageBrokerService, LoggingService]
-        }
-    ],
-    bootstrap: [AppComponent]
-})
+        },
+        provideHttpClient(withInterceptorsFromDi())
+    ] })
 export class AppModule {}