fix(CLI): update init command and Expo plugin to support RN 0.82 MainApplication.kt (#99)

* fix(CLI): update init command to support RN 0.82 MainApplication.kt

* docs: update README.md with RN 0.82+ manual instructions for MainApplication.kt

* fix(CLI): update Expo plugin to support RN 0.82 MainApplication.kt

Author: floydkim

README.md

@@ -146,7 +146,28 @@ Then, edit `AppDelegate.swift` like below.
 
 #### Edit `MainApplication` Code
 
-**If you have `MainApplication.kt` (>= RN 0.73)**
+**(RN 0.82+) If you have `MainApplication.kt`**
+
+```diff
++ import com.microsoft.codepush.react.CodePush
+
+  class MainApplication : Application(), ReactApplication {
+    override val reactHost: ReactHost by lazy {
+      getDefaultReactHost(
+        context = applicationContext,
+        packageList =
+          PackageList(this).packages.apply {
+            // Packages that cannot be autolinked yet can be added manually here, for example:
+            // add(MyReactNativePackage())
+          },
++       jsBundleFilePath = CodePush.getJSBundleFile(),
+      )
+    }
+  // ...
+}
+```
+
+**(RN 0.73+) If you have `MainApplication.kt`**
 
 ```diff
 + import com.microsoft.codepush.react.CodePush
@@ -163,6 +184,7 @@ Then, edit `AppDelegate.swift` like below.
   }
 ```
 
+
 **Or if you have `MainApplication.java`**
 
 ```diff

cli/commands/initCommand/initAndroid.ts

@@ -2,14 +2,62 @@ import path from "path";
 import fs from "fs";
 import { EOL } from "os";
 
+const IMPORT_CODE_PUSH = 'import com.microsoft.codepush.react.CodePush';
+const RN_LEGACY_MARKER = 'object : DefaultReactNativeHost(this)';
+const RN_082_MARKER = '  getDefaultReactHost(';
+
 export function modifyMainApplicationKt(mainApplicationContent: string) {
-    if (mainApplicationContent.includes('CodePush.getJSBundleFile()')) {
+    const hasCodePushImport = mainApplicationContent.includes(IMPORT_CODE_PUSH);
+    const hasGetJSBundleFileFn = mainApplicationContent.includes('CodePush.getJSBundleFile()');
+
+    if (hasCodePushImport && hasGetJSBundleFileFn) {
         console.log('log: MainApplication.kt already has CodePush initialized.');
         return mainApplicationContent;
     }
-    return mainApplicationContent
-        .replace('import com.facebook.react.ReactApplication', `import com.facebook.react.ReactApplication${EOL}import com.microsoft.codepush.react.CodePush`)
-        .replace('override fun getJSMainModuleName(): String = "index"', `override fun getJSMainModuleName(): String = "index"${EOL}        override fun getJSBundleFile(): String = CodePush.getJSBundleFile()`)
+
+    let updatedContent = mainApplicationContent;
+
+    if (!hasCodePushImport) {
+        updatedContent = mainApplicationContent.replace('import com.facebook.react.ReactApplication', `import com.facebook.react.ReactApplication${EOL}${IMPORT_CODE_PUSH}`);
+    }
+
+    const isExtendingDefaultReactNativeHost = mainApplicationContent.includes(RN_LEGACY_MARKER);
+
+    // RN <0.82
+    if (isExtendingDefaultReactNativeHost) {
+        if (!hasGetJSBundleFileFn) {
+            updatedContent = updatedContent.replace('override fun getJSMainModuleName(): String = "index"', `override fun getJSMainModuleName(): String = "index"${EOL}        override fun getJSBundleFile(): String = CodePush.getJSBundleFile()`);
+        }
+        return updatedContent;
+    }
+
+    // RN 0.82+
+    const isUsingGetDefaultReactHost = mainApplicationContent.includes(RN_082_MARKER);
+    if (isUsingGetDefaultReactHost) {
+        if (!hasGetJSBundleFileFn) {
+            return addJsBundleFilePathArgument(updatedContent);
+        }
+        return updatedContent;
+    }
+
+    throw new Error('Unsupported MainApplication.kt structure.');
+}
+
+function addJsBundleFilePathArgument(mainApplicationContent: string) {
+    const packageListArgumentPattern = /(packageList\s*=\s*\n\s*PackageList\(this\)[\s\S]+?\},\s*\n)/;
+
+    if (!packageListArgumentPattern.test(mainApplicationContent)) {
+        console.log('log: Could not find packageList argument while updating MainApplication.kt.');
+        return mainApplicationContent;
+    }
+
+    return mainApplicationContent.replace(packageListArgumentPattern, (match) => {
+        if (match.includes('jsBundleFilePath')) {
+            return match;
+        }
+
+        return `${match}      jsBundleFilePath = CodePush.getJSBundleFile(),${EOL}`;
+    });
 }
 
 export async function initAndroid() {

cli/commands/initCommand/test/initAndroid.test.ts

@@ -47,13 +47,55 @@ class MainApplication : Application(), ReactApplication {
 }
 `;
 
+// https://github.com/react-native-community/template/blob/0.82.1/template/android/app/src/main/java/com/helloworld/MainApplication.kt
+const ktRN82Template = `
+package com.helloworld
+
+import android.app.Application
+import com.facebook.react.PackageList
+import com.facebook.react.ReactApplication
+import com.facebook.react.ReactHost
+import com.facebook.react.ReactNativeApplicationEntryPoint.loadReactNative
+import com.facebook.react.defaults.DefaultReactHost.getDefaultReactHost
+
+class MainApplication : Application(), ReactApplication {
+
+  override val reactHost: ReactHost by lazy {
+    getDefaultReactHost(
+      context = applicationContext,
+      packageList =
+        PackageList(this).packages.apply {
+          // Packages that cannot be autolinked yet can be added manually here, for example:
+          // add(MyReactNativePackage())
+        },
+    )
+  }
+
+  override fun onCreate() {
+    super.onCreate()
+    loadReactNative(this)
+  }
+}
+`;
+
 describe('Android init command', () => {
     it('should correctly modify Kotlin MainApplication content', () => {
         const modifiedContent = modifyMainApplicationKt(ktTemplate);
         expect(modifiedContent).toContain('import com.microsoft.codepush.react.CodePush');
         expect(modifiedContent).toContain('override fun getJSBundleFile(): String = CodePush.getJSBundleFile()');
     });
 
+    it('should insert jsBundleFilePath argument for RN 0.82 style MainApplication', () => {
+        const modifiedContent = modifyMainApplicationKt(ktRN82Template);
+
+        expect(modifiedContent).toContain('import com.microsoft.codepush.react.CodePush');
+        expect(modifiedContent).toContain('jsBundleFilePath = CodePush.getJSBundleFile()');
+
+        const packageListIndex = modifiedContent.indexOf('packageList =');
+        const jsBundleIndex = modifiedContent.indexOf('jsBundleFilePath = CodePush.getJSBundleFile()');
+        expect(jsBundleIndex).toBeGreaterThan(packageListIndex);
+    });
+
     it('should log a message and exit if MainApplication.java is found', async () => {
         const originalCwd = process.cwd();
 

expo/plugin/withCodePushAndroid.js

@@ -1,11 +1,10 @@
 const { withMainApplication, WarningAggregator } = require('expo/config-plugins');
 
-function androidMainApplicationApplyImplementation(
-  mainApplication,
-  find,
-  add,
-  reverse = false,
-) {
+const IMPORT_CODE_PUSH = 'import com.microsoft.codepush.react.CodePush';
+const RN_082_MARKER = '  getDefaultReactHost(';
+const JS_BUNDLE_FILE_PATH_ARGUMENT = 'jsBundleFilePath = CodePush.getJSBundleFile()';
+
+function androidMainApplicationApplyImplementation(mainApplication, find, add, reverse = false) {
   if (mainApplication.includes(add)) {
     return mainApplication;
   }
@@ -28,20 +27,54 @@ function androidMainApplicationApplyImplementation(
   return mainApplication;
 }
 
+function addJsBundleFilePathArgument(mainApplication) {
+  if (mainApplication.includes(JS_BUNDLE_FILE_PATH_ARGUMENT)) {
+    return mainApplication;
+  }
+
+  const packageListArgumentPattern = /(packageList\s*=\s*\n\s*PackageList\(this\)[\s\S]+?\},\s*\n)/;
+
+  if (!packageListArgumentPattern.test(mainApplication)) {
+    WarningAggregator.addWarningAndroid(
+      'withCodePushAndroid',
+      `
+      Failed to detect "packageList = PackageList(this)" block in MainApplication.kt.
+      Please add "jsBundleFilePath = CodePush.getJSBundleFile()" inside getDefaultReactHost arguments.
+
+      Android manual setup: https://github.com/Soomgo-Mobile/react-native-code-push#2-1-manual-setup
+      `,
+    );
+    return mainApplication;
+  }
+
+  return mainApplication.replace(packageListArgumentPattern, (match) => {
+    if (match.includes('jsBundleFilePath')) {
+      return match;
+    }
+
+    return `${match}      ${JS_BUNDLE_FILE_PATH_ARGUMENT},\n`;
+  });
+}
+
 const withAndroidMainApplicationDependency = (config) => {
   return withMainApplication(config, (action) => {
     action.modResults.contents = androidMainApplicationApplyImplementation(
       action.modResults.contents,
-      'class MainApplication : Application(), ReactApplication {',
-      'import com.microsoft.codepush.react.CodePush\n',
-      true,
+      'import com.facebook.react.ReactApplication',
+      IMPORT_CODE_PUSH,
     );
 
-    action.modResults.contents = androidMainApplicationApplyImplementation(
-      action.modResults.contents,
-      'object : DefaultReactNativeHost(this) {',
-      '          override fun getJSBundleFile(): String = CodePush.getJSBundleFile()\n',
-    );
+    if (!action.modResults.contents.includes('CodePush.getJSBundleFile()')) {
+      if (action.modResults.contents.includes(RN_082_MARKER)) {
+        action.modResults.contents = addJsBundleFilePathArgument(action.modResults.contents);
+      } else {
+        action.modResults.contents = androidMainApplicationApplyImplementation(
+          action.modResults.contents,
+          'object : DefaultReactNativeHost(this) {',
+          '        override fun getJSBundleFile(): String = CodePush.getJSBundleFile()\n');
+      }
+    }
+
     return action;
   });
 };