Merge branch 'pasta/main' into pasta/ziti

stephenarosaj · stephenarosaj · commit 8d3c2c54fe6e · 2026-04-01T13:57:18.000-07:00
diff --git a/.changeset/funky-teeth-pick.md b/.changeset/funky-teeth-pick.md
@@ -0,0 +1,6 @@
+---
+'firebase': minor
+'@firebase/auth': minor
+---
+
+Updated the peer dependency range for @react-native-async-storage/async-storage to support both v2 and v3
diff --git a/docs-devsite/auth.md b/docs-devsite/auth.md
@@ -20,7 +20,7 @@ Firebase Authentication
 |  [getAuth(app)](./auth.md#getauth_cf608e1) | Returns the Auth instance associated with the provided [FirebaseApp](./app.firebaseapp.md#firebaseapp_interface)<!-- -->. If no instance exists, initializes an Auth instance with platform-specific default dependencies. |
 |  [initializeAuth(app, deps)](./auth.md#initializeauth_ca77c9b) | Initializes an [Auth](./auth.auth.md#auth_interface) instance with fine-grained control over [Dependencies](./auth.dependencies.md#dependencies_interface)<!-- -->. |
 |  <b>function(storage, ...)</b> |
-|  [getReactNativePersistence(storage)](./auth.md#getreactnativepersistence_bab4ada) | Returns a persistence object that wraps <code>AsyncStorage</code> imported from <code>react-native</code> or <code>@react-native-community/async-storage</code>, and can be used in the persistence dependency field in [initializeAuth()](./auth.md#initializeauth_ca77c9b)<!-- -->. |
+|  [getReactNativePersistence(storage)](./auth.md#getreactnativepersistence_bab4ada) | Returns a persistence object that wraps <code>AsyncStorage</code> imported from <code>react-native</code> or <code>@react-native-async-storage/async-storage</code>, and can be used in the persistence dependency field in [initializeAuth()](./auth.md#initializeauth_ca77c9b)<!-- -->. |
 |  <b>function(auth, ...)</b> |
 |  [applyActionCode(auth, oobCode)](./auth.md#applyactioncode_d2ae15a) | Applies a verification code sent to the user by email or other out-of-band mechanism. |
 |  [beforeAuthStateChanged(auth, callback, onAbort)](./auth.md#beforeauthstatechanged_22f2ab6) | Adds a blocking callback that runs before an auth state change sets a new user. |
@@ -232,7 +232,7 @@ export declare function initializeAuth(app: FirebaseApp, deps?: Dependencies): A
 
 ### getReactNativePersistence(storage) {:#getreactnativepersistence_bab4ada}
 
-Returns a persistence object that wraps `AsyncStorage` imported from `react-native` or `@react-native-community/async-storage`<!-- -->, and can be used in the persistence dependency field in [initializeAuth()](./auth.md#initializeauth_ca77c9b)<!-- -->.
+Returns a persistence object that wraps `AsyncStorage` imported from `react-native` or `@react-native-async-storage/async-storage`<!-- -->, and can be used in the persistence dependency field in [initializeAuth()](./auth.md#initializeauth_ca77c9b)<!-- -->.
 
 <b>Signature:</b>
 
@@ -250,6 +250,28 @@ export declare function getReactNativePersistence(storage: ReactNativeAsyncStora
 
 [Persistence](./auth.persistence.md#persistence_interface)
 
+### Example
+
+
+```javascript
+import { initializeAuth, getReactNativePersistence } from 'firebase/auth';
+
+// For @react-native-async-storage/async-storage v3:
+import { createAsyncStorage } from '@react-native-async-storage/async-storage';
+const appStorage = createAsyncStorage('app');
+const persistence = getReactNativePersistence(appStorage);
+
+// For @react-native-async-storage/async-storage v2:
+// import ReactNativeAsyncStorage from '@react-native-async-storage/async-storage';
+// const persistence = getReactNativePersistence(ReactNativeAsyncStorage);
+
+// Then, initialize auth:
+const auth = initializeAuth(app, {
+  persistence
+});
+
+```
+
 ## function(auth, ...)
 
 ### applyActionCode(auth, oobCode) {:#applyactioncode_d2ae15a}
diff --git a/packages/auth/index.rn.ts b/packages/auth/index.rn.ts
@@ -62,9 +62,21 @@ persist between sessions. In order to persist auth state, install the package
 initializeAuth:
 
 import { initializeAuth, getReactNativePersistence } from 'firebase/auth';
+
+// For @react-native-async-storage/async-storage v3:
+import { createAsyncStorage } from '@react-native-async-storage/async-storage';
+const appStorage = createAsyncStorage("app");
+const persistence = getReactNativePersistence(appStorage);
+
+/*
+// For @react-native-async-storage/async-storage v2:
 import ReactNativeAsyncStorage from '@react-native-async-storage/async-storage';
+const persistence = getReactNativePersistence(ReactNativeAsyncStorage);
+*/
+
+// Then, initialize auth:
 const auth = initializeAuth(app, {
-  persistence: getReactNativePersistence(ReactNativeAsyncStorage)
+  persistence
 });
 `;
 
diff --git a/packages/auth/package.json b/packages/auth/package.json
@@ -116,7 +116,7 @@
   },
   "peerDependencies": {
     "@firebase/app": "0.x",
-    "@react-native-async-storage/async-storage": "^2.2.0"
+    "@react-native-async-storage/async-storage": "^2.2.0 || ^3.0.0"
   },
   "peerDependenciesMeta": {
     "@react-native-async-storage/async-storage": {
diff --git a/packages/auth/src/platform_react_native/persistence/react_native.ts b/packages/auth/src/platform_react_native/persistence/react_native.ts
@@ -27,9 +27,28 @@ import {
 
 /**
  * Returns a persistence object that wraps `AsyncStorage` imported from
- * `react-native` or `@react-native-community/async-storage`, and can
+ * `react-native` or `@react-native-async-storage/async-storage`, and can
  * be used in the persistence dependency field in {@link initializeAuth}.
  *
+ * @example
+ * ```javascript
+ * import { initializeAuth, getReactNativePersistence } from 'firebase/auth';
+ *
+ * // For @react-native-async-storage/async-storage v3:
+ * import { createAsyncStorage } from '@react-native-async-storage/async-storage';
+ * const appStorage = createAsyncStorage('app');
+ * const persistence = getReactNativePersistence(appStorage);
+ *
+ * // For @react-native-async-storage/async-storage v2:
+ * // import ReactNativeAsyncStorage from '@react-native-async-storage/async-storage';
+ * // const persistence = getReactNativePersistence(ReactNativeAsyncStorage);
+ *
+ * // Then, initialize auth:
+ * const auth = initializeAuth(app, {
+ *   persistence
+ * });
+ * ```
+ *
  * @public
  */
 export function getReactNativePersistence(
