@react-native-firebase/app 12.9.1 → 12.9.2

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.
 
+## [12.9.2](https://github.com/invertase/react-native-firebase/compare/v12.9.1...v12.9.2) (2021-10-17)
+
+### Bug Fixes
+
+- **app, expo:** update iOS `AppDelegate` plugin to work with Expo SDK 43 ([#5796](https://github.com/invertase/react-native-firebase/issues/5796)) ([d67c3b9](https://github.com/invertase/react-native-firebase/commit/d67c3b906d1bb6d858269efba8b597891faf8772))
+
 ## [12.9.1](https://github.com/invertase/react-native-firebase/compare/v12.9.0...v12.9.1) (2021-10-10)
 
 ### Bug Fixes

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 = "12.9.1";
+  public static String VERSION = "12.9.2";
 }

package/ios/RNFBApp/RNFBVersion.m

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

package/lib/version.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-native-firebase/app",
-  "version": "12.9.1",
+  "version": "12.9.2",
   "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": "19.2.0"
     }
   },
-  "gitHead": "6fdca258a2b1849ad92c2a0c3669b37c705ab4e3"
+  "gitHead": "6f435cf294f3d7e0876cff4dda415b1c9bfe6099"
 }

package/plugin/build/ios/appDelegate.js

@@ -5,21 +5,30 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.withFirebaseAppDelegate = 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"));
 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;
 function modifyObjcAppDelegate(contents) {
     // Add import
     if (!contents.includes('@import Firebase;')) {
         contents = contents.replace(/#import "AppDelegate.h"/g, `#import "AppDelegate.h"
 @import Firebase;`);
     }
-    // Add invocation
-    if (!contents.includes(methodInvocationBlock)) {
-        // self.moduleRegistryAdapter = [[UMModuleRegistryAdapter alloc]
-        contents = contents.replace(/self\.moduleRegistryAdapter = \[\[UMModuleRegistryAdapter alloc\]/g, `${methodInvocationBlock}
-  self.moduleRegistryAdapter = [[UMModuleRegistryAdapter alloc]`);
+    // To avoid potential issues with existing changes from older plugin versions
+    if (contents.includes(methodInvocationBlock)) {
+        return contents;
     }
-    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;
 }
 exports.modifyObjcAppDelegate = modifyObjcAppDelegate;
 const withFirebaseAppDelegate = config => {

package/plugin/src/android/applyPlugin.ts

@@ -0,0 +1,30 @@
+import { ConfigPlugin, WarningAggregator, withAppBuildGradle } from '@expo/config-plugins';
+
+import { googleServicesPlugin } from './constants';
+
+/**
+ * Update `app/build.gradle` by applying google-services plugin
+ */
+export const withApplyGoogleServicesPlugin: ConfigPlugin = config => {
+  return withAppBuildGradle(config, config => {
+    if (config.modResults.language === 'groovy') {
+      config.modResults.contents = applyPlugin(config.modResults.contents);
+    } else {
+      WarningAggregator.addWarningAndroid(
+        'react-native-firebase-app',
+        `Cannot automatically configure app build.gradle if it's not groovy`,
+      );
+    }
+    return config;
+  });
+};
+
+export function applyPlugin(appBuildGradle: string) {
+  // Make sure the project does not have the plugin already
+  const pattern = new RegExp(`apply\\s+plugin:\\s+['"]${googleServicesPlugin}['"]`);
+  if (!appBuildGradle.match(pattern)) {
+    return appBuildGradle + `\napply plugin: '${googleServicesPlugin}'`;
+  }
+
+  return appBuildGradle;
+}

package/plugin/src/android/buildscriptDependency.ts

