Skip to content

Allow Firestore offline and messaging in non-server environments such as workers #2015

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Mar 13, 2019
Merged

Allow Firestore offline and messaging in non-server environments such as workers #2015

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e98eacb
feat(afs): Allow offline in all non-server environments e.g, workers
jamesdaniels Feb 22, 2019
b257c3a
feat(fcm): Allow messaging in all non-server environments e.g, workers
jamesdaniels Feb 22, 2019
5096f04
Merge branch 'master' into server-platforms
davideast Mar 10, 2019
766f122
Merge branch 'master' into server-platforms
jamesdaniels Mar 13, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/firestore/firestore.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { AngularFirestoreDocument } from './document/document';
import { AngularFirestoreCollection } from './collection/collection';

import { FirebaseFirestore, FirebaseOptions, FirebaseAppConfig, FirebaseOptionsToken, FirebaseNameOrConfigToken, _firebaseAppFactory, FirebaseZoneScheduler } from '@angular/fire';
import { isPlatformBrowser } from '@angular/common';
import { isPlatformServer } from '@angular/common';

import { firestore, SDK_VERSION } from 'firebase/app';

Expand Down Expand Up @@ -123,7 +123,7 @@ export class AngularFirestore {
return firestore;
});

if (shouldEnablePersistence && isPlatformBrowser(platformId)) {
if (shouldEnablePersistence && !isPlatformServer(platformId)) {
// We need to try/catch here because not all enablePersistence() failures are caught
// https://github.com/firebase/firebase-js-sdk/issues/608
const enablePersistence = () => {
Expand Down
4 changes: 2 additions & 2 deletions src/messaging/messaging.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Injectable, Inject, Optional, NgZone, PLATFORM_ID } from '@angular/core';
import { isPlatformBrowser } from '@angular/common';
import { isPlatformServer } from '@angular/common';
import { messaging } from 'firebase/app';
import { Observable, empty, from, of, throwError } from 'rxjs';
import { mergeMap, catchError, map, switchMap, concat, defaultIfEmpty } from 'rxjs/operators';
Expand All @@ -23,7 +23,7 @@ export class AngularFireMessaging {
zone: NgZone
) {

if (isPlatformBrowser(platformId)) {
if (!isPlatformServer(platformId)) {

// @ts-ignore
const requireMessaging = from(import('firebase/messaging'));
Expand Down