Skip to content

Commit

Permalink
fix(): Angular/rxjs 6 and dropping database-depricated
Browse files Browse the repository at this point in the history
Co-authored-by: Yuki Kawamoto <kawamoto62@gmail.com>
  • Loading branch information
jamesdaniels and kawamoto committed May 12, 2018
1 parent 0c3b215 commit dd4a36c
Show file tree
Hide file tree
Showing 37 changed files with 97 additions and 3,167 deletions.
3 changes: 1 addition & 2 deletions karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -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']),

Expand All @@ -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}',
],

Expand Down
18 changes: 9 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand Down Expand Up @@ -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"
}
4 changes: 1 addition & 3 deletions src/auth/auth.ts
Original file line number Diff line number Diff line change
@@ -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';

Expand Down
3 changes: 1 addition & 2 deletions src/core/angularfire2.ts
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
8 changes: 0 additions & 8 deletions src/database-deprecated/database.module.ts

This file was deleted.

44 changes: 0 additions & 44 deletions src/database-deprecated/database.ts

This file was deleted.

Loading

0 comments on commit dd4a36c

Please sign in to comment.