some minor cleanup

src/app/app.module.ts

@@ -6,6 +6,7 @@ import { RouterModule } from '@angular/router';
 
 import { StoreModule } from '@ngrx/store';
 import { StoreDevtoolsModule } from '@ngrx/store-devtools';
+import { RouterStateSerializer, StoreRouterConnectingModule } from '@ngrx/router-store';
 
 import { TranslateModule } from '@ngx-translate/core';
 
@@ -30,6 +31,8 @@ import { GLOBAL_CONFIG, ENV_CONFIG } from '../config';
 import { EffectsModule } from '@ngrx/effects';
 import { appMetaReducers } from './app.metareducers';
 
+import { DSpaceRouterStateSerializer } from './shared/ngrx/dspace-router-state-serializer';
+
 export function getConfig() {
   return ENV_CONFIG;
 }
@@ -37,20 +40,27 @@ export function getConfig() {
 @NgModule({
   imports: [
     CommonModule,
-    FormsModule,
     HttpModule,
     RouterModule,
     AppRoutingModule,
-    TransferHttpModule,
     CoreModule.forRoot(),
     NgbModule.forRoot(),
     TranslateModule.forRoot(),
     EffectsModule.forRoot(appEffects),
     StoreModule.forRoot(appReducers, { metaReducers: appMetaReducers }),
-    StoreDevtoolsModule.instrument({ maxAge: 50 })
+    StoreDevtoolsModule.instrument({ maxAge: 50 }),
+    StoreRouterConnectingModule,
+    TransferHttpModule,
   ],
   providers: [
-    { provide: GLOBAL_CONFIG, useFactory: (getConfig) }
+    {
+      provide: GLOBAL_CONFIG,
+      useFactory: (getConfig)
+    },
+    {
+      provide: RouterStateSerializer,
+      useClass: DSpaceRouterStateSerializer
+    }
   ],
   declarations: [
     AppComponent,

src/app/browser-app.module.ts

@@ -23,8 +23,6 @@ import { CoreModule } from './core/core.module';
 import { AppModule } from './app.module';
 
 import { AppComponent } from './app.component';
-import { RouterStateSerializer, StoreRouterConnectingModule } from '@ngrx/router-store';
-import { DSpaceRouterStateSerializer } from './shared/ngrx/dspace-router-state-serializer';
 
 export function init(cache: TransferState) {
   return () => {
@@ -57,7 +55,6 @@ export function createTranslateLoader(http: HttpClient) {
       }
     }),
     EffectsModule.forRoot([BrowserTransferStoreEffects]),
-    StoreRouterConnectingModule,
     AppModule
   ],
   providers: [
@@ -68,10 +65,6 @@ export function createTranslateLoader(http: HttpClient) {
       deps: [
         TransferState
       ]
-    },
-    {
-      provide: RouterStateSerializer,
-      useClass: DSpaceRouterStateSerializer
     }
   ]
 })

src/app/server-app.module.ts

@@ -34,8 +34,6 @@ import { AppModule } from './app.module';
 import { AppComponent } from './app.component';
 
 import { GLOBAL_CONFIG, GlobalConfig } from '../config';
-import { RouterStateSerializer, StoreRouterConnectingModule } from '@ngrx/router-store';
-import { DSpaceRouterStateSerializer } from './shared/ngrx/dspace-router-state-serializer';
 
 export function boot(cache: TransferState, appRef: ApplicationRef, store: Store<AppState>, request: Request, config: GlobalConfig) {
   // authentication mechanism goes here
@@ -45,6 +43,7 @@ export function boot(cache: TransferState, appRef: ApplicationRef, store: Store<
     });
   };
 }
+
 export function createTranslateLoader() {
   return new TranslateUniversalLoader('dist/assets/i18n/', '.json');
 }
@@ -56,8 +55,6 @@ export function createTranslateLoader() {
       appId: 'ds-app-id'
     }),
     RouterModule.forRoot([], { useHash: false }),
-    StoreRouterConnectingModule,
-    ServerModule,
     ServerCookiesModule,
     ServerDataLoaderModule,
     ServerTransferStateModule,
@@ -70,6 +67,7 @@ export function createTranslateLoader() {
       }
     }),
     EffectsModule.forRoot([ServerTransferStoreEffects]),
+    ServerModule,
     AppModule
   ],
   providers: [
@@ -84,10 +82,6 @@ export function createTranslateLoader() {
         REQUEST,
         GLOBAL_CONFIG
       ]
-    },
-    {
-      provide: RouterStateSerializer,
-      useClass: DSpaceRouterStateSerializer
     }
   ]
 })