Merge pull request #20 from angular/master

Update upstream

Author: GulajavaMinistudio

.travis.yml

@@ -26,7 +26,7 @@ before_script:
 
 script:
   - npm run build
-  - ./node_modules/.bin/karma start --single-run --browsers Chrome --reporters mocha
+  - ./node_modules/.bin/karma start --single-run --browsers Firefox --reporters mocha
   # Run integration test to make sure our typings are correct for user-land.
   - node tools/run-typings-test.js
 

docs/firestore/collections.md

@@ -37,7 +37,7 @@ export class AppComponent {
 }
 ```
 
-The `AngularFirestoreCollection` is service you use to create streams of the collection and perform data operations on the underyling collection.
+The `AngularFirestoreCollection` is a service you use to create streams of the collection and perform data operations on the underyling collection.
 
 ### The `DocumentChangeAction` type
 

karma.conf.js

@@ -41,7 +41,7 @@ module.exports = function(config) {
     logLevel: config.LOG_INFO,
     autoWatch: true,
     reporters: ['mocha'],
-    browsers: ['Chrome'],
+    browsers: ['Firefox'],
     singleRun: false
   })
 };

package.json

@@ -1,6 +1,6 @@
 {
   "name": "angularfire2",
-  "version": "5.0.0-rc.5-next",
+  "version": "5.0.0-rc.6",
   "description": "The official library of Firebase and Angular.",
   "private": true,
   "scripts": {
@@ -34,7 +34,18 @@
     "@angular/core": "^5.0.0",
     "@angular/platform-browser": "^5.0.0",
     "@angular/platform-browser-dynamic": "^5.0.0",
-    "firebase": "^4.5.0",
+    "@firebase/app": "^0.1.6",
+    "@firebase/app-types": "^0.1.1",
+    "@firebase/auth": "^0.3.2",
+    "@firebase/auth-types": "^0.1.1",
+    "@firebase/database": "^0.1.7",
+    "@firebase/database-types": "^0.1.1",
+    "@firebase/firestore": "^0.2.3",
+    "@firebase/firestore-types": "^0.1.1",
+    "@firebase/messaging-types": "^0.1.1",
+    "@firebase/storage": "^0.1.6",
+    "@firebase/storage-types": "^0.1.1",
+    "firebase": "^4.8.2",
     "rxjs": "^5.5.4",
     "zone.js": "^0.8.0"
   },
@@ -56,9 +67,9 @@
     "jasmine": "^2.4.1",
     "jasmine-core": "^2.4.1",
     "json": "^9.0.3",
-    "karma": "^0.13.19",
-    "karma-chrome-launcher": "^0.2.2",
-    "karma-firefox-launcher": "^0.1.7",
+    "karma": "^2.0.0",
+    "karma-chrome-launcher": "^2.2.0",
+    "karma-firefox-launcher": "^1.1.0",
     "karma-jasmine": "^0.3.6",
     "karma-mocha-reporter": "^2.0.2",
     "karma-systemjs": "^0.10.0",
@@ -71,6 +82,7 @@
     "rollup": "^0.35.11",
     "rollup-plugin-node-resolve": "^3.0.0",
     "rollup-watch": "^2.5.0",
+    "shelljs": "^0.8.0",
     "systemjs": "^0.19.16",
     "systemjs-builder": "^0.15.7",
     "traceur": "0.0.96",

src/auth/auth.module.ts

@@ -1,6 +1,7 @@
 import { NgModule, NgZone } from '@angular/core';
 import { FirebaseApp, AngularFireModule } from 'angularfire2';
 import { AngularFireAuth } from './auth';
+import '@firebase/auth';
 
 export function _getAngularFireAuth(app: FirebaseApp) {
   return new AngularFireAuth(app);

src/auth/package.json

@@ -22,7 +22,8 @@
     "@angular/core": "ANGULAR_VERSION",
     "@angular/platform-browser": "ANGULAR_VERSION",
     "@angular/platform-browser-dynamic": "ANGULAR_VERSION",
-    "firebase": "FIREBASE_VERSION",
+    "@firebase/app": "FIREBASE_APP_VERSION",
+    "@firebase/auth": "FIREBASE_AUTH_VERSION",
     "rxjs": "RXJS_VERSION",
     "zone.js": "ZONEJS_VERSION"
   },

src/core/package.json

@@ -21,7 +21,7 @@
     "@angular/core": "ANGULAR_VERSION",
     "@angular/platform-browser": "ANGULAR_VERSION",
     "@angular/platform-browser-dynamic": "ANGULAR_VERSION",
-    "firebase": "FIREBASE_VERSION",
+    "@firebase/app": "FIREBASE_APP_VERSION",
     "rxjs": "RXJS_VERSION",
     "zone.js": "ZONEJS_VERSION"
   },

src/database-deprecated/database.module.ts

@@ -1,6 +1,7 @@
 import { NgModule } from '@angular/core';
 import { AngularFireModule, FirebaseApp } from 'angularfire2';
 import { AngularFireDatabase } from './database';
+import '@firebase/database';
 
 export function _getAngularFireDatabase(app: FirebaseApp) {
   return new AngularFireDatabase(app);

src/database-deprecated/package.json

@@ -22,7 +22,8 @@
     "@angular/core": "ANGULAR_VERSION",
     "@angular/platform-browser": "ANGULAR_VERSION",
     "@angular/platform-browser-dynamic": "ANGULAR_VERSION",
-    "firebase": "FIREBASE_VERSION",
+    "@firebase/app": "FIREBASE_APP_VERSION",
+    "@firebase/database": "FIREBASE_DATABASE_VERSION",
     "rxjs": "RXJS_VERSION",
     "zone.js": "ZONEJS_VERSION"
   },

src/database/database.module.ts

@@ -1,6 +1,7 @@
 import { NgModule } from '@angular/core';
 import { AngularFireModule, FirebaseApp } from 'angularfire2';
 import { AngularFireDatabase } from './database';
+import '@firebase/database';
 
 export function _getAngularFireDatabase(app: FirebaseApp) {
   return new AngularFireDatabase(app);

src/database/package.json

@@ -22,7 +22,8 @@
     "@angular/core": "ANGULAR_VERSION",
     "@angular/platform-browser": "ANGULAR_VERSION",
     "@angular/platform-browser-dynamic": "ANGULAR_VERSION",
-    "firebase": "FIREBASE_VERSION",
+    "@firebase/app": "FIREBASE_APP_VERSION",
+    "@firebase/database": "FIREBASE_DATABASE_VERSION",
     "rxjs": "RXJS_VERSION",
     "zone.js": "ZONEJS_VERSION"
   },

src/firestore/firestore.module.ts

@@ -2,6 +2,7 @@ import { InjectionToken, ModuleWithProviders, NgModule } from '@angular/core';
 import { FirebaseApp, AngularFireModule } from 'angularfire2';
 import { AngularFirestore } from './firestore';
 import { from } from 'rxjs/observable/from';
+import '@firebase/firestore';
 
 import { EnablePersistenceToken } from './enable-persistance-token';
 

src/firestore/package.json

@@ -22,8 +22,8 @@
     "@angular/core": "ANGULAR_VERSION",
     "@angular/platform-browser": "ANGULAR_VERSION",
     "@angular/platform-browser-dynamic": "ANGULAR_VERSION",
-    "firebase": "FIREBASE_VERSION",
-    "firestore": "FIRESTORE_VERSION",
+    "@firebase/app": "FIREBASE_APP_VERSION",
+    "@firebase/firestore": "FIREBASE_FIRESTORE_VERSION",
     "rxjs": "RXJS_VERSION",
     "zone.js": "ZONEJS_VERSION"
   },

src/root.spec.js

@@ -13,6 +13,8 @@ export * from './packages-dist/database/list/state-changes.spec';
 export * from './packages-dist/database/list/audit-trail.spec';
 export * from './packages-dist/storage/storage.spec';
 
+// // Since this a deprecated API, we run on it on manual tests only
+// // It needs a network connection to run which makes it flaky on Travis
 // export * from './packages-dist/database-deprecated/firebase_list_factory.spec';
 // export * from './packages-dist/database-deprecated/firebase_object_factory.spec';
 // export * from './packages-dist/database-deprecated/firebase_list_observable.spec';

src/storage/observable/fromTask.ts

@@ -2,7 +2,7 @@ import { UploadTask, UploadTaskSnapshot } from '@firebase/storage-types';
 import { Observable } from 'rxjs/Observable';
 
 export function fromTask(task: UploadTask) {
-  return new Observable<UploadTaskSnapshot | undefined>(subscriber => {
+  return new Observable<UploadTaskSnapshot>(subscriber => {
     const progress = (snap: UploadTaskSnapshot) => subscriber.next(snap);
     const error = e => subscriber.error(e);
     const complete = () => subscriber.complete();

src/storage/package.json

@@ -22,7 +22,8 @@
     "@angular/core": "ANGULAR_VERSION",
     "@angular/platform-browser": "ANGULAR_VERSION",
     "@angular/platform-browser-dynamic": "ANGULAR_VERSION",
-    "firebase": "FIREBASE_VERSION",
+    "@firebase/app": "FIREBASE_APP_VERSION",
+    "@firebase/storage": "FIREBASE_STORAGE_VERSION",
     "rxjs": "RXJS_VERSION",
     "zone.js": "ZONEJS_VERSION"
   },

src/storage/ref.ts

@@ -20,20 +20,18 @@ export interface AngularFireStorageReference {
  */
 export function createStorageRef(ref: Reference): AngularFireStorageReference {
   return {
-    getDownloadURL() { return from(ref.getDownloadURL()); },
-    getMetadata() { return from(ref.getMetadata()) },
-    delete() { return from(ref.delete()); },
-    child(path: string) { return createStorageRef(ref.child(path)); },
-    updateMetatdata(meta: SettableMetadata) {
-      return from(ref.updateMetadata(meta));
-    },
-    put(data: any, metadata?: UploadMetadata) {
+    getDownloadURL: () => from(ref.getDownloadURL()),
+    getMetadata: () => from(ref.getMetadata()),
+    delete: () => from(ref.delete()),
+    child: (path: string) => createStorageRef(ref.child(path)),
+    updateMetatdata: (meta: SettableMetadata) => from(ref.updateMetadata(meta)),
+    put: (data: any, metadata?: UploadMetadata) => {
       const task = ref.put(data, metadata);
       return createUploadTask(task);
     },
-    putString(data: string, format?: StringFormat, metadata?: UploadMetadata) {
+    putString: (data: string, format?: StringFormat, metadata?: UploadMetadata) => {
       const task = ref.putString(data, format, metadata);
       return createUploadTask(task);
     }
-  }
+  };
 }

src/storage/storage.module.ts

@@ -1,6 +1,7 @@
 import { NgModule } from '@angular/core';
 import { AngularFireModule, FirebaseApp } from 'angularfire2';
 import { AngularFireStorage } from './storage';
+import '@firebase/storage';
 
 export function _getAngularFireStorage(app: FirebaseApp) {
   return new AngularFireStorage(app);

src/storage/storage.spec.ts

@@ -3,7 +3,7 @@ import { Observable } from 'rxjs/Observable'
 import { forkJoin } from 'rxjs/observable/forkJoin';
 import { TestBed, inject } from '@angular/core/testing';
 import { FirebaseApp, FirebaseAppConfig, AngularFireModule } from 'angularfire2';
-import { AngularFireStorageModule, AngularFireStorage } from 'angularfire2/storage';
+import { AngularFireStorageModule, AngularFireStorage, AngularFireUploadTask } from 'angularfire2/storage';
 import { COMMON_CONFIG } from './test-config';
 
 describe('AngularFireStorage', () => {
@@ -63,6 +63,18 @@ describe('AngularFireStorage', () => {
         () => { ref.delete().subscribe(done, done.fail); }
       );
     });
+
+    it('should resolve the task as a promise', (done) => {
+      const data = { angular: "promise" };
+      const blob = new Blob([JSON.stringify(data)], { type : 'application/json' });
+      const ref = afStorage.ref('afs.json');
+      const task: AngularFireUploadTask = ref.put(blob);
+      task.then(snap => { 
+        expect(snap).toBeDefined(); 
+        done();
+      }).catch(done.fail);
+    });
+
   });
 
   describe('reference', () => {

src/storage/storage.ts

@@ -11,7 +11,6 @@ import { Observable } from 'rxjs/Observable';
  * This service is the main entry point for this feature module. It provides
  * an API for uploading and downloading binary files from Cloud Storage for
  * Firebase.
- *
  */
 @Injectable()
 export class AngularFireStorage {

src/storage/task.ts

@@ -2,41 +2,42 @@ import { UploadTaskSnapshot, UploadTask } from '@firebase/storage-types';
 import { fromTask } from './observable/fromTask';
 import { Observable } from 'rxjs/Observable';
 import { map, filter } from 'rxjs/operators';
+import { from } from 'rxjs/observable/from';
 
 export interface AngularFireUploadTask {
+  task: UploadTask,
   snapshotChanges(): Observable<UploadTaskSnapshot | undefined>;
   percentageChanges(): Observable<number | undefined>;
   downloadURL(): Observable<string | null>;
   pause(): boolean;
   cancel(): boolean;
   resume(): boolean;
-  then(): Promise<any>;
+  then(
+    onFulfilled?: ((a: UploadTaskSnapshot) => any) | null, 
+    onRejected?: ((a: Error) => any) | null
+  ): Promise<any>;
   catch(onRejected: (a: Error) => any): Promise<any>;
 }
 
+/**
+ * Create an AngularFireUploadTask from a regular UploadTask from the Storage SDK.
+ * This method creates an observable of the upload and returns on object that provides
+ * multiple methods for controlling and monitoring the file upload.
+ * @param task 
+ */
 export function createUploadTask(task: UploadTask): AngularFireUploadTask {
   const inner$ = fromTask(task);
   return {
-    pause() { return task.pause(); },
-    cancel() { return task.cancel(); },
-    resume() { return task.resume(); },
-    then() { return task.then(); },
-    catch(onRejected: (a: Error) => any) {
-      return task.catch(onRejected);
-    },
-    snapshotChanges() { return inner$; },
-    percentageChanges() {
-      return inner$.pipe(
-        filter(s => s !== undefined),
-        map(s => s!.bytesTransferred / s!.totalBytes * 100)
-      );
-    },
-    downloadURL() {
-      return inner$.pipe(
-        filter(s => s !== undefined),
-        filter(s => s!.bytesTransferred === s!.totalBytes),
-        map(s => s!.downloadURL)
-      );
-    }
+    task: task,
+    then: task.then.bind(task),
+    catch: task.catch.bind(task),
+    pause: task.pause.bind(task),
+    cancel: task.cancel.bind(task),
+    resume: task.resume.bind(task),
+    snapshotChanges: () => inner$,
+    downloadURL: () => from(task.then(s => s.downloadURL)),
+    percentageChanges: () => inner$.pipe(
+      map(s => s.bytesTransferred / s.totalBytes * 100)
+    )
   };
 }

test/ng-build/index.js

@@ -1,6 +1,6 @@
 const fs = require('fs');
 const { spawn, spawnSync } = require('child_process');
-const ng5Pkg = require('./ng5/package.json');
+const ng5Pkg = require(`${__dirname}/ng5/package.json`);
 const pkg = require('../../package.json');
 const shell = require('shelljs');
 

tools/build.js

@@ -54,11 +54,18 @@ const GLOBALS = {
   '@angular/core': 'ng.core',
   '@angular/compiler': 'ng.compiler',
   '@angular/platform-browser': 'ng.platformBrowser',
+  'firebase/auth': 'firebase',
+  'firebase/app': 'firebase',
+  'firebase/database': 'firebase',
+  'firebase/firestore': 'firebase',
+  'firebase/storage': 'firebase',
   '@firebase/auth': 'firebase',
   '@firebase/app': 'firebase',
   '@firebase/database': 'firebase',
   '@firebase/firestore': 'firebase',
   '@firebase/storage': 'firebase',
+  '@firebase/util': 'firebase',
+  '@firebase/webchannel-wrapper': 'firebase',
   'rxjs/scheduler/queue': 'Rx.Scheduler',
   '@angular/core/testing': 'ng.core.testing',
   'angularfire2': 'angularfire2',
@@ -72,7 +79,11 @@ const GLOBALS = {
 // Map of dependency versions across all packages
 const VERSIONS = {
   ANGULAR_VERSION: pkg.dependencies['@angular/core'],
-  FIREBASE_VERSION: pkg.dependencies['firebase'],
+  FIREBASE_APP_VERSION: pkg.dependencies['@firebase/app'],
+  FIREBASE_DATABASE_VERSION: pkg.dependencies['@firebase/database'],
+  FIREBASE_FIRESTORE_VERSION: pkg.dependencies['@firebase/firestore'],
+  FIREBASE_AUTH_VERSION: pkg.dependencies['@firebase/auth'],
+  FIREBASE_STORAGE_VERSION: pkg.dependencies['@firebase/storage'],
   RXJS_VERSION: pkg.dependencies['rxjs'],
   ZONEJS_VERSION: pkg.dependencies['zone.js'],
   ANGULARFIRE2_VERSION: pkg.version,
@@ -115,6 +126,15 @@ const DEST_PKG_PATHS = {
   storage: `${process.cwd()}/dist/packages-dist/storage/package.json`
 };
 
+const FIREBASE_FEATURE_MODULES = {
+  app: `${process.cwd()}/node_modules/@firebase/app/dist/esm/index.js`,
+  auth: `${process.cwd()}/node_modules/@firebase/auth/dist/auth.js`,
+  database: `${process.cwd()}/node_modules/@firebase/database/dist/esm/index.js`,
+  firestore: `${process.cwd()}/node_modules/@firebase/firestore/dist/esm/index.js`,
+  storage: `${process.cwd()}/node_modules/@firebase/storage/dist/esm/index.js`,
+  util: `${process.cwd()}/node_modules/@firebase/util/dist/esm/index.js`,
+};
+
 // Constants for running typescript commands
 const TSC = 'node_modules/.bin/tsc';
 const NGC = 'node_modules/.bin/ngc';
@@ -149,6 +169,16 @@ 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`,
+      globals,
+      moduleName: `firebase.${feature}`
+    });
+  });
+}
+
 /**
  * Create a UMD bundle given a module name.
  * @param {string} name