AW6241 Migrate main to ng-18

projects/common/src/fm/common.module.ts

@@ -1,7 +1,7 @@
 // angular modules
 import { NgModule, APP_INITIALIZER, ModuleWithProviders, Injector, Optional, SkipSelf,InjectionToken } from '@angular/core';
 import { CommonModule, DatePipe } from '@angular/common';
-import { HttpClientModule, HttpClient, HTTP_INTERCEPTORS } from '@angular/common/http';
+import { HttpClient, HTTP_INTERCEPTORS, provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
 import { FormsModule } from '@angular/forms';
 
 // external modules
@@ -126,79 +126,73 @@ export {
   GradientSelectComponent
 };
 
-@NgModule({
-  imports: [
-    CommonModule,
-    HttpClientModule,
-    AppCommonRoutingModule,
-    StoreModule.forFeature(MODULE_NAME, commonReducers.reducer),
-    EffectsModule.forFeature([commonEffects.AppCommonEffects]),
-    OAuthModule.forRoot(),
-    NgbModule,
-    FormsModule,
-    UploadxModule,
-    ClipboardModule,
-    AvatarModule,
-    ImageCropperModule
-  ],
-  declarations: [
-    AppComponent,
-    AuthCallbackComponent,
-    SidePanelComponent,
-    SafePipe,
-    NotFoundComponent,
-    NotImplementedComponent,
-    ResumableFileUploadComponent,
-    TimespanComponent,
-    TagInputComponent,
-    SessionClearedComponent,
-    MenuBackgroundComponent,
-    HasPackageDirective,
-    PackageExistsDirective,
-    HasClaimDirective,
-    HasRoleDirective,
-    UserMenuComponent,
-    GradientComponent,
-    GradientSelectComponent,
-    AppMenuComponent,
-    NotificationMenuComponent,
-    HelpMenuComponent,
-    BackButtonComponent,
-    ThumbnailComponent,
-    EditImageModalComponent,
-    AvatarComponent,
-    ItemLinkComponent
-  ],
-  exports: [
-    NgbModule,
-    UploadxModule,
-    ClipboardModule,
-    CommonModule,
-    AppComponent,
-    ResumableFileUploadComponent,
-    AuthCallbackComponent,
-    SidePanelComponent,
-    SafePipe,
-    NotFoundComponent,
-    NotImplementedComponent,
-    ResumableFileUploadComponent,
-    TimespanComponent,
-    TagInputComponent,
-    SessionClearedComponent,
-    MenuBackgroundComponent,
-    HasPackageDirective,
-    PackageExistsDirective,
-    HasClaimDirective,
-    HasRoleDirective,
-    UserMenuComponent,
-    GradientComponent,
-    GradientSelectComponent,
-    BackButtonComponent,
-    ThumbnailComponent,
-    AvatarComponent,
-    ItemLinkComponent,
-    EditImageModalComponent
-  ]
-})
+@NgModule({ declarations: [
+        AppComponent,
+        AuthCallbackComponent,
+        SidePanelComponent,
+        SafePipe,
+        NotFoundComponent,
+        NotImplementedComponent,
+        ResumableFileUploadComponent,
+        TimespanComponent,
+        TagInputComponent,
+        SessionClearedComponent,
+        MenuBackgroundComponent,
+        HasPackageDirective,
+        PackageExistsDirective,
+        HasClaimDirective,
+        HasRoleDirective,
+        UserMenuComponent,
+        GradientComponent,
+        GradientSelectComponent,
+        AppMenuComponent,
+        NotificationMenuComponent,
+        HelpMenuComponent,
+        BackButtonComponent,
+        ThumbnailComponent,
+        EditImageModalComponent,
+        AvatarComponent,
+        ItemLinkComponent
+    ],
+    exports: [
+        NgbModule,
+        UploadxModule,
+        ClipboardModule,
+        CommonModule,
+        AppComponent,
+        ResumableFileUploadComponent,
+        AuthCallbackComponent,
+        SidePanelComponent,
+        SafePipe,
+        NotFoundComponent,
+        NotImplementedComponent,
+        ResumableFileUploadComponent,
+        TimespanComponent,
+        TagInputComponent,
+        SessionClearedComponent,
+        MenuBackgroundComponent,
+        HasPackageDirective,
+        PackageExistsDirective,
+        HasClaimDirective,
+        HasRoleDirective,
+        UserMenuComponent,
+        GradientComponent,
+        GradientSelectComponent,
+        BackButtonComponent,
+        ThumbnailComponent,
+        AvatarComponent,
+        ItemLinkComponent,
+        EditImageModalComponent
+    ], imports: [CommonModule,
+        AppCommonRoutingModule,
+        StoreModule.forFeature(MODULE_NAME, commonReducers.reducer),
+        EffectsModule.forFeature([commonEffects.AppCommonEffects]),
+        OAuthModule.forRoot(),
+        NgbModule,
+        FormsModule,
+        UploadxModule,
+        ClipboardModule,
+        AvatarModule,
+        ImageCropperModule], providers: [provideHttpClient(withInterceptorsFromDi())] })
 export class AppCommonModule {
 }