More

jamesdaniels · Nov 26, 2025 · Oct 10, 2025 · Oct 10, 2025 · Nov 25, 2025 · Nov 26, 2025
commit 07105f4ced6b89443748731469db84f4108c0385
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -46,16 +46,16 @@
   },
   "homepage": "https://github.com/angular/angularfire#readme",
   "dependencies": {
-    "@angular-devkit/architect": "0.2100.0-next.7",
-    "@angular-devkit/core": "21.0.0-next.7",
-    "@angular-devkit/schematics": "21.0.0-next.7",
-    "@angular/common": "21.0.0-next.7",
-    "@angular/compiler": "21.0.0-next.7",
-    "@angular/core": "21.0.0-next.7",
-    "@angular/platform-browser": "21.0.0-next.7",
-    "@angular/platform-browser-dynamic": "21.0.0-next.7",
-    "@angular/router": "21.0.0-next.7",
-    "@schematics/angular": "21.0.0-next.7",
+    "@angular-devkit/architect": "~0.2100.0",
+    "@angular-devkit/core": "^21.0.0",
+    "@angular-devkit/schematics": "^21.0.0",
+    "@angular/common": "^21.0.0",
+    "@angular/compiler": "^21.0.0",
+    "@angular/core": "^21.0.0",
+    "@angular/platform-browser": "^21.0.0",
+    "@angular/platform-browser-dynamic": "^21.0.0",
+    "@angular/router": "^21.0.0",
+    "@schematics/angular": "^21.0.0",
     "esbuild": "^0.24.0",
     "firebase": "^12.4.0",
     "firebase-functions": "^6.1.0",
@@ -75,13 +75,13 @@
     "zone.js": "~0.15.0"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "21.0.0-next.7",
-    "@angular-eslint/builder": "20.0.0-alpha.1",
-    "@angular-eslint/eslint-plugin": "20.0.0-alpha.1",
-    "@angular/animations": "21.0.0-next.7",
-    "@angular/cli": "21.0.0-next.7",
-    "@angular/compiler-cli": "21.0.0-next.7",
-    "@angular/platform-server": "21.0.0-next.7",
+    "@angular-devkit/build-angular": "^21.0.0",
+    "@angular-eslint/builder": "^21.0.0",
+    "@angular-eslint/eslint-plugin": "^21.0.0",
+    "@angular/animations": "^21.0.0",
+    "@angular/cli": "^21.0.0",
+    "@angular/compiler-cli": "^21.0.0",
+    "@angular/platform-server": "^21.0.0",
     "@types/fs-extra": "^7.0.0",
     "@types/gzip-size": "^5.1.1",
     "@types/inquirer": "^0.0.44",
@@ -109,7 +109,7 @@
     "karma-jasmine": "~5.1.0",
     "karma-jasmine-html-reporter": "^2.1.0",
     "karma-safarinative-launcher": "^1.1.0",
-    "ng-packagr": "20.0.0-next.4",
+    "ng-packagr": "^21.0.0",
     "reflect-metadata": "^0.1.2",
     "replace-in-file": "^5.0.2",
     "rimraf": "^2.5.4",
@@ -121,14 +121,8 @@
     "yaml": "^2.7.0"
   },
   "overrides": {
-    "@angular/compiler-cli": {
-      "ng-packagr": "20.0.0-next.4"
-    },
-    "@angular-devkit/build-angular": {
-      "ng-packagr": "20.0.0-next.4"
-    },
-    "ng-packagr": {
-      "@angular/compiler-cli": "21.0.0-next.7"
+    "rxfire": {
+      "firebase": "^12.4.0"
     }
   },
   "typings": "index.d.ts"

diff --git a/src/ai/ai.ts b/src/ai/ai.ts
@@ -4,7 +4,7 @@ import { from, timer } from 'rxjs';
 import { concatMap, distinct } from 'rxjs/operators';
 
 // see notes in core/firebase.app.module.ts for why we're building the class like this
-// eslint-disable-next-line @typescript-eslint/no-empty-interface
+ 
 export interface AI extends FirebaseAI {}
 
 export class AI {
@@ -15,7 +15,7 @@ export class AI {
 
 export const AI_PROVIDER_NAME = 'AI';
 
-// eslint-disable-next-line @typescript-eslint/no-empty-interface
+ 
 export interface AIInstances extends Array<FirebaseAI> {}
 
 export class AIInstances {

diff --git a/src/analytics/analytics.ts b/src/analytics/analytics.ts
@@ -4,7 +4,7 @@ import { from, timer } from 'rxjs';
 import { concatMap, distinct } from 'rxjs/operators';
 
 // see notes in core/firebase.app.module.ts for why we're building the class like this
-// eslint-disable-next-line @typescript-eslint/no-empty-interface
+ 
 export interface Analytics extends FirebaseAnalytics {}
 
 export class Analytics {
@@ -15,7 +15,7 @@ export class Analytics {
 
 export const ANALYTICS_PROVIDER_NAME = 'analytics';
 
-// eslint-disable-next-line @typescript-eslint/no-empty-interface
+ 
 export interface AnalyticsInstances extends Array<FirebaseAnalytics> {}
 
 export class AnalyticsInstances {

diff --git a/src/app-check/app-check.ts b/src/app-check/app-check.ts
@@ -6,7 +6,7 @@ import { concatMap, distinct } from 'rxjs/operators';
 export const APP_CHECK_PROVIDER_NAME = 'app-check';
 
 // see notes in core/firebase.app.module.ts for why we're building the class like this
-// eslint-disable-next-line @typescript-eslint/no-empty-interface
+ 
 export interface AppCheck extends FirebaseAppCheck {}
 
 export class AppCheck {
@@ -15,7 +15,7 @@ export class AppCheck {
   }
 }
 
-// eslint-disable-next-line @typescript-eslint/no-empty-interface
+ 
 export interface AppCheckInstances extends Array<AppCheck> {}
 
 export class AppCheckInstances {

diff --git a/src/app/app.module.ts b/src/app/app.module.ts
@@ -64,7 +64,7 @@ export function firebaseAppFactory(fn: (injector: Injector) => IFirebaseApp) {
 })
 export class FirebaseAppModule {
   // eslint-disable-next-line @typescript-eslint/ban-types
-  constructor(@Inject(PLATFORM_ID) platformId: Object) {
+  constructor(@Inject(PLATFORM_ID) platformId: object) {
     registerVersion('angularfire', VERSION.full, 'core');
     registerVersion('angularfire', VERSION.full, 'app');
     // eslint-disable-next-line @typescript-eslint/no-base-to-string

diff --git a/src/app/app.ts b/src/app/app.ts
@@ -15,7 +15,7 @@ import { concatMap, distinct } from 'rxjs/operators';
 //   constructor(private app: FirebaseApp) { }
 //   ngOnDestroy() { deleteApp(this.app); }
 //
-// eslint-disable-next-line @typescript-eslint/no-empty-interface
+ 
 export interface FirebaseApp extends IFirebaseApp {}
 
 export class FirebaseApp {
@@ -24,7 +24,7 @@ export class FirebaseApp {
   }
 }
 
-// eslint-disable-next-line @typescript-eslint/no-empty-interface
+ 
 export interface FirebaseApps extends Array<IFirebaseApp> {}
 
 export class FirebaseApps {

diff --git a/src/auth/auth.ts b/src/auth/auth.ts
@@ -6,7 +6,7 @@ import { concatMap, distinct } from 'rxjs/operators';
 export const AUTH_PROVIDER_NAME = 'auth';
 
 // see notes in core/firebase.app.module.ts for why we're building the class like this
-// eslint-disable-next-line @typescript-eslint/no-empty-interface
+ 
 export interface Auth extends FirebaseAuth {}
 
 export class Auth {
@@ -15,7 +15,7 @@ export class Auth {
   }
 }
 
-// eslint-disable-next-line @typescript-eslint/no-empty-interface
+ 
 export interface AuthInstances extends Array<FirebaseAuth> {}
 
 export class AuthInstances {

diff --git a/src/compat/analytics/analytics.ts b/src/compat/analytics/analytics.ts
@@ -25,7 +25,7 @@ const GTAG_FUNCTION_NAME = 'gtag'; // TODO rename these
 const DATA_LAYER_NAME = 'dataLayer';
 const SEND_TO_KEY = 'send_to';
 
-// eslint-disable-next-line @typescript-eslint/no-empty-interface
+ 
 export interface AngularFireAnalytics extends ɵPromiseProxy<firebase.analytics.Analytics> {
 }
 
@@ -50,7 +50,7 @@ export class AngularFireAnalytics {
     @Optional() @Inject(DEBUG_MODE) debugModeEnabled: boolean | null,
     @Optional() @Inject(CONFIG) providedConfig: Config | null,
     // eslint-disable-next-line @typescript-eslint/ban-types
-    @Inject(PLATFORM_ID) platformId: Object,
+    @Inject(PLATFORM_ID) platformId: object,
     zone: NgZone,
     schedulers: ɵAngularFireSchedulers,
   ) {

diff --git a/src/compat/analytics/user-tracking.service.ts b/src/compat/analytics/user-tracking.service.ts
@@ -16,7 +16,7 @@ export class UserTrackingService implements OnDestroy {
   constructor(
     analytics: AngularFireAnalytics,
     // eslint-disable-next-line @typescript-eslint/ban-types
-    @Inject(PLATFORM_ID) platformId: Object,
+    @Inject(PLATFORM_ID) platformId: object,
     auth: AngularFireAuth,
     zone: NgZone,
   ) {

diff --git a/src/compat/auth/auth.ts b/src/compat/auth/auth.ts
@@ -11,7 +11,7 @@ import { Observable, Subject, from, merge, of } from 'rxjs';
 import { filter, first, map, observeOn, shareReplay, subscribeOn, switchMap, switchMapTo } from 'rxjs/operators';
 import { proxyPolyfillCompat } from './base';
 
-// eslint-disable-next-line @typescript-eslint/no-empty-interface
+ 
 export interface AngularFireAuth extends ɵPromiseProxy<firebase.auth.Auth> {}
 
 type UseEmulatorArguments = Parameters<firebase.auth.Auth['useEmulator']>;
@@ -88,7 +88,7 @@ export class AngularFireAuth {
     @Inject(FIREBASE_OPTIONS) options: FirebaseOptions,
     @Optional() @Inject(FIREBASE_APP_NAME) name: string|null|undefined,
     // eslint-disable-next-line @typescript-eslint/ban-types
-    @Inject(PLATFORM_ID) platformId: Object,
+    @Inject(PLATFORM_ID) platformId: object,
     zone: NgZone,
     schedulers: ɵAngularFireSchedulers,
     @Optional() @Inject(USE_EMULATOR) useEmulator: any, // can't use the tuple here

diff --git a/src/compat/database/database.ts b/src/compat/database/database.ts
@@ -38,7 +38,7 @@ export class AngularFireDatabase {
     @Optional() @Inject(FIREBASE_APP_NAME) name: string | null | undefined,
     @Optional() @Inject(URL) databaseURL: string | null,
     // eslint-disable-next-line @typescript-eslint/ban-types
-    @Inject(PLATFORM_ID) platformId: Object,
+    @Inject(PLATFORM_ID) platformId: object,
     zone: NgZone,
     public schedulers: ɵAngularFireSchedulers,
     @Optional() @Inject(USE_EMULATOR) _useEmulator: any, // tuple isn't working here

diff --git a/src/compat/database/interfaces.ts b/src/compat/database/interfaces.ts
@@ -6,7 +6,7 @@ export type FirebaseOperation = string | firebase.database.Reference | firebase.
 export interface AngularFireList<T> {
   query: DatabaseQuery;
   valueChanges(events?: ChildEvent[], options?: unknown): Observable<T[]>;
-  valueChanges<K extends string>(events?: ChildEvent[], options?: {idField: K}): Observable<(T & {[T in K]?: string})[]>;
+  valueChanges<K extends string>(events?: ChildEvent[], options?: {idField: K}): Observable<(T & Partial<Record<K, string>>)[]>;
   snapshotChanges(events?: ChildEvent[]): Observable<SnapshotAction<T>[]>;
   stateChanges(events?: ChildEvent[]): Observable<SnapshotAction<T>>;
   auditTrail(events?: ChildEvent[]): Observable<SnapshotAction<T>[]>;

diff --git a/src/compat/database/list/audit-trail.ts b/src/compat/database/list/audit-trail.ts
@@ -54,7 +54,7 @@ function waitForLoaded<T>(query: DatabaseQuery, action$: Observable<SnapshotActi
       // This is the magical part, only emit when the last load key
       // in the dataset has been loaded by a child event. At this point
       // we can assume the dataset is "whole".
-      skipWhile(meta => meta.loadedKeys.indexOf(meta.lastKeyToLoad) === -1),
+      skipWhile(meta => !meta.loadedKeys.includes(meta.lastKeyToLoad)),
       // Pluck off the meta data because the user only cares
       // to iterate through the snapshots
       map(meta => meta.actions)

diff --git a/src/compat/firebase.app.module.ts b/src/compat/firebase.app.module.ts
@@ -60,7 +60,7 @@ export class AngularFireModule {
   }
 
   // eslint-disable-next-line @typescript-eslint/ban-types
-  constructor(@Inject(PLATFORM_ID) platformId: Object) {
+  constructor(@Inject(PLATFORM_ID) platformId: object) {
     firebase.registerVersion('angularfire', VERSION.full, 'core');
     firebase.registerVersion('angularfire', VERSION.full, 'app-compat');
     // eslint-disable-next-line @typescript-eslint/no-base-to-string

diff --git a/src/compat/firebase.app.ts b/src/compat/firebase.app.ts
@@ -1,6 +1,6 @@
 import firebase from 'firebase/compat/app';
 
-// eslint-disable-next-line @typescript-eslint/no-empty-interface
+ 
 export interface FirebaseApp extends firebase.app.App {}
 
 export class FirebaseApp {

diff --git a/src/compat/firestore/collection-group/collection-group.ts b/src/compat/firestore/collection-group/collection-group.ts
@@ -51,7 +51,7 @@ export class AngularFirestoreCollectionGroup<T = DocumentData> {
     }
     return docChanges<T>(this.query, this.afs.schedulers.outsideAngular)
       .pipe(
-        map(actions => actions.filter(change => events.indexOf(change.type) > -1)),
+        map(actions => actions.filter(change => events.includes(change.type))),
         filter(changes =>  changes.length > 0),
         pendingUntilEvent(this.injector)
       );
@@ -86,7 +86,7 @@ export class AngularFirestoreCollectionGroup<T = DocumentData> {
   valueChanges(): Observable<T[]>;
   // eslint-disable-next-line no-empty-pattern
   valueChanges({}): Observable<T[]>;
-  valueChanges<K extends string>(options: {idField: K}): Observable<(T & { [T in K]: string })[]>;
+  valueChanges<K extends string>(options: {idField: K}): Observable<(T & Record<K, string>)[]>;
   valueChanges<K extends string>(options: {idField?: K} = {}): Observable<T[]> {
     const fromCollectionRefScheduled$ = fromCollectionRef<T>(this.query, this.afs.schedulers.outsideAngular);
     return fromCollectionRefScheduled$
@@ -96,7 +96,7 @@ export class AngularFirestoreCollectionGroup<T = DocumentData> {
             return {
               [options.idField]: a.id,
               ...a.data()
-            } as T & { [T in K]: string };
+            } as T & Record<K, string>;
           } else {
             return a.data();
           }

diff --git a/src/compat/firestore/collection/changes.ts b/src/compat/firestore/collection/changes.ts
@@ -68,7 +68,7 @@ export function sortedChanges<T>(
 export function combineChanges<T>(current: DocumentChange<T>[], changes: DocumentChange<T>[], events: DocumentChangeType[]) {
   changes.forEach(change => {
     // skip unwanted change types
-    if (events.indexOf(change.type) > -1) {
+    if (events.includes(change.type)) {
       current = combineChange(current, change);
     }
   });

diff --git a/src/compat/firestore/collection/collection.ts b/src/compat/firestore/collection/collection.ts
@@ -67,7 +67,7 @@ export class AngularFirestoreCollection<T = DocumentData> {
     let source = docChanges<T>(this.query, this.afs.schedulers.outsideAngular);
     if (events && events.length > 0) {
       source = source.pipe(
-        map(actions => actions.filter(change => events.indexOf(change.type) > -1))
+        map(actions => actions.filter(change => events.includes(change.type)))
       );
     }
     return source.pipe(
@@ -110,7 +110,7 @@ export class AngularFirestoreCollection<T = DocumentData> {
   valueChanges(): Observable<T[]>;
   // eslint-disable-next-line no-empty-pattern
   valueChanges({}): Observable<T[]>;
-  valueChanges<K extends string>(options: {idField: K}): Observable<(T & { [T in K]: string })[]>;
+  valueChanges<K extends string>(options: {idField: K}): Observable<(T & Record<K, string>)[]>;
   valueChanges<K extends string>(options: {idField?: K} = {}): Observable<T[]> {
     return fromCollectionRef<T>(this.query, this.afs.schedulers.outsideAngular)
       .pipe(
@@ -119,7 +119,7 @@ export class AngularFirestoreCollection<T = DocumentData> {
             return {
               ...a.data() as any,
               ...{ [options.idField]: a.id }
-            } as T & { [T in K]: string };
+            } as T & Record<K, string>;
           } else {
             return a.data();
           }

diff --git a/src/compat/firestore/document/document.ts b/src/compat/firestore/document/document.ts
@@ -87,14 +87,14 @@ export class AngularFirestoreDocument<T = DocumentData> {
    * provided `idField` property name.
    */
   valueChanges(options?: unknown): Observable<T | undefined>;
-  valueChanges<K extends string>(options: { idField: K }): Observable<(T & { [T in K]: string }) | undefined>;
+  valueChanges<K extends string>(options: { idField: K }): Observable<(T & Record<K, string>) | undefined>;
   valueChanges<K extends string>(options: { idField?: K } = {}): Observable<T | undefined> {
     return this.snapshotChanges().pipe(
       map(({ payload }) =>
         options.idField ? {
           ...payload.data(),
           ...{ [options.idField]: payload.id }
-        } as T & { [T in K]: string } : payload.data()
+        } as T & Record<K, string> : payload.data()
       )
     );
   }

diff --git a/src/compat/firestore/firestore.ts b/src/compat/firestore/firestore.ts
@@ -134,7 +134,7 @@ export class AngularFirestore {
     @Optional() @Inject(ENABLE_PERSISTENCE) shouldEnablePersistence: boolean | null,
     @Optional() @Inject(SETTINGS) settings: Settings | null,
     // eslint-disable-next-line @typescript-eslint/ban-types
-    @Inject(PLATFORM_ID) platformId: Object,
+    @Inject(PLATFORM_ID) platformId: object,
     zone: NgZone,
     public schedulers: ɵAngularFireSchedulers,
     @Optional() @Inject(PERSISTENCE_SETTINGS) persistenceSettings: PersistenceSettings | null,

diff --git a/src/compat/functions/functions.ts b/src/compat/functions/functions.ts
@@ -17,7 +17,7 @@ type UseEmulatorArguments = Parameters<firebase.functions.Functions['useEmulator
 export const USE_EMULATOR = new InjectionToken<UseEmulatorArguments>('angularfire2.functions.use-emulator');
 
 // override httpsCallable for compatibility with 5.x
-// eslint-disable-next-line @typescript-eslint/no-empty-interface
+ 
 export interface AngularFireFunctions extends Omit<ɵPromiseProxy<firebase.functions.Functions>, 'httpsCallable'> {
 }
 

diff --git a/src/compat/messaging/messaging.ts b/src/compat/messaging/messaging.ts
@@ -12,7 +12,7 @@ import { proxyPolyfillCompat } from './base';
 export const VAPID_KEY = new InjectionToken<string>('angularfire2.messaging.vapid-key');
 export const SERVICE_WORKER = new InjectionToken<Promise<ServiceWorkerRegistration>>('angularfire2.messaging.service-worker-registeration');
 
-// eslint-disable-next-line @typescript-eslint/no-empty-interface
+ 
 export interface AngularFireMessaging extends Omit<ɵPromiseProxy<firebase.messaging.Messaging>, 'deleteToken' | 'getToken' | 'requestPermission'> {
 }
 
@@ -32,7 +32,7 @@ export class AngularFireMessaging {
     @Inject(FIREBASE_OPTIONS) options: FirebaseOptions,
     @Optional() @Inject(FIREBASE_APP_NAME) name: string | null | undefined,
     // eslint-disable-next-line @typescript-eslint/ban-types
-    @Inject(PLATFORM_ID) platformId: Object,
+    @Inject(PLATFORM_ID) platformId: object,
     zone: NgZone,
     schedulers: ɵAngularFireSchedulers,
     @Optional() @Inject(VAPID_KEY) vapidKey: string|null,

diff --git a/src/compat/performance/performance.service.ts b/src/compat/performance/performance.service.ts
@@ -11,7 +11,7 @@ export class PerformanceMonitoringService implements OnDestroy {
     private disposable: Subscription|undefined;
 
     constructor(appRef: ApplicationRef) {
-        // eslint-disable-next-line @typescript-eslint/prefer-optional-chain
+         
         if (typeof window !== 'undefined' && window.performance?.mark) {
             this.disposable = appRef.isStable.pipe(
                 first(it => it),