@react-native-firebase/app 21.7.4 → 21.9.0

package/CHANGELOG.md

@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [21.9.0](https://github.com/invertase/react-native-firebase/compare/v21.8.0...v21.9.0) (2025-02-11)
+
+### Features
+
+- **app, expo:** support rn77 AppDelegate.swift in config plugin ([#8324](https://github.com/invertase/react-native-firebase/issues/8324)) ([6a7867c](https://github.com/invertase/react-native-firebase/commit/6a7867c9366b851a6de62cc37b7834090caad98b))
+
+### Bug Fixes
+
+- firebase-ios-sdk 11.8.0 / firebase-android-sdk 33.9.0 ([67aba08](https://github.com/invertase/react-native-firebase/commit/67aba08c00aa46b72fcb1353bd428fa552b6686a))
+
+## [21.8.0](https://github.com/invertase/react-native-firebase/compare/v21.7.4...v21.8.0) (2025-02-10)
+
+### Bug Fixes
+
+- do not ship unit tests in released packages ([e71dadf](https://github.com/invertase/react-native-firebase/commit/e71dadfc1c0cad2e89c94100913af31ddf7d9c91))
+
 ## [21.7.4](https://github.com/invertase/react-native-firebase/compare/v21.7.3...v21.7.4) (2025-02-08)
 
 **Note:** Version bump only for package @react-native-firebase/app

package/android/src/reactnative/java/io/invertase/firebase/app/ReactNativeFirebaseVersion.java

@@ -18,5 +18,5 @@ package io.invertase.firebase.app;
  */
 // generated file - do not modify or commit
 public class ReactNativeFirebaseVersion {
-  public static String VERSION = "21.7.4";
+  public static String VERSION = "21.9.0";
 }

package/ios/RNFBApp/RNFBVersion.m

@@ -18,4 +18,4 @@
 #import <React/RCTVersion.h>
 
 // generated file - do not modify or commit
-NSString* const RNFBVersionString = @"21.7.4";
+NSString* const RNFBVersionString = @"21.9.0";

package/lib/internal/RNFBNativeEventEmitter.js

@@ -37,24 +37,24 @@ class RNFBNativeEventEmitter extends NativeEventEmitter {
       this.ready = true;
     }
     RNFBAppModule.eventsAddListener(eventType);
-    if (global.RNFBDebug) {
+    if (globalThis.RNFBDebug) {
       // eslint-disable-next-line no-console
       console.debug(`[RNFB-->Event][👂] ${eventType} -> listening`);
     }
     const listenerDebugger = (...args) => {
-      if (global.RNFBDebug) {
+      if (globalThis.RNFBDebug) {
         // eslint-disable-next-line no-console
         console.debug(`[RNFB<--Event][📣] ${eventType} <-`, JSON.stringify(args[0]));
         // Possible leaking test if events are still being received after the test.
         // This is not super accurate but it's better than nothing, e.g. if doing setup/teardown
         // logic outside of a test this may cause false positives.
-        if (global.RNFBTest && !global.RNFBDebugInTestLeakDetection) {
+        if (globalThis.RNFBTest && !globalThis.RNFBDebugInTestLeakDetection) {
           // eslint-disable-next-line no-console
           console.debug(
             `[TEST--->Leak][💡] Possible leaking test detected! An event (☝️) ` +
               `was received outside of any running tests which may indicates that some ` +
               `listeners/event subscriptions that have not been unsubscribed from in your ` +
-              `test code. The last test that ran was: "${global.RNFBDebugLastTest}".`,
+              `test code. The last test that ran was: "${globalThis.RNFBDebugLastTest}".`,
           );
         }
       }

package/lib/internal/nativeModuleAndroidIos.js

@@ -9,7 +9,7 @@ import { NativeModules } from 'react-native';
  */
 export function getReactNativeModule(moduleName) {
   const nativeModule = NativeModules[moduleName];
-  if (!global.RNFBDebug) {
+  if (!globalThis.RNFBDebug) {
     return nativeModule;
   }
   return new Proxy(nativeModule, {

package/lib/internal/nativeModuleWeb.js

@@ -10,11 +10,12 @@ export function getReactNativeModule(moduleName) {
   if (!nativeModule) {
     throw new Error(`Native module ${moduleName} is not registered.`);
   }
-  if (!global.RNFBDebug) {
+  if (!globalThis.RNFBDebug) {
     return nativeModule;
   }
   return new Proxy(nativeModule, {
     ownKeys(target) {
+      // FIXME - test in new arch context - I don't think Object.keys works
       return Object.keys(target);
     },
     get: (_, name) => {

package/lib/version.js

@@ -1,2 +1,2 @@
 // Generated by genversion.
-module.exports = '21.7.4';
+module.exports = '21.9.0';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-native-firebase/app",
-  "version": "21.7.4",
+  "version": "21.9.0",
   "author": "Invertase <oss@invertase.io> (http://invertase.io)",
   "description": "A well tested, feature rich Firebase implementation for React Native, supporting iOS & Android. Individual module support for Admob, Analytics, Auth, Crash Reporting, Cloud Firestore, Database, Dynamic Links, Functions, Messaging (FCM), Remote Config, Storage and more.",
   "main": "lib/index.js",
@@ -57,11 +57,11 @@
     "react-native": "*"
   },
   "dependencies": {
-    "firebase": "11.2.0"
+    "firebase": "11.3.0"
   },
   "devDependencies": {
     "@react-native-async-storage/async-storage": "^2.1.1",
-    "expo": "^52.0.30"
+    "expo": "^52.0.32"
   },
   "peerDependenciesMeta": {
     "expo": {
@@ -73,7 +73,7 @@
   },
   "sdkVersions": {
     "ios": {
-      "firebase": "11.7.0",
+      "firebase": "11.8.0",
       "iosTarget": "13.0",
       "macosTarget": "10.15",
       "tvosTarget": "13.0"
@@ -82,13 +82,13 @@
       "minSdk": 21,
       "targetSdk": 34,
       "compileSdk": 34,
-      "firebase": "33.8.0",
-      "firebaseCrashlyticsGradle": "3.0.2",
+      "firebase": "33.9.0",
+      "firebaseCrashlyticsGradle": "3.0.3",
       "firebasePerfGradle": "1.4.2",
       "gmsGoogleServicesGradle": "4.4.2",
       "playServicesAuth": "21.3.0",
-      "firebaseAppDistributionGradle": "5.1.0"
+      "firebaseAppDistributionGradle": "5.1.1"
     }
   },
-  "gitHead": "82c4c7391fee6597726e5363d78400f11a644e47"
+  "gitHead": "306d9c766ff5614fff6404be5c3dd4bcdb450754"
 }

package/plugin/build/ios/appDelegate.d.ts

@@ -1,5 +1,6 @@
 import { ConfigPlugin } from '@expo/config-plugins';
 import { AppDelegateProjectFile } from '@expo/config-plugins/build/ios/Paths';
 export declare function modifyObjcAppDelegate(contents: string): string;
+export declare function modifySwiftAppDelegate(contents: string): string;
 export declare function modifyAppDelegateAsync(appDelegateFileInfo: AppDelegateProjectFile): Promise<void>;
 export declare const withFirebaseAppDelegate: ConfigPlugin;

package/plugin/build/ios/appDelegate.js

@@ -5,17 +5,18 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.withFirebaseAppDelegate = void 0;
 exports.modifyObjcAppDelegate = modifyObjcAppDelegate;
+exports.modifySwiftAppDelegate = modifySwiftAppDelegate;
 exports.modifyAppDelegateAsync = modifyAppDelegateAsync;
 const config_plugins_1 = require("@expo/config-plugins");
 const generateCode_1 = require("@expo/config-plugins/build/utils/generateCode");
 const fs_1 = __importDefault(require("fs"));
-const methodInvocationBlock = `[FIRApp configure];`;
-// https://regex101.com/r/mPgaq6/1
-const methodInvocationLineMatcher = /(?:self\.moduleName\s*=\s*@\"([^"]*)\";)|(?:(self\.|_)(\w+)\s?=\s?\[\[UMModuleRegistryAdapter alloc\])|(?:RCTBridge\s?\*\s?(\w+)\s?=\s?\[(\[RCTBridge alloc\]|self\.reactDelegate))/g;
-// https://regex101.com/r/nHrTa9/1/
-// if the above regex fails, we can use this one as a fallback:
-const fallbackInvocationLineMatcher = /-\s*\(BOOL\)\s*application:\s*\(UIApplication\s*\*\s*\)\s*\w+\s+didFinishLaunchingWithOptions:/g;
 function modifyObjcAppDelegate(contents) {
+    const methodInvocationBlock = `[FIRApp configure];`;
+    // https://regex101.com/r/mPgaq6/1
+    const methodInvocationLineMatcher = /(?:self\.moduleName\s*=\s*@\"([^"]*)\";)|(?:(self\.|_)(\w+)\s?=\s?\[\[UMModuleRegistryAdapter alloc\])|(?:RCTBridge\s?\*\s?(\w+)\s?=\s?\[(\[RCTBridge alloc\]|self\.reactDelegate))/g;
+    // https://regex101.com/r/nHrTa9/1/
+    // if the above regex fails, we can use this one as a fallback:
+    const fallbackInvocationLineMatcher = /-\s*\(BOOL\)\s*application:\s*\(UIApplication\s*\*\s*\)\s*\w+\s+didFinishLaunchingWithOptions:/g;
     // Add import
     if (!contents.includes('#import <Firebase/Firebase.h>')) {
         contents = contents.replace(/#import "AppDelegate.h"/g, `#import "AppDelegate.h"
@@ -58,16 +59,49 @@ function modifyObjcAppDelegate(contents) {
         }).contents;
     }
 }
+function modifySwiftAppDelegate(contents) {
+    const methodInvocationBlock = `FirebaseApp.configure()`;
+    const methodInvocationLineMatcher = /(?:self\.moduleName\s*=\s*"([^"]*)")/g;
+    // Add import
+    if (!contents.includes('import FirebaseCore')) {
+        contents = contents.replace(/import ReactAppDependencyProvider/g, `import ReactAppDependencyProvider
+import FirebaseCore`);
+    }
+    // To avoid potential issues with existing changes from older plugin versions
+    if (contents.includes(methodInvocationBlock)) {
+        return contents;
+    }
+    if (!methodInvocationLineMatcher.test(contents)) {
+        config_plugins_1.WarningAggregator.addWarningIOS('@react-native-firebase/app', 'Unable to determine correct Firebase insertion point in AppDelegate.swift. Skipping Firebase addition.');
+        return contents;
+    }
+    // Add invocation
+    return (0, generateCode_1.mergeContents)({
+        tag: '@react-native-firebase/app-didFinishLaunchingWithOptions',
+        src: contents,
+        newSrc: methodInvocationBlock,
+        anchor: methodInvocationLineMatcher,
+        offset: 0, // new line will be inserted right above matched anchor
+        comment: '//',
+    }).contents;
+}
 async function modifyAppDelegateAsync(appDelegateFileInfo) {
     const { language, path, contents } = appDelegateFileInfo;
-    if (['objc', 'objcpp'].includes(language)) {
-        const newContents = modifyObjcAppDelegate(contents);
-        await fs_1.default.promises.writeFile(path, newContents);
-    }
-    else {
-        // TODO: Support Swift
-        throw new Error(`Cannot add Firebase code to AppDelegate of language "${language}"`);
+    let newContents = contents;
+    switch (language) {
+        case 'objc':
+        case 'objcpp': {
+            newContents = modifyObjcAppDelegate(contents);
+            break;
+        }
+        case 'swift': {
+            newContents = modifySwiftAppDelegate(contents);
+            break;
+        }
+        default:
+            throw new Error(`Cannot add Firebase code to AppDelegate of language "${language}"`);
     }
+    await fs_1.default.promises.writeFile(path, newContents);
 }
 const withFirebaseAppDelegate = config => {
     return (0, config_plugins_1.withDangerousMod)(config, [

package/plugin/src/ios/appDelegate.ts

@@ -3,17 +3,17 @@ import { AppDelegateProjectFile } from '@expo/config-plugins/build/ios/Paths';
 import { mergeContents } from '@expo/config-plugins/build/utils/generateCode';
 import fs from 'fs';
 
-const methodInvocationBlock = `[FIRApp configure];`;
-// https://regex101.com/r/mPgaq6/1
-const methodInvocationLineMatcher =
-  /(?:self\.moduleName\s*=\s*@\"([^"]*)\";)|(?:(self\.|_)(\w+)\s?=\s?\[\[UMModuleRegistryAdapter alloc\])|(?:RCTBridge\s?\*\s?(\w+)\s?=\s?\[(\[RCTBridge alloc\]|self\.reactDelegate))/g;
+export function modifyObjcAppDelegate(contents: string): string {
+  const methodInvocationBlock = `[FIRApp configure];`;
+  // https://regex101.com/r/mPgaq6/1
+  const methodInvocationLineMatcher =
+    /(?:self\.moduleName\s*=\s*@\"([^"]*)\";)|(?:(self\.|_)(\w+)\s?=\s?\[\[UMModuleRegistryAdapter alloc\])|(?:RCTBridge\s?\*\s?(\w+)\s?=\s?\[(\[RCTBridge alloc\]|self\.reactDelegate))/g;
 
-// https://regex101.com/r/nHrTa9/1/
-// if the above regex fails, we can use this one as a fallback:
-const fallbackInvocationLineMatcher =
-  /-\s*\(BOOL\)\s*application:\s*\(UIApplication\s*\*\s*\)\s*\w+\s+didFinishLaunchingWithOptions:/g;
+  // https://regex101.com/r/nHrTa9/1/
+  // if the above regex fails, we can use this one as a fallback:
+  const fallbackInvocationLineMatcher =
+    /-\s*\(BOOL\)\s*application:\s*\(UIApplication\s*\*\s*\)\s*\w+\s+didFinishLaunchingWithOptions:/g;
 
-export function modifyObjcAppDelegate(contents: string): string {
   // Add import
   if (!contents.includes('#import <Firebase/Firebase.h>')) {
     contents = contents.replace(
@@ -68,16 +68,63 @@ export function modifyObjcAppDelegate(contents: string): string {
   }
 }
 
+export function modifySwiftAppDelegate(contents: string): string {
+  const methodInvocationBlock = `FirebaseApp.configure()`;
+  const methodInvocationLineMatcher = /(?:self\.moduleName\s*=\s*"([^"]*)")/g;
+
+  // Add import
+  if (!contents.includes('import FirebaseCore')) {
+    contents = contents.replace(
+      /import ReactAppDependencyProvider/g,
+      `import ReactAppDependencyProvider
+import FirebaseCore`,
+    );
+  }
+
+  // To avoid potential issues with existing changes from older plugin versions
+  if (contents.includes(methodInvocationBlock)) {
+    return contents;
+  }
+
+  if (!methodInvocationLineMatcher.test(contents)) {
+    WarningAggregator.addWarningIOS(
+      '@react-native-firebase/app',
+      'Unable to determine correct Firebase insertion point in AppDelegate.swift. Skipping Firebase addition.',
+    );
+    return contents;
+  }
+
+  // Add invocation
+  return mergeContents({
+    tag: '@react-native-firebase/app-didFinishLaunchingWithOptions',
+    src: contents,
+    newSrc: methodInvocationBlock,
+    anchor: methodInvocationLineMatcher,
+    offset: 0, // new line will be inserted right above matched anchor
+    comment: '//',
+  }).contents;
+}
+
 export async function modifyAppDelegateAsync(appDelegateFileInfo: AppDelegateProjectFile) {
   const { language, path, contents } = appDelegateFileInfo;
 
-  if (['objc', 'objcpp'].includes(language)) {
-    const newContents = modifyObjcAppDelegate(contents);
-    await fs.promises.writeFile(path, newContents);
-  } else {
-    // TODO: Support Swift
-    throw new Error(`Cannot add Firebase code to AppDelegate of language "${language}"`);
+  let newContents = contents;
+
+  switch (language) {
+    case 'objc':
+    case 'objcpp': {
+      newContents = modifyObjcAppDelegate(contents);
+      break;
+    }
+    case 'swift': {
+      newContents = modifySwiftAppDelegate(contents);
+      break;
+    }
+    default:
+      throw new Error(`Cannot add Firebase code to AppDelegate of language "${language}"`);
   }
+
+  await fs.promises.writeFile(path, newContents);
 }
 
 export const withFirebaseAppDelegate: ConfigPlugin = config => {

package/plugin/tsconfig.tsbuildinfo

@@ -1 +1 @@
-{"root":["./src/index.ts","./src/android/applyPlugin.ts","./src/android/buildscriptDependency.ts","./src/android/constants.ts","./src/android/copyGoogleServices.ts","./src/android/index.ts","./src/ios/appDelegate.ts","./src/ios/googleServicesPlist.ts","./src/ios/index.ts"],"version":"5.7.3"}
+{"root":["./src/index.ts","./src/android/applyplugin.ts","./src/android/buildscriptdependency.ts","./src/android/constants.ts","./src/android/copygoogleservices.ts","./src/android/index.ts","./src/ios/appdelegate.ts","./src/ios/googleservicesplist.ts","./src/ios/index.ts"],"version":"5.7.3"}

package/__tests__/app.test.ts

@@ -1,96 +0,0 @@
-import { describe, expect, it, jest } from '@jest/globals';
-import { checkV9Deprecation } from '../lib/common/unitTestUtils';
-import firebase, {
-  deleteApp,
-  registerVersion,
-  onLog,
-  getApps,
-  initializeApp,
-  getApp,
-  setLogLevel,
-} from '../lib';
-
-describe('App', function () {
-  describe('modular', function () {
-    it('`deleteApp` function is properly exposed to end user', function () {
-      expect(deleteApp).toBeDefined();
-    });
-
-    it('`registerVersion` function is properly exposed to end user', function () {
-      expect(registerVersion).toBeDefined();
-    });
-
-    it('`onLog` function is properly exposed to end user', function () {
-      expect(onLog).toBeDefined();
-    });
-
-    it('`getApps` function is properly exposed to end user', function () {
-      expect(getApps).toBeDefined();
-    });
-
-    it('`initializeApp` function is properly exposed to end user', function () {
-      expect(initializeApp).toBeDefined();
-    });
-
-    it('`getApp` function is properly exposed to end user', function () {
-      expect(getApp).toBeDefined();
-    });
-
-    it('`setLogLevel` function is properly exposed to end user', function () {
-      expect(setLogLevel).toBeDefined();
-    });
-  });
-
-  describe('`console.warn` only called for non-modular API', function () {
-    it('deleteApp', function () {
-      // this test has a slightly special setup
-      // @ts-ignore test
-      jest.spyOn(getApp(), '_deleteApp').mockImplementation(() => Promise.resolve(null));
-      checkV9Deprecation(
-        () => {}, // no modular replacement
-        () => getApp().delete(), // modular getApp(), then non-modular to check
-      );
-    });
-
-    it('getApps', function () {
-      checkV9Deprecation(
-        () => getApps(),
-        () => firebase.apps,
-      );
-    });
-
-    it('getApp', function () {
-      checkV9Deprecation(
-        () => getApp(),
-        () => firebase.app(),
-      );
-    });
-
-    it('setLogLevel', function () {
-      checkV9Deprecation(
-        () => setLogLevel('debug'),
-        () => firebase.setLogLevel('debug'),
-      );
-    });
-
-    it('FirebaseApp.toString()', function () {
-      checkV9Deprecation(
-        () => {}, // no modular replacement
-        () => getApp().toString(), // modular getApp(), then non-modular to check
-      );
-    });
-
-    it('FirebaseApp.extendApp()', function () {
-      checkV9Deprecation(
-        // no modular replacement for this one so no modular func to send in
-        () => {},
-        // modular getApp(), then non-modular to check
-        () => {
-          const app = getApp();
-          (app as any).extendApp({ some: 'property' });
-          return;
-        },
-      );
-    });
-  });
-});