Updating to beta.8

Author: jamesdaniels

package.json

@@ -52,7 +52,7 @@
     "@angular/platform-browser": "^12.0.0",
     "@angular/platform-browser-dynamic": "^12.0.0",
     "@angular/router": "^12.0.0",
-    "firebase": "9.0.0-beta.7",
+    "firebase": "9.0.0-beta.8",
     "firebase-admin": "^8.10.0",
     "firebase-functions": "^3.6.0",
     "firebase-tools": "^8.0.0",

sample/package.json

@@ -22,7 +22,7 @@
     "@angular/platform-browser": "^12.0.0",
     "@angular/platform-browser-dynamic": "^12.0.0",
     "@angular/router": "^12.0.0",
-    "firebase": "9.0.0-beta.7",
+    "firebase": "9.0.0-beta.8",
     "lodash.isequal": "^4.5.0",
     "rxfire": "6.0.0-canary.92c6c26",
     "rxjs": "~6.6.0",

sample/yarn.lock

@@ -2,15 +2,15 @@ import {
   InjectionToken, Inject, isDevMode, ModuleWithProviders, NgModule, NgZone, Optional, PLATFORM_ID, VERSION as NG_VERSION, Version
 } from '@angular/core';
 import firebase from 'firebase/compat/app';
-import { FirebaseOptions, FirebaseAppConfig } from 'firebase/app';
+import { FirebaseOptions, FirebaseAppSettings } from 'firebase/app';
 import { VERSION } from '@angular/fire';
 import { FirebaseApp } from './firebase.app';
 
 export const FIREBASE_OPTIONS = new InjectionToken<FirebaseOptions>('angularfire2.app.options');
 export const FIREBASE_APP_NAME = new InjectionToken<string | undefined>('angularfire2.app.name');
 
 
