X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fmain.ts;h=432db0eacb92557bae45f4958efdd7f416854916;hb=fbe088b816c6e33e013006285e18bc2938173507;hp=86fdabba564dd4d40a490f2d508d9660234ccd9f;hpb=28f3d1b36a70426795240c9370e47b6c4ba847f8;p=github%2FChocobozzz%2FPeerTube.git diff --git a/client/src/main.ts b/client/src/main.ts index 86fdabba5..432db0eac 100644 --- a/client/src/main.ts +++ b/client/src/main.ts @@ -1,62 +1,32 @@ -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 { logger } from './root-helpers' -import { hmrBootstrap } from './hmr' -import { getDevLocale, isOnDevLocale } from '@app/shared/i18n/i18n-utils' -import { buildFileLocale } from '../../shared' - -let providers: any[] = [] if (environment.production) { enableProdMode() } -// Template translation, should be in the bootstrap step -if (isOnDevLocale()) { - const locale = buildFileLocale(getDevLocale()) - const translations = require(`raw-loader!./locale/target/angular_${locale}.xml`) - - providers = [ - { provide: TRANSLATIONS, useValue: translations }, - { provide: TRANSLATIONS_FORMAT, useValue: 'xlf' } - ] -} +logger.registerServerSending(environment.apiUrl) 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 && typeof navigator.serviceWorker.getRegistrations === 'function') { - navigator.serviceWorker.getRegistrations() - .then(registrations => { - for (const registration of registrations) { - registration.unregister() - } - }) + // allows to run `ng.profiler.timeChangeDetection();` + enableDebugTools(componentRef) } return bootstrapModule }) .catch(err => { - console.error(err) + logger.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() -} +bootstrap()