@bravemobile/react-native-code-push 12.1.2 → 12.1.5

package/README.md

@@ -10,6 +10,9 @@
 
 Supports React Native 0.74 ~ 0.82.
 
+> [!NOTE]
+> If you are using React Native 0.76 or lower, please use version `12.0.2` of this library.
+
 (Tested on the React Native CLI template apps)
 
 ### ✅ Requirements

package/android/app/proguard-rules.pro

@@ -20,17 +20,14 @@
 -keepclassmembers class com.facebook.react.ReactInstanceManager {
     private final ** mBundleLoader;
 }
--keepclassmembers class com.facebook.react.ReactDelegate {
-    private ** mReactHost; # bridgeless
-    public void reload(...); # RN 0.74 and above
-}
 # bridgeless
 -keepclassmembers class com.facebook.react.defaults.DefaultReactHostDelegate {
     private ** jsBundleLoader;
 }
 # bridgeless
 -keepclassmembers class com.facebook.react.runtime.ReactHostImpl {
-    private final ** mReactHostDelegate;
+    private final ** mReactHostDelegate; # RN < 0.81
+    private final ** reactHostDelegate; # RN 0.81+
 }
 
 # Can't find referenced class org.bouncycastle.**

package/android/app/src/main/java/com/microsoft/codepush/react/CodePushNativeModule.java

@@ -12,8 +12,8 @@ import androidx.annotation.OptIn;
 
 import com.facebook.react.ReactDelegate;
 import com.facebook.react.ReactHost;
-import com.facebook.react.ReactInstanceManager;
 import com.facebook.react.ReactActivity;
+import com.facebook.react.ReactInstanceManager;
 import com.facebook.react.ReactRootView;
 import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.JSBundleLoader;
@@ -126,7 +126,9 @@ public class CodePushNativeModule extends ReactContextBaseJavaModule {
 
             ReactHost reactHost = resolveReactHost();
             if (reactHost == null) {
+                CodePushUtils.log("Unable to resolve ReactHost");
                 // Bridge, Old Architecture
+                setJSBundleLoaderBridge(latestJSBundleLoader);
                 return;
             }
 
@@ -138,11 +140,27 @@ public class CodePushNativeModule extends ReactContextBaseJavaModule {
         }
     }
 
