Skip to content

Commit c3a954c

Browse files
committed
fix(imports): add firebase imports to all places that reference firebase namespace
Fixes #525
1 parent e93d45d commit c3a954c

16 files changed

+22
-13
lines changed

src/angularfire2.spec.ts

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import * as firebase from 'firebase';
12
import {
23
TestBed,
34
inject

src/angularfire2.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { initializeApp } from 'firebase';
1+
import * as firebase from 'firebase';
22
import * as utils from './utils';
33
import { FirebaseAppConfig } from './interfaces';
44
import { AuthConfiguration } from './auth';
@@ -49,7 +49,7 @@ export class AngularFire {
4949
}
5050

5151
export function _getFirebase(config: FirebaseAppConfig): firebase.app.App {
52-
return initializeApp(config);
52+
return firebase.initializeApp(config);
5353
}
5454

5555
export function _getWindowLocation(){

src/auth/auth.spec.ts

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import * as firebase from 'firebase';
12
import { auth, initializeApp } from 'firebase';
23
import { ReflectiveInjector, Provider } from '@angular/core';
34
import { Observable } from 'rxjs/Observable'

src/auth/auth.ts

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import * as firebase from 'firebase';
12
import { Provider, Inject, Injectable, Optional } from '@angular/core';
23
import { Observable } from 'rxjs/Observable';
34
import { Observer } from 'rxjs/Observer';

src/auth/auth_backend.spec.ts

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import * as firebase from 'firebase';
12
import {
23
authDataToAuthState,
34
AuthProviders,

src/auth/auth_backend.ts

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import * as firebase from 'firebase';
12
import { Observable } from 'rxjs/Observable';
23

34
export abstract class AuthBackend {

src/auth/firebase_sdk_auth_backend.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1+
import * as firebase from 'firebase';
12
import { Injectable, Inject } from '@angular/core';
23
import { Observable } from 'rxjs/Observable';
34
import { Observer } from 'rxjs/Observer';
45
import { FirebaseApp } from '../tokens';
56
import { isPresent, ZoneScheduler } from '../utils';
6-
import { auth } from 'firebase';
77
import {
88
authDataToAuthState,
99
AuthBackend,
@@ -18,7 +18,7 @@ const {
1818
GithubAuthProvider,
1919
GoogleAuthProvider,
2020
TwitterAuthProvider
21-
} = auth;
21+
} = firebase.auth;
2222

2323
import { map } from 'rxjs/operator/map';
2424
import { fromPromise } from 'rxjs/observable/fromPromise';

src/database/database.ts

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import * as firebase from 'firebase';
12
import { Inject, Injectable } from '@angular/core';
23
import { FirebaseApp, FirebaseConfig } from '../tokens';
34
import { FirebaseAppConfig } from '../angularfire2';

src/database/firebase_list_factory.spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
declare var require: any;
1+
import * as firebase from 'firebase';
22
import {
33
FirebaseListFactory,
44
FirebaseListObservable,

src/database/firebase_list_factory.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1+
import * as firebase from 'firebase';
12
import { AFUnwrappedDataSnapshot } from '../interfaces';
23
import { FirebaseListObservable } from './firebase_list_observable';
34
import { Observer } from 'rxjs/Observer';
4-
import { database } from 'firebase';
55
import { observeQuery } from './query_observable';
66
import { Query, FirebaseListFactoryOpts } from '../interfaces';
77
import * as utils from '../utils';
@@ -17,7 +17,7 @@ export function FirebaseListFactory (
1717
let ref: firebase.database.Reference | firebase.database.Query;
1818

1919
utils.checkForUrlOrFirebaseRef(absoluteUrlOrDbRef, {
20-
isUrl: () => ref = database().refFromURL(<string>absoluteUrlOrDbRef),
20+
isUrl: () => ref = firebase.database().refFromURL(<string>absoluteUrlOrDbRef),
2121
isRef: () => ref = <firebase.database.Reference>absoluteUrlOrDbRef,
2222
isQuery: () => ref = <firebase.database.Query>absoluteUrlOrDbRef,
2323
});

src/database/firebase_list_observable.spec.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { FirebaseListObservable } from './index';
22
import { Observer } from 'rxjs/Observer';
33
import { map } from 'rxjs/operator/map';
4-
import { database } from 'firebase';
4+
import * as firebase from 'firebase';
55
import { unwrapMapFn } from '../utils';
66
import {
77
FIREBASE_PROVIDERS,
@@ -30,7 +30,7 @@ describe('FirebaseObservable', () => {
3030
});
3131
inject([FirebaseApp, AngularFire], (firebaseApp: firebase.app.App, _af: AngularFire) => {
3232
app = firebaseApp;
33-
ref = database().ref();
33+
ref = firebase.database().ref();
3434
O = new FirebaseListObservable(ref, (observer:Observer<any>) => {
3535
});
3636
})();

src/database/firebase_object_factory.spec.ts

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import * as firebase from 'firebase';
12
import { Subscription } from 'rxjs';
23
import { FirebaseObjectFactory, FirebaseObjectObservable } from './index';
34
import {

src/database/firebase_object_factory.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { FirebaseObjectObservable } from './index';
22
import { Observer } from 'rxjs/Observer';
3-
import { database } from 'firebase';
3+
import * as firebase from 'firebase';
44
import * as utils from '../utils';
55
import { Query } from '../interfaces';
66
import { observeQuery } from './query_observable';
@@ -13,7 +13,7 @@ export function FirebaseObjectFactory (
1313
let ref: firebase.database.Reference;
1414

1515
utils.checkForUrlOrFirebaseRef(absoluteUrlOrDbRef, {
16-
isUrl: () => ref = database().refFromURL(<string>absoluteUrlOrDbRef),
16+
isUrl: () => ref = firebase.database().refFromURL(<string>absoluteUrlOrDbRef),
1717
isRef: () => ref = <firebase.database.Reference>absoluteUrlOrDbRef
1818
});
1919

src/database/firebase_object_observable.spec.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import { COMMON_CONFIG, ANON_AUTH_CONFIG } from '../test-config';
1414
import { FirebaseObjectObservable } from './index';
1515
import { Observer } from 'rxjs/Observer';
1616
import { map } from 'rxjs/operator/map';
17-
import { database } from 'firebase';
17+
import * as firebase from 'firebase';
1818

1919
const rootDatabaseUrl = COMMON_CONFIG.databaseURL;
2020

@@ -30,7 +30,7 @@ describe('FirebaseObjectObservable', () => {
3030
});
3131
inject([FirebaseApp, AngularFire], (firebaseApp: firebase.app.App, _af: AngularFire) => {
3232
app = firebaseApp;
33-
ref = database().ref()
33+
ref = firebase.database().ref()
3434
O = new FirebaseObjectObservable((observer:Observer<any>) => {
3535
}, ref);
3636
})();

src/interfaces.ts

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import * as firebase from 'firebase';
12
import { Observable } from 'rxjs/Observable';
23

34
export interface FirebaseAppConfig {

src/utils.ts

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import * as firebase from 'firebase';
12
import { Subscription } from 'rxjs/Subscription';
23
import { Scheduler } from 'rxjs/Scheduler';
34
import { queue } from 'rxjs/scheduler/queue';

0 commit comments

Comments
 (0)