@@ -0,0 +1,33 @@
+import { ConfigPlugin, WarningAggregator, withProjectBuildGradle } from '@expo/config-plugins';
+
+import { googleServicesClassPath, googleServicesVersion } from './constants';
+
+/**
+ * Update `<project>/build.gradle` by adding google-services dependency to buildscript
+ */
+export const withBuildscriptDependency: ConfigPlugin = config => {
+  return withProjectBuildGradle(config, config => {
+    if (config.modResults.language === 'groovy') {
+      config.modResults.contents = setBuildscriptDependency(config.modResults.contents);
+    } else {
+      WarningAggregator.addWarningAndroid(
+        'react-native-firebase-app',
+        `Cannot automatically configure project build.gradle if it's not groovy`,
+      );
+    }
+    return config;
+  });
+};
+
+export function setBuildscriptDependency(buildGradle: string) {
+  if (!buildGradle.includes(googleServicesClassPath)) {
+    // TODO: Find a more stable solution for this
+    return buildGradle.replace(
+      /dependencies\s?{/,
+      `dependencies {
+        classpath '${googleServicesClassPath}:${googleServicesVersion}'`,
+    );
+  } else {
+    return buildGradle;
+  }
+}

package/plugin/src/android/constants.ts

@@ -0,0 +1,7 @@
+const appPackageJson = require('@react-native-firebase/app/package.json');
+
+export const DEFAULT_TARGET_PATH = 'app/google-services.json';
+
+export const googleServicesClassPath = 'com.google.gms:google-services';
+export const googleServicesPlugin = 'com.google.gms.google-services';
+export const googleServicesVersion = appPackageJson.sdkVersions.android.gmsGoogleServicesGradle;

package/plugin/src/android/copyGoogleServices.ts

@@ -0,0 +1,36 @@
+import { ConfigPlugin, withDangerousMod } from '@expo/config-plugins';
+
+import { DEFAULT_TARGET_PATH } from './constants';
+import path from 'path';
+import fs from 'fs';
+
+/**
+ * Copy `google-services.json`
+ */
+export const withCopyAndroidGoogleServices: ConfigPlugin = config => {
+  return withDangerousMod(config, [
+    'android',
+    async config => {
+      if (!config.android?.googleServicesFile) {
+        throw new Error(
+          'Path to google-services.json is not defined. Please specify the `expo.android.googleServicesFile` field in app.json.',
+        );
+      }
+
+      const srcPath = path.resolve(
+        config.modRequest.projectRoot,
+        config.android.googleServicesFile,
+      );
+      const destPath = path.resolve(config.modRequest.platformProjectRoot, DEFAULT_TARGET_PATH);
+
+      try {
+        await fs.promises.copyFile(srcPath, destPath);
+      } catch (e) {
+        throw new Error(
+          `Cannot copy google-services.json, because the file ${srcPath} doesn't exist. Please provide a valid path in \`app.json\`.`,
+        );
+      }
+      return config;
+    },
+  ]);
+};

package/plugin/src/android/index.ts

@@ -0,0 +1,5 @@
+import { withApplyGoogleServicesPlugin } from './applyPlugin';
+import { withBuildscriptDependency } from './buildscriptDependency';
+import { withCopyAndroidGoogleServices } from './copyGoogleServices';
+
+export { withBuildscriptDependency, withApplyGoogleServicesPlugin, withCopyAndroidGoogleServices };

package/plugin/src/index.ts

@@ -0,0 +1,27 @@
+import { ConfigPlugin, withPlugins, createRunOncePlugin } from '@expo/config-plugins';
+
+import {
+  withApplyGoogleServicesPlugin,
+  withBuildscriptDependency,
+  withCopyAndroidGoogleServices,
+} from './android';
+import { withFirebaseAppDelegate, withIosGoogleServicesFile } from './ios';
+
+/**
+ * A config plugin for configuring `@react-native-firebase/app`
+ */
+const withRnFirebaseApp: ConfigPlugin = config => {
+  return withPlugins(config, [
+    // iOS
+    withFirebaseAppDelegate,
+    withIosGoogleServicesFile,
+
+    // Android
+    withBuildscriptDependency,
+    withApplyGoogleServicesPlugin,
+    withCopyAndroidGoogleServices,
+  ]);
+};
+
+const pak = require('@react-native-firebase/app/package.json');
+export default createRunOncePlugin(withRnFirebaseApp, pak.name, pak.version);

package/plugin/src/ios/appDelegate.ts

@@ -0,0 +1,55 @@
+import { ConfigPlugin, IOSConfig, 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
+const methodInvocationLineMatcher =
+  /(?:(self\.|_)(\w+)\s?=\s?\[\[UMModuleRegistryAdapter alloc\])|(?:RCTBridge\s?\*\s?(\w+)\s?=\s?\[\[RCTBridge alloc\])/g;
+
+export function modifyObjcAppDelegate(contents: string): string {
+  // Add import
+  if (!contents.includes('@import Firebase;')) {
+    contents = contents.replace(
+      /#import "AppDelegate.h"/g,
+      `#import "AppDelegate.h"
+@import Firebase;`,
+    );
+  }
+
+  // To avoid potential issues with existing changes from older plugin versions
+  if (contents.includes(methodInvocationBlock)) {
+    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;
+}
+
+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);
+
+      return config;
+    },
+  ]);
+};

