fix(Android): Support RN 0.82 (#95)

* fix(Android): app freezes when restarting in RN 0.82

deprecated ReactInstanceManager no longer needed on RN >= 0.74

* fix(Android): JS bundle file name incorrectly set to null (RN 0.82)

* remove(Android): legacy code doesn't work

* remove(Android): unused imports from CodePush.java

* remove(Android): code no longer used

* fix(CLI): tsc build failure

* fix(CLI): jest error while resolving js modules

```
    Cannot find module '../initIos.js' from 'commands/initCommand/test/initIos.test.ts'

    > 1 | import { modifyObjectiveCAppDelegate, modifySwiftAppDelegate } from "../initIos.js";
        | ^

```

```
    Cannot find module '../initAndroid.js' from 'commands/initCommand/test/initAndroid.test.ts'

      1 | import fs from "fs";
      2 | import path from "path";
    > 3 | import { initAndroid, modifyMainApplicationKt } from "../initAndroid.js";
        | ^

```

* remove(Android): code not used

* docs: update supported React Native version to 0.82

Author: floydkim

README.md

@@ -8,7 +8,7 @@
 
 ### 🚀 New Architecture support
 
-Supports React Native 0.74 ~ 0.81.
+Supports React Native 0.74 ~ 0.82.
 
 (Tested on the React Native CLI template apps)
 

android/app/src/main/java/com/microsoft/codepush/react/CodePush.java

@@ -5,22 +5,17 @@
 import android.content.pm.PackageManager;
 import android.content.res.Resources;
 
-import com.facebook.react.ReactInstanceManager;
 import com.facebook.react.ReactPackage;
 import com.facebook.react.bridge.JavaScriptModule;
 import com.facebook.react.bridge.NativeModule;
 import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.devsupport.interfaces.DevSupportManager;
-import com.facebook.react.modules.debug.interfaces.DeveloperSettings;
 import com.facebook.react.uimanager.ViewManager;
 
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
-import java.lang.reflect.Method;
 
 public class CodePush implements ReactPackage {
 
@@ -31,7 +26,7 @@ public class CodePush implements ReactPackage {
 
     private boolean mDidUpdate = false;
 
-    private String mAssetsBundleFileName;
+    private String mAssetsBundleFileName = CodePushConstants.DEFAULT_JS_BUNDLE_NAME;
 
     // Helper classes.
     private CodePushUpdateManager mUpdateManager;
@@ -47,7 +42,6 @@ public class CodePush implements ReactPackage {
 
     private static String mPublicKey;
 
-    private static ReactInstanceHolder mReactInstanceHolder;
     private static CodePush mCurrentInstance;
 
     public static String getServiceUrl() {
@@ -87,7 +81,6 @@ private CodePush(Context context, boolean isDebugMode) {
         String serverUrlFromStrings = getCustomPropertyFromStringsIfExist("ServerUrl");
         if (serverUrlFromStrings != null) mServerUrl = serverUrlFromStrings;
 
-        clearDebugCacheIfNeeded(null);
         initializeUpdateAfterRestart();
     }
 
@@ -128,39 +121,6 @@ private String getCustomPropertyFromStringsIfExist(String propertyName) {
         return null;
     }
 
-    private boolean isLiveReloadEnabled(ReactInstanceManager instanceManager) {
-        // Use instanceManager for checking if we use LiveReload mode. In this case we should not remove ReactNativeDevBundle.js file
-        // because we get error with trying to get this after reloading. Issue: https://github.com/microsoft/react-native-code-push/issues/1272
-        if (instanceManager != null) {
-            DevSupportManager devSupportManager = instanceManager.getDevSupportManager();
-            if (devSupportManager != null) {
-                DeveloperSettings devSettings = devSupportManager.getDevSettings();
-                Method[] methods = devSettings.getClass().getMethods();
-                for (Method m : methods) {
-                    if (m.getName().equals("isReloadOnJSChangeEnabled")) {
-                        try {
-                            return (boolean) m.invoke(devSettings);
-                        } catch (Exception x) {
-                            return false;
-                        }
-                    }
-                }
-            }
-        }
-
-        return false;
-    }
-
-    public void clearDebugCacheIfNeeded(ReactInstanceManager instanceManager) {
-        if (mIsDebugMode && mSettingsManager.isPendingUpdate(null) && !isLiveReloadEnabled(instanceManager)) {
-            // This needs to be kept in sync with https://github.com/facebook/react-native/blob/master/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManager.java#L78
-            File cachedDevBundle = new File(mContext.getFilesDir(), "ReactNativeDevBundle.js");
-            if (cachedDevBundle.exists()) {
-                cachedDevBundle.delete();
-            }
-        }
-    }
-
     public boolean didUpdate() {
         return mDidUpdate;
     }
@@ -368,17 +328,6 @@ public void clearUpdates() {
         mSettingsManager.removeFailedUpdates();
     }
 
-    public static void setReactInstanceHolder(ReactInstanceHolder reactInstanceHolder) {
-        mReactInstanceHolder = reactInstanceHolder;
-    }
-
-    static ReactInstanceManager getReactInstanceManager() {
-        if (mReactInstanceHolder == null) {
-            return null;
-        }
-        return mReactInstanceHolder.getReactInstanceManager();
-    }
-
     @Override
     public List<NativeModule> createNativeModules(ReactApplicationContext reactApplicationContext) {
         CodePushNativeModule codePushModule = new CodePushNativeModule(reactApplicationContext, this, mUpdateManager, mTelemetryManager, mSettingsManager);

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

@@ -10,7 +10,6 @@
 
 import androidx.annotation.OptIn;
 
-import com.facebook.react.ReactApplication;
 import com.facebook.react.ReactDelegate;
 import com.facebook.react.ReactHost;
 import com.facebook.react.ReactInstanceManager;
@@ -116,7 +115,7 @@ public void run() {
 
     // Use reflection to find and set the appropriate fields on ReactInstanceManager. See #556 for a proposal for a less brittle way
     // to approach this.
-    private void setJSBundle(ReactInstanceManager instanceManager, String latestJSBundleFile) throws IllegalAccessException {
+    private void setJSBundle(String latestJSBundleFile) throws IllegalAccessException {
         try {
             JSBundleLoader latestJSBundleLoader;
             if (latestJSBundleFile.toLowerCase().startsWith("assets://")) {
@@ -128,7 +127,6 @@ private void setJSBundle(ReactInstanceManager instanceManager, String latestJSBu
             ReactHost reactHost = resolveReactHost();
             if (reactHost == null) {
                 // Bridge, Old Architecture
-                setJSBundleLoaderBridge(instanceManager, latestJSBundleLoader);
                 return;
             }
 
@@ -140,12 +138,6 @@ private void setJSBundle(ReactInstanceManager instanceManager, String latestJSBu
         }
     }
 
-    private void setJSBundleLoaderBridge(ReactInstanceManager instanceManager, JSBundleLoader latestJSBundleLoader) throws NoSuchFieldException, IllegalAccessException {
-        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");
@@ -159,27 +151,14 @@ private void setJSBundleLoaderBridgeless(ReactHost reactHost, JSBundleLoader lat
 
     private void loadBundle() {
         clearLifecycleEventListener();
-        try {
-            mCodePush.clearDebugCacheIfNeeded(resolveInstanceManager());
-        } catch(Exception e) {
-            // If we got error in out reflection we should clear debug cache anyway.
-            mCodePush.clearDebugCacheIfNeeded(null);
-        }
 
         try {
-            // #1) Get the ReactInstanceManager instance, which is what includes the
-            //     logic to reload the current React context.
-            final ReactInstanceManager instanceManager = resolveInstanceManager();
-            if (instanceManager == null) {
-                return;
-            }
-
             String latestJSBundleFile = mCodePush.getJSBundleFileInternal(mCodePush.getAssetsBundleFileName());
 
-            // #2) Update the locally stored JS bundle file path
-            setJSBundle(instanceManager, latestJSBundleFile);
+            // #1) Update the locally stored JS bundle file path
+            setJSBundle(latestJSBundleFile);
 
-            // #3) Get the context creation method and fire it on the UI thread (which RN enforces)
+            // #2) Get the context creation method and fire it on the UI thread (which RN enforces)
             new Handler(Looper.getMainLooper()).post(new Runnable() {
                 @Override
                 public void run() {
@@ -249,24 +228,6 @@ private ReactHost resolveReactHost() {
         }
     }
 
-    // Use reflection to find the ReactInstanceManager. See #556 for a proposal for a less brittle way to approach this.
-    private ReactInstanceManager resolveInstanceManager() throws NoSuchFieldException, IllegalAccessException {
-        ReactInstanceManager instanceManager = CodePush.getReactInstanceManager();
-        if (instanceManager != null) {
-            return instanceManager;
-        }
-
-        final Activity currentActivity = getReactApplicationContext().getCurrentActivity();
-        if (currentActivity == null) {
-            return null;
-        }
-
-        ReactApplication reactApplication = (ReactApplication) currentActivity.getApplication();
-        instanceManager = reactApplication.getReactNativeHost().getReactInstanceManager();
-
-        return instanceManager;
-    }
-
     private void restartAppInternal(boolean onlyIfUpdateIsPending) {
         if (this._restartInProgress) {
             CodePushUtils.log("Restart request queued until the current restart is completed");

android/app/src/main/java/com/microsoft/codepush/react/ReactInstanceHolder.java

@@ -1,6 +1,6 @@
 import fs from "fs";
 import path from "path";
-import { initAndroid, modifyMainApplicationKt } from "../initAndroid.ts";
+import { initAndroid, modifyMainApplicationKt } from "../initAndroid.js";
 import { jest, expect, describe, it } from "@jest/globals";
 
 const tempDir = path.join(__dirname, 'temp');

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

@@ -1,4 +1,4 @@
-import { modifyObjectiveCAppDelegate, modifySwiftAppDelegate } from "../initIos.ts";
+import { modifyObjectiveCAppDelegate, modifySwiftAppDelegate } from "../initIos.js";
 import { expect, describe, it} from "@jest/globals";
 
 // https://github.com/react-native-community/template/blob/0.80.2/template/ios/HelloWorld/AppDelegate.swift

cli/commands/initCommand/test/initIos.test.ts

@@ -0,0 +1,11 @@
+/** @type {import('jest').Config} */
+module.exports = {
+  rootDir: __dirname,
+  testEnvironment: 'node',
+  // resolver: '<rootDir>/jest.resolver.cjs',
+  transform: {
+    '^.+\\.(t|j)s$': ['babel-jest', { configFile: '../babel.config.js' }],
+  },
+  moduleFileExtensions: ['ts', 'js'],
+  watchman: false,
+};

cli/jest.config.cjs

@@ -0,0 +1,17 @@
+module.exports = (request, options) => {
+  const defaultResolver = options.defaultResolver;
+
+  try {
+    return defaultResolver(request, options);
+  } catch (error) {
+    if (request.endsWith('.js') && error && error.code === 'MODULE_NOT_FOUND') {
+      const tsRequest = request.replace(/\.js$/, '.ts');
+      try {
+        return defaultResolver(tsRequest, options);
+      } catch {
+        throw error;
+      }
+    }
+    throw error;
+  }
+};

cli/jest.resolver.cjs

@@ -7,7 +7,8 @@
   "scripts": {
     "clean": "rm -rf dist",
     "build": "tsc -p tsconfig.json",
-    "typecheck": "tsc -p tsconfig.json --noEmit"
+    "typecheck": "tsc -p tsconfig.json --noEmit",
+    "test": "jest"
   },
   "dependencies": {
     "commander": "^12.1.0",

cli/package.json

@@ -12,8 +12,7 @@
     "esModuleInterop": true,
     "skipLibCheck": true,
     "strict": true,
-    "forceConsistentCasingInFileNames": true,
-    "allowImportingTsExtensions": true
+    "forceConsistentCasingInFileNames": true
   },
   "include": ["./**/*.ts"],
   "exclude": [