From aa41cc6e0aa2fdaf6e1000f8a7e410d4382a77e5 Mon Sep 17 00:00:00 2001
From: Armando Navarro <adnavarro@google.com>
Date: Wed, 22 Jul 2026 19:56:24 -0700
Subject: [PATCH] fix(core): raise the rxfire floor to ^6.2.0 for its firebase
 12 peers

rxfire 6.1.0 peers firebase ^9||^10||^11, so npm installs a second
firebase 11 next to @angular/fire's firebase 12 and the first Firestore
read throws "Type does not match the expected instance". rxfire 6.2.0
(the peer-range fix, rxfire#152) is on npm latest since 2026-07-22.

^6.1.0 already resolves to 6.2.0 on fresh installs; the raised floor is
for upgraders whose lockfile pins rxfire 6.1.0, which survives an
@angular/fire upgrade and recreates the dual-SDK tree. ^6.2.0 forces
the bump.

Also drop the root overrides block that forced rxfire's firebase peer
to ^12.4.0 in this repo's own tree (obsolete with 6.2.0), and sync the
lockfile's stale root version 21.0.0-next.0 to 21.0.0-rc.0 to match
package.json.
---
 package-lock.json | 14 +++++++-------
 package.json      |  7 +------
 src/package.json  |  2 +-
 3 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 47ec21f14..8c679f4e4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@angular/fire",
-  "version": "21.0.0-next.0",
+  "version": "21.0.0-rc.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@angular/fire",
-      "version": "21.0.0-next.0",
+      "version": "21.0.0-rc.0",
       "license": "MIT",
       "dependencies": {
         "@angular-devkit/architect": "~0.2100.0",
@@ -29,7 +29,7 @@
         "jsonc-parser": "^3.0.0",
         "open": "^7.0.3 || ^8.0.0",
         "ora": "^5.3.0",
-        "rxfire": "^6.1.0",
+        "rxfire": "^6.2.0",
         "rxjs": "~7.8.0",
         "semver": "^7.1.3",
         "triple-beam": "^1.3.0",
@@ -22041,12 +22041,12 @@
       }
     },
     "node_modules/rxfire": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/rxfire/-/rxfire-6.1.0.tgz",
-      "integrity": "sha512-NezdjeY32VZcCuGO0bbb8H8seBsJSCaWdUwGsHNzUcAOHR0VGpzgPtzjuuLXr8R/iemkqSzbx/ioS7VwV43ynA==",
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/rxfire/-/rxfire-6.2.0.tgz",
+      "integrity": "sha512-XSRdYjV6rZJUbUL2IpTqLtgnhNHDp9j2KSHZW04R+/ODKm8Ir2ag8I+kVZCq6j1NCclB4JMx60sgSDWcvDYR3g==",
       "license": "Apache-2.0",
       "peerDependencies": {
-        "firebase": "^9.0.0 || ^10.0.0 || ^11.0.0",
+        "firebase": "^9.0.0 || ^10.0.0 || ^11.0.0 || ^12.0.0",
         "rxjs": "^6.0.0 || ^7.0.0"
       }
     },
diff --git a/package.json b/package.json
index 98ceafca4..339999f3e 100644
--- a/package.json
+++ b/package.json
@@ -66,7 +66,7 @@
     "jsonc-parser": "^3.0.0",
     "open": "^7.0.3 || ^8.0.0",
     "ora": "^5.3.0",
-    "rxfire": "^6.1.0",
+    "rxfire": "^6.2.0",
     "rxjs": "~7.8.0",
     "semver": "^7.1.3",
     "triple-beam": "^1.3.0",
@@ -120,10 +120,5 @@
     "typescript": ">=5.9 <6.0",
     "yaml": "^2.7.0"
   },
-  "overrides": {
-    "rxfire": {
-      "firebase": "^12.4.0"
-    }
-  },
   "typings": "index.d.ts"
 }
diff --git a/src/package.json b/src/package.json
index 9c47b71cf..2e36e2956 100644
--- a/src/package.json
+++ b/src/package.json
@@ -36,7 +36,7 @@
   },
   "dependencies": {
     "firebase": "^12.4.0",
-    "rxfire": "^6.1.0",
+    "rxfire": "^6.2.0",
     "@angular-devkit/schematics": "^21.0.0",
     "@schematics/angular": "^21.0.0",
     "tslib": "^2.3.0"