Skip to content

Commit 40bb84d

Browse files
committed
Drop the side-effect imports
1 parent 349756e commit 40bb84d

File tree

13 files changed

+7
-9
lines changed

13 files changed

+7
-9
lines changed

src/auth/auth.module.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
import { NgModule } from '@angular/core';
22
import { AngularFireAuth } from './auth';
33

4-
import 'firebase/auth';
5-
64
@NgModule({
75
providers: [ AngularFireAuth ]
86
})

src/auth/auth.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ export class AngularFireAuth {
4343
const scheduler = new ɵFirebaseZoneScheduler(zone, platformId);
4444
this.auth = zone.runOutsideAngular(() => {
4545
const app = ɵfirebaseAppFactory(options, zone, nameOrConfig);
46+
if (!app.auth) { throw "You must import 'firebase/auth' before using AngularFireAuth" }
4647
return app.auth();
4748
});
4849

src/core/firebase.app.module.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { InjectionToken, NgModule, Optional, NgZone } from '@angular/core';
22
import { app, auth, database, messaging, storage, firestore, functions, analytics, performance, remoteConfig } from 'firebase/app';
3+
34
// @ts-ignore (https://github.com/firebase/firebase-js-sdk/pull/1206)
45
import firebase from 'firebase/app'; // once fixed can pull in as "default as firebase" above
56

src/database-deprecated/database.module.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import { NgModule } from '@angular/core';
22
import { AngularFireDatabase } from './database';
3-
import 'firebase/database';
43

54
@NgModule({
65
providers: [ AngularFireDatabase ]

src/database-deprecated/database.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ export class AngularFireDatabase {
2323
) {
2424
this.database = zone.runOutsideAngular(() => {
2525
const app = ɵfirebaseAppFactory(options, zone, nameOrConfig);
26+
if (!app.database) { throw "You must import 'firebase/database' before using AngularFireDatabase" }
2627
return app.database(databaseURL || undefined);
2728
});
2829
}

src/database/database.module.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
import { NgModule } from '@angular/core';
22
import { AngularFireDatabase } from './database';
33

4-
import 'firebase/database';
5-
64
@NgModule({
75
providers: [ AngularFireDatabase ]
86
})

src/database/database.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ export class AngularFireDatabase {
2020
this.scheduler = new ɵFirebaseZoneScheduler(zone, platformId);
2121
this.database = zone.runOutsideAngular(() => {
2222
const app = ɵfirebaseAppFactory(options, zone, nameOrConfig);
23+
if (!app.database) { throw "You must import 'firebase/database' before using AngularFireDatabase" }
2324
return app.database(databaseURL || undefined);
2425
});
2526
}

src/firestore/firestore.module.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@ import { ModuleWithProviders, NgModule } from '@angular/core';
22
import { PersistenceSettings } from './interfaces';
33
import { AngularFirestore, ENABLE_PERSISTENCE, PERSISTENCE_SETTINGS } from './firestore';
44

5-
import 'firebase/firestore';
6-
75
@NgModule({
86
providers: [ AngularFirestore ]
97
})

src/firestore/firestore.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@ export class AngularFirestore {
111111
this.scheduler = new ɵFirebaseZoneScheduler(zone, platformId);
112112
this.firestore = zone.runOutsideAngular(() => {
113113
const app = ɵfirebaseAppFactory(options, zone, nameOrConfig);
114+
if (!app.firestore) { throw "You must import 'firebase/firestore' before using AngularFirestore" }
114115
const firestore = app.firestore();
115116
if (settings) { firestore.settings(settings) }
116117
return firestore;

src/functions/functions.module.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import { NgModule } from '@angular/core';
22
import { AngularFireFunctions } from './functions';
3-
import 'firebase/functions'
43

54
@NgModule({
65
providers: [ AngularFireFunctions ]

src/functions/functions.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ export class AngularFireFunctions {
2929

3030
this.functions = zone.runOutsideAngular(() => {
3131
const app = ɵfirebaseAppFactory(options, zone, nameOrConfig);
32+
if (!app.functions) { throw "You must import 'firebase/functions' before using AngularFireFunctions" }
3233
return app.functions(region || undefined);
3334
});
3435

src/storage/storage.module.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import { NgModule } from '@angular/core';
22
import { AngularFireStorage } from './storage';
3-
import 'firebase/storage';
43

54
@NgModule({
65
providers: [ AngularFireStorage ]

src/storage/storage.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ export class AngularFireStorage {
2828
this.scheduler = new ɵFirebaseZoneScheduler(zone, platformId);
2929
this.storage = zone.runOutsideAngular(() => {
3030
const app = ɵfirebaseAppFactory(options, zone, nameOrConfig);
31+
if (!app.storage) { throw "You must import 'firebase/storage' before using AngularFireStorage" }
3132
return app.storage(storageBucket || undefined);
3233
});
3334
}

0 commit comments

Comments
 (0)