Bumping more things

Author: jamesdaniels

package.json

@@ -85,7 +85,7 @@
     "karma-jasmine": "^2.0.1",
     "karma-jasmine-html-reporter": "^1.4.2",
     "ncp": "^2.0.0",
-    "ng-packagr": "^5.3.0",
+    "ng-packagr": "^9.0.0-0 || ^9.0.0",
     "pretty-size": "^2.0.0",
     "protractor": "3.0.0",
     "reflect-metadata": "0.1.2",

src/analytics/analytics.service.ts

@@ -29,7 +29,9 @@ const SCREEN_INSTANCE_DELIMITER = '#';
 
 const ANNOTATIONS = '__annotations__';
 
-@Injectable()
+@Injectable({
+    providedIn: 'root'
+})
 export class ScreenTrackingService implements OnDestroy {
 
     private disposable: Subscription|undefined;
@@ -149,7 +151,9 @@ export class ScreenTrackingService implements OnDestroy {
 
 }
 
-@Injectable()
+@Injectable({
+    providedIn: 'root'
+})
 export class UserTrackingService implements OnDestroy {
 
     private disposable: Subscription|undefined;

src/analytics/analytics.spec.ts

@@ -1,6 +1,6 @@
 import { TestBed, inject } from '@angular/core/testing';
 import { FirebaseApp, FIREBASE_OPTIONS, AngularFireModule, FIREBASE_APP_NAME } from '@angular/fire';
-import { AngularFireAnalytics, AngularFireAnalyticsModule, COLLECTION_ENABLED, APP_VERSION, APP_NAME } from '@angular/fire/analytics';
+import { AngularFireAnalytics, AngularFireAnalyticsModule, COLLECTION_ENABLED, APP_VERSION, APP_NAME } from './public_api';
 import { COMMON_CONFIG } from '../test-config';
 
 

src/analytics/analytics.ts

@@ -23,7 +23,9 @@ const DATA_LAYER_NAME = 'dataLayer';
 
 export interface AngularFireAnalytics extends PromiseProxy<analytics.Analytics> {};
 
-@Injectable()
+@Injectable({
+  providedIn: 'root'
+})
 export class AngularFireAnalytics {
 
   private gtag: (...args: any[]) => void;
@@ -72,7 +74,6 @@ export class AngularFireAnalytics {
     if (debugModeEnabled)   { this.updateConfig({ [DEBUG_MODE_KEY]:  1 }) }
 
     const analytics = of(undefined).pipe(
-      // @ts-ignore zapping in the UMD in the build script
       switchMap(() => zone.runOutsideAngular(() => import('firebase/analytics'))),
       catchError(err => err.message === 'Not supported' ? empty() : throwError(err) ),
       map(() => ɵfirebaseAppFactory(options, zone, nameOrConfig)),

src/analytics/package.json

@@ -1,8 +1,10 @@
 {
+  "$schema": "../node_modules/ng-packagr/package.schema.json",
   "ngPackage": {
     "lib": {
       "umdModuleIds": {
-        "firebase/app": "firebase"
+        "firebase/app": "firebase",
+        "tslib": "tslib"
       },
       "entryFile": "public_api.ts"
     }

src/auth-guard/auth-guard.spec.ts

@@ -2,7 +2,7 @@ import { TestBed, inject } from '@angular/core/testing';
 import { FirebaseApp, AngularFireModule } from '@angular/fire';
 import { COMMON_CONFIG } from '../test-config';
 import { AngularFireAuthModule } from '@angular/fire/auth';
-import { AngularFireAuthGuardModule, AngularFireAuthGuard } from '@angular/fire/auth-guard';
+import { AngularFireAuthGuardModule, AngularFireAuthGuard } from './public_api';
 import { RouterModule, Router } from '@angular/router';
 import { APP_BASE_HREF } from '@angular/common';
 

src/auth-guard/auth-guard.ts

@@ -8,7 +8,9 @@ import { AngularFireAuth } from '@angular/fire/auth';
 export type AuthPipeGenerator = (next: ActivatedRouteSnapshot, state: RouterStateSnapshot) => AuthPipe;
 export type AuthPipe = UnaryFunction<Observable<User|null>, Observable<boolean|any[]>>;
 
-@Injectable()
+@Injectable({
+  providedIn: 'root'
+})
 export class AngularFireAuthGuard implements CanActivate {
 
   constructor(private afAuth: AngularFireAuth, private router: Router) {}

src/auth-guard/package.json

@@ -1,4 +1,5 @@
 {
+  "$schema": "../../node_modules/ng-packagr/package.schema.json",
   "ngPackage": {
     "lib": {
       "entryFile": "public_api.ts"

src/auth/auth.spec.ts

@@ -2,7 +2,7 @@ import { User } from 'firebase/app';
 import { Observable, Subject } from 'rxjs'
 import { TestBed, inject } from '@angular/core/testing';
 import { FirebaseApp, FIREBASE_OPTIONS, AngularFireModule, FIREBASE_APP_NAME } from '@angular/fire';
-import { AngularFireAuth, AngularFireAuthModule } from '@angular/fire/auth';
+import { AngularFireAuth, AngularFireAuthModule } from './public_api';
 import { COMMON_CONFIG } from '../test-config';
 import { take, skip } from 'rxjs/operators';
 import 'firebase/auth';
@@ -48,7 +48,7 @@ describe('AngularFireAuth', () => {
   });
 
   afterEach(done => {
-    afAuth.auth.app.delete().then(done, done.fail);
+    afAuth.app.then(app => app.delete()).then(done, done.fail);
   });
 
   describe('Zones', () => {
@@ -78,12 +78,8 @@ describe('AngularFireAuth', () => {
     expect(afAuth instanceof AngularFireAuth).toBe(true);
   });
 
-  it('should have the Firebase Auth instance', () => {
-    expect(afAuth.auth).toBeDefined();
-  });
-
   it('should have an initialized Firebase app', () => {
-    expect(afAuth.auth.app).toBeDefined();
+    expect(afAuth.app).toBeDefined();
   });
 
   it('should emit auth updates through authState', (done: any) => {
@@ -158,11 +154,12 @@ describe('AngularFireAuth with different app', () => {
     });
 
     it('should have an initialized Firebase app', () => {
-      expect(afAuth.auth.app).toBeDefined();
+      expect(afAuth.app).toBeDefined();
     });
 
-    it('should have an initialized Firebase app instance member', () => {
-      expect(afAuth.auth.app.name).toEqual(FIREBASE_APP_NAME_TOO);
+    it('should have an initialized Firebase app instance member', async () => {
+      const app = await afAuth.app;
+      expect(app.name).toEqual(FIREBASE_APP_NAME_TOO);
     });
   });
 

src/auth/auth.ts

@@ -1,16 +1,15 @@
 import { Injectable, Inject, Optional, NgZone, PLATFORM_ID } from '@angular/core';
 import { Observable, of, from } from 'rxjs';
-import { switchMap } from 'rxjs/operators';
-import { FIREBASE_OPTIONS, FIREBASE_APP_NAME, FirebaseOptions, FirebaseAppConfig, FirebaseAuth, ɵfirebaseAppFactory, ɵFirebaseZoneScheduler } from '@angular/fire';
+import { switchMap, shareReplay, map } from 'rxjs/operators';
+import { FIREBASE_OPTIONS, FIREBASE_APP_NAME, FirebaseOptions, FirebaseAppConfig, FirebaseAuth, ɵfirebaseAppFactory, ɵFirebaseZoneScheduler, ɵrunOutsideAngular, PromiseProxy, ɵlazySDKProxy } from '@angular/fire';
 import { User, auth } from 'firebase/app';
 
-@Injectable()
-export class AngularFireAuth {
+export interface AngularFireAuth extends PromiseProxy<auth.Auth> {};
 
-  /**
-   * Firebase Auth instance
-   */
-  public readonly auth: FirebaseAuth;
+@Injectable({
+  providedIn: 'root'
+})
+export class AngularFireAuth {
 
   /**
    * Observable of authentication state; as of Firebase 4.0 this is only triggered via sign-in/out
@@ -41,37 +40,37 @@ export class AngularFireAuth {
     private zone: NgZone
   ) {
     const scheduler = new ɵFirebaseZoneScheduler(zone, platformId);
-    this.auth = zone.runOutsideAngular(() => {
-      const app = ɵfirebaseAppFactory(options, zone, nameOrConfig);
-      if (!app.auth) { throw "You must import 'firebase/auth' before using AngularFireAuth" }
-      return app.auth();
-    });
 
-    this.authState = scheduler.keepUnstableUntilFirst(
-      scheduler.runOutsideAngular(
-        new Observable(subscriber => {
-          const unsubscribe = this.auth.onAuthStateChanged(subscriber);
-          return { unsubscribe };
-        })
-      )
+    const auth = of(undefined).pipe(
+      switchMap(() => zone.runOutsideAngular(() => import('firebase/auth'))),
+      map(() => ɵfirebaseAppFactory(options, zone, nameOrConfig)),
+      map(app => app.auth()),
+      ɵrunOutsideAngular(zone),
+      shareReplay({ bufferSize: 1, refCount: false }),
+    );
+
+    this.authState = auth.pipe(
+      switchMap(auth => from(auth.onAuthStateChanged)),
+      ɵrunOutsideAngular(zone),
+      scheduler.keepUnstableUntilFirst.bind(scheduler),
+    );
+
+    this.user = auth.pipe(
+      switchMap(auth => from(auth.onIdTokenChanged)),
+      ɵrunOutsideAngular(zone),
+      scheduler.keepUnstableUntilFirst.bind(scheduler),
+    );
+
+    this.idToken = this.user.pipe(
+      switchMap(user => user ? from(user.getIdToken()) : of(null))
     );
 
-    this.user = scheduler.keepUnstableUntilFirst(
-      scheduler.runOutsideAngular(
-        new Observable(subscriber => {
-          const unsubscribe = this.auth.onIdTokenChanged(subscriber);
-          return { unsubscribe };
-        })
-      )
+    this.idTokenResult = this.user.pipe(
+      switchMap(user => user ? from(user.getIdTokenResult()) : of(null))
     );
 
-    this.idToken = this.user.pipe(switchMap(user => {
-      return user ? from(user.getIdToken()) : of(null)
-    }));
+    return ɵlazySDKProxy(this, auth, zone);
 
-    this.idTokenResult = this.user.pipe(switchMap(user => {
-      return user ? from(user.getIdTokenResult()) : of(null)
-    }));
   }
 
 }

src/auth/package.json

@@ -1,4 +1,5 @@
 {
+  "$schema": "../../node_modules/ng-packagr/package.schema.json",
   "ngPackage": {
     "lib": {
       "entryFile": "public_api.ts"

src/core/angularfire2.spec.ts

@@ -1,6 +1,6 @@
 import { TestBed, inject } from '@angular/core/testing';
 import { PlatformRef, NgModule, CompilerFactory } from '@angular/core';
-import { FirebaseApp, AngularFireModule } from '@angular/fire';
+import { FirebaseApp, AngularFireModule } from './public_api';
 import { Subscription } from 'rxjs';
 import { COMMON_CONFIG } from '../test-config';
 import { BrowserModule } from '@angular/platform-browser';

src/database-deprecated/database.ts

@@ -7,7 +7,9 @@ import { FirebaseObjectObservable } from './firebase_object_observable';
 import * as utils from './utils';
 import { FirebaseDatabase, FirebaseOptions, FirebaseAppConfig, FIREBASE_OPTIONS, FIREBASE_APP_NAME, DATABASE_URL, ɵfirebaseAppFactory } from '@angular/fire';
 
-@Injectable()
+@Injectable({
+  providedIn: 'root'
+})
 export class AngularFireDatabase {
 
   /**

src/database-deprecated/package.json

@@ -1,4 +1,5 @@
 {
+  "$schema": "../../node_modules/ng-packagr/package.schema.json",
   "ngPackage": {
     "lib": {
       "entryFile": "public_api.ts"

src/database/database.spec.ts

@@ -1,5 +1,5 @@
 import { FirebaseApp, AngularFireModule, FIREBASE_OPTIONS, FIREBASE_APP_NAME } from '@angular/fire';
-import { AngularFireDatabase, AngularFireDatabaseModule, URL } from '@angular/fire/database';
+import { AngularFireDatabase, AngularFireDatabaseModule, URL } from './public_api';
 import { TestBed, inject } from '@angular/core/testing';
 import { COMMON_CONFIG } from '../test-config';
 import { NgZone } from '@angular/core';

src/database/database.ts

@@ -5,7 +5,9 @@ import { createListReference } from './list/create-reference';
 import { createObjectReference } from './object/create-reference';
 import { FirebaseDatabase, FirebaseOptions, FirebaseAppConfig, DATABASE_URL, FIREBASE_OPTIONS, FIREBASE_APP_NAME, ɵfirebaseAppFactory, ɵFirebaseZoneScheduler } from '@angular/fire';
 
-@Injectable()
+@Injectable({
+  providedIn: 'root'
+})
 export class AngularFireDatabase {
   public readonly database: FirebaseDatabase;
   public readonly scheduler: ɵFirebaseZoneScheduler;

src/database/list/audit-trail.spec.ts

@@ -1,6 +1,6 @@
 import { DatabaseReference } from '../interfaces';
 import { FirebaseApp, AngularFireModule } from '@angular/fire';
-import { AngularFireDatabase, AngularFireDatabaseModule, auditTrail, ChildEvent, URL } from '@angular/fire/database';
+import { AngularFireDatabase, AngularFireDatabaseModule, auditTrail, ChildEvent, URL } from '../public_api';
 import { TestBed, inject } from '@angular/core/testing';
 import { COMMON_CONFIG } from '../../test-config';
 import { skip } from 'rxjs/operators';

src/database/list/changes.spec.ts

@@ -1,6 +1,6 @@
 import { database } from 'firebase/app';
 import { FirebaseApp, AngularFireModule } from '@angular/fire';
-import { AngularFireDatabase, AngularFireDatabaseModule, listChanges, URL } from '@angular/fire/database';
+import { AngularFireDatabase, AngularFireDatabaseModule, listChanges, URL } from '../public_api';
 import { TestBed, inject } from '@angular/core/testing';
 import { COMMON_CONFIG } from '../../test-config';
 import { skip, take } from 'rxjs/operators';

src/database/list/snapshot-changes.spec.ts

@@ -1,6 +1,6 @@
 import { database } from 'firebase/app';
 import { FirebaseApp, AngularFireModule } from '@angular/fire';
-import { AngularFireDatabase, AngularFireDatabaseModule, snapshotChanges, ChildEvent, URL } from '@angular/fire/database';
+import { AngularFireDatabase, AngularFireDatabaseModule, snapshotChanges, ChildEvent, URL } from '../public_api';
 import { TestBed, inject } from '@angular/core/testing';
 import { COMMON_CONFIG } from '../../test-config';
 import { BehaviorSubject } from 'rxjs';

src/database/list/state-changes.spec.ts

@@ -1,6 +1,6 @@
 import { database } from 'firebase/app';
 import { FirebaseApp, AngularFireModule } from '@angular/fire';
-import { AngularFireDatabase, AngularFireDatabaseModule, stateChanges, ChildEvent, URL } from '@angular/fire/database';
+import { AngularFireDatabase, AngularFireDatabaseModule, stateChanges, ChildEvent, URL } from '../public_api';
 import { TestBed, inject } from '@angular/core/testing';
 import { COMMON_CONFIG } from '../../test-config';
 import { skip } from 'rxjs/operators';

src/database/observable/fromRef.spec.ts

@@ -1,6 +1,6 @@
 import { DatabaseReference } from '../interfaces';
 import { FirebaseApp, AngularFireModule } from '@angular/fire';
-import { AngularFireDatabase, AngularFireDatabaseModule, fromRef, URL } from '@angular/fire/database';
+import { AngularFireDatabase, AngularFireDatabaseModule, fromRef, URL } from '../public_api';
 import { TestBed, inject } from '@angular/core/testing';
 import { COMMON_CONFIG } from '../../test-config';
 import { take } from 'rxjs/operators';

src/database/package.json

@@ -1,4 +1,5 @@
 {
+  "$schema": "../../node_modules/ng-packagr/package.schema.json",
   "ngPackage": {
     "lib": {
       "umdModuleIds": {

src/firestore/collection-group/collection-group.spec.ts

@@ -1,5 +1,5 @@
 import { FirebaseApp, AngularFireModule } from '@angular/fire';
-import { AngularFirestore, AngularFirestoreModule, AngularFirestoreDocument, AngularFirestoreCollectionGroup, SETTINGS } from '@angular/fire/firestore';
+import { AngularFirestore, AngularFirestoreModule, AngularFirestoreDocument, AngularFirestoreCollectionGroup, SETTINGS } from '../public_api';
 import { QueryGroupFn, Query } from '../interfaces';
 import { Observable, BehaviorSubject, Subscription } from 'rxjs';
 import { skip, take, switchMap } from 'rxjs/operators';

src/firestore/firestore.ts

@@ -87,7 +87,9 @@ export function associateQuery(collectionRef: CollectionReference, queryFn = ref
  *   }
  * }
  */
-@Injectable()
+@Injectable({
+  providedIn: 'root'
+})
 export class AngularFirestore {
   public readonly firestore: FirebaseFirestore;
   public readonly persistenceEnabled$: Observable<boolean>;

src/firestore/package.json

@@ -1,4 +1,5 @@
 {
+  "$schema": "../../node_modules/ng-packagr/package.schema.json",
   "ngPackage": {
     "lib": {
       "entryFile": "public_api.ts"

src/functions/functions.spec.ts

@@ -1,6 +1,6 @@
 import { TestBed, inject } from '@angular/core/testing';
 import { FirebaseApp, FIREBASE_OPTIONS, AngularFireModule, FIREBASE_APP_NAME } from '@angular/fire';
-import { AngularFireFunctions, AngularFireFunctionsModule, REGION, ORIGIN } from '@angular/fire/functions';
+import { AngularFireFunctions, AngularFireFunctionsModule, REGION, ORIGIN } from './public_api';
 import { COMMON_CONFIG } from '../test-config';
 import 'firebase/functions';
 
@@ -31,7 +31,7 @@ describe('AngularFireFunctions', () => {
   });
 
   it('should have the Firebase Functions instance', () => {
-    expect(afFns.functions).toBeDefined();
+    expect(afFns.useFunctionsEmulator).toBeDefined();
   });
 
 });
@@ -73,7 +73,7 @@ describe('AngularFireFunctions with different app', () => {
     });
 
     it('should have the Firebase Functions instance', () => {
-      expect(afFns.functions).toBeDefined();
+      expect(afFns.useFunctionsEmulator).toBeDefined();
     });
 
   });