@angular/fire 7.1.0-rc.5 → 7.2.0-canary.390691b

package/analytics/analytics.module.d.ts

@@ -5,13 +5,11 @@ import { FirebaseApp } from '@angular/fire/app';
 import { ScreenTrackingService } from './screen-tracking.service';
 import { UserTrackingService } from './user-tracking.service';
 import * as i0 from "@angular/core";
-export declare const PROVIDED_ANALYTICS_INSTANCE_FACTORIES: InjectionToken<((injector: Injector) => Analytics)[]>;
 export declare const PROVIDED_ANALYTICS_INSTANCES: InjectionToken<Analytics[]>;
-export declare const isSupportedPromiseSymbol: unique symbol;
-export declare function defaultAnalyticsInstanceFactory(isSupported: boolean, provided: FirebaseAnalytics[] | undefined, defaultApp: FirebaseApp): Analytics;
-export declare function analyticsInstanceFactory(fn: (injector: Injector) => FirebaseAnalytics): (zone: NgZone, isSupported: boolean, injector: Injector) => Analytics;
+export declare function defaultAnalyticsInstanceFactory(provided: FirebaseAnalytics[] | undefined, defaultApp: FirebaseApp): Analytics;
+export declare function analyticsInstanceFactory(fn: (injector: Injector) => FirebaseAnalytics): (zone: NgZone, injector: Injector) => Analytics;
 export declare class AnalyticsModule {
-    constructor(_screenTracking: ScreenTrackingService, _userTracking: UserTrackingService);
+    constructor(_screenTrackingService: ScreenTrackingService, _userTrackingService: UserTrackingService);
     static ɵfac: i0.ɵɵFactoryDeclaration<AnalyticsModule, [{ optional: true; }, { optional: true; }]>;
     static ɵmod: i0.ɵɵNgModuleDeclaration<AnalyticsModule, never, never, never>;
     static ɵinj: i0.ɵɵInjectorDeclaration<AnalyticsModule>;

package/analytics/firebase.d.ts

@@ -1,8 +1,8 @@
 export * from 'firebase/analytics';
-import { getAnalytics as _getAnalytics, initializeAnalytics as _initializeAnalytics, isSupported as _isSupported, logEvent as _logEvent, setAnalyticsCollectionEnabled as _setAnalyticsCollectionEnabled, setCurrentScreen as _setCurrentScreen, settings as _settings, setUserId as _setUserId, setUserProperties as _setUserProperties } from 'firebase/analytics';
+import { getAnalytics as _getAnalytics, initializeAnalytics as _initializeAnalytics, logEvent as _logEvent, setAnalyticsCollectionEnabled as _setAnalyticsCollectionEnabled, setCurrentScreen as _setCurrentScreen, settings as _settings, setUserId as _setUserId, setUserProperties as _setUserProperties } from 'firebase/analytics';
+export { isSupported } from './overrides';
 export declare const getAnalytics: typeof _getAnalytics;
 export declare const initializeAnalytics: typeof _initializeAnalytics;
-export declare const isSupported: typeof _isSupported;
 export declare const logEvent: typeof _logEvent;
 export declare const setAnalyticsCollectionEnabled: typeof _setAnalyticsCollectionEnabled;
 export declare const setCurrentScreen: typeof _setCurrentScreen;

package/analytics/overrides.d.ts

@@ -0,0 +1 @@
+export declare const isSupported: () => any;

package/analytics/screen-tracking.service.d.ts

@@ -2,8 +2,6 @@ import { ComponentFactoryResolver, NgZone, OnDestroy, Injector } from '@angular/
 import { Observable } from 'rxjs';
 import { Router } from '@angular/router';
 import { Title } from '@angular/platform-browser';
-import { FirebaseApp } from '@angular/fire/app';
-import { Analytics } from './analytics';
 import { UserTrackingService } from './user-tracking.service';
 import * as i0 from "@angular/core";
 declare const FIREBASE_EVENT_ORIGIN_KEY = "firebase_event_origin";
@@ -34,9 +32,9 @@ export declare const ɵscreenViewEvent: (router: Router, title: Title | null, co
 }>;
 export declare class ScreenTrackingService implements OnDestroy {
     private disposable;
-    constructor(router: Router, title: Title, componentFactoryResolver: ComponentFactoryResolver, zone: NgZone, userTrackingService: UserTrackingService, firebaseApp: FirebaseApp, analyticsInstanceFactories: Array<(injector: Injector) => Analytics>, injector: Injector);
+    constructor(router: Router, title: Title, componentFactoryResolver: ComponentFactoryResolver, zone: NgZone, userTrackingService: UserTrackingService, injector: Injector);
     ngOnDestroy(): void;
-    static ɵfac: i0.ɵɵFactoryDeclaration<ScreenTrackingService, [{ optional: true; }, { optional: true; }, null, null, { optional: true; }, null, null, null]>;
+    static ɵfac: i0.ɵɵFactoryDeclaration<ScreenTrackingService, [{ optional: true; }, { optional: true; }, null, null, { optional: true; }, null]>;
     static ɵprov: i0.ɵɵInjectableDeclaration<ScreenTrackingService>;
 }
 export {};

package/analytics/user-tracking.service.d.ts

@@ -1,12 +1,10 @@
 import { Injector, NgZone, OnDestroy } from '@angular/core';
-import { Analytics } from './analytics';
 import { Auth } from '@angular/fire/auth';
-import { FirebaseApp } from '@angular/fire/app';
 import * as i0 from "@angular/core";
 export declare class UserTrackingService implements OnDestroy {
     readonly initialized: Promise<void>;
-    private readonly disposables;
-    constructor(auth: Auth, zone: NgZone, analyticsInstanceFactories: Array<(injector: Injector) => Analytics>, injector: Injector, firebaseApp: FirebaseApp);
+    private disposables;
+    constructor(auth: Auth, zone: NgZone, injector: Injector);
     ngOnDestroy(): void;
     static ɵfac: i0.ɵɵFactoryDeclaration<UserTrackingService, never>;
     static ɵprov: i0.ɵɵInjectableDeclaration<UserTrackingService>;

package/auth-guard/angular-fire-auth-guard.d.ts

@@ -0,0 +1,5 @@
+/**
+ * Generated bundle index. Do not edit.
+ */
+/// <amd-module name="@angular/fire/auth-guard" />
+export * from './public_api';

package/auth-guard/auth-guard.d.ts

@@ -0,0 +1,29 @@
+import { ActivatedRouteSnapshot, CanActivate, Router, RouterStateSnapshot } from '@angular/router';
+import { Observable, UnaryFunction } from 'rxjs';
+import { Auth } from '@angular/fire/auth';
+import { User } from 'firebase/auth';
+import * as i0 from "@angular/core";
+export declare type AuthPipeGenerator = (next: ActivatedRouteSnapshot, state: RouterStateSnapshot) => AuthPipe;
+export declare type AuthPipe = UnaryFunction<Observable<User | null>, Observable<boolean | string | any[]>>;
+export declare const loggedIn: AuthPipe;
+export declare class AuthGuard implements CanActivate {
+    private router;
+    private auth;
+    constructor(router: Router, auth: Auth);
+    canActivate: (next: ActivatedRouteSnapshot, state: RouterStateSnapshot) => Observable<boolean | import("@angular/router").UrlTree>;
+    static ɵfac: i0.ɵɵFactoryDeclaration<AuthGuard, never>;
+    static ɵprov: i0.ɵɵInjectableDeclaration<AuthGuard>;
+}
+export declare const canActivate: (pipe: AuthPipeGenerator) => {
+    canActivate: (typeof AuthGuard)[];
+    data: {
+        authGuardPipe: AuthPipeGenerator;
+    };
+};
+export declare const isNotAnonymous: AuthPipe;
+export declare const idTokenResult: import("rxjs").OperatorFunction<User, any>;
+export declare const emailVerified: AuthPipe;
+export declare const customClaims: UnaryFunction<Observable<User>, Observable<any>>;
+export declare const hasCustomClaim: (claim: string) => AuthPipe;
+export declare const redirectUnauthorizedTo: (redirect: string | any[]) => AuthPipe;
+export declare const redirectLoggedInTo: (redirect: string | any[]) => AuthPipe;

package/auth-guard/auth-guard.module.d.ts

@@ -0,0 +1,7 @@
+import * as i0 from "@angular/core";
+export declare class AuthGuardModule {
+    constructor();
+    static ɵfac: i0.ɵɵFactoryDeclaration<AuthGuardModule, never>;
+    static ɵmod: i0.ɵɵNgModuleDeclaration<AuthGuardModule, never, never, never>;
+    static ɵinj: i0.ɵɵInjectorDeclaration<AuthGuardModule>;
+}

package/auth-guard/package.json

@@ -0,0 +1,11 @@
+{
+  "$schema": "../../node_modules/ng-packagr/package.schema.json",
+  "main": "../bundles/angular-fire-auth-guard.umd.js",
+  "module": "../fesm2015/angular-fire-auth-guard.js",
+  "es2015": "../fesm2015/angular-fire-auth-guard.js",
+  "esm2015": "../esm2015/auth-guard/angular-fire-auth-guard.js",
+  "fesm2015": "../fesm2015/angular-fire-auth-guard.js",
+  "typings": "angular-fire-auth-guard.d.ts",
+  "sideEffects": false,
+  "name": "@angular/fire/auth-guard"
+}

package/auth-guard/public_api.d.ts

@@ -0,0 +1,2 @@
+export * from './auth-guard';
+export * from './auth-guard.module';

package/bundles/angular-fire-analytics.umd.js

@@ -1,8 +1,8 @@
 (function (global, factory) {
-    typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@angular/fire'), require('rxjs'), require('rxjs/operators'), require('@angular/core'), require('firebase/analytics'), require('@angular/fire/app'), require('firebase/app'), require('@angular/router'), require('@angular/platform-browser'), require('@angular/fire/auth')) :
-    typeof define === 'function' && define.amd ? define('@angular/fire/analytics', ['exports', '@angular/fire', 'rxjs', 'rxjs/operators', '@angular/core', 'firebase/analytics', '@angular/fire/app', 'firebase/app', '@angular/router', '@angular/platform-browser', '@angular/fire/auth'], factory) :
-    (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory((global.angular = global.angular || {}, global.angular.fire = global.angular.fire || {}, global.angular.fire.analytics = {}), global.angular.fire, global.rxjs, global.rxjs.operators, global.ng.core, global['firebase-analytics'], global.angular.fire.app, global.app, global.ng.router, global.ng.platformBrowser, global.angular.fire.auth));
-}(this, (function (exports, fire, rxjs, operators, i0, analytics, i2, app, i1$1, i2$1, i1) { 'use strict';
+    typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@angular/fire'), require('rxjs'), require('rxjs/operators'), require('@angular/core'), require('@angular/fire/app'), require('firebase/app'), require('@angular/router'), require('firebase/analytics'), require('@angular/platform-browser'), require('@angular/fire/auth')) :
+    typeof define === 'function' && define.amd ? define('@angular/fire/analytics', ['exports', '@angular/fire', 'rxjs', 'rxjs/operators', '@angular/core', '@angular/fire/app', 'firebase/app', '@angular/router', 'firebase/analytics', '@angular/platform-browser', '@angular/fire/auth'], factory) :
+    (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory((global.angular = global.angular || {}, global.angular.fire = global.angular.fire || {}, global.angular.fire.analytics = {}), global.angular.fire, global.rxjs, global.rxjs.operators, global.ng.core, global.angular.fire.app, global.app, global.ng.router, global['firebase-analytics'], global.ng.platformBrowser, global.angular.fire.auth));
+}(this, (function (exports, fire, rxjs, operators, i0, app$1, app, i1$1, analytics, i2, i1) { 'use strict';
 
     function _interopNamespace(e) {
         if (e && e.__esModule) return e;
@@ -25,9 +25,8 @@
     }
 
     var i0__namespace = /*#__PURE__*/_interopNamespace(i0);
-    var i2__namespace = /*#__PURE__*/_interopNamespace(i2);
     var i1__namespace$1 = /*#__PURE__*/_interopNamespace(i1$1);
-    var i2__namespace$1 = /*#__PURE__*/_interopNamespace(i2$1);
+    var i2__namespace = /*#__PURE__*/_interopNamespace(i2);
     var i1__namespace = /*#__PURE__*/_interopNamespace(i1);
 
     var Analytics = /** @class */ (function () {
@@ -357,10 +356,11 @@
         return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
     }
 
+    var isSupported = fire.ɵisAnalyticsSupportedFactory.async;
+
     // DO NOT MODIFY, this file is autogenerated by tools/build.ts
     var getAnalytics = fire.ɵzoneWrap(analytics.getAnalytics, true);
     var initializeAnalytics = fire.ɵzoneWrap(analytics.initializeAnalytics, true);
-    var isSupported = fire.ɵzoneWrap(analytics.isSupported, true);
     var logEvent = fire.ɵzoneWrap(analytics.logEvent, true);
     var setAnalyticsCollectionEnabled = fire.ɵzoneWrap(analytics.setAnalyticsCollectionEnabled, true);
     var setCurrentScreen = fire.ɵzoneWrap(analytics.setCurrentScreen, true);
@@ -369,39 +369,41 @@
     var setUserProperties = fire.ɵzoneWrap(analytics.setUserProperties, true);
 
     var UserTrackingService = /** @class */ (function () {
-        function UserTrackingService(auth, zone, analyticsInstanceFactories, injector, firebaseApp) {
+        function UserTrackingService(auth, zone, injector) {
+            var _this = this;
             this.disposables = [];
             app.registerVersion('angularfire', fire.VERSION.full, 'user-tracking');
-            // Analytics is not ready to be injected yet, as the APP_INITIALIZER hasn't evulated yet, do this the hard way
-            var analyticsInstance = globalThis[isSupportedPromiseSymbol].then(function (isSupported) {
-                var analyticsInstances = analyticsInstanceFactories.map(function (fn) { return analyticsInstanceFactory(fn)(zone, isSupported, injector); });
-                return defaultAnalyticsInstanceFactory(isSupported, analyticsInstances, firebaseApp);
-            });
             var resolveInitialized;
             this.initialized = zone.runOutsideAngular(function () { return new Promise(function (resolve) { resolveInitialized = resolve; }); });
-            this.disposables = [
-                // TODO add credential tracking back in
-                i1.authState(auth).subscribe(function (user) {
-                    analyticsInstance.then(function (analytics) { return analytics && setUserId(analytics, user === null || user === void 0 ? void 0 : user.uid); });
+            // The APP_INITIALIZER that is making isSupported() sync for the sake of convenient DI
+            // may not be done when services are initialized. Guard the functionality by first ensuring
+            // that the (global) promise has resolved, then get Analytics from the injector.
+            isSupported().then(function () {
+                var analytics = injector.get(Analytics);
+                if (analytics) {
+                    _this.disposables = [
+                        // TODO add credential tracking back in
+                        i1.authState(auth).subscribe(function (user) {
+                            setUserId(analytics, user === null || user === void 0 ? void 0 : user.uid);
+                            resolveInitialized();
+                        }),
+                    ];
+                }
+                else {
                     resolveInitialized();
-                }),
-            ];
+                }
+            });
         }
         UserTrackingService.prototype.ngOnDestroy = function () {
             this.disposables.forEach(function (it) { return it.unsubscribe(); });
         };
         return UserTrackingService;
     }());
-    UserTrackingService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.1.3", ngImport: i0__namespace, type: UserTrackingService, deps: [{ token: i1__namespace.Auth }, { token: i0__namespace.NgZone }, { token: PROVIDED_ANALYTICS_INSTANCE_FACTORIES }, { token: i0__namespace.Injector }, { token: i2__namespace.FirebaseApp }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    UserTrackingService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.1.3", ngImport: i0__namespace, type: UserTrackingService, deps: [{ token: i1__namespace.Auth }, { token: i0__namespace.NgZone }, { token: i0__namespace.Injector }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
     UserTrackingService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.1.3", ngImport: i0__namespace, type: UserTrackingService });
     i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.1.3", ngImport: i0__namespace, type: UserTrackingService, decorators: [{
                 type: i0.Injectable
-            }], ctorParameters: function () {
-            return [{ type: i1__namespace.Auth }, { type: i0__namespace.NgZone }, { type: Array, decorators: [{
-                            type: i0.Inject,
-                            args: [PROVIDED_ANALYTICS_INSTANCE_FACTORIES]
-                        }] }, { type: i0__namespace.Injector }, { type: i2__namespace.FirebaseApp }];
-        } });
+            }], ctorParameters: function () { return [{ type: i1__namespace.Auth }, { type: i0__namespace.NgZone }, { type: i0__namespace.Injector }]; } });
 
     var FIREBASE_EVENT_ORIGIN_KEY = 'firebase_event_origin';
     var FIREBASE_PREVIOUS_SCREEN_CLASS_KEY = 'firebase_previous_class';
@@ -497,38 +499,32 @@
         })); }));
     };
     var ScreenTrackingService = /** @class */ (function () {
-        function ScreenTrackingService(router, title, componentFactoryResolver, zone, userTrackingService, firebaseApp, analyticsInstanceFactories, injector) {
+        function ScreenTrackingService(router, title, componentFactoryResolver, zone, userTrackingService, injector) {
             var _this = this;
             app.registerVersion('angularfire', fire.VERSION.full, 'screen-tracking');
-            if (!router) {
-                return this;
-            }
-            // Analytics is not ready to be injected yet, as the APP_INITIALIZER hasn't evulated yet, do this the hard way
-            var analyticsInstance = globalThis[isSupportedPromiseSymbol].then(function (isSupported) {
-                var analyticsInstances = analyticsInstanceFactories.map(function (fn) { return analyticsInstanceFactory(fn)(zone, isSupported, injector); });
-                return defaultAnalyticsInstanceFactory(isSupported, analyticsInstances, firebaseApp);
-            });
-            zone.runOutsideAngular(function () {
-                _this.disposable = ɵscreenViewEvent(router, title, componentFactoryResolver).pipe(operators.switchMap(function (params) { return __awaiter(_this, void 0, void 0, function () {
-                    var analytics;
-                    return __generator(this, function (_b) {
-                        switch (_b.label) {
-                            case 0:
-                                if (!userTrackingService) return [3 /*break*/, 2];
-                                return [4 /*yield*/, userTrackingService.initialized];
-                            case 1:
-                                _b.sent();
-                                _b.label = 2;
-                            case 2: return [4 /*yield*/, analyticsInstance];
-                            case 3:
-                                analytics = _b.sent();
-                                if (!analytics) {
-                                    return [2 /*return*/];
-                                }
-                                return [2 /*return*/, logEvent(analytics, SCREEN_VIEW_EVENT, params)];
-                        }
-                    });
-                }); })).subscribe();
+            // The APP_INITIALIZER that is making isSupported() sync for the sake of convenient DI
+            // may not be done when services are initialized. Guard the functionality by first ensuring
+            // that the (global) promise has resolved, then get Analytics from the injector.
+            isSupported().then(function () {
+                var analytics = injector.get(Analytics);
+                if (!router || !analytics) {
+                    return;
+                }
+                zone.runOutsideAngular(function () {
+                    _this.disposable = ɵscreenViewEvent(router, title, componentFactoryResolver).pipe(operators.switchMap(function (params) { return __awaiter(_this, void 0, void 0, function () {
+                        return __generator(this, function (_b) {
+                            switch (_b.label) {
+                                case 0:
+                                    if (!userTrackingService) return [3 /*break*/, 2];
+                                    return [4 /*yield*/, userTrackingService.initialized];
+                                case 1:
+                                    _b.sent();
+                                    _b.label = 2;
+                                case 2: return [2 /*return*/, logEvent(analytics, SCREEN_VIEW_EVENT, params)];
+                            }
+                        });
+                    }); })).subscribe();
+                });
             });
         }
         ScreenTrackingService.prototype.ngOnDestroy = function () {
@@ -538,39 +534,31 @@
         };
         return ScreenTrackingService;
     }());
-    ScreenTrackingService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.1.3", ngImport: i0__namespace, type: ScreenTrackingService, deps: [{ token: i1__namespace$1.Router, optional: true }, { token: i2__namespace$1.Title, optional: true }, { token: i0__namespace.ComponentFactoryResolver }, { token: i0__namespace.NgZone }, { token: UserTrackingService, optional: true }, { token: i2__namespace.FirebaseApp }, { token: PROVIDED_ANALYTICS_INSTANCE_FACTORIES }, { token: i0__namespace.Injector }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    ScreenTrackingService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.1.3", ngImport: i0__namespace, type: ScreenTrackingService, deps: [{ token: i1__namespace$1.Router, optional: true }, { token: i2__namespace.Title, optional: true }, { token: i0__namespace.ComponentFactoryResolver }, { token: i0__namespace.NgZone }, { token: UserTrackingService, optional: true }, { token: i0__namespace.Injector }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
     ScreenTrackingService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.1.3", ngImport: i0__namespace, type: ScreenTrackingService });
     i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.1.3", ngImport: i0__namespace, type: ScreenTrackingService, decorators: [{
                 type: i0.Injectable
             }], ctorParameters: function () {
             return [{ type: i1__namespace$1.Router, decorators: [{
                             type: i0.Optional
-                        }] }, { type: i2__namespace$1.Title, decorators: [{
+                        }] }, { type: i2__namespace.Title, decorators: [{
                             type: i0.Optional
                         }] }, { type: i0__namespace.ComponentFactoryResolver }, { type: i0__namespace.NgZone }, { type: UserTrackingService, decorators: [{
                             type: i0.Optional
-                        }] }, { type: i2__namespace.FirebaseApp }, { type: Array, decorators: [{
-                            type: i0.Inject,
-                            args: [PROVIDED_ANALYTICS_INSTANCE_FACTORIES]
                         }] }, { type: i0__namespace.Injector }];
         } });
 
