chore(): Cleaning up the types

Author: jamesdaniels

src/auth/auth.spec.ts

@@ -1,5 +1,4 @@
-import { User } from 'firebase';
-import { ReflectiveInjector, Provider } from '@angular/core';
+import { User } from 'firebase/app';
 import { Observable, Subject } from 'rxjs'
 import { TestBed, inject } from '@angular/core/testing';
 import { FirebaseApp, FirebaseOptionsToken, AngularFireModule, FirebaseNameOrConfigToken } from 'angularfire2';

src/auth/auth.ts

@@ -3,7 +3,7 @@ import { Observable, of, from } from 'rxjs';
 import { switchMap } from 'rxjs/operators';
 import { FirebaseAppConfig, FirebaseOptions } from 'angularfire2';
 
-import { User, auth } from 'firebase';
+import { User, auth } from 'firebase/app';
 
 import { FirebaseAuth, FirebaseOptionsToken, FirebaseNameOrConfigToken, _firebaseAppFactory, FirebaseZoneScheduler } from 'angularfire2';
 

src/core/angularfire2.spec.ts

@@ -1,11 +1,11 @@
 
-import { TestBed, inject, withModule, async } from '@angular/core/testing';
-import { ReflectiveInjector, Provider, PlatformRef, NgModule, Compiler, ApplicationRef, CompilerFactory } from '@angular/core';
+import { TestBed, inject } from '@angular/core/testing';
+import { PlatformRef, NgModule, CompilerFactory } from '@angular/core';
 import { FirebaseApp, AngularFireModule } from 'angularfire2';
 import { Subscription } from 'rxjs';
 import { COMMON_CONFIG } from './test-config';
 import { BrowserModule } from '@angular/platform-browser';
-import { database } from 'firebase';
+import { database } from 'firebase/app';
 
 describe('angularfire', () => {
   let subscription:Subscription;

src/core/firebase.app.module.ts

@@ -1,7 +1,5 @@
-import { InjectionToken, NgZone, NgModule, Optional } from '@angular/core';
-import { app, auth, database, firestore, functions, messaging, storage } from 'firebase';
-// @ts-ignore
-import firebase from 'firebase/app';
+import { InjectionToken, NgModule, Optional } from '@angular/core';
+import { default as firebase, app, auth, database, firestore, functions, messaging, storage } from 'firebase/app';
 
 // Public types don't expose FirebaseOptions or FirebaseAppConfig
 export type FirebaseOptions = {[key:string]: any};
@@ -38,7 +36,7 @@ export function _firebaseAppFactory(options: FirebaseOptions, nameOrConfig?: str
     config.name = config.name || name;
     const existingApp = firebase.apps.filter(app => app && app.name === config.name)[0];
     // We support FirebaseConfig, initializeApp's public type only accepts string; need to cast as any
-    return (existingApp || firebase.initializeApp(options, config)) as FirebaseApp;
+    return (existingApp || firebase.initializeApp(options, config as any)) as FirebaseApp;
 }
 
 const FirebaseAppProvider = {

src/database-deprecated/firebase_object_observable.ts

@@ -1,6 +1,6 @@
 import { Observable, Operator, Subscriber, Subscription } from 'rxjs';
 import { Reference } from './interfaces';
-import { database } from 'firebase';
+import { database } from 'firebase/app';
 
 export class FirebaseObjectObservable<T> extends Observable<T> {
   constructor(subscribe?: <R>(subscriber: Subscriber<R>) => Subscription | Function | void, public $ref?:Reference) {

src/database-deprecated/interfaces.ts

@@ -1,5 +1,5 @@
 import { Observable } from 'rxjs';
-import { database } from 'firebase';
+import { database } from 'firebase/app';
 
 export type Reference = database.Reference;
 export type DataSnapshot = database.DataSnapshot;

src/database/interfaces.ts

@@ -1,5 +1,5 @@
 import { Observable } from 'rxjs';
-import { database } from 'firebase';
+import { database } from 'firebase/app';
 
 export type FirebaseOperation = string | database.Reference | database.DataSnapshot;
 

src/database/list/changes.spec.ts

@@ -1,4 +1,4 @@
-import { database } from 'firebase';
+import { database } from 'firebase/app';
 import { FirebaseApp, AngularFireModule } from 'angularfire2';
 import { AngularFireDatabase, AngularFireDatabaseModule, listChanges } from 'angularfire2/database';
 import { TestBed, inject } from '@angular/core/testing';

src/database/list/remove.ts

@@ -1,6 +1,6 @@
 import { DatabaseReference, DataSnapshot, FirebaseOperation, DatabaseSnapshot } from '../interfaces';
 import { checkOperationCases } from '../utils';
-import { database } from 'firebase';
+import { database } from 'firebase/app';
 
 // TODO(davideast): Find out why TS thinks this returns firebase.Primise
 // instead of Promise.

src/database/list/snapshot-changes.spec.ts

@@ -1,4 +1,4 @@
-import { database } from 'firebase';
+import { database } from 'firebase/app';
 import { FirebaseApp, AngularFireModule } from 'angularfire2';
 import { AngularFireDatabase, AngularFireDatabaseModule, snapshotChanges, ChildEvent } from 'angularfire2/database';
 import { TestBed, inject } from '@angular/core/testing';

src/database/list/state-changes.spec.ts

@@ -1,4 +1,4 @@
-import { database } from 'firebase';
+import { database } from 'firebase/app';
 import { FirebaseApp, AngularFireModule } from 'angularfire2';
 import { AngularFireDatabase, AngularFireDatabaseModule, stateChanges, ChildEvent } from 'angularfire2/database';
 import { TestBed, inject } from '@angular/core/testing';

src/firestore/interfaces.ts

@@ -1,5 +1,5 @@
 import { Subscriber } from 'rxjs';
-import { firestore } from 'firebase';
+import { firestore } from 'firebase/app';
 
 export type Settings =  firestore.Settings;
 export type CollectionReference = firestore.CollectionReference;

src/firestore/utils.spec.ts

@@ -1,4 +1,4 @@
-import { firestore } from 'firebase';
+import { firestore } from 'firebase/app';
 import { AngularFirestoreCollection } from './collection/collection';
 
 export interface Stock {

src/messaging/messaging.ts

@@ -1,6 +1,6 @@
 import { Injectable, Inject, Optional, NgZone, PLATFORM_ID } from '@angular/core';
 import { isPlatformBrowser } from '@angular/common';
-import { messaging } from 'firebase';
+import { messaging } from 'firebase/app';
 import { Observable, empty, from, of, throwError } from 'rxjs';
 import { mergeMap, catchError, map, switchMap, concat, defaultIfEmpty } from 'rxjs/operators';
 import { FirebaseOptions, FirebaseAppConfig, runOutsideAngular } from 'angularfire2';

src/storage/interfaces.ts

@@ -1,4 +1,4 @@
-import { storage } from 'firebase';
+import { storage } from 'firebase/app';
 
 export type UploadTask = storage.UploadTask;
 export type UploadTaskSnapshot = storage.UploadTaskSnapshot;

src/storage/observable/fromTask.ts

@@ -1,6 +1,6 @@
 import { Observable } from 'rxjs';
 import { UploadTask, UploadTaskSnapshot } from '../interfaces';
-import { storage } from 'firebase';
+import { storage } from 'firebase/app';
 
 export function fromTask(task: UploadTask) {
   return new Observable<UploadTaskSnapshot>(subscriber => {