+    private void setJSBundleLoaderBridge(JSBundleLoader latestJSBundleLoader) throws NoSuchFieldException, IllegalAccessException {
+        ReactDelegate reactDelegate = resolveReactDelegate();
+        assert reactDelegate != null;
+        ReactInstanceManager instanceManager = reactDelegate.getReactInstanceManager();
+        Field bundleLoaderField = instanceManager.getClass().getDeclaredField("mBundleLoader");
+        bundleLoaderField.setAccessible(true);
+        bundleLoaderField.set(instanceManager, latestJSBundleLoader);
+    }
+
     @OptIn(markerClass = UnstableReactNativeAPI.class)
     private void setJSBundleLoaderBridgeless(ReactHost reactHost, JSBundleLoader latestJSBundleLoader) throws NoSuchFieldException, IllegalAccessException {
-        Field mReactHostDelegateField = reactHost.getClass().getDeclaredField("mReactHostDelegate");
-        mReactHostDelegateField.setAccessible(true);
-        ReactHostDelegate reactHostDelegate = (ReactHostDelegate) mReactHostDelegateField.get(reactHost);
+        Field reactHostDelegateField;
+        try {
+            // RN < 0.81
+            reactHostDelegateField = reactHost.getClass().getDeclaredField("mReactHostDelegate");
+        } catch (NoSuchFieldException e) {
+            // RN >= 0.81
+            reactHostDelegateField = reactHost.getClass().getDeclaredField("reactHostDelegate");
+        }
+        reactHostDelegateField.setAccessible(true);
+        ReactHostDelegate reactHostDelegate = (ReactHostDelegate) reactHostDelegateField.get(reactHost);
         assert reactHostDelegate != null;
         Field jsBundleLoaderField = reactHostDelegate.getClass().getDeclaredField("jsBundleLoader");
         jsBundleLoaderField.setAccessible(true);
@@ -216,16 +234,11 @@ public class CodePushNativeModule extends ReactContextBaseJavaModule {
     private ReactHost resolveReactHost() {
         ReactDelegate reactDelegate = resolveReactDelegate();
         if (reactDelegate == null) {
+            CodePushUtils.log("Unable to resolve ReactDelegate");
             return null;
         }
 
-        try {
-            Field reactHostField = reactDelegate.getClass().getDeclaredField("mReactHost");
-            reactHostField.setAccessible(true);
-            return (ReactHost) reactHostField.get(reactDelegate);
-        } catch (Exception e) {
-            return null;
-        }
+        return reactDelegate.getReactHost();
     }
 
     private void restartAppInternal(boolean onlyIfUpdateIsPending) {

package/cli/commands/initCommand/initAndroid.ts

@@ -44,7 +44,7 @@ export function modifyMainApplicationKt(mainApplicationContent: string) {
 }
 
 function addJsBundleFilePathArgument(mainApplicationContent: string) {
-    const packageListArgumentPattern = /(packageList\s*=\s*\n\s*PackageList\(this\)[\s\S]+?\},\s*\n)/;
+    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.');

package/cli/dist/commands/initCommand/initAndroid.js

@@ -34,7 +34,7 @@ export function modifyMainApplicationKt(mainApplicationContent) {
     throw new Error('Unsupported MainApplication.kt structure.');
 }
 function addJsBundleFilePathArgument(mainApplicationContent) {
-    const packageListArgumentPattern = /(packageList\s*=\s*\n\s*PackageList\(this\)[\s\S]+?\},\s*\n)/;
+    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;

package/expo/plugin/withCodePushAndroid.js

@@ -1,7 +1,7 @@
 const { withMainApplication, WarningAggregator } = require('expo/config-plugins');
 
 const IMPORT_CODE_PUSH = 'import com.microsoft.codepush.react.CodePush';
-const RN_082_MARKER = '  getDefaultReactHost(';
+const RN_082_MARKER = 'ExpoReactHostFactory.getDefaultReactHost(';
 const JS_BUNDLE_FILE_PATH_ARGUMENT = 'jsBundleFilePath = CodePush.getJSBundleFile()';
 
 function androidMainApplicationApplyImplementation(mainApplication, find, add, reverse = false) {
@@ -32,7 +32,7 @@ function addJsBundleFilePathArgument(mainApplication) {
     return mainApplication;
   }
 
-  const packageListArgumentPattern = /(packageList\s*=\s*\n\s*PackageList\(this\)[\s\S]+?\},\s*\n)/;
+  const packageListArgumentPattern = /(packageList\s*=\s*\n\s*PackageList\(this\)[\s\S]+?\},?\s*\n)/;
 
   if (!packageListArgumentPattern.test(mainApplication)) {
     WarningAggregator.addWarningAndroid(
@@ -68,10 +68,19 @@ const withAndroidMainApplicationDependency = (config) => {
       if (action.modResults.contents.includes(RN_082_MARKER)) {
         action.modResults.contents = addJsBundleFilePathArgument(action.modResults.contents);
       } else {
+        // https://github.com/Soomgo-Mobile/react-native-code-push/issues/97
+        const isExpoSDK54 = config.sdkVersion?.startsWith('54.') ?? false;
+        const addingCode = isExpoSDK54
+          ? '        override fun getJSBundleFile(): String {\n' +
+            '          CodePush.getInstance(applicationContext, BuildConfig.DEBUG)\n' +
+            '          return CodePush.getJSBundleFile()\n' +
+            '        }\n'
+          : '        override fun getJSBundleFile(): String = CodePush.getJSBundleFile()\n';
         action.modResults.contents = androidMainApplicationApplyImplementation(
           action.modResults.contents,
           'object : DefaultReactNativeHost(this) {',
-          '        override fun getJSBundleFile(): String = CodePush.getJSBundleFile()\n');
+          addingCode,
+        );
       }
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bravemobile/react-native-code-push",
-  "version": "12.1.2",
+  "version": "12.1.5",
   "description": "React Native plugin for the CodePush service",
   "main": "src/CodePush.js",
   "react-native": "src/CodePush.js",
@@ -69,7 +69,7 @@
     "prepack": "npm run build:cli",
     "publish": "npm publish --access=public",
     "eslint": "eslint --quiet .",
-    "jest": "jest src/versioning/* && npm run --workspace cli test"
+    "jest": "jest src/versioning/* expo/* && npm run --workspace cli test"
   },
   "repository": {
     "type": "git",