fix(): Angular/rxjs 6 and dropping database-depricated

Co-authored-by: Yuki Kawamoto <[email protected]>

Author: jamesdaniels

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']),
 
@@ -32,7 +32,6 @@ module.exports = function(config) {
       'dist/packages-dist/bundles/database.umd.{js,map}',
       'dist/packages-dist/bundles/firestore.umd.{js,map}',
       'dist/packages-dist/bundles/storage.umd.{js,map}',
-      'dist/packages-dist/bundles/database-deprecated.umd.{js,map}',
       'dist/packages-dist/bundles/test.umd.{js,map}',
     ],
 

package.json

@@ -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.1.6",
     "@firebase/app-types": "^0.1.1",
     "@firebase/auth": "^0.3.2",
@@ -47,15 +47,15 @@
     "@firebase/storage-types": "^0.1.1",
     "bufferutil": "^3.0.3",
     "firebase": "^4.8.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 } 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 { FirebaseAppConfig, FirebaseAppName, _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';