fix(node): Fix firebase-node packaging and deps

Author: jamesdaniels

package.json

@@ -34,14 +34,16 @@
     "@angular/core": "^6.0.0",
     "@angular/platform-browser": "^6.0.0",
     "@angular/platform-browser-dynamic": "^6.0.0",
-    "bufferutil": "^3.0.3",
     "firebase": "^5.0.3",
     "rxjs": "^6.0.0",
-    "utf-8-validate": "^4.0.0",
     "ws": "^3.3.2",
-    "xmlhttprequest": "^1.8.0",
+    "xhr2": "^0.1.4",
     "zone.js": "^0.8.0"
   },
+  "optionalDependencies": {
+    "bufferutil": "~3.0.0",
+    "utf-8-validate": "~4.0.0"
+  },
   "devDependencies": {
     "@angular/compiler-cli": "^6.0.0",
     "@angular/platform-server": "^6.0.0",

src/firebase-node/index.js

@@ -1,4 +1,4 @@
 // Patches for loading angularfire in a Universal Context
 
 global['WebSocket'] = require("ws");
-global['XMLHttpRequest'] = require("xmlhttprequest").XMLHttpRequest;
+global['XMLHttpRequest'] = require("xhr2");

src/firebase-node/package.json

@@ -1,5 +1,5 @@
 {
-    "name": "@angular/fire",
+    "name": "@angular/fire/firebase-node",
     "version": "ANGULARFIRE2_VERSION",
     "description": "Fixes for Node.js",
     "main": "index.js",
@@ -14,9 +14,11 @@
     },
     "author": "angular,firebase",
     "license": "MIT",
-    "peerDependencies": {
-      "xmlhttprequest": "XMLHTTPREQUEST_VERSION",
-      "ws": "WS_VERSION",
+    "dependencies": {
+      "xhr2": "XHR2_VERSION",
+      "ws": "WS_VERSION"
+    },
+    "optionalDependencies": {
       "bufferutil": "BUFFERUTIL_VERSION",
       "utf-8-validate": "UTF_8_VALIDATE_VERSION"
     },

tools/build.js

@@ -43,9 +43,9 @@ const VERSIONS = {
   ANGULARFIRE2_VERSION: pkg.version,
   FIRESTORE_VERSION: pkg.dependencies['firestore'],
   WS_VERSION: pkg.dependencies['ws'],
-  BUFFERUTIL_VERSION: pkg.dependencies['bufferutil'],
-  UTF_8_VALIDATE_VERSION: pkg.dependencies['utf-8-validate'],
-  XMLHTTPREQUEST_VERSION: pkg.dependencies['xmlhttprequest']
+  BUFFERUTIL_VERSION: pkg.optionalDependencies['bufferutil'],
+  UTF_8_VALIDATE_VERSION: pkg.optionalDependencies['utf-8-validate'],
+  XHR2_VERSION: pkg.dependencies['xhr2']
 };
 
 const MODULE_NAMES = {

yarn.lock

@@ -810,7 +810,7 @@ [email protected]:
     bindings "1.2.x"
     nan "^2.0.5"
 
-bufferutil@^3.0.3:
+bufferutil@~3.0.0:
   version "3.0.5"
   resolved "https://registry.yarnpkg.com/bufferutil/-/bufferutil-3.0.5.tgz#8abfc3b6da7aca6a13268b3f2482f0c7aa05fffb"
   dependencies:
@@ -5575,7 +5575,7 @@ [email protected]:
     bindings "~1.2.1"
     nan "~2.4.0"
 
-utf-8-validate@^4.0.0:
+utf-8-validate@~4.0.0:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/utf-8-validate/-/utf-8-validate-4.0.2.tgz#deadcedfbf5ec535e3c72874e9ddc0663c139691"
   dependencies:
@@ -5797,7 +5797,7 @@ xmlhttprequest-ssl@~1.5.4:
   version "1.5.5"
   resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.5.tgz#c2876b06168aadc40e57d97e81191ac8f4398b3e"
 
-[email protected], xmlhttprequest@^1.8.0:
+[email protected]:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/xmlhttprequest/-/xmlhttprequest-1.8.0.tgz#67fe075c5c24fef39f9d65f5f7b7fe75171968fc"