X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fmain.ts;h=84c82203d2e678fbacd7e111e05c318d6f3051d3;hb=443d762d01d0face6ac9fa10e08cd74721753546;hp=061be17deec6ea3bc5441c57124481122c09e15f;hpb=74b7c6d48e9ca377fe938c8134ed74b612e62ba0;p=github%2FChocobozzz%2FPeerTube.git diff --git a/client/src/main.ts b/client/src/main.ts index 061be17de..84c82203d 100644 --- a/client/src/main.ts +++ b/client/src/main.ts @@ -1,45 +1,22 @@ -import { enableProdMode, TRANSLATIONS, TRANSLATIONS_FORMAT } from '@angular/core' +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 { hmrBootstrap } from './hmr' -import { getDevLocale, isOnDevLocale } from '@app/shared/i18n/i18n-utils' - -let providers = [] if (environment.production) { enableProdMode() } -// Template translation, should be in the bootstrap step -if (isOnDevLocale()) { - const locale = getDevLocale() - const translations = require(`raw-loader!./locale/target/angular_${locale}.xml`) - - providers = [ - { provide: TRANSLATIONS, useValue: translations }, - { provide: TRANSLATIONS_FORMAT, useValue: 'xlf' } - ] -} - const bootstrap = () => platformBrowserDynamic() - .bootstrapModule(AppModule, { providers }) + .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 (!environment.production) { + const applicationRef = bootstrapModule.injector.get(ApplicationRef) + const componentRef = applicationRef.components[0] - if (navigator.serviceWorker) { - navigator.serviceWorker.getRegistrations() - .then(registrations => { - for (const registration of registrations) { - registration.unregister() - } - }) + // allows to run `ng.profiler.timeChangeDetection();` + enableDebugTools(componentRef) } return bootstrapModule @@ -49,13 +26,4 @@ const bootstrap = () => platformBrowserDynamic() 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() -} +bootstrap()