2 files changed, 24 insertions, 13 deletions

diff --git a/client/src/app/app-routing.module.ts b/client/src/app/app-routing.module.ts
index 8036c52e6..191ae6974 100644
--- a/client/src/app/app-routing.module.ts
+++ b/client/src/app/app-routing.module.ts
@@ -1,5 +1,5 @@
 import { NgModule } from '@angular/core'
-import { Routes, RouterModule } from '@angular/router'
+import { Routes, RouterModule, PreloadAllModules } from '@angular/router'
 
 const routes: Routes = [
   {
@@ -14,7 +14,12 @@ const routes: Routes = [
 ]
 
 @NgModule({
-  imports: [ RouterModule.forRoot(routes) ],
+  imports: [
+    RouterModule.forRoot(routes, {
+      useHash: Boolean(history.pushState) === false,
+      preloadingStrategy: PreloadAllModules
+    })
+  ],
   exports: [ RouterModule ]
 })
 export class AppRoutingModule {}
diff --git a/client/src/main.browser.ts b/client/src/main.browser.ts
index aeae06e04..28f0d5781 100644
--- a/client/src/main.browser.ts
+++ b/client/src/main.browser.ts
@@ -1,22 +1,28 @@
 /* tslint: disable */
 
-import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
-import { decorateModuleRef } from './app/environment';
+import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'
+import { decorateModuleRef } from './app/environment'
+import { hmrModule } from '@angularclass/hmr'
 
 /**
  * App Module
  * our top level module that holds all of our components
  */
-import { AppModule } from './app';
+import { AppModule } from './app'
 
 /**
  * Bootstrap our Angular app with a top level NgModule
  */
-export function main(): Promise<any> {
+export function main (): Promise<any> {
   return platformBrowserDynamic()
     .bootstrapModule(AppModule)
     .then(decorateModuleRef)
-    .catch((err) => console.error(err));
+    .then((ngModuleRef: any) => {
+      // `module` global ref for webpackhmr
+      // Don't run this in Prod
+      return hmrModule(ngModuleRef, module)
+    })
+    .catch((err) => console.error(err))
 }
 
 /**
@@ -25,15 +31,15 @@ export function main(): Promise<any> {
  */
 switch (document.readyState) {
   case 'loading':
-    document.addEventListener('DOMContentLoaded', _domReadyHandler, false);
-    break;
+    document.addEventListener('DOMContentLoaded', _domReadyHandler, false)
+    break
   case 'interactive':
   case 'complete':
   default:
-    main();
+    main()
 }
 
-function _domReadyHandler() {
- document.removeEventListener('DOMContentLoaded', _domReadyHandler, false);
- main();
+function _domReadyHandler () {
+  document.removeEventListener('DOMContentLoaded', _domReadyHandler, false)
+  main()
 }