X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fmain.ts;h=86fdabba564dd4d40a490f2d508d9660234ccd9f;hb=6eb62c33908025d877a28f1cfbc527c511ae3103;hp=7c058e12fd165a77e993f602a1c23feb8f3857c0;hpb=0f6da32b148c0f4146b2ae9ad1add9a9f00cc339;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/client/src/main.ts b/client/src/main.ts
index 7c058e12f..86fdabba5 100644
--- a/client/src/main.ts
+++ b/client/src/main.ts
@@ -1,34 +1,62 @@
-import { enableProdMode, provide } from '@angular/core';
-import { disableDeprecatedForms, provideForms } from '@angular/forms';
-import {
-  HTTP_PROVIDERS,
-  RequestOptions,
-  XHRBackend
-} from '@angular/http';
-import { bootstrap }    from '@angular/platform-browser-dynamic';
-import { provideRouter } from '@angular/router';
-
-import { routes } from './app/app.routes';
-import { AuthHttp, AuthService } from './app/shared';
-import { AppComponent } from './app/app.component';
-
-if (process.env.ENV === 'production') {
-  enableProdMode();
+import { enableProdMode, TRANSLATIONS, TRANSLATIONS_FORMAT } from '@angular/core'
+import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'
+
+import { AppModule } from './app/app.module'
+import { environment } from './environments/environment'
+
+import { hmrBootstrap } from './hmr'
+import { getDevLocale, isOnDevLocale } from '@app/shared/i18n/i18n-utils'
+import { buildFileLocale } from '../../shared'
+
+let providers: any[] = []
+if (environment.production) {
+  enableProdMode()
 }
 
-bootstrap(AppComponent, [
-  HTTP_PROVIDERS,
-  provide(AuthHttp, {
-    useFactory: (backend: XHRBackend, defaultOptions: RequestOptions, authService: AuthService) => {
-      return new AuthHttp(backend, defaultOptions, authService);
-    },
-    deps: [ XHRBackend, RequestOptions, AuthService ]
-  }),
+// Template translation, should be in the bootstrap step
+if (isOnDevLocale()) {
+  const locale = buildFileLocale(getDevLocale())
+  const translations = require(`raw-loader!./locale/target/angular_${locale}.xml`)
 
-  AuthService,
+  providers = [
+    { provide: TRANSLATIONS, useValue: translations },
+    { provide: TRANSLATIONS_FORMAT, useValue: 'xlf' }
+  ]
+}
 
-  provideRouter(routes),
+const bootstrap = () => platformBrowserDynamic()
+  .bootstrapModule(AppModule, { providers })
+  .then(bootstrapModule => {
+    // TODO: Uncomment and remove unregistration when https://github.com/angular/angular/issues/21191 is fixed
+    // TODO: Remove when https://github.com/angular/angular-cli/issues/8779 is fixed?
+    // if ('serviceWorker' in navigator && environment.production) {
+    //   navigator.serviceWorker.register('/ngsw-worker.js')
+    //     .catch(err => console.error('Cannot register service worker.', err))
+    // }
 
-  disableDeprecatedForms(),
-  provideForms()
-]);
+    if (navigator.serviceWorker && typeof navigator.serviceWorker.getRegistrations === 'function') {
+      navigator.serviceWorker.getRegistrations()
+        .then(registrations => {
+          for (const registration of registrations) {
+            registration.unregister()
+          }
+        })
+    }
+
+    return bootstrapModule
+  })
+  .catch(err => {
+    console.error(err)
+    return null
+  })
+
+if (environment.hmr) {
+  if (module[ 'hot' ]) {
+    hmrBootstrap(module, bootstrap)
+  } else {
+    console.error('HMR is not enabled for webpack-dev-server!')
+    console.log('Are you using the --hmr flag for ng serve?')
+  }
+} else {
+  bootstrap()
+}