fix(auth): resolve type issue when migrating to v9 (#8277)

invertase · Feb 7, 2025 · f4e44ad · f4e44ad
1 parent 209b36e
commit f4e44ad
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 9 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
-Original file line number
+Diff line change
@@ Expand Up / @@ -17,8 +17,6 @@ @@
     import { ReactNativeFirebase } from '@react-native-firebase/app';
-    export type FirebaseApp = ReactNativeFirebase.FirebaseApp;
     /**
      * Firebase Database package for React Native.
      *
@@ Expand Down @@