@react-native-firebase/app 14.8.0 → 14.8.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.8.1](https://github.com/invertase/react-native-firebase/compare/v14.8.0...v14.8.1) (2022-04-25)
+
+### Bug Fixes
+
+- **app, expo:** Support RN 0.68 Obj-C++ AppDelegate ([#6213](https://github.com/invertase/react-native-firebase/issues/6213)) ([6f2d7e1](https://github.com/invertase/react-native-firebase/commit/6f2d7e1608d04613b77461f9647802aa1058e6cc))
+
 # [14.8.0](https://github.com/invertase/react-native-firebase/compare/v14.7.0...v14.8.0) (2022-04-19)
 
 ### Features

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.8.0";
+  public static String VERSION = "14.8.1";
 }

package/ios/RNFBApp/RNFBVersion.m

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

package/lib/version.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-native-firebase/app",
-  "version": "14.8.0",
+  "version": "14.8.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",
@@ -56,7 +56,7 @@
     "react-native": "*"
   },
   "dependencies": {
-    "@expo/config-plugins": "^4.0.18",
+    "@expo/config-plugins": "^4.1.1",
     "opencollective-postinstall": "^2.0.1",
     "superstruct": "^0.6.2"
   },
@@ -79,5 +79,5 @@
       "playServicesAuth": "20.1.0"
     }
   },
-  "gitHead": "6b4ac1c0227719905dec4bf008f15366706cb465"
+  "gitHead": "c5975dfc18806965f0f603f20ed8fd5f037c4dbe"
 }

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

@@ -1,3 +1,5 @@
 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 modifyAppDelegateAsync(appDelegateFileInfo: AppDelegateProjectFile): Promise<void>;
 export declare const withFirebaseAppDelegate: ConfigPlugin;

package/plugin/build/ios/appDelegate.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.withFirebaseAppDelegate = exports.modifyObjcAppDelegate = void 0;
+exports.withFirebaseAppDelegate = exports.modifyAppDelegateAsync = exports.modifyObjcAppDelegate = void 0;
 const config_plugins_1 = require("@expo/config-plugins");
 const generateCode_1 = require("@expo/config-plugins/build/utils/generateCode");
 const fs_1 = __importDefault(require("fs"));
@@ -57,20 +57,24 @@ function modifyObjcAppDelegate(contents) {
     }
 }
 exports.modifyObjcAppDelegate = modifyObjcAppDelegate;
+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}"`);
+    }
+}
+exports.modifyAppDelegateAsync = modifyAppDelegateAsync;
 const withFirebaseAppDelegate = config => {
     return (0, config_plugins_1.withDangerousMod)(config, [
         'ios',
         async (config) => {
             const fileInfo = config_plugins_1.IOSConfig.Paths.getAppDelegate(config.modRequest.projectRoot);
-            let contents = await fs_1.default.promises.readFile(fileInfo.path, 'utf-8');
-            if (fileInfo.language === 'objc') {
-                contents = modifyObjcAppDelegate(contents);
-            }
-            else {
-                // TODO: Support Swift
-                throw new Error(`Cannot add Firebase code to AppDelegate of language "${fileInfo.language}"`);
-            }
-            await fs_1.default.promises.writeFile(fileInfo.path, contents);
+            await modifyAppDelegateAsync(fileInfo);
             return config;
         },
     ]);

package/plugin/src/ios/appDelegate.ts

@@ -1,4 +1,5 @@
 import { ConfigPlugin, IOSConfig, WarningAggregator, withDangerousMod } from '@expo/config-plugins';
+import { AppDelegateProjectFile } from '@expo/config-plugins/build/ios/Paths';
 import { mergeContents } from '@expo/config-plugins/build/utils/generateCode';
 import fs from 'fs';
 
@@ -67,22 +68,24 @@ export function modifyObjcAppDelegate(contents: string): string {
   }
 }
 
+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}"`);
+  }
+}
+
 export const withFirebaseAppDelegate: ConfigPlugin = config => {
   return withDangerousMod(config, [
     'ios',
     async config => {
       const fileInfo = IOSConfig.Paths.getAppDelegate(config.modRequest.projectRoot);
-      let contents = await fs.promises.readFile(fileInfo.path, 'utf-8');
-      if (fileInfo.language === 'objc') {
-        contents = modifyObjcAppDelegate(contents);
-      } else {
-        // TODO: Support Swift
-        throw new Error(
-          `Cannot add Firebase code to AppDelegate of language "${fileInfo.language}"`,
-        );
-      }
-      await fs.promises.writeFile(fileInfo.path, contents);
-
+      await modifyAppDelegateAsync(fileInfo);
       return config;
     },
   ]);