@bravemobile/react-native-code-push 12.3.1 → 12.3.2

package/README.md

@@ -8,7 +8,7 @@
 
 ### 🚀 New Architecture support
 
-Supports React Native 0.74 ~ 0.83.
+Supports React Native 0.74 ~ 0.84.
 
 > [!NOTE]
 > If you are using React Native 0.76 or lower, please use version `12.0.2` of this library.

package/android/app/proguard-rules.pro

@@ -25,6 +25,11 @@
     private ** jsBundleLoader;
 }
 # bridgeless
+-keepclassmembers class * extends com.facebook.react.runtime.ReactHostDelegate {
+    private ** jsBundleLoader;
+    private ** _jsBundleLoader;
+}
+# bridgeless
 -keepclassmembers class com.facebook.react.runtime.ReactHostImpl {
     private final ** mReactHostDelegate; # RN < 0.81
     private final ** reactHostDelegate; # RN 0.81+

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

@@ -151,18 +151,31 @@ public class CodePushNativeModule extends ReactContextBaseJavaModule {
 
     @OptIn(markerClass = UnstableReactNativeAPI.class)
     private void setJSBundleLoaderBridgeless(ReactHost reactHost, JSBundleLoader latestJSBundleLoader) throws NoSuchFieldException, IllegalAccessException {
-        Field reactHostDelegateField;
-        try {
-            // RN < 0.81
-            reactHostDelegateField = reactHost.getClass().getDeclaredField("mReactHostDelegate");
-        } catch (NoSuchFieldException e) {
+        // RN < 0.81
+        Field reactHostDelegateField = resolveDeclaredField(reactHost.getClass(), "mReactHostDelegate");
+        if (reactHostDelegateField == null) {
             // RN >= 0.81
-            reactHostDelegateField = reactHost.getClass().getDeclaredField("reactHostDelegate");
+            reactHostDelegateField = resolveDeclaredField(reactHost.getClass(), "reactHostDelegate");
+        }
+        if (reactHostDelegateField == null) {
+            throw new NoSuchFieldException("Unable to resolve ReactHostDelegate field.");
         }
+
         reactHostDelegateField.setAccessible(true);
         ReactHostDelegate reactHostDelegate = (ReactHostDelegate) reactHostDelegateField.get(reactHost);
         assert reactHostDelegate != null;
-        Field jsBundleLoaderField = reactHostDelegate.getClass().getDeclaredField("jsBundleLoader");
+
+        // Expo ReactHost delegate keeps this mutable backing field specifically
+        // so integrations can override the bundle loader at runtime.
+        Field jsBundleLoaderField = resolveDeclaredField(reactHostDelegate.getClass(), "_jsBundleLoader");
+        if (jsBundleLoaderField == null) {
+            // Fallback for non-Expo delegates.
+            jsBundleLoaderField = resolveDeclaredField(reactHostDelegate.getClass(), "jsBundleLoader");
+        }
+        if (jsBundleLoaderField == null) {
+            throw new NoSuchFieldException("Unable to resolve JSBundleLoader field.");
+        }
+
         jsBundleLoaderField.setAccessible(true);
         jsBundleLoaderField.set(reactHostDelegate, latestJSBundleLoader);
     }
@@ -234,13 +247,24 @@ public class CodePushNativeModule extends ReactContextBaseJavaModule {
     private ReactHost resolveReactHost() {
         ReactDelegate reactDelegate = resolveReactDelegate();
         if (reactDelegate == null) {
-            CodePushUtils.log("Unable to resolve ReactDelegate");
             return null;
         }
 
         return reactDelegate.getReactHost();
     }
 
+    private Field resolveDeclaredField(Class<?> targetClass, String fieldName) {
+        Class<?> cursor = targetClass;
+        while (cursor != null) {
+            try {
+                return cursor.getDeclaredField(fieldName);
+            } catch (NoSuchFieldException ignored) {
+                cursor = cursor.getSuperclass();
+            }
+        }
+        return null;
+    }
+
     private void restartAppInternal(boolean onlyIfUpdateIsPending) {
         if (this._restartInProgress) {
             CodePushUtils.log("Restart request queued until the current restart is completed");

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

@@ -149,11 +149,6 @@ public class CodePushUpdateUtils {
             try {
                 return CodePushUtils.getStringFromInputStream(context.getAssets().open(CodePushConstants.CODE_PUSH_OLD_HASH_FILE_NAME));
             } catch (IOException ex) {
-                if (!isDebugMode) {
-                    // Only print this message in "Release" mode. In "Debug", we may not have the
-                    // hash if the build skips bundling the files.
-                    CodePushUtils.log("Unable to get the hash of the binary's bundled resources - \"codepush.gradle\" may have not been added to the build definition.");
-                }
             }
             return null;
         }

package/expo/plugin/withCodePushAndroid.js

@@ -28,11 +28,9 @@ function androidMainApplicationApplyImplementation(mainApplication, find, add, r
 }
 
 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)/;
+  // Capture packageList block plus optional existing jsBundleFilePath line.
+  // This allows us to normalize comma placement before injecting the new argument.
+  const packageListArgumentPattern = /(packageList\s*=\s*\n\s*PackageList\(this\)[\s\S]+?\},?\s*\n)(\s*jsBundleFilePath\s*=\s*CodePush\.getJSBundleFile\(\),\s*\n)?/;
 
   if (!packageListArgumentPattern.test(mainApplication)) {
     WarningAggregator.addWarningAndroid(
@@ -47,12 +45,15 @@ function addJsBundleFilePathArgument(mainApplication) {
     return mainApplication;
   }
 
-  return mainApplication.replace(packageListArgumentPattern, (match) => {
-    if (match.includes('jsBundleFilePath')) {
-      return match;
-    }
-
-    return `${match}      ${JS_BUNDLE_FILE_PATH_ARGUMENT},\n`;
+  return mainApplication.replace(packageListArgumentPattern, (match, packageListArgument, existingJsBundleArgument) => {
+    const trimmedMatch = packageListArgument.replace(/\s+$/, '');
+    // Kotlin call args need a trailing comma before the next named argument.
+    const hasTrailingComma = /,\s*$/.test(trimmedMatch);
+    const packageListArgumentWithComma = hasTrailingComma ? trimmedMatch : `${trimmedMatch},`;
+    const jsBundleArgument = existingJsBundleArgument
+      ? existingJsBundleArgument.replace(/\s+$/, '')
+      : `      ${JS_BUNDLE_FILE_PATH_ARGUMENT},`;
+    return `${packageListArgumentWithComma}\n${jsBundleArgument}\n`;
   });
 }
 
@@ -64,10 +65,9 @@ const withAndroidMainApplicationDependency = (config) => {
       IMPORT_CODE_PUSH,
     );
 
-    if (!action.modResults.contents.includes('CodePush.getJSBundleFile()')) {
-      if (action.modResults.contents.includes(RN_082_MARKER)) {
-        action.modResults.contents = addJsBundleFilePathArgument(action.modResults.contents);
-      } else {
+    if (action.modResults.contents.includes(RN_082_MARKER)) {
+      action.modResults.contents = addJsBundleFilePathArgument(action.modResults.contents);
+    } else if (!action.modResults.contents.includes('CodePush.getJSBundleFile()')) {
         // https://github.com/Soomgo-Mobile/react-native-code-push/issues/97
         const isExpoSDK54 = config.sdkVersion?.startsWith('54.') ?? false;
         const addingCode = isExpoSDK54
@@ -81,7 +81,6 @@ const withAndroidMainApplicationDependency = (config) => {
           'object : DefaultReactNativeHost(this) {',
           addingCode,
         );
-      }
     }
 
     return action;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bravemobile/react-native-code-push",
-  "version": "12.3.1",
+  "version": "12.3.2",
   "description": "React Native plugin for the CodePush service",
   "main": "src/CodePush.js",
   "react-native": "src/CodePush.js",
@@ -52,24 +52,18 @@
   ],
   "scripts": {
     "setup": "npm install --quiet --no-progress",
-    "test": "npm run build:tests && npm run test:setup && npm run test:fast",
-    "test:android": "npm run build:tests && npm run test:setup:android && npm run test:fast:android",
-    "test:ios": "npm run build:tests && npm run test:setup:ios && npm run test:fast:ios",
-    "test:setup": "mocha --recursive bin/test --android --ios --setup",
-    "test:setup:android": "mocha --recursive bin/test --android --setup",
-    "test:setup:ios": "mocha --recursive bin/test --ios --setup",
-    "test:fast": "mocha --recursive bin/test --android --ios",
-    "test:fast:android": "mocha --recursive bin/test --android",
-    "test:fast:ios": "mocha --recursive bin/test --ios",
-    "test:debugger:android": "mocha --recursive --inspect-brk=0.0.0.0 bin/test --android",
-    "test:debugger:ios": "mocha --recursive --inspect-brk=0.0.0.0 bin/test --ios",
-    "tslint": "tslint -c tslint.json test/**/*.ts",
+    "setup-example-app": "ts-node --project scripts/setupExampleApp/tsconfig.json scripts/setupExampleApp/runSetupExampleApp.ts",
+    "setup-expo-example-app": "ts-node --project scripts/setupExampleApp/tsconfig.json scripts/setupExpoExampleApp/runSetupExpoExampleApp.ts",
     "type:cli": "npm run --workspace cli typecheck",
+    "type:scripts": "tsc --project scripts/tsconfig.json --noEmit",
+    "type:e2e": "tsc --project e2e/tsconfig.json --noEmit",
+    "typecheck": "npm run type:cli && npm run type:scripts && npm run type:e2e",
     "build:cli": "npm run --workspace cli clean && npm run --workspace cli build",
     "prepack": "npm run build:cli",
     "publish": "npm publish --access=public",
     "eslint": "eslint --quiet .",
-    "jest": "jest src/versioning/* expo/* && npm run --workspace cli test"
+    "jest": "jest src/versioning/* expo/* && npm run --workspace cli test",
+    "e2e": "ts-node --project e2e/tsconfig.json e2e/run.ts"
   },
   "repository": {
     "type": "git",
@@ -81,8 +75,8 @@
     "semver": "^7.3.5",
     "shelljs": "^0.10.0",
     "xcode": "^3.0.1",
-    "yazl": "^3.3.1",
-    "yauzl": "^3.2.0"
+    "yauzl": "^3.2.0",
+    "yazl": "^3.3.1"
   },
   "peerDependencies": {
     "expo": ">=50.0.0",
@@ -98,29 +92,18 @@
     "@babel/preset-env": "^7.26.0",
     "@babel/preset-typescript": "^7.27.1",
     "@eslint/js": "^9.13.0",
-    "@types/assert": "^1.5.2",
-    "@types/mkdirp": "^1.0.1",
-    "@types/mocha": "^9.0.0",
+    "@types/express": "^5.0.6",
     "@types/node": "^18.19.129",
-    "@types/q": "^1.5.4",
     "@types/semver": "^7.5.8",
     "@types/shelljs": "^0.8.15",
     "@types/yauzl": "^2.10.3",
-    "archiver": "latest",
     "babel-jest": "^29.7.0",
-    "body-parser": "latest",
-    "code-push-plugin-testing-framework": "file:./code-push-plugin-testing-framework",
     "eslint": "^9.13.0",
     "eslint-plugin-react": "^7.37.2",
     "express": "latest",
     "globals": "^15.11.0",
     "jest": "^29.7.0",
-    "mkdirp": "latest",
-    "mocha": "^9.2.0",
-    "q": "^1.5.1",
-    "slash": "^3.0.0",
     "ts-node": "^10.9.2",
-    "tslint": "^6.1.3",
     "typescript": "5.0.4",
     "typescript-eslint": "^8.11.0"
   },