aboutsummaryrefslogtreecommitdiffhomepage
path: root/client/src
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2018-02-22 14:15:23 +0100
committerChocobozzz <me@florianbigard.com>2018-02-22 14:15:23 +0100
commit78967fca4cacbc247fa6fb62d64b2d6825a10804 (patch)
treef063a82b0658005e3d5ce23648333805782155ed /client/src
parent93df58cc4865af9046d2b31e03fa37d3ae54e45b (diff)
downloadPeerTube-78967fca4cacbc247fa6fb62d64b2d6825a10804.tar.gz
PeerTube-78967fca4cacbc247fa6fb62d64b2d6825a10804.tar.zst
PeerTube-78967fca4cacbc247fa6fb62d64b2d6825a10804.zip
Register service worker
Diffstat (limited to 'client/src')
-rw-r--r--client/src/app/app.module.ts6
-rw-r--r--client/src/app/core/core.module.ts8
-rw-r--r--client/src/main.ts13
-rw-r--r--client/src/manifest.json2
4 files changed, 19 insertions, 10 deletions
diff --git a/client/src/app/app.module.ts b/client/src/app/app.module.ts
index 34114b60b..cae99786b 100644
--- a/client/src/app/app.module.ts
+++ b/client/src/app/app.module.ts
@@ -1,11 +1,9 @@
1import { NgModule } from '@angular/core' 1import { NgModule } from '@angular/core'
2import { BrowserModule } from '@angular/platform-browser' 2import { BrowserModule } from '@angular/platform-browser'
3import { ServiceWorkerModule } from '@angular/service-worker'
4import { AboutModule } from '@app/about' 3import { AboutModule } from '@app/about'
5import { ResetPasswordModule } from '@app/reset-password' 4import { ResetPasswordModule } from '@app/reset-password'
6 5
7import { MetaLoader, MetaModule, MetaStaticLoader, PageTitlePositioning } from '@ngx-meta/core' 6import { MetaLoader, MetaModule, MetaStaticLoader, PageTitlePositioning } from '@ngx-meta/core'
8import { environment } from '../environments/environment'
9 7
10import { AccountModule } from './account' 8import { AccountModule } from './account'
11 9
@@ -60,9 +58,7 @@ export function metaFactory (): MetaLoader {
60 MetaModule.forRoot({ 58 MetaModule.forRoot({
61 provide: MetaLoader, 59 provide: MetaLoader,
62 useFactory: (metaFactory) 60 useFactory: (metaFactory)
63 }), 61 })
64
65 ServiceWorkerModule.register('/ngsw-worker.js', { enabled: environment.production })
66 ], 62 ],
67 providers: [ ] 63 providers: [ ]
68}) 64})
diff --git a/client/src/app/core/core.module.ts b/client/src/app/core/core.module.ts
index 93c9741a7..eea6f340b 100644
--- a/client/src/app/core/core.module.ts
+++ b/client/src/app/core/core.module.ts
@@ -1,7 +1,7 @@
1import { NgModule, Optional, SkipSelf } from '@angular/core'
2import { CommonModule } from '@angular/common' 1import { CommonModule } from '@angular/common'
3import { RouterModule } from '@angular/router' 2import { NgModule, Optional, SkipSelf } from '@angular/core'
4import { BrowserAnimationsModule } from '@angular/platform-browser/animations' 3import { BrowserAnimationsModule } from '@angular/platform-browser/animations'
4import { RouterModule } from '@angular/router'
5import { LoadingBarModule } from '@ngx-loading-bar/core' 5import { LoadingBarModule } from '@ngx-loading-bar/core'
6import { LoadingBarHttpClientModule } from '@ngx-loading-bar/http-client' 6import { LoadingBarHttpClientModule } from '@ngx-loading-bar/http-client'
7 7
@@ -9,10 +9,10 @@ import { SimpleNotificationsModule } from 'angular2-notifications'
9import { ModalModule } from 'ngx-bootstrap/modal' 9import { ModalModule } from 'ngx-bootstrap/modal'
10 10
11import { AuthService } from './auth' 11import { AuthService } from './auth'
12import { LoginGuard, UserRightGuard } from './routing'
13import { ServerService } from './server'
14import { ConfirmComponent, ConfirmService } from './confirm' 12import { ConfirmComponent, ConfirmService } from './confirm'
15import { throwIfAlreadyLoaded } from './module-import-guard' 13import { throwIfAlreadyLoaded } from './module-import-guard'
14import { LoginGuard, UserRightGuard } from './routing'
15import { ServerService } from './server'
16 16
17@NgModule({ 17@NgModule({
18 imports: [ 18 imports: [
diff --git a/client/src/main.ts b/client/src/main.ts
index b02b6830f..9686ba4b8 100644
--- a/client/src/main.ts
+++ b/client/src/main.ts
@@ -12,6 +12,19 @@ if (environment.production) {
12 12
13const bootstrap = () => platformBrowserDynamic() 13const bootstrap = () => platformBrowserDynamic()
14 .bootstrapModule(AppModule) 14 .bootstrapModule(AppModule)
15 .then(bootstrapModule => {
16 // TODO: Remove when https://github.com/angular/angular-cli/issues/8779 is fixed?
17 if ('serviceWorker' in navigator && environment.production) {
18 navigator.serviceWorker.register('/ngsw-worker.js')
19 .catch(err => console.error('Cannot register service worker.', err))
20 }
21
22 return bootstrapModule
23 })
24 .catch(err => {
25 console.error(err)
26 return null
27 })
15 28
16if (environment.hmr) { 29if (environment.hmr) {
17 if (module[ 'hot' ]) { 30 if (module[ 'hot' ]) {
diff --git a/client/src/manifest.json b/client/src/manifest.json
index 707efb973..30914e35f 100644
--- a/client/src/manifest.json
+++ b/client/src/manifest.json
@@ -43,5 +43,5 @@
43 ], 43 ],
44 "name": "PeerTube", 44 "name": "PeerTube",
45 "short_name": "PeerTube", 45 "short_name": "PeerTube",
46 "start_url": "." 46 "start_url": "/videos/trending"
47} 47}