Upgrade ng deps

Author: jamesdaniels

package.json

@@ -40,15 +40,15 @@
   },
   "homepage": "https://github.com/angular/angularfire#readme",
   "dependencies": {
-    "@angular-devkit/architect": ">= 0.900 < 0.1200",
-    "@angular-devkit/core": "^9.0.0 || ^10.0.0 || ^11.0.0",
-    "@angular-devkit/schematics": "^9.0.0 || ^10.0.0 || ^11.0.0",
-    "@angular/common": "^9.0.0 || ^10.0.0 || ^11.0.0",
-    "@angular/compiler": "^9.0.0 || ^10.0.0 || ^11.0.0",
-    "@angular/core": "^9.0.0 || ^10.0.0 || ^11.0.0",
-    "@angular/platform-browser": "^9.0.0 || ^10.0.0 || ^11.0.0",
-    "@angular/platform-browser-dynamic": "^9.0.0 || ^10.0.0 || ^11.0.0",
-    "@angular/router": "^9.0.0 || ^10.0.0 || ^11.0.0",
+    "@angular-devkit/architect": "0.1200.0-rc.0",
+    "@angular-devkit/core": "12.0.0-rc.0",
+    "@angular-devkit/schematics": "12.0.0-rc.0",
+    "@angular/common": "12.0.0-rc.0",
+    "@angular/compiler": "12.0.0-rc.0",
+    "@angular/core": "12.0.0-rc.0",
+    "@angular/platform-browser": "12.0.0-rc.0",
+    "@angular/platform-browser-dynamic": "12.0.0-rc.0",
+    "@angular/router": "12.0.0-rc.0",
     "firebase": "^9.0.0-beta.1",
     "firebase-admin": "^8.10.0",
     "firebase-functions": "^3.6.0",
@@ -63,7 +63,7 @@
     "rxfire": "0.500.0-canary.0df3466",
     "rxjs": "^6.5.3",
     "semver": "^7.1.3",
-    "tslib": "^1.10.0 || ^2.0.0",
+    "tslib": "^2.0.0",
     "ws": "^7.2.1",
     "xhr2": "^0.1.4",
     "zone.js": "0.10.2"
@@ -73,12 +73,12 @@
     "utf-8-validate": "^5.0.2"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": ">= 0.900 < 0.1200",
-    "@angular-devkit/build-ng-packagr": ">= 0.900 < 0.1200",
-    "@angular/animations": " ^9.0.0 || ^10.0.0 || ^11.0.0",
-    "@angular/cli": "^9.0.0 || ^10.0.0 || ^11.0.0",
-    "@angular/compiler-cli": "^9.0.0 || ^10.0.0 || ^11.0.0",
-    "@angular/platform-server": "^9.0.0 || ^10.0.0 || ^11.0.0",
+    "@angular-devkit/build-angular": "12.0.0-rc.0",
+    "@angular-devkit/build-ng-packagr": ">= 0.900 < 0.1300",
+    "@angular/animations": "12.0.0-rc.0",
+    "@angular/cli": "12.0.0-rc.0",
+    "@angular/compiler-cli": "12.0.0-rc.0",
+    "@angular/platform-server": "12.0.0-rc.0",
     "@types/fs-extra": "^7.0.0",
     "@types/gzip-size": "^5.1.1",
     "@types/inquirer": "^0.0.44",
@@ -119,10 +119,10 @@
     "tslint": "~6.1.0",
     "ttypescript": "^1.5.12",
     "typedoc": "^0.16.4",
-    "typescript": ">=4.0.0 <4.1.0"
+    "typescript": ">=4.2.3 <4.3.0"
   },
   "typings": "index.d.ts",
   "resolutions": {
-    "webpack": "5.4.0"
+    "webpack": "^5.35.0"
   }
 }

src/database/database.module.ts

@@ -1,5 +1,6 @@
 import { NgModule, Optional, NgZone, InjectionToken } from '@angular/core';
 import { FirebaseDatabase } from 'firebase/database';
+import { AUTH_INSTANCES } from '../auth/auth.module';
 
 import { ɵsmartCacheInstance, ɵfetchCachedInstance } from '../core';
 import { Database } from './database';
@@ -59,7 +60,9 @@ export function provideDatabase(fn: () => FirebaseDatabase) {
       multi: true,
       deps: [
         NgZone,
-        [new Optional(), FIREBASE_APPS ]
+        [new Optional(), FIREBASE_APPS ],
+        // Database+Auth work better if Auth is loaded first
+        [new Optional(), AUTH_INSTANCES ],
       ]
     }]
   };

src/firestore/firestore.module.ts

@@ -4,6 +4,7 @@ import { FirebaseFirestore } from 'firebase/firestore';
 import { ɵsmartCacheInstance, ɵfetchCachedInstance } from '../core';
 import { Firestore } from './firestore';
 import { DEFAULT_APP_NAME, FIREBASE_APPS } from '../app/app.module';
+import { AUTH_INSTANCES } from '../auth/auth.module';
 
 export const FIRESTORE_INSTANCES = new InjectionToken<Firestore[]>('angularfire2.firestore-instances');
 
@@ -59,7 +60,9 @@ export function provideFirestore(fn: () => FirebaseFirestore) {
       multi: true,
       deps: [
         NgZone,
-        [new Optional(), FIREBASE_APPS ]
+        [new Optional(), FIREBASE_APPS ],
+        // Firestore+Auth work better if Auth is loaded first
+        [new Optional(), AUTH_INSTANCES ],
       ]
     }]
   };