registerVersion is actually on firebase object

Author: jamesdaniels

package.json

@@ -89,6 +89,7 @@
     "pretty-size": "^2.0.0",
     "protractor": "3.0.0",
     "reflect-metadata": "0.1.2",
+    "replace-in-file": "^5.0.2",
     "rimraf": "^2.5.4",
     "schematics-utilities": "^2.0.1",
     "shelljs": "^0.8.0",

src/core/firebase.app.module.ts

@@ -1,7 +1,6 @@
-import { InjectionToken, NgModule, Optional, NgZone, VERSION as NG_VERSION, Version } from '@angular/core';
+import { InjectionToken, NgModule, Optional, NgZone, VERSION as NG_VERSION, Version, PLATFORM_ID, Inject } from '@angular/core';
 import { app, auth, database, messaging, storage, firestore, functions, analytics, performance, remoteConfig } from 'firebase/app';
-// @ts-ignore (https://github.com/firebase/firebase-js-sdk/pull/1206)
-import firebase from 'firebase/app'; // once fixed can pull in as "default as firebase" above
+import * as firebase from 'firebase/app';
 
 // INVESTIGATE Public types don't expose FirebaseOptions or FirebaseAppConfig, is this the case anylonger?
 export interface FirebaseOptions {[key:string]: any};
@@ -25,7 +24,6 @@ export class FirebaseApp implements Partial<app.App> {
     firestore: () => firestore.Firestore;
     functions: (region?: string) => functions.Functions;
     remoteConfig: () => remoteConfig.RemoteConfig;
-    registerVersion?: (library: string, version: string) => void;
 }
 
 export const VERSION = new Version('ANGULARFIRE2_VERSION');
@@ -38,12 +36,7 @@ export function ɵfirebaseAppFactory(options: FirebaseOptions, zone: NgZone, nam
     const existingApp = firebase.apps.filter(app => app && app.name === config.name)[0] as any;
     // We support FirebaseConfig, initializeApp's public type only accepts string; need to cast as any
     // Could be solved with https://github.com/firebase/firebase-js-sdk/pull/1206
-    const app = (existingApp || zone.runOutsideAngular(() => firebase.initializeApp(options, config as any))) as FirebaseApp;
-    if (app.registerVersion) {
-        app.registerVersion('angularfire', VERSION.full);
-        app.registerVersion('angular', NG_VERSION.full);
-    }
-    return app;
+    return (existingApp || zone.runOutsideAngular(() => firebase.initializeApp(options, config as any))) as FirebaseApp;
 }
 
 const FirebaseAppProvider = {
@@ -69,4 +62,8 @@ export class AngularFireModule {
             ]
         }
     }
+    constructor(@Inject(PLATFORM_ID) platformId:Object ) {
+        firebase.registerVersion('angularfire', VERSION.full, platformId.toString());
+        firebase.registerVersion('angular', NG_VERSION.full);
+    }
 }

tools/build.js

@@ -82,6 +82,28 @@ var dest = function () {
     return path_1.join.apply(void 0, __spreadArrays([process.cwd(), 'dist', 'packages-dist'], args));
 };
 var rootPackage = Promise.resolve().then(function () { return require(path_1.join(process.cwd(), 'package.json')); });
