some minor cleanup

package.json

@@ -93,7 +93,7 @@
     "cookie-parser": "1.4.3",
     "core-js": "2.5.1",
     "express": "4.15.5",
-    "express-session": "1.15.5",
+    "express-session": "1.15.6",
     "font-awesome": "4.7.0",
     "http-server": "0.10.0",
     "https": "1.0.0",

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
     }
   ]
 })

yarn.lock

@@ -2506,19 +2506,19 @@ exports-loader@0.6.4:
     loader-utils "^1.0.2"
     source-map "0.5.x"
 
-express-session@1.15.5:
+express-session@1.15.6:
-  version "1.15.5"
+  version "1.15.6"
-  resolved "https://registry.yarnpkg.com/express-session/-/express-session-1.15.5.tgz#f49a18227263b316f6f8544da5fee25a540259ec"
+  resolved "https://registry.yarnpkg.com/express-session/-/express-session-1.15.6.tgz#47b4160c88f42ab70fe8a508e31cbff76757ab0a"
   dependencies:
     cookie "0.3.1"
     cookie-signature "1.0.6"
     crc "3.4.4"
-    debug "2.6.8"
+    debug "2.6.9"
     depd "~1.1.1"
     on-headers "~1.0.1"
-    parseurl "~1.3.1"
+    parseurl "~1.3.2"
-    uid-safe "~2.1.4"
+    uid-safe "~2.1.5"
-    utils-merge "1.0.0"
+    utils-merge "1.0.1"
 
 express@4.15.5:
   version "4.15.5"
@@ -7645,9 +7645,9 @@ uid-number@^0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/uid-number/-/uid-number-0.0.6.tgz#0ea10e8035e8eb5b8e4449f06da1c730663baa81"
 
-uid-safe@~2.1.4:
+uid-safe@~2.1.5:
-  version "2.1.4"
+  version "2.1.5"
-  resolved "https://registry.yarnpkg.com/uid-safe/-/uid-safe-2.1.4.tgz#3ad6f38368c6d4c8c75ec17623fb79aa1d071d81"
+  resolved "https://registry.yarnpkg.com/uid-safe/-/uid-safe-2.1.5.tgz#2b3d5c7240e8fc2e58f8aa269e5ee49c0857bd3a"
   dependencies:
     random-bytes "~1.0.0"
 
@@ -7820,6 +7820,10 @@ utils-merge@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.0.tgz#0294fb922bb9375153541c4f7096231f287c8af8"
 
+utils-merge@1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
+
 uuid@^2.0.1, uuid@^2.0.2:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-2.0.3.tgz#67e2e863797215530dff318e5bf9dcebfd47b21a"