chore(build): Cleanup firebase build (angular#1655)

* First

* Use module import

Author: jamesdaniels

package.json

@@ -46,7 +46,6 @@
     "@firebase/storage": "^0.2.2",
     "@firebase/storage-types": "^0.2.2",
     "bufferutil": "^3.0.3",
-    "firebase": "^5.0.2",
     "rxjs": "^6.0.0",
     "utf-8-validate": "^4.0.0",
     "ws": "^3.3.2",
@@ -62,6 +61,7 @@
     "conventional-changelog-cli": "^1.2.0",
     "es6-module-loader": "^0.17.10",
     "es6-shim": "^0.35.0",
+    "firebase": "^5.0.2",
     "fs-extra": "^4.0.0",
     "gulp": "^3.9.0",
     "gulp-jasmine": "^2.2.1",

src/core/angularfire2.ts

@@ -3,7 +3,7 @@ import { isPlatformServer } from '@angular/common';
 import { Observable, Subscription, queueScheduler as queue } from 'rxjs';
 import { first } from 'rxjs/operators';
 
-import firebase from '@firebase/app';
+import { firebase } from '@firebase/app';
 import { FirebaseApp, FirebaseOptions, FirebaseAppConfig } from '@firebase/app-types';
 
 export const FirebaseOptionsToken = new InjectionToken<FirebaseOptions>('angularfire2.app.options');

test/typings-test/package.sample.json

@@ -4,7 +4,7 @@
   "private": true,
   "dependencies": {
     "angularfire2": "file:{{ANGULARFIRE_VERSION}}",
-    "firebase": "{{FIREBASE_VERSION}}",
+    "@firebase/app": "{{FIREBASE_APP_VERSION}}",
     "@angular/common": "{{ANGULAR_VERSION}}",
     "@angular/compiler": "{{ANGULAR_VERSION}}",
     "@angular/core": "{{ANGULAR_VERSION}}",

tools/build.js

@@ -13,22 +13,15 @@ const GLOBALS = {
   'rxjs': 'rxjs',
   'rxjs/operators': 'rxjs.operators',
   '@angular/common': 'ng.common',
-  '@angular/core': 'ng.core',
   '@angular/compiler': 'ng.compiler',
+  '@angular/core': 'ng.core',
+  '@angular/core/testing': 'ng.core.testing',
   '@angular/platform-browser': 'ng.platformBrowser',
-  'firebase/auth': 'firebase',
-  'firebase/app': 'firebase',
-  'firebase/database': 'firebase',
-  'firebase/firestore': 'firebase',
-  'firebase/storage': 'firebase',
-  '@firebase/auth': 'firebase',
   '@firebase/app': 'firebase',
+  '@firebase/auth': 'firebase',
   '@firebase/database': 'firebase',
   '@firebase/firestore': 'firebase',
   '@firebase/storage': 'firebase',
-  '@firebase/util': 'firebase',
-  '@firebase/webchannel-wrapper': 'firebase',
-  '@angular/core/testing': 'ng.core.testing',
   'angularfire2': 'angularfire2',
   'angularfire2/auth': 'angularfire2.auth',
   'angularfire2/database': 'angularfire2.database',

tools/run-typings-test.js

@@ -29,7 +29,7 @@ ncp(pathToTestSrcFolder, pathToTestFolder, () => {
 
   fs.writeFileSync(`${pathToTestFolder}/package.json`, JSON.stringify(samplePackage, null, 2)
     .replace('{{ANGULARFIRE_VERSION}}', path.resolve(__dirname, '../dist/packages-dist'))
-    .replace('{{FIREBASE_VERSION}}', rootPackage.dependencies.firebase)
+    .replace('{{FIREBASE_APP_VERSION}}', rootPackage.dependencies['@firebase/app'])
     .replace('{{RXJS_VERSION}}', rootPackage.dependencies.rxjs)
     .replace('{{ZONE_VERSION}}', rootPackage.dependencies['zone.js'])
     .replace('{{TYPESCRIPT_VERSION}}', rootPackage.devDependencies.typescript)

yarn.lock

@@ -73,7 +73,7 @@
   dependencies:
     "@firebase/auth-types" "0.3.2"
 
-"@firebase/database-types@^0.3.1":
+"@firebase/database-types@0.3.1", "@firebase/database-types@^0.3.1":
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/@firebase/database-types/-/database-types-0.3.1.tgz#4a15423f3b2cb3bed111f5a353c5c1bb2e2787ba"
 
@@ -1825,6 +1825,12 @@ fast-levenshtein@~2.0.4:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
 
+[email protected]:
+  version "0.11.1"
+  resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.11.1.tgz#f0efe18c4f56e4f40afc7e06c719fd5ee6188f38"
+  dependencies:
+    websocket-driver ">=0.5.1"
+
 file-uri-to-path@1:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz#553a7b8446ff6f684359c445f1e37a05dacc33dd"
@@ -2588,6 +2594,10 @@ http-errors@~1.6.2:
     setprototypeof "1.1.0"
     statuses ">= 1.4.0 < 2"
 
+http-parser-js@>=0.4.0:
+  version "0.4.12"
+  resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.4.12.tgz#b9cfbf4a2cf26f0fc34b10ca1489a27771e3474f"
+
 http-proxy-agent@1:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-1.0.0.tgz#cc1ce38e453bf984a0f7702d2dd59c73d081284a"
@@ -5770,6 +5780,17 @@ void-elements@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-2.0.1.tgz#c066afb582bb1cb4128d60ea92392e94d5e9dbec"
 
+websocket-driver@>=0.5.1:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.0.tgz#0caf9d2d755d93aee049d4bdd0d3fe2cca2a24eb"
+  dependencies:
+    http-parser-js ">=0.4.0"
+    websocket-extensions ">=0.1.1"
+
+websocket-extensions@>=0.1.1:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.3.tgz#5d2ff22977003ec687a4b87073dfbbac146ccf29"
+
 [email protected], whatwg-fetch@>=0.10.0:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-2.0.4.tgz#dde6a5df315f9d39991aa17621853d720b85566f"