+function replacePackageCoreVersion() {
+    return __awaiter(this, void 0, void 0, function () {
+        var root, replace, result;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, rootPackage];
+                case 1:
+                    root = _a.sent();
+                    replace = require('replace-in-file');
+                    return [4 /*yield*/, replace({
+                            files: dest('**', '*.js'),
+                            from: 'ANGULARFIRE2_VERSION',
+                            to: root.version
+                        })];
+                case 2:
+                    result = _a.sent();
+                    console.log(result);
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
 function replacePackageJsonVersions() {
     return __awaiter(this, void 0, void 0, function () {
         var path, root, pkg;
@@ -174,7 +196,8 @@ function buildLibrary() {
                             fs_extra_1.copy(path_1.join(process.cwd(), 'docs'), dest('docs')),
                             fs_extra_1.copy(src('firebase-node'), dest('firebase-node')),
                             compileSchematics(),
-                            replacePackageJsonVersions()
+                            replacePackageJsonVersions(),
+                            replacePackageCoreVersion()
                         ])];
                 case 2:
                     _a.sent();

tools/build.ts

@@ -1,5 +1,5 @@
 import { spawn } from 'child_process';
-import { copy, writeFile, readFile, accessSync } from 'fs-extra';
+import { copy, writeFile, readFile } from 'fs-extra';
 import { prettySize } from 'pretty-size';
 import { sync as gzipSync } from 'gzip-size';
 import { join, dirname } from 'path';
@@ -18,6 +18,16 @@ const dest = (...args:string[]) => join(process.cwd(), 'dist', 'packages-dist',
 
 const rootPackage = import(join(process.cwd(), 'package.json'));
 
+async function replacePackageCoreVersion() {
+  const root = await rootPackage;
+  const replace = require('replace-in-file');
+  return replace({
+    files: dest('**', '*.js'),
+    from: 'ANGULARFIRE2_VERSION',
+    to: root.version
+  });
+}
+
 async function replacePackageJsonVersions() {
   const path = dest('package.json');
   const root = await rootPackage;
@@ -69,7 +79,8 @@ async function buildLibrary() {
     copy(join(process.cwd(), 'docs'), dest('docs')),
     copy(src('firebase-node'), dest('firebase-node')),
     compileSchematics(),
-    replacePackageJsonVersions()
+    replacePackageJsonVersions(),
+    replacePackageCoreVersion()
   ]);
 }
 

yarn.lock

@@ -1970,7 +1970,7 @@ ansi-styles@^3.2.1:
   dependencies:
     color-convert "^1.9.0"
 
-ansi-styles@^4.1.0:
+ansi-styles@^4.0.0, ansi-styles@^4.1.0:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.2.1.tgz#90ae75c424d008d2624c5bf29ead3177ebfcf359"
   integrity sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==
@@ -3380,6 +3380,15 @@ cliui@^4.0.0:
     strip-ansi "^4.0.0"
     wrap-ansi "^2.0.0"
 
+cliui@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-6.0.0.tgz#511d702c0c4e41ca156d7d0e96021f23e13225b1"
+  integrity sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==
+  dependencies:
+    string-width "^4.2.0"
+    strip-ansi "^6.0.0"
+    wrap-ansi "^6.2.0"
+
 clone-deep@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-4.0.1.tgz#c19fd9bdbbf85942b4fd979c84dcf7d5f07c2387"
@@ -5390,7 +5399,7 @@ find-up@^3.0.0:
   dependencies:
     locate-path "^3.0.0"
 
-find-up@^4.0.0:
+find-up@^4.0.0, find-up@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"
   integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==
@@ -5891,7 +5900,7 @@ glob@^3.2.11, glob@~3.2:
     inherits "2"
     minimatch "0.3"
 
-glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4:
+glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6:
   version "7.1.6"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
   integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==
@@ -10656,6 +10665,15 @@ repeating@^2.0.0:
   dependencies:
     is-finite "^1.0.0"
 
+replace-in-file@^5.0.2:
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/replace-in-file/-/replace-in-file-5.0.2.tgz#bd26203b66dfb5b8112ae36a2d2cf928ea4cfe12"
+  integrity sha512-1Vc7Sbr/rTuHgU1PZuBb7tGsFx3D4NKdhV4BpEF2MuN/6+SoXcFtx+dZ1Zz+5Dq4k5x9js87Y+gXQYPTQ9ppkA==
+  dependencies:
+    chalk "^3.0.0"
+    glob "^7.1.6"
+    yargs "^15.0.2"
+
 request@^2.72.0, request@^2.74.0, request@^2.79.0, request@^2.81.0, request@^2.83.0, request@^2.87.0, request@^2.88.0:
   version "2.88.0"
   resolved "https://registry.yarnpkg.com/request/-/request-2.88.0.tgz#9c2fca4f7d35b592efe57c7f0a55e81052124fef"
@@ -11745,7 +11763,7 @@ string-width@^3.0.0:
     is-fullwidth-code-point "^2.0.0"
     strip-ansi "^5.1.0"
 
-string-width@^4.0.0, string-width@^4.1.0:
+string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.0.tgz#952182c46cc7b2c313d1596e623992bd163b72b5"
   integrity sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==
@@ -13141,6 +13159,15 @@ wrap-ansi@^2.0.0:
     string-width "^1.0.1"
     strip-ansi "^3.0.1"
 
+wrap-ansi@^6.2.0:
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz#e9393ba07102e6c91a3b221478f0257cd2856e53"
+  integrity sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==
+  dependencies:
+    ansi-styles "^4.0.0"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
+
 wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
@@ -13314,6 +13341,14 @@ yargs-parser@^13.0.0:
     camelcase "^5.0.0"
     decamelize "^1.2.0"
 
+yargs-parser@^16.1.0:
+  version "16.1.0"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-16.1.0.tgz#73747d53ae187e7b8dbe333f95714c76ea00ecf1"
+  integrity sha512-H/V41UNZQPkUMIT5h5hiwg4QKIY1RPvoBV4XcjUbRM8Bk2oKqqyZ0DIEbTFZB0XjbtSPG8SAa/0DxCQmiRgzKg==
+  dependencies:
+    camelcase "^5.0.0"
+    decamelize "^1.2.0"
+
 [email protected]:
   version "12.0.5"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-12.0.5.tgz#05f5997b609647b64f66b81e3b4b10a368e7ad13"
@@ -13349,6 +13384,23 @@ [email protected]:
     y18n "^4.0.0"
     yargs-parser "^13.0.0"
 
+yargs@^15.0.2:
+  version "15.1.0"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.1.0.tgz#e111381f5830e863a89550bd4b136bb6a5f37219"
+  integrity sha512-T39FNN1b6hCW4SOIk1XyTOWxtXdcen0t+XYrysQmChzSipvhBO8Bj0nK1ozAasdk24dNWuMZvr4k24nz+8HHLg==
+  dependencies:
+    cliui "^6.0.0"
+    decamelize "^1.2.0"
+    find-up "^4.1.0"
+    get-caller-file "^2.0.1"
+    require-directory "^2.1.1"
+    require-main-filename "^2.0.0"
+    set-blocking "^2.0.0"
+    string-width "^4.2.0"
+    which-module "^2.0.0"
+    y18n "^4.0.0"
+    yargs-parser "^16.1.0"
+
 yargs@^3.10.0:
   version "3.32.0"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-3.32.0.tgz#03088e9ebf9e756b69751611d2a5ef591482c995"