feat(): support Angular and rxjs 6 (#1625)

* fix(): Angular/rxjs 6 and dropping database-depricated Co-authored-by: Yuki Kawamoto <kawamoto62@gmail.com> * Brought database-deprecated back in * Changelog and version update for rc8 * Had some bad merges and updating build test * Drop package-lock from test/ng6 * fixed the ng-build yarn command

Author: jamesdaniels

.travis.yml

@@ -43,3 +43,5 @@ script:
  - ./node_modules/.bin/karma start --single-run --browsers ChromeHeadlessTravis --reporters mocha
  # Run integration test to make sure our typings are correct for user-land.
  - node tools/run-typings-test.js
+ # Run the ng6 build test
+ - cd test/ng-build/ng6 && yarn && yarn build:prod

CHANGELOG.md

@@ -1,3 +1,29 @@
+<a name="5.0.0-rc.8"></a>
+# [5.0.0-rc.8](https://github.com/angular/angularfire2/compare/5.0.0-rc.7...5.0.0-rc.8) (2018-05-12)
+
+### Bug Fixes
+
+* Zone was already loaded, type is implied ([#1631](https://github.com/angular/angularfire2/issues/1631)) ([7d2fd53](https://github.com/angular/angularfire2/commit/7d2fd53)), closes [#1599](https://github.com/angular/angularfire2/issues/1599)
+
+### Features
+
+* Supporting Angular and rxjs 6 ([dd4a36c](https://github.com/angular/angularfire2/commit/dd4a36c))
+* Support Firebase JS SDK 5.0 ([#1628](https://github.com/angular/angularfire2/issues/1628)) ([b99bfa3](https://github.com/angular/angularfire2/commit/b99bfa3))
+* Support FirebaseAppConfig, clean up injection tokens ([#1627](https://github.com/angular/angularfire2/issues/1627)) ([57906bd](https://github.com/angular/angularfire2/commit/57906bd))
+* **firestore:** Support Firestore Settings, timestampsInSnapshots default to true ([#1629](https://github.com/angular/angularfire2/issues/1629)) ([570c0a7](https://github.com/angular/angularfire2/commit/570c0a7))
+* **auth:** Update to rxjs pipeable operators ([#1621](https://github.com/angular/angularfire2/issues/1621)) ([0c3b215](https://github.com/angular/angularfire2/commit/0c3b215))
+* **core:** Update to rxjs pipeable operators ([#1620](https://github.com/angular/angularfire2/issues/1620)) ([3fbbb7d](https://github.com/angular/angularfire2/commit/3fbbb7d))
+* **database:** Update to rxjs pipeable operators ([#1622](https://github.com/angular/angularfire2/issues/1622)) ([5c3681d](https://github.com/angular/angularfire2/commit/5c3681d))
+* **firestore:** Update to rxjs pipeable operators ([#1623](https://github.com/angular/angularfire2/issues/1623)) ([97b26e3](https://github.com/angular/angularfire2/commit/97b26e3))
+* **storage:** Update to rxjs pipeable operators ([#1624](https://github.com/angular/angularfire2/issues/1624)) ([014be21](https://github.com/angular/angularfire2/commit/014be21))
+
+### Breaking changes
+
+* Due to the addition of a conflicting `FirebaseAppConfig` interface in Firebase 4.13 we've now changed our `FirebaseAppConfig` Injection Token to be `FirebaseOptionsToken`
+* For consistency the `FirebaseAppName` Injection Token is now `FirebaseAppNameToken`
+* rxjs 5 is no longer supported, upgrade to 6 ([see the rxjs migration guide for more information](https://github.com/ReactiveX/rxjs/blob/master/MIGRATION.md))
+* Firebase JS SDK 4.x is no longer supported, upgrade to 5 ([see the changelog for more information](https://firebase.google.com/support/release-notes/js#version_500_may_8_2018))
+
 <a name="5.0.0-rc.7"></a>
 # [5.0.0-rc.7](https://github.com/angular/angularfire2/compare/5.0.0-rc.6...5.0.0-rc.7) (2018-05-04)
 

karma.conf.js

@@ -20,7 +20,7 @@ module.exports = function(config) {
  'node_modules/zone.js/dist/async-test.js',
  'node_modules/zone.js/dist/fake-async-test.js',
 
- 'node_modules/rxjs/bundles/Rx.{js,map}',
+ 'node_modules/rxjs/bundles/rxjs.umd.{js,map}',
 
  ...getAngularFiles(['core','common','compiler','platform-browser','platform-browser-dynamic']),
 

package.json

@@ -1,6 +1,6 @@
 {
  "name": "angularfire2",
- "version": "5.0.0-rc.7",
+ "version": "5.0.0-rc.8",
  "description": "The official library of Firebase and Angular.",
  "private": true,
  "scripts": {
@@ -29,11 +29,11 @@
  },
  "homepage": "https://github.com/angular/angularfire2#readme",
  "dependencies": {
- "@angular/common": "^5.0.0",
- "@angular/compiler": "^5.0.0",
- "@angular/core": "^5.0.0",
- "@angular/platform-browser": "^5.0.0",
- "@angular/platform-browser-dynamic": "^5.0.0",
+ "@angular/common": "^6.0.0",
+ "@angular/compiler": "^6.0.0",
+ "@angular/core": "^6.0.0",
+ "@angular/platform-browser": "^6.0.0",
+ "@angular/platform-browser-dynamic": "^6.0.0",
  "@firebase/app": "^0.3.1",
  "@firebase/app-types": "^0.3.1",
  "@firebase/auth": "^0.5.2",
@@ -47,15 +47,15 @@
  "@firebase/storage-types": "^0.2.2",
  "bufferutil": "^3.0.3",
  "firebase": "^5.0.2",
- "rxjs": "^5.5.4",
+ "rxjs": "^6.0.0",
  "utf-8-validate": "^4.0.0",
  "ws": "^3.3.2",
  "xmlhttprequest": "^1.8.0",
  "zone.js": "^0.8.0"
  },
  "devDependencies": {
- "@angular/compiler-cli": "^5.0.0",
- "@angular/platform-server": "^5.0.0",
+ "@angular/compiler-cli": "^6.0.0",
+ "@angular/platform-server": "^6.0.0",
  "@types/jasmine": "^2.5.36",
  "@types/request": "0.0.30",
  "concurrently": "^2.2.0",
@@ -90,7 +90,7 @@
  "systemjs": "^0.19.16",
  "systemjs-builder": "^0.15.7",
  "traceur": "0.0.96",
- "typescript": ">=2.4.2 <2.5"
+ "typescript": ">=2.7.2 <2.8.0"
  },
  "typings": "index.d.ts"
 }

src/auth/auth.ts

@@ -1,10 +1,8 @@
 import { FirebaseAuth, User } from '@firebase/auth-types';
 import { FirebaseOptions, FirebaseAppConfig } from '@firebase/app-types';
 import { Injectable, Inject, Optional, NgZone, PLATFORM_ID } from '@angular/core';
-import { Observable } from 'rxjs';
+import { Observable, of, from } from 'rxjs';
 import { switchMap } from 'rxjs/operators';
-import { of } from 'rxjs/observable/of';
-import { from } from 'rxjs/observable/from';
 
 import { FirebaseOptionsToken, FirebaseAppConfigToken, FirebaseAppNameToken, _firebaseAppFactory, FirebaseZoneScheduler } from 'angularfire2';
 

src/core/angularfire2.ts

@@ -1,7 +1,6 @@
 import { InjectionToken, NgZone } from '@angular/core';
 import { isPlatformServer } from '@angular/common';
-import { Observable, Subscription } from 'rxjs';
-import { queue } from 'rxjs/scheduler/queue';
+import { Observable, Subscription, queueScheduler as queue } from 'rxjs';
 import { first } from 'rxjs/operators';
 
 import firebase from '@firebase/app';

src/database-deprecated/database.ts

@@ -25,7 +25,7 @@ export class AngularFireDatabase {
  zone: NgZone
  ) {
  this.database = zone.runOutsideAngular(() => {
- const app = _firebaseAppFactory(config, name);
+ const app = _firebaseAppFactory(options, name, config);
  return app.database(databaseURL || undefined);
  });
  }

src/database-deprecated/firebase_list_factory.ts

@@ -4,12 +4,10 @@ import { FirebaseZoneScheduler } from 'angularfire2';
 import * as utils from './utils';
 import { AFUnwrappedDataSnapshot } from './interfaces';
 import { FirebaseListObservable } from './firebase_list_observable';
-import { Observer } from 'rxjs/Observer';
-import { observeOn } from 'rxjs/operator/observeOn';
+import { Observer } from 'rxjs';
+import { observeOn, switchMap, map } from 'rxjs/operators';
 import { observeQuery } from './query_observable';
 import { Query, FirebaseListFactoryOpts, DatabaseReference, DatabaseQuery, DatabaseSnapshot } from './interfaces';
-import { switchMap } from 'rxjs/operator/switchMap';
-import { map } from 'rxjs/operator/map';
 
 export function FirebaseListFactory (
  ref: DatabaseReference,

src/database-deprecated/firebase_list_observable.ts

@@ -1,7 +1,4 @@
-import { Observable } from 'rxjs/Observable';
-import { Operator } from 'rxjs/Operator';
-import { Subscriber } from 'rxjs/Subscriber';
-import { Subscription } from 'rxjs/Subscription';
+import { Observable, Operator, Subscriber, Subscription } from 'rxjs';
 import { Reference, DataSnapshot, ThenableReference } from '@firebase/database-types';
 import * as utils from './utils';
 import { AFUnwrappedDataSnapshot, FirebaseOperationCases, QueryReference, DatabaseSnapshot, DatabaseReference } from './interfaces';

src/database-deprecated/firebase_object_factory.ts

@@ -1,8 +1,8 @@
 import { NgZone } from '@angular/core';
 import { FirebaseObjectObservable } from './firebase_object_observable';
 import { FirebaseZoneScheduler } from 'angularfire2';
-import { Observer } from 'rxjs/Observer';
-import { observeOn } from 'rxjs/operator/observeOn';
+import { Observer } from 'rxjs';
+import { observeOn } from 'rxjs/operators';
 import { DataSnapshot } from '@firebase/database-types';
 import * as utils from './utils';
 import { FirebaseObjectFactoryOpts, DatabaseReference } from './interfaces';