package/plugin/src/ios/googleServicesPlist.ts

@@ -0,0 +1,55 @@
+import { ConfigPlugin, IOSConfig, withXcodeProject, XcodeProject } from '@expo/config-plugins';
+import fs from 'fs';
+import path from 'path';
+
+export const withIosGoogleServicesFile: ConfigPlugin = config => {
+  return withXcodeProject(config, config => {
+    if (!config.ios?.googleServicesFile) {
+      throw new Error(
+        'Path to GoogleService-Info.plist is not defined. Please specify the `expo.ios.googleServicesFile` field in app.json.',
+      );
+    }
+
+    config.modResults = setGoogleServicesFile({
+      projectRoot: config.modRequest.projectRoot,
+      project: config.modResults,
+      googleServicesFileRelativePath: config.ios.googleServicesFile,
+    });
+    return config;
+  });
+};
+
+export function setGoogleServicesFile({
+  projectRoot,
+  project,
+  googleServicesFileRelativePath,
+}: {
+  project: XcodeProject;
+  projectRoot: string;
+  googleServicesFileRelativePath: string;
+}): XcodeProject {
+  const googleServiceFilePath = path.resolve(projectRoot, googleServicesFileRelativePath);
+
+  if (!fs.existsSync(googleServiceFilePath)) {
+    throw new Error(
+      `GoogleService-Info.plist doesn't exist in ${googleServiceFilePath}. Place it there or configure the path in app.json`,
+    );
+  }
+
+  fs.copyFileSync(
+    googleServiceFilePath,
+    path.join(IOSConfig.Paths.getSourceRoot(projectRoot), 'GoogleService-Info.plist'),
+  );
+
+  const projectName = IOSConfig.XcodeUtils.getProjectName(projectRoot);
+  const plistFilePath = `${projectName}/GoogleService-Info.plist`;
+  if (!project.hasFile(plistFilePath)) {
+    project = IOSConfig.XcodeUtils.addResourceFileToGroup({
+      filepath: plistFilePath,
+      groupName: projectName,
+      project,
+      isBuildFile: true,
+    });
+  }
+  return project;
+}

package/plugin/src/ios/index.ts

@@ -0,0 +1,4 @@
+import { withFirebaseAppDelegate } from './appDelegate';
+import { withIosGoogleServicesFile } from './googleServicesPlist';
+
+export { withIosGoogleServicesFile, withFirebaseAppDelegate };

package/plugin/tsconfig.json

@@ -0,0 +1,9 @@
+{
+  "extends": "@tsconfig/node12/tsconfig.json",
+  "compilerOptions": {
+    "outDir": "build",
+    "rootDir": "src",
+    "declaration": true
+  },
+  "include": ["./src"]
+}