chore(packaging): Support new @firebase scoped packages (angular#1423)

* fix(deps): add firebase types to peerDeps

* fix(deps): Add module deps for Firebase

* fix(deps): scoped firebase packaging

* chore(deps): Update deps

* fix(build): Use Firefox

Author: davideast

.travis.yml

@@ -26,7 +26,7 @@ before_script:
 
 script:
   - npm run build
-  - ./node_modules/.bin/karma start --single-run --browsers Chrome --reporters mocha
+  - ./node_modules/.bin/karma start --single-run --browsers Firefox --reporters mocha
   # Run integration test to make sure our typings are correct for user-land.
   - node tools/run-typings-test.js
 

karma.conf.js

@@ -41,7 +41,7 @@ module.exports = function(config) {
     logLevel: config.LOG_INFO,
     autoWatch: true,
     reporters: ['mocha'],
-    browsers: ['Chrome'],
+    browsers: ['Firefox'],
     singleRun: false
   })
 };

package.json

@@ -1,6 +1,6 @@
 {
   "name": "angularfire2",
-  "version": "5.0.0-rc.5-next",
+  "version": "5.0.0-rc.5.6-next",
   "description": "The official library of Firebase and Angular.",
   "private": true,
   "scripts": {
@@ -34,7 +34,18 @@
     "@angular/core": "^5.0.0",
     "@angular/platform-browser": "^5.0.0",
     "@angular/platform-browser-dynamic": "^5.0.0",
-    "firebase": "^4.5.0",
+    "@firebase/app": "^0.1.6",
+    "@firebase/app-types": "^0.1.1",
+    "@firebase/auth": "^0.3.2",
+    "@firebase/auth-types": "^0.1.1",
+    "@firebase/database": "^0.1.7",
+    "@firebase/database-types": "^0.1.1",
+    "@firebase/firestore": "^0.2.3",
+    "@firebase/firestore-types": "^0.1.1",
+    "@firebase/messaging-types": "^0.1.1",
+    "@firebase/storage": "^0.1.6",
+    "@firebase/storage-types": "^0.1.1",
+    "firebase": "^4.8.2",
     "rxjs": "^5.5.4",
     "zone.js": "^0.8.0"
   },
@@ -56,9 +67,9 @@
     "jasmine": "^2.4.1",
     "jasmine-core": "^2.4.1",
     "json": "^9.0.3",
-    "karma": "^0.13.19",
-    "karma-chrome-launcher": "^0.2.2",
-    "karma-firefox-launcher": "^0.1.7",
+    "karma": "^2.0.0",
+    "karma-chrome-launcher": "^2.2.0",
+    "karma-firefox-launcher": "^1.1.0",
     "karma-jasmine": "^0.3.6",
     "karma-mocha-reporter": "^2.0.2",
     "karma-systemjs": "^0.10.0",
@@ -71,6 +82,7 @@
     "rollup": "^0.35.11",
     "rollup-plugin-node-resolve": "^3.0.0",
     "rollup-watch": "^2.5.0",
+    "shelljs": "^0.8.0",
     "systemjs": "^0.19.16",
     "systemjs-builder": "^0.15.7",
     "traceur": "0.0.96",

src/auth/auth.module.ts

@@ -1,6 +1,7 @@
 import { NgModule, NgZone } from '@angular/core';
 import { FirebaseApp, AngularFireModule } from 'angularfire2';
 import { AngularFireAuth } from './auth';
+import '@firebase/auth';
 
 export function _getAngularFireAuth(app: FirebaseApp) {
   return new AngularFireAuth(app);

src/auth/package.json

@@ -22,7 +22,8 @@
     "@angular/core": "ANGULAR_VERSION",
     "@angular/platform-browser": "ANGULAR_VERSION",
     "@angular/platform-browser-dynamic": "ANGULAR_VERSION",
-    "firebase": "FIREBASE_VERSION",
+    "@firebase/app": "FIREBASE_APP_VERSION",
+    "@firebase/auth": "FIREBASE_AUTH_VERSION",
     "rxjs": "RXJS_VERSION",
     "zone.js": "ZONEJS_VERSION"
   },

src/core/package.json

@@ -21,7 +21,7 @@
     "@angular/core": "ANGULAR_VERSION",
     "@angular/platform-browser": "ANGULAR_VERSION",
     "@angular/platform-browser-dynamic": "ANGULAR_VERSION",
-    "firebase": "FIREBASE_VERSION",
+    "@firebase/app": "FIREBASE_APP_VERSION",
     "rxjs": "RXJS_VERSION",
     "zone.js": "ZONEJS_VERSION"
   },

src/database-deprecated/database.module.ts

@@ -1,6 +1,7 @@
 import { NgModule } from '@angular/core';
 import { AngularFireModule, FirebaseApp } from 'angularfire2';
 import { AngularFireDatabase } from './database';
+import '@firebase/database';
 
 export function _getAngularFireDatabase(app: FirebaseApp) {
   return new AngularFireDatabase(app);

src/database-deprecated/package.json

@@ -22,7 +22,8 @@
     "@angular/core": "ANGULAR_VERSION",
     "@angular/platform-browser": "ANGULAR_VERSION",
     "@angular/platform-browser-dynamic": "ANGULAR_VERSION",
-    "firebase": "FIREBASE_VERSION",
+    "@firebase/app": "FIREBASE_APP_VERSION",
+    "@firebase/database": "FIREBASE_DATABASE_VERSION",
     "rxjs": "RXJS_VERSION",
     "zone.js": "ZONEJS_VERSION"
   },

src/database/database.module.ts

@@ -1,6 +1,7 @@
 import { NgModule } from '@angular/core';
 import { AngularFireModule, FirebaseApp } from 'angularfire2';
 import { AngularFireDatabase } from './database';
+import '@firebase/database';
 
 export function _getAngularFireDatabase(app: FirebaseApp) {
   return new AngularFireDatabase(app);

src/database/package.json

@@ -22,7 +22,8 @@
     "@angular/core": "ANGULAR_VERSION",
     "@angular/platform-browser": "ANGULAR_VERSION",
     "@angular/platform-browser-dynamic": "ANGULAR_VERSION",
-    "firebase": "FIREBASE_VERSION",
+    "@firebase/app": "FIREBASE_APP_VERSION",
+    "@firebase/database": "FIREBASE_DATABASE_VERSION",
     "rxjs": "RXJS_VERSION",
     "zone.js": "ZONEJS_VERSION"
   },