@react-native-firebase/app 14.0.0 → 14.0.1

package/CHANGELOG.md

@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [14.0.1](https://github.com/invertase/react-native-firebase/compare/v14.0.0...v14.0.1) (2021-12-15)
+
+### Bug Fixes
+
+- **app, expo:** Update AppDelegate config plugin for Expo SDK 44 ([#5940](https://github.com/invertase/react-native-firebase/issues/5940)) ([185756d](https://github.com/invertase/react-native-firebase/commit/185756df6de238aa8a018007cf6b2fa810cb6055))
+
 # [14.0.0](https://github.com/invertase/react-native-firebase/compare/v13.1.1...v14.0.0) (2021-12-14)
 
 **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 = "14.0.0";
+  public static String VERSION = "14.0.1";
 }

package/ios/RNFBApp/RNFBVersion.m

@@ -18,4 +18,4 @@
 #import "RCTVersion.h"
 
 // generated file - do not modify or commit
-NSString* const RNFBVersionString = @"14.0.0";
+NSString* const RNFBVersionString = @"14.0.1";

package/lib/version.js

@@ -1,2 +1,2 @@
 // generated by genversion
-module.exports = '14.0.0';
+module.exports = '14.0.1';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-native-firebase/app",
-  "version": "14.0.0",
+  "version": "14.0.1",
   "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",
@@ -79,5 +79,5 @@
       "playServicesAuth": "20.0.0"
     }
   },
-  "gitHead": "fcf375a763004967f94da70940d9f1aad591ef7a"
+  "gitHead": "c2f5b82e487ba3c05e10ccafaa8cc09b43cb5811"
 }

package/plugin/build/ios/appDelegate.js

@@ -8,8 +8,11 @@ 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/Imm3E8/1
-const methodInvocationLineMatcher = /(?:(self\.|_)(\w+)\s?=\s?\[\[UMModuleRegistryAdapter alloc\])|(?:RCTBridge\s?\*\s?(\w+)\s?=\s?\[\[RCTBridge alloc\])/g;
+// https://regex101.com/r/mPgaq6/1
+const methodInvocationLineMatcher = /(?:(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) {
     // Add import
     if (!contents.includes('@import Firebase;')) {
@@ -20,15 +23,38 @@ function modifyObjcAppDelegate(contents) {
     if (contents.includes(methodInvocationBlock)) {
         return contents;
     }
+    if (!methodInvocationLineMatcher.test(contents) &&
+        !fallbackInvocationLineMatcher.test(contents)) {
+        config_plugins_1.WarningAggregator.addWarningIOS('@react-native-firebase/app', 'Unable to determine correct Firebase insertion point in AppDelegate.m. 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,
-        comment: '//',
-    }).contents;
+    try {
+        return (0, generateCode_1.mergeContents)({
+            tag: '@react-native-firebase/app-didFinishLaunchingWithOptions',
+            src: contents,
+            newSrc: methodInvocationBlock,
+            anchor: methodInvocationLineMatcher,
+            offset: 0,
+            comment: '//',
+        }).contents;
+    }
+    catch (e) {
+        // tests if the opening `{` is in the new line
+        const multilineMatcher = new RegExp(fallbackInvocationLineMatcher.source + '.+\\n*{');
+        const isHeaderMultiline = multilineMatcher.test(contents);
+        // we fallback to another regex if the first one fails
+        return (0, generateCode_1.mergeContents)({
+            tag: '@react-native-firebase/app-didFinishLaunchingWithOptions-fallback',
+            src: contents,
+            newSrc: methodInvocationBlock,
+            anchor: fallbackInvocationLineMatcher,
+            // new line will be inserted right below matched anchor
+            // or two lines, if the `{` is in the new line
+            offset: isHeaderMultiline ? 2 : 1,
+            comment: '//',
+        }).contents;
+    }
 }
 exports.modifyObjcAppDelegate = modifyObjcAppDelegate;
 const withFirebaseAppDelegate = config => {

package/plugin/src/ios/appDelegate.ts

@@ -1,11 +1,16 @@
-import { ConfigPlugin, IOSConfig, withDangerousMod } from '@expo/config-plugins';
+import { ConfigPlugin, IOSConfig, WarningAggregator, withDangerousMod } from '@expo/config-plugins';
 import { mergeContents } from '@expo/config-plugins/build/utils/generateCode';
 import fs from 'fs';
 
 const methodInvocationBlock = `[FIRApp configure];`;
-// https://regex101.com/r/Imm3E8/1
+// https://regex101.com/r/mPgaq6/1
 const methodInvocationLineMatcher =
-  /(?:(self\.|_)(\w+)\s?=\s?\[\[UMModuleRegistryAdapter alloc\])|(?:RCTBridge\s?\*\s?(\w+)\s?=\s?\[\[RCTBridge alloc\])/g;
+  /(?:(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;
 
 export function modifyObjcAppDelegate(contents: string): string {
   // Add import
@@ -22,15 +27,44 @@ export function modifyObjcAppDelegate(contents: string): string {
     return contents;
   }
 
+  if (
+    !methodInvocationLineMatcher.test(contents) &&
+    !fallbackInvocationLineMatcher.test(contents)
+  ) {
+    WarningAggregator.addWarningIOS(
+      '@react-native-firebase/app',
+      'Unable to determine correct Firebase insertion point in AppDelegate.m. 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 before matched anchor
-    comment: '//',
-  }).contents;
+  try {
+    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;
+  } catch (e: any) {
+    // tests if the opening `{` is in the new line
+    const multilineMatcher = new RegExp(fallbackInvocationLineMatcher.source + '.+\\n*{');
+    const isHeaderMultiline = multilineMatcher.test(contents);
+
+    // we fallback to another regex if the first one fails
+    return mergeContents({
+      tag: '@react-native-firebase/app-didFinishLaunchingWithOptions-fallback',
+      src: contents,
+      newSrc: methodInvocationBlock,
+      anchor: fallbackInvocationLineMatcher,
+      // new line will be inserted right below matched anchor
+      // or two lines, if the `{` is in the new line
+      offset: isHeaderMultiline ? 2 : 1,
+      comment: '//',
+    }).contents;
+  }
 }
 
 export const withFirebaseAppDelegate: ConfigPlugin = config => {