-export function ɵfirebaseAppFactory(options: FirebaseOptions, zone: NgZone, nameOrConfig?: string | FirebaseAppConfig | null) {
+export function ɵfirebaseAppFactory(options: FirebaseOptions, zone: NgZone, nameOrConfig?: string | FirebaseAppSettings | null) {
   const name = typeof nameOrConfig === 'string' && nameOrConfig || '[DEFAULT]';
   const config = typeof nameOrConfig === 'object' && nameOrConfig || {};
   config.name = config.name || name;
@@ -48,7 +48,7 @@ const FIREBASE_APP_PROVIDER = {
   providers: [FIREBASE_APP_PROVIDER]
 })
 export class AngularFireModule {
-  static initializeApp(options: FirebaseOptions, nameOrConfig?: string | FirebaseAppConfig): ModuleWithProviders<AngularFireModule> {
+  static initializeApp(options: FirebaseOptions, nameOrConfig?: string | FirebaseAppSettings): ModuleWithProviders<AngularFireModule> {
     return {
       ngModule: AngularFireModule,
       providers: [

src/compat/firebase.app.module.ts

@@ -1,5 +1,5 @@
 import { NgModule, Optional, NgZone, InjectionToken, ModuleWithProviders } from '@angular/core';
-import { FirebaseDatabase } from 'firebase/database';
+import { Database as FirebaseDatabase } from 'firebase/database';
 
 import { AuthInstances } from '@angular/fire/auth';
 import { ɵgetDefaultInstanceOf, ɵmemoizeInstance, ɵAngularFireSchedulers } from '@angular/fire';

src/database/database.module.ts

@@ -1,4 +1,4 @@
-import { FirebaseDatabase } from 'firebase/database';
+import { Database as FirebaseDatabase } from 'firebase/database';
 import { ɵgetAllInstancesOf } from '@angular/fire';
 import { from, timer } from 'rxjs';
 import { concatMap, distinct } from 'rxjs/operators';

src/database/database.ts

@@ -1,5 +1,5 @@
 import { NgModule, Optional, NgZone, InjectionToken, ModuleWithProviders } from '@angular/core';
-import { FirebaseFirestore } from 'firebase/firestore';
+import { Firestore as FirebaseFirestore } from 'firebase/firestore';
 import { AuthInstances  } from '@angular/fire/auth';
 import { ɵmemoizeInstance, ɵgetDefaultInstanceOf, ɵAngularFireSchedulers } from '@angular/fire';
 import { Firestore, FirestoreInstances, FIRESTORE_PROVIDER_NAME } from './firestore';

src/firestore/firestore.module.ts

@@ -1,4 +1,4 @@
-import { FirebaseFirestore } from 'firebase/firestore';
+import { Firestore as FirebaseFirestore } from 'firebase/firestore';
 import { ɵgetAllInstancesOf } from '@angular/fire';
 import { from, timer } from 'rxjs';
 import { concatMap, distinct } from 'rxjs/operators';

src/firestore/firestore.ts

@@ -1,5 +1,5 @@
 import { NgModule, Optional, NgZone, InjectionToken, ModuleWithProviders } from '@angular/core';
-import { FirebaseFirestore } from 'firebase/firestore/lite';
+import { Firestore as FirebaseFirestore } from 'firebase/firestore/lite';
 import { AuthInstances  } from '@angular/fire/auth';
 import { ɵmemoizeInstance, ɵgetDefaultInstanceOf, ɵAngularFireSchedulers } from '@angular/fire';
 import { Firestore, FirestoreInstances, FIRESTORE_PROVIDER_NAME } from './lite';

src/firestore/lite/lite.module.ts

@@ -1,4 +1,4 @@
-import { FirebaseFirestore } from 'firebase/firestore/lite';
+import { Firestore as FirebaseFirestore } from 'firebase/firestore/lite';
 import { ɵgetAllInstancesOf } from '@angular/fire';
 import { from, timer } from 'rxjs';
 import { concatMap, distinct } from 'rxjs/operators';

src/firestore/lite/lite.ts

@@ -1,5 +1,5 @@
 import { NgModule, Optional, NgZone, InjectionToken, ModuleWithProviders } from '@angular/core';
-import { FirebaseMessaging } from 'firebase/messaging';
+import { Messaging as FirebaseMessaging } from 'firebase/messaging';
 import { ɵgetDefaultInstanceOf, ɵmemoizeInstance, ɵAngularFireSchedulers } from '@angular/fire';
 import { Messaging, MessagingInstances, MESSAGING_PROVIDER_NAME } from './messaging';
 import { FirebaseApps } from '@angular/fire/app';

src/messaging/messaging.module.ts

@@ -1,4 +1,4 @@
-import { FirebaseMessaging } from 'firebase/messaging';
+import { Messaging as FirebaseMessaging } from 'firebase/messaging';
 import { ɵgetAllInstancesOf } from '@angular/fire';
 import { from, timer } from 'rxjs';
 import { concatMap, distinct } from 'rxjs/operators';

src/messaging/messaging.ts

@@ -1,5 +1,5 @@
 import { NgModule, Optional, NgZone, InjectionToken, ModuleWithProviders } from '@angular/core';
-import { StorageService as FirebaseStorage } from 'firebase/storage';
+import { FirebaseStorage } from 'firebase/storage';
 import { ɵgetDefaultInstanceOf, ɵmemoizeInstance, ɵAngularFireSchedulers } from '@angular/fire';
 import { Storage, StorageInstances, STORAGE_PROVIDER_NAME } from './storage';
 import { FirebaseApps } from '@angular/fire/app';

src/storage/storage.module.ts

@@ -1,4 +1,4 @@
-import { StorageService as FirebaseStorage } from 'firebase/storage';
+import { FirebaseStorage } from 'firebase/storage';
 import { ɵgetAllInstancesOf } from '@angular/fire';
 import { from, timer } from 'rxjs';
 import { concatMap, distinct } from 'rxjs/operators';