-    var PROVIDED_ANALYTICS_INSTANCE_FACTORIES = new i0.InjectionToken('angularfire2.analytics-instances.factory');
     var PROVIDED_ANALYTICS_INSTANCES = new i0.InjectionToken('angularfire2.analytics-instances');
-    var IS_SUPPORTED = new i0.InjectionToken('angularfire2.analytics.isSupported');
-    var isSupportedValueSymbol = Symbol('angularfire2.analytics.isSupported.value');
-    var isSupportedPromiseSymbol = Symbol('angularfire2.analytics.isSupported');
-    globalThis[isSupportedPromiseSymbol] || (globalThis[isSupportedPromiseSymbol] = analytics.isSupported().then(function (it) { return globalThis[isSupportedValueSymbol] = it; }));
-    function defaultAnalyticsInstanceFactory(isSupported, provided, defaultApp) {
-        if (!isSupported) {
+    function defaultAnalyticsInstanceFactory(provided, defaultApp) {
+        if (!fire.ɵisAnalyticsSupportedFactory.sync()) {
             return null;
         }
         var defaultAnalytics = fire.ɵgetDefaultInstanceOf(ANALYTICS_PROVIDER_NAME, provided, defaultApp);
         return defaultAnalytics && new Analytics(defaultAnalytics);
     }
     function analyticsInstanceFactory(fn) {
-        return function (zone, isSupported, injector) {
-            if (!isSupported) {
+        return function (zone, injector) {
+            if (!fire.ɵisAnalyticsSupportedFactory.sync()) {
                 return null;
             }
             var analytics = zone.runOutsideAngular(function () { return fn(injector); });
@@ -587,13 +575,12 @@
         provide: Analytics,
         useFactory: defaultAnalyticsInstanceFactory,
         deps: [
-            IS_SUPPORTED,
             [new i0.Optional(), PROVIDED_ANALYTICS_INSTANCES],
-            i2.FirebaseApp,
+            app$1.FirebaseApp,
         ]
     };
     var AnalyticsModule = /** @class */ (function () {
-        function AnalyticsModule(_screenTracking, _userTracking) {
+        function AnalyticsModule(_screenTrackingService, _userTrackingService) {
             app.registerVersion('angularfire', fire.VERSION.full, 'analytics');
         }
         return AnalyticsModule;
@@ -605,7 +592,7 @@
             ANALYTICS_INSTANCES_PROVIDER,
             {
                 provide: i0.APP_INITIALIZER,
-                useValue: function () { return globalThis[isSupportedPromiseSymbol]; },
+                useValue: fire.ɵisAnalyticsSupportedFactory.async,
                 multi: true,
             }
         ] });
@@ -617,7 +604,7 @@
                             ANALYTICS_INSTANCES_PROVIDER,
                             {
                                 provide: i0.APP_INITIALIZER,
-                                useValue: function () { return globalThis[isSupportedPromiseSymbol]; },
+                                useValue: fire.ɵisAnalyticsSupportedFactory.async,
                                 multi: true,
                             }
                         ]
@@ -637,22 +624,14 @@
         return {
             ngModule: AnalyticsModule,
             providers: [{
-                    provide: IS_SUPPORTED,
-                    useFactory: function () { return globalThis[isSupportedValueSymbol]; },
-                }, {
-                    provide: PROVIDED_ANALYTICS_INSTANCE_FACTORIES,
-                    useValue: fn,
-                    multi: true,
-                }, {
                     provide: PROVIDED_ANALYTICS_INSTANCES,
                     useFactory: analyticsInstanceFactory(fn),
                     multi: true,
                     deps: __spreadArray([
                         i0.NgZone,
-                        IS_SUPPORTED,
                         i0.Injector,
                         fire.ɵAngularFireSchedulers,
-                        i2.FirebaseApps
+                        app$1.FirebaseApps
                     ], __read(deps))
                 }]
         };