fix(core): empty and errors were blocking Universal rendering

Author: jamesdaniels

package.json

@@ -72,9 +72,9 @@
     "protractor": "3.0.0",
     "reflect-metadata": "0.1.2",
     "rimraf": "^2.5.4",
-    "rollup": "^0.35.11",
-    "rollup-plugin-node-resolve": "^3.0.0",
-    "rollup-watch": "^2.5.0",
+    "rollup": "^0.64.1",
+    "rollup-plugin-node-resolve": "^3.3.0",
+    "rollup-watch": "^4.3.1",
     "shelljs": "^0.8.0",
     "systemjs": "^0.19.16",
     "systemjs-builder": "^0.15.7",

src/core/angularfire2.ts

@@ -1,7 +1,6 @@
 import { InjectionToken, NgZone } from '@angular/core';
 import { isPlatformServer } from '@angular/common';
 import { Observable, Subscription, queueScheduler as queue } from 'rxjs';
-import { first } from 'rxjs/operators';
 
 // Put in database.ts when we drop database-depreciated
 export const RealtimeDatabaseURL = new InjectionToken<string>('angularfire2.realtimeDatabaseURL');
@@ -17,8 +16,20 @@ export class FirebaseZoneScheduler {
       return new Observable<T>(subscriber => {
         const noop = () => {};
         const task = Zone.current.scheduleMacroTask('firebaseZoneBlock', noop, {}, noop, noop);
-        obs$.pipe(first()).subscribe(() => this.zone.runOutsideAngular(() => task.invoke()));
-        return obs$.subscribe(subscriber);
+        obs$.subscribe(
+          next => {
+            task.invoke();
+            subscriber.next(next);
+          },
+          error => {
+            if (task.state === 'scheduled') { task.invoke() }
+            subscriber.error(error);
+          },
+          () => {
+            if (task.state === 'scheduled') { task.invoke() }
+            subscriber.complete();
+          }
+        );
       });
     } else {
       return obs$;

src/messaging/messaging.ts

@@ -25,7 +25,8 @@ export class AngularFireMessaging {
 
     if (isPlatformBrowser(platformId)) {
 
-      const requireMessaging = from(require('firebase/messaging'));
+      // @ts-ignore
+      const requireMessaging = from(import('firebase/messaging'));
 
       this.messaging = requireMessaging.pipe(
         map(() => _firebaseAppFactory(options, nameOrConfig)),

tools/build.js

@@ -115,13 +115,14 @@ function spawnObservable(command, args) {
   });
 }
 
-function generateBundle(entry, { dest, globals, moduleName }) {
-  return rollup({ entry }).then(bundle => {
+function generateBundle(input, { name, file, globals, moduleName }) {
+  return rollup({ input }).then(bundle => {
     return bundle.write({
       format: 'umd',
+      name,
       external: Object.keys(globals),
       plugins: [resolve()],
-      dest,
+      file,
       globals,
       moduleName,
     });
@@ -131,7 +132,8 @@ function generateBundle(entry, { dest, globals, moduleName }) {
 function createFirebaseBundles(featurePaths, globals) {
   return Object.keys(featurePaths).map(feature => {
     return generateBundle(featurePaths[feature], {
-      dest: `${process.cwd()}/dist/bundles/${feature}.js`,
+      name: feature,
+      file: `${process.cwd()}/dist/bundles/${feature}.js`,
       globals,
       moduleName: `firebase.${feature}`
     });
@@ -148,7 +150,8 @@ function createUmd(name, globals) {
   const moduleName = MODULE_NAMES[name];
   const entry = ENTRIES[name];
   return generateBundle(entry, {
-    dest: `${process.cwd()}/dist/packages-dist/bundles/${name}.umd.js`,
+    name,
+    file: `${process.cwd()}/dist/packages-dist/bundles/${name}.umd.js`,
     globals,
     moduleName
   });
@@ -158,7 +161,8 @@ function createTestUmd(globals) {
   const entry = `${process.cwd()}/dist/root.spec.js`;
   const moduleName = 'angularfire2.test';
   return generateBundle(entry, {
-    dest: `${process.cwd()}/dist/packages-dist/bundles/test.umd.js`,
+    name: 'test',
+    file: `${process.cwd()}/dist/packages-dist/bundles/test.umd.js`,
     globals,
     moduleName
   });