Bundle webtorrent with webpack. Closes https://github.com/Chocobozzz/PeerTube/issues/50

[github/Chocobozzz/PeerTube.git] / client / src / app / app.module.ts

diff --git a/client/src/app/app.module.ts b/client/src/app/app.module.ts
index 02da38b38c93b28093ea21297c5e538e2dbb407a..8a072eaac2507beb27a7d68ff71a27cc256a6f66 100644 (file)
--- a/client/src/app/app.module.ts
+++ b/client/src/app/app.module.ts
@@ -1,18 +1,25 @@
 import { ApplicationRef, NgModule } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
-import { removeNgStyles, createNewHosts } from '@angularclass/hmr';
+import {
+  removeNgStyles,
+  createNewHosts,
+  createInputTransfer
+} from '@angularclass/hmr';
 
 import { MetaModule, MetaLoader, MetaStaticLoader, PageTitlePositioning } from '@nglibs/meta';
+// TODO: remove, we need this to avoid error in ng2-smart-table
+import 'rxjs/add/operator/toPromise';
 import 'bootstrap-loader';
 
 import { ENV_PROVIDERS } from './environment';
 import { AppRoutingModule } from './app-routing.module';
 import { AppComponent } from './app.component';
-import { AppState } from './app.service';
+import { AppState, InternalStateType } from './app.service';
 
 import { AccountModule } from './account';
 import { CoreModule } from './core';
 import { LoginModule } from './login';
+import { SignupModule } from './signup';
 import { SharedModule } from './shared';
 import { VideosModule } from './videos';
 
@@ -28,6 +35,12 @@ export function metaFactory(): MetaLoader {
   });
 }
 
+type StoreType = {
+  state: InternalStateType,
+  restoreInputValues: () => void,
+  disposeOldHosts: () => void
+};
+
 // Application wide providers
 const APP_PROVIDERS = [
   AppState
@@ -46,16 +59,17 @@ const APP_PROVIDERS = [
 
     AppRoutingModule,
 
-    MetaModule.forRoot({
-      provide: MetaLoader,
-      useFactory: (metaFactory)
-    }),
-
     AccountModule,
     CoreModule,
     LoginModule,
+    SignupModule,
     SharedModule,
-    VideosModule
+    VideosModule,
+
+    MetaModule.forRoot({
+      provide: MetaLoader,
+      useFactory: (metaFactory)
+    })
   ],
   providers: [ // expose our Services and Providers into Angular's dependency injection
     ENV_PROVIDERS,
@@ -63,25 +77,58 @@ const APP_PROVIDERS = [
   ]
 })
 export class AppModule {
-  constructor(public appRef: ApplicationRef, public appState: AppState) {}
-  hmrOnInit(store) {
-    if (!store || !store.state) return;
-    console.log('HMR store', store);
+  constructor(
+    public appRef: ApplicationRef,
+    public appState: AppState
+  ) {}
+
+  public hmrOnInit(store: StoreType) {
+    if (!store || !store.state) {
+      return;
+    }
+    console.log('HMR store', JSON.stringify(store, null, 2));
+    /**
+     * Set state
+     */
     this.appState._state = store.state;
+    /**
+     * Set input values
+     */
+    if ('restoreInputValues' in store) {
+      let restoreInputValues = store.restoreInputValues;
+      setTimeout(restoreInputValues);
+    }
+
     this.appRef.tick();
     delete store.state;
+    delete store.restoreInputValues;
   }
-  hmrOnDestroy(store) {
-    const cmpLocation = this.appRef.components.map(cmp => cmp.location.nativeElement);
-    // recreate elements
+
+  public hmrOnDestroy(store: StoreType) {
+    const cmpLocation = this.appRef.components.map((cmp) => cmp.location.nativeElement);
+    /**
+     * Save state
+     */
     const state = this.appState._state;
     store.state = state;
+    /**
+     * Recreate root elements
+     */
     store.disposeOldHosts = createNewHosts(cmpLocation);
-    // remove styles
+    /**
+     * Save input values
+     */
+    store.restoreInputValues  = createInputTransfer();
+    /**
+     * Remove styles
+     */
     removeNgStyles();
   }
-  hmrAfterDestroy(store) {
-    // display new elements
+
+  public hmrAfterDestroy(store: StoreType) {
+    /**
+     * Display new elements
+     */
     store.disposeOldHosts();
     delete store.disposeOldHosts;
   }