fix(afs): workarounds for firebase-js-sdk #605 and #608 (#1540)

src/firestore/firestore.spec.ts

@@ -33,8 +33,9 @@ describe('AngularFirestore', () => {
     })();
   });
 
-  afterEach(async (done) => {
-    await app.delete();
+  afterEach(done => {
+    // can't await here https://github.com/firebase/firebase-js-sdk/issues/605
+    app.delete();
     done();
   });
 

src/firestore/firestore.ts

@@ -4,7 +4,9 @@ import { FirebaseFirestore, CollectionReference, DocumentReference } from '@fire
 import { Observable } from 'rxjs/Observable';
 import { Subscriber } from 'rxjs/Subscriber';
 import { from } from 'rxjs/observable/from';
+import { of } from 'rxjs/observable/of';
 import 'rxjs/add/operator/map';
+import 'rxjs/add/operator/catch';
 
 import { FirebaseOptions } from '@firebase/app-types';
 import { Injectable, Inject, Optional } from '@angular/core';
@@ -118,11 +120,11 @@ export class AngularFirestore {
       return app.firestore();
     });
 
-    this.persistenceEnabled$ = zone.runOutsideAngular(() => {
-      return shouldEnablePersistence ?
-        from(this.firestore.enablePersistence().then(() => true, () => false)) :
-        from(new Promise((res, rej) => { res(false); }));
-    });
+    this.persistenceEnabled$ = zone.runOutsideAngular(() =>
+        shouldEnablePersistence ? from(this.firestore.enablePersistence().then(() => true, () => false))
+                                : of(false)
+      )
+      .catch(() => of(false)); // https://github.com/firebase/firebase-js-sdk/issues/608
   }
 
   /**

tools/build.js

@@ -32,6 +32,7 @@ const GLOBALS = {
   'rxjs/operator/take': 'Rx.Observable.prototype',
   'rxjs/operator/toArray': 'Rx.Observable.prototype',
   'rxjs/operator/toPromise': 'Rx.Observable.prototype',
+  'rxjs/add/operator/catch': 'Rx.Observable.prototype',
   'rxjs/add/operator/first': 'Rx.Observable.prototype',
   'rxjs/add/operator/map': 'Rx.Observable.prototype',
   'rxjs/add/operator/scan': 'Rx.Observable.prototype',