From f4e44ad50ec85604b7ba0ea835490f473ed5447c Mon Sep 17 00:00:00 2001
From: Jude Selase Kwashie <64037520+SelaseKay@users.noreply.github.com>
Date: Fri, 7 Feb 2025 19:34:58 +0000
Subject: [PATCH] fix(auth): resolve type issue when migrating to v9 (#8277)

---
 packages/auth/lib/modular/index.d.ts          | 3 ++-
 packages/database/lib/index.d.ts              | 2 --
 packages/functions/lib/modular/index.d.ts     | 3 ++-
 packages/messaging/lib/modular/index.d.ts     | 3 ++-
 packages/ml/lib/modular/index.d.ts            | 3 ++-
 packages/perf/lib/modular/index.d.ts          | 3 ++-
 packages/remote-config/lib/modular/index.d.ts | 3 ++-
 packages/storage/lib/modular/index.d.ts       | 3 ++-
 8 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/packages/auth/lib/modular/index.d.ts b/packages/auth/lib/modular/index.d.ts
index f1903d6557..1619e79993 100644
--- a/packages/auth/lib/modular/index.d.ts
+++ b/packages/auth/lib/modular/index.d.ts
@@ -15,11 +15,12 @@
  * limitations under the License.
  */
 
-import { FirebaseApp } from '@firebase/app-types';
+import { ReactNativeFirebase } from '@react-native-firebase/app';
 import { FirebaseAuthTypes, CallbackOrObserver, AuthListenerCallback } from '../index';
 import { firebase } from '..';
 
 import Auth = FirebaseAuthTypes.Module;
+import FirebaseApp = ReactNativeFirebase.FirebaseApp;
 
 /**
  * Returns the Auth instance associated with the provided FirebaseApp.
diff --git a/packages/database/lib/index.d.ts b/packages/database/lib/index.d.ts
index 1f56385052..6cbe0816de 100644
--- a/packages/database/lib/index.d.ts
+++ b/packages/database/lib/index.d.ts
@@ -17,8 +17,6 @@
 
 import { ReactNativeFirebase } from '@react-native-firebase/app';
 
-export type FirebaseApp = ReactNativeFirebase.FirebaseApp;
-
 /**
  * Firebase Database package for React Native.
  *
diff --git a/packages/functions/lib/modular/index.d.ts b/packages/functions/lib/modular/index.d.ts
index 538dbd5c61..bf5b0cbbb7 100644
--- a/packages/functions/lib/modular/index.d.ts
+++ b/packages/functions/lib/modular/index.d.ts
@@ -1,6 +1,7 @@
-import { FirebaseApp } from '@firebase/app';
+import { ReactNativeFirebase } from '@react-native-firebase/app';
 import { FirebaseFunctionsTypes } from '..';
 
+import FirebaseApp = ReactNativeFirebase.FirebaseApp;
 import Functions = FirebaseFunctionsTypes.Module;
 import HttpsCallable = FirebaseFunctionsTypes.HttpsCallable;
 import HttpsCallableOptions = FirebaseFunctionsTypes.HttpsCallableOptions;
diff --git a/packages/messaging/lib/modular/index.d.ts b/packages/messaging/lib/modular/index.d.ts
index 0fcfaa7a98..7dcbb85b5d 100644
--- a/packages/messaging/lib/modular/index.d.ts
+++ b/packages/messaging/lib/modular/index.d.ts
@@ -1,7 +1,8 @@
 import { FirebaseMessagingTypes } from '..';
-import { FirebaseApp } from '@firebase/app-types';
+import { ReactNativeFirebase } from '@react-native-firebase/app';
 
 import Messaging = FirebaseStorageTypes.Module;
+import FirebaseApp = ReactNativeFirebase.FirebaseApp;
 
 /**
  * Returns a Messaging instance for the given app.
diff --git a/packages/ml/lib/modular/index.d.ts b/packages/ml/lib/modular/index.d.ts
index 5cc2d23f74..ee65cb3b8c 100644
--- a/packages/ml/lib/modular/index.d.ts
+++ b/packages/ml/lib/modular/index.d.ts
@@ -1,7 +1,8 @@
-import { FirebaseApp } from '@firebase/app-types';
+import { ReactNativeFirebase } from '@react-native-firebase/app';
 import { FirebaseMLTypes } from '..';
 
 type FirebaseML = FirebaseMLTypes.Module;
+import FirebaseApp = ReactNativeFirebase.FirebaseApp;
 
 /**
  * Returns the existing default {@link FirebaseML} instance that is associated with the
diff --git a/packages/perf/lib/modular/index.d.ts b/packages/perf/lib/modular/index.d.ts
index 0aa6e2445c..97d741c8f9 100644
--- a/packages/perf/lib/modular/index.d.ts
+++ b/packages/perf/lib/modular/index.d.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  *
  */
-import { FirebaseApp } from '@firebase/app-types';
+import { ReactNativeFirebase } from '@react-native-firebase/app';
 import { FirebasePerformanceTypes } from '..';
 
 import Performance = FirebasePerformanceTypes.Module;
@@ -23,6 +23,7 @@ import Trace = FirebasePerformanceTypes.Module.Trace;
 import HttpMethod = FirebasePerformanceTypes.HttpMethod;
 import HttpMetric = FirebasePerformanceTypes.HttpMetric;
 import ScreenTrace = FirebasePerformanceTypes.ScreenTrace;
+import FirebaseApp = ReactNativeFirebase.FirebaseApp;
 
 /**
  * Returns a Performance instance for the given app.
diff --git a/packages/remote-config/lib/modular/index.d.ts b/packages/remote-config/lib/modular/index.d.ts
index e5fa82c8a6..88ccc23bb8 100644
--- a/packages/remote-config/lib/modular/index.d.ts
+++ b/packages/remote-config/lib/modular/index.d.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  *
  */
-import { FirebaseApp } from '@firebase/app-types';
+import { ReactNativeFirebase } from '@react-native-firebase/app';
 import { FirebaseRemoteConfigTypes } from '..';
 
 import RemoteConfig = FirebaseRemoteConfigTypes.Module;
@@ -24,6 +24,7 @@ import ConfigDefaults = FirebaseRemoteConfigTypes.ConfigDefaults;
 import ConfigSettings = FirebaseRemoteConfigTypes.ConfigSettings;
 import LastFetchStatusType = FirebaseRemoteConfigTypes.LastFetchStatusType;
 import RemoteConfigLogLevel = FirebaseRemoteConfigTypes.RemoteConfigLogLevel;
+import FirebaseApp = ReactNativeFirebase.FirebaseApp;
 
 /**
  * Returns a RemoteConfig instance for the given app.
diff --git a/packages/storage/lib/modular/index.d.ts b/packages/storage/lib/modular/index.d.ts
index f71d895512..8c5f600c3c 100644
--- a/packages/storage/lib/modular/index.d.ts
+++ b/packages/storage/lib/modular/index.d.ts
@@ -15,7 +15,7 @@
  *
  */
 
-import { FirebaseApp } from '@firebase/app-types';
+import { ReactNativeFirebase } from '@react-native-firebase/app';
 import { FirebaseStorageTypes } from '../index';
 
 import Storage = FirebaseStorageTypes.Module;
@@ -27,6 +27,7 @@ import Task = FirebaseStorageTypes.Task;
 import ListOptions = FirebaseStorageTypes.ListOptions;
 import SettableMetadata = FirebaseStorageTypes.SettableMetadata;
 import EmulatorMockTokenOptions = FirebaseStorageTypes.EmulatorMockTokenOptions;
+import FirebaseApp = ReactNativeFirebase.FirebaseApp;
 
 /**
  * Returns the existing default {@link Storage} instance that is associated with the