Skip to content

Commit f7e011e

Browse files
committed
Update angularfire package to @angular/fire
- Fix #77
1 parent 3a0d289 commit f7e011e

9 files changed

Lines changed: 516 additions & 461 deletions

File tree

README.MD

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ To install this library, run:
1313
$ npm install firebaseui-angular --save
1414
```
1515

16-
To run this library you need to have [AngularFire](https://github.com/angular/angularfire2), [Firebase](https://firebase.google.com/docs/web/setup),
16+
To run this library you need to have [AngularFire2](https://github.com/angular/angularfire2), [Firebase](https://firebase.google.com/docs/web/setup),
1717
[FirebaseUI-Web](https://github.com/firebase/firebaseui-web) installed.
1818
Fast install:
1919
```bash
20-
$ npm install firebase firebaseui angularfire2 firebaseui-angular --save
20+
$ npm install firebase firebaseui @angular/fire firebaseui-angular --save
2121
```
2222

2323
## How to use
@@ -31,12 +31,12 @@ import {NgModule} from '@angular/core';
3131
import {FormsModule} from '@angular/forms';
3232
import {AppComponent} from './app.component';
3333
import {FirebaseUIModule} from 'firebaseui-angular';
34-
import {AngularFireModule} from 'angularfire2';
3534
import {environment} from '../environments/environment';
36-
import {AngularFireAuthModule} from 'angularfire2/auth';
3735
import {AppRoutingModule} from './app-routing.module';
38-
import * as firebase from 'firebase/app';
39-
import * as firebaseui from 'firebaseui';
36+
import * as firebase from 'firebase/app/dist/index.esm';
37+
import * as firebaseui from 'firebaseui/dist/firebaseui.js';
38+
import {AngularFireModule} from '@angular/fire';
39+
import {AngularFireAuthModule} from '@angular/fire/auth';
4040

4141
const firebaseUiAuthConfig: firebaseui.auth.Config = {
4242
signInFlow: 'popup',

package-lock.json

Lines changed: 485 additions & 430 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -20,28 +20,28 @@
2020
},
2121
"private": true,
2222
"dependencies": {
23-
"@angular/animations": "6.1.2",
24-
"@angular/common": "6.1.2",
25-
"@angular/compiler": "6.1.2",
26-
"@angular/core": "6.1.2",
27-
"@angular/forms": "6.1.2",
28-
"@angular/http": "6.1.2",
29-
"@angular/platform-browser": "6.1.2",
30-
"@angular/platform-browser-dynamic": "6.1.2",
31-
"@angular/router": "6.1.2",
32-
"angularfire2": "^5.0.0-rc.11",
23+
"@angular/animations": "6.1.7",
24+
"@angular/common": "6.1.7",
25+
"@angular/compiler": "6.1.7",
26+
"@angular/core": "6.1.7",
27+
"@angular/fire": "5.0.0",
28+
"@angular/forms": "6.1.7",
29+
"@angular/http": "6.1.7",
30+
"@angular/platform-browser": "6.1.7",
31+
"@angular/platform-browser-dynamic": "6.1.7",
32+
"@angular/router": "6.1.7",
3333
"core-js": "^2.5.7",
34-
"firebase": "^5.4.0",
35-
"firebaseui": "^3.3.0",
36-
"rxjs": "^6.2.2",
34+
"firebase": "^5.4.2",
35+
"firebaseui": "^3.4.0",
36+
"rxjs": "^6.3.2",
3737
"zone.js": "^0.8.26"
3838
},
3939
"devDependencies": {
40-
"@angular-devkit/build-angular": "^0.7.4",
41-
"@angular-devkit/build-ng-packagr": "^0.7.4",
42-
"@angular/cli": "6.1.3",
43-
"@angular/compiler-cli": "6.1.2",
44-
"@angular/language-service": "6.1.2",
40+
"@angular-devkit/build-angular": "^0.7.5",
41+
"@angular-devkit/build-ng-packagr": "^0.7.5",
42+
"@angular/cli": "6.1.5",
43+
"@angular/compiler-cli": "6.1.7",
44+
"@angular/language-service": "6.1.7",
4545
"@types/jasmine": "^2.8.8",
4646
"@types/jasminewd2": "~2.0.3",
4747
"@types/node": "10.1.1",

projects/firebaseui-angular-library/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
"peerDependencies": {
2323
"@angular/common": "^6.1.2",
2424
"@angular/core": "^6.1.2",
25+
"@angular/fire": "5.0.0",
2526
"firebaseui": "^3.2.0",
26-
"angularfire2": "^5.0.0-rc.11",
2727
"firebase": "^5.3.1"
2828
}
2929
}

projects/firebaseui-angular-library/src/lib/firebaseui-angular-library.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import {Component, EventEmitter, Inject, OnDestroy, OnInit, Output} from '@angular/core';
2+
import {AngularFireAuth} from '@angular/fire/auth';
23
import {Subscription} from 'rxjs';
34
import {
45
AuthMethods,
@@ -12,7 +13,6 @@ import {
1213
NativeFirebaseUIAuthConfig,
1314
} from './firebaseui-angular-library.helper';
1415
import * as firebaseui from 'firebaseui';
15-
import {AngularFireAuth} from 'angularfire2/auth';
1616
// noinspection ES6UnusedImports
1717
import * as firebase from 'firebase/app';
1818
import {User} from 'firebase/app';

projects/firebaseui-angular-library/src/lib/firebaseui-angular-library.service.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Injectable } from '@angular/core';
2-
import {AngularFireAuth} from 'angularfire2/auth';
2+
import {AngularFireAuth} from '@angular/fire/auth';
33
import * as firebaseui from 'firebaseui';
44

55
@Injectable({

src/app/app.module.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ import {NgModule} from '@angular/core';
33
import {FormsModule} from '@angular/forms';
44
import {AppComponent} from './app.component';
55
import {FirebaseUIModule} from 'firebaseui-angular';
6-
import {AngularFireModule} from 'angularfire2';
76
import {environment} from '../environments/environment';
8-
import {AngularFireAuthModule} from 'angularfire2/auth';
97
import {AppRoutingModule} from './app-routing.module';
108
import * as firebase from 'firebase/app';
119
import * as firebaseui from 'firebaseui';
10+
import {AngularFireModule} from '@angular/fire';
11+
import {AngularFireAuthModule} from '@angular/fire/auth';
1212

1313
const firebaseUiAuthConfig: firebaseui.auth.Config = {
1414
signInFlow: 'popup',

src/app/main/main.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import {Component, OnInit} from '@angular/core';
2-
import {AngularFireAuth} from 'angularfire2/auth';
2+
import {AngularFireAuth} from '@angular/fire/auth';
33
import {FirebaseUISignInSuccessWithAuthResult} from 'firebaseui-angular';
44
import {FirebaseUISignInFailure} from '../../../projects/firebaseui-angular-library/src/lib/firebaseui-angular-library.helper';
55

src/app/second-page/second-page.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import {Component, OnInit} from '@angular/core';
2-
import {AngularFireAuth} from 'angularfire2/auth';
32
import {FirebaseUISignInSuccess} from 'firebaseui-angular';
3+
import {AngularFireAuth} from '@angular/fire/auth';
44

55
@Component({
66
selector: 'fbui-ng-second-page',

0 commit comments

Comments
 (0)