Skip to content

Commit 8722d18

Browse files
committed
fix(analytics): don't reject the promise in SSR
1 parent 5186389 commit 8722d18

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

sample/src/app/app.module.ts

+3-2
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ import { FirestoreOfflineModule } from './firestore-offline/firestore-offline.mo
6767
AngularFireAnalyticsModule,
6868
AngularFireFunctionsModule,
6969
AngularFirePerformanceModule,
70-
AngularFireAuthGuardModule,
7170
FirestoreOfflineModule
7271
],
7372
providers: [
@@ -86,7 +85,9 @@ import { FirestoreOfflineModule } from './firestore-offline/firestore-offline.mo
8685
{ provide: REMOTE_CONFIG_DEFAULTS, useValue: { background_color: 'red' } },
8786
{ provide: USE_DEVICE_LANGUAGE, useValue: true },
8887
{ provide: VAPID_KEY, useValue: environment.vapidKey },
89-
{ provide: SERVICE_WORKER, useFactory: () => navigator?.serviceWorker?.getRegistration() ?? undefined },
88+
{ provide: SERVICE_WORKER, useFactory: () =>
89+
(typeof navigator !== 'undefined' && navigator.serviceWorker?.getRegistration()) ?? undefined
90+
},
9091
{ provide: APP_VERSION, useValue: '0.0.0' },
9192
{ provide: APP_NAME, useValue: 'Angular' }
9293
],

src/analytics/analytics.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ export class AngularFireAnalytics {
138138

139139
} else {
140140

141-
this.analyticsInitialized = Promise.reject();
141+
this.analyticsInitialized = Promise.resolve();
142142

143143
}
144144

0 commit comments

Comments
 (0)