X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fmain.ts;h=0fddf3aace64c3d7938a4b25b1adfb7c01288806;hb=0158eeb0c91af586304f16e1bc8f9b359ab69e11;hp=41fc6e0c2a464d1f9f7a9da45469a6de6ef8bb66;hpb=602eb142bebb62f1774d6e17c211eef99ace584b;p=github%2FChocobozzz%2FPeerTube.git diff --git a/client/src/main.ts b/client/src/main.ts index 41fc6e0c2..0fddf3aac 100644 --- a/client/src/main.ts +++ b/client/src/main.ts @@ -1,28 +1,45 @@ -import { enableProdMode, provide } from '@angular/core'; -import { - HTTP_PROVIDERS, - RequestOptions, - XHRBackend -} from '@angular/http'; -import { bootstrap } from '@angular/platform-browser-dynamic'; -import { provideRouter } from '@angular/router'; +import { ApplicationRef, enableProdMode } from '@angular/core' +import { enableDebugTools } from '@angular/platform-browser' +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic' +import { AppModule } from './app/app.module' +import { environment } from './environments/environment' -import { routes } from './app/app.routes'; -import { AuthHttp, AuthService } from './app/shared'; -import { AppComponent } from './app/app.component'; - -if (process.env.ENV === 'production') { - enableProdMode(); +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 ] - }), - AuthService, - provideRouter(routes) -]); +const bootstrap = () => platformBrowserDynamic() + .bootstrapModule(AppModule) + .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)) + // } + + if (navigator.serviceWorker && typeof navigator.serviceWorker.getRegistrations === 'function') { + navigator.serviceWorker.getRegistrations() + .then(registrations => { + for (const registration of registrations) { + registration.unregister() + } + }) + } + + if (!environment.production) { + const applicationRef = bootstrapModule.injector.get(ApplicationRef) + const componentRef = applicationRef.components[0] + + // allows to run `ng.profiler.timeChangeDetection();` + enableDebugTools(componentRef) + } + + return bootstrapModule + }) + .catch(err => { + console.error(err) + return null + }) + +bootstrap()