expo-dev-launcher 5.0.15 → 5.0.16

package/CHANGELOG.md

@@ -10,6 +10,12 @@
 
 ### 💡 Others
 
+## 5.0.16 — 2024-11-22
+
+### 💡 Others
+
+- Fixed compatibility for React Native 0.77. ([#33081](https://github.com/expo/expo/pull/33081) by [@kudo](https://github.com/kudo))
+
 ## 5.0.15 — 2024-11-19
 
 _This version does not introduce any user-facing changes._

package/android/build.gradle

@@ -17,7 +17,7 @@ android {
   namespace "expo.modules.devlauncher"
   defaultConfig {
     versionCode 9
-    versionName "5.0.15"
+    versionName "5.0.16"
   }
 
   buildTypes {
@@ -35,15 +35,21 @@ android {
     def rnVersion = getRNVersion()
     main {
       java {
-        if (rnVersion >= versionToNumber(0, 74, 0)) {
-          srcDirs += "src/react-native-74/main"
+        if (rnVersion >= versionToNumber(0, 77, 0)) {
+          srcDirs += "src/rn77/main"
+        } else if (rnVersion >= versionToNumber(0, 74, 0)) {
+          // TODO(kudo,20241112): Remove this when we drop react-native 0.76 support
+          srcDirs += "src/rn74/main"
         }
       }
     }
     debug {
       java {
-        if (rnVersion >= versionToNumber(0, 74, 0)) {
-          srcDirs += "src/react-native-74/debug"
+        if (rnVersion >= versionToNumber(0, 77, 0)) {
+          srcDirs += "src/rn77/debug"
+        } else if (rnVersion >= versionToNumber(0, 74, 0)) {
+          // TODO(kudo,20241112): Remove this when we drop react-native 0.76 support
+          srcDirs += "src/rn74/debug"
         }
       }
     }

package/android/src/debug/java/expo/modules/devlauncher/DevLauncherPackageDelegate.kt

@@ -17,7 +17,7 @@ import expo.modules.devlauncher.modules.DevLauncherModule
 import expo.modules.devlauncher.modules.DevLauncherAuth
 import expo.modules.core.interfaces.ReactNativeHostHandler
 import expo.modules.devlauncher.modules.DevLauncherDevMenuExtension
-import expo.modules.devlauncher.rncompatibility.DevLauncherReactNativeHostHandler
+import expo.modules.devlauncher.react.DevLauncherReactNativeHostHandler
 import expo.modules.updatesinterface.UpdatesControllerRegistry
 import java.lang.ref.WeakReference
 

package/android/src/debug/java/expo/modules/devlauncher/helpers/DevLauncherReactUtils.kt

@@ -19,9 +19,9 @@ import com.facebook.react.runtime.ReactHostDelegate
 import com.facebook.react.runtime.ReactHostImpl
 import expo.interfaces.devmenu.ReactHostWrapper
 import expo.modules.devlauncher.launcher.DevLauncherControllerInterface
+import expo.modules.devlauncher.react.DevLauncherBridgeDevSupportManager
+import expo.modules.devlauncher.react.DevLauncherBridgelessDevSupportManager
 import expo.modules.devlauncher.react.DevLauncherDevSupportManagerSwapper
-import expo.modules.devlauncher.rncompatibility.DevLauncherBridgeDevSupportManager
-import expo.modules.devlauncher.rncompatibility.DevLauncherBridgelessDevSupportManager
 import expo.modules.devmenu.DevMenuManager
 import expo.modules.devmenu.helpers.setPrivateDeclaredFieldValue
 import okhttp3.HttpUrl

package/android/src/{react-native-74/debug/expo/modules/devlauncher/rncompatibility → debug/java/expo/modules/devlauncher/react}/DevLauncherBridgeDevSupportManager.kt

@@ -1,4 +1,4 @@
-package expo.modules.devlauncher.rncompatibility
+package expo.modules.devlauncher.react
 
 import android.content.Context
 import android.util.Log

package/android/src/{react-native-74/debug/expo/modules/devlauncher/rncompatibility → debug/java/expo/modules/devlauncher/react}/DevLauncherReactNativeHostHandler.kt

@@ -1,4 +1,4 @@
-package expo.modules.devlauncher.rncompatibility
+package expo.modules.devlauncher.react
 
 import android.content.Context
 import com.facebook.hermes.reactexecutor.HermesExecutorFactory

package/android/src/{react-native-74/debug/expo/modules/devlauncher/rncompatibility → rn74/debug/expo/modules/devlauncher/react}/DevLauncherBridgelessDevSupportManager.kt

@@ -1,4 +1,4 @@
-package expo.modules.devlauncher.rncompatibility
+package expo.modules.devlauncher.react
 
 import android.content.Context
 import android.util.Log

package/android/src/{react-native-74/debug/expo/modules/devlauncher/rncompatibility → rn74/debug/expo/modules/devlauncher/react}/DevLauncherDevSupportManagerFactory.kt

@@ -1,4 +1,4 @@
-package expo.modules.devlauncher.rncompatibility
+package expo.modules.devlauncher.react
 
 import android.content.Context
 import com.facebook.react.common.SurfaceDelegateFactory

package/android/src/{debug/java → rn74/debug}/expo/modules/devlauncher/react/DevLauncherDevSupportManagerSwapper.kt

@@ -16,8 +16,8 @@ import expo.modules.devlauncher.helpers.getProtectedFieldValue
 import expo.modules.devlauncher.helpers.setProtectedDeclaredField
 import expo.modules.devlauncher.koin.DevLauncherKoinComponent
 import expo.modules.devlauncher.launcher.DevLauncherControllerInterface
-import expo.modules.devlauncher.rncompatibility.DevLauncherBridgeDevSupportManager
-import expo.modules.devlauncher.rncompatibility.DevLauncherBridgelessDevSupportManager
+import expo.modules.devlauncher.react.DevLauncherBridgeDevSupportManager
+import expo.modules.devlauncher.react.DevLauncherBridgelessDevSupportManager
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import org.koin.core.component.inject

package/android/src/rn77/debug/expo/modules/devlauncher/react/DevLauncherBridgelessDevSupportManager.kt

@@ -0,0 +1,84 @@
+package expo.modules.devlauncher.react
+
+import android.content.Context
+import android.util.Log
+import com.facebook.react.devsupport.NonFinalBridgelessDevSupportManager
+import com.facebook.react.devsupport.ReactInstanceDevHelper
+import com.facebook.react.devsupport.interfaces.DevBundleDownloadListener
+import com.facebook.react.devsupport.interfaces.RedBoxHandler
+import com.facebook.react.packagerconnection.RequestHandler
+import expo.modules.devlauncher.DevLauncherController
+import expo.modules.devlauncher.helpers.injectDevServerHelper
+import expo.modules.devlauncher.koin.DevLauncherKoinComponent
+import expo.modules.devlauncher.koin.optInject
+import expo.modules.devlauncher.launcher.DevLauncherControllerInterface
+import expo.modules.devlauncher.launcher.errors.DevLauncherAppError
+import expo.modules.devlauncher.launcher.errors.DevLauncherErrorActivity
+
+class DevLauncherBridgelessDevSupportManager(
+  applicationContext: Context,
+  reactInstanceDevHelper: ReactInstanceDevHelper,
+  packagerPathForJSBundleName: String?,
+  enableOnCreate: Boolean,
+  redBoxHandler: RedBoxHandler?,
+  devBundleDownloadListener: DevBundleDownloadListener?,
+  minNumShakes: Int,
+  customPackagerCommandHandlers: MutableMap<String, RequestHandler>?
+) : NonFinalBridgelessDevSupportManager(
+  applicationContext,
+  reactInstanceDevHelper,
+  packagerPathForJSBundleName,
+  enableOnCreate,
+  redBoxHandler,
+  devBundleDownloadListener,
+  minNumShakes,
+  customPackagerCommandHandlers,
+  null,
+  null,
+  null
+), DevLauncherKoinComponent {
+  private val controller: DevLauncherControllerInterface? by optInject()
+
+  init {
+    injectDevServerHelper(applicationContext, this, controller)
+  }
+
+  @Suppress("INAPPLICABLE_JVM_NAME")
+  @get:JvmName("getjSBundleURLForRemoteDebugging")
+  override val jSBundleURLForRemoteDebugging: String? = super.getJSBundleURLForRemoteDebugging()
+
+  override fun showNewJavaError(message: String?, e: Throwable?) {
+    Log.e("DevLauncher", "$message", e)
+    if (!DevLauncherController.wasInitialized()) {
+      Log.e("DevLauncher", "DevLauncher wasn't initialized. Couldn't intercept native error handling.")
+      super.showNewJavaError(message, e)
+      return
+    }
+
+    val activity = reactInstanceDevHelper?.currentActivity
+    if (activity == null || activity.isFinishing || activity.isDestroyed) {
+      return
+    }
+
+    controller?.onAppLoadedWithError()
+    DevLauncherErrorActivity.showError(activity, DevLauncherAppError(message, e))
+  }
+
+  override fun getUniqueTag() = "DevLauncherApp-Bridgeless"
+
+  override fun startInspector() {
+    // no-op for the default `startInspector` which would be implicitly called
+    // right after `ReactInstanceManager` construction.
+    // For dev-launcher, we should inject the correct dev server address and
+    // call our customized `startInspectorWhenDevLauncherReady`.
+    // Check `DevLauncherReactUtils.injectReactInterceptor()` for details.
+  }
+
+  fun startInspectorWhenDevLauncherReady() {
+    super.startInspector()
+  }
+
+  companion object {
+    fun getDevHelperInternalFieldName() = "mReactInstanceDevHelper"
+  }
+}

package/android/src/rn77/debug/expo/modules/devlauncher/react/DevLauncherDevSupportManagerFactory.kt

@@ -0,0 +1,75 @@
+package expo.modules.devlauncher.react
+
+import android.content.Context
+import com.facebook.react.common.SurfaceDelegateFactory
+import com.facebook.react.devsupport.DevSupportManagerFactory
+import com.facebook.react.devsupport.ReleaseDevSupportManager
+import com.facebook.react.devsupport.ReactInstanceDevHelper
+import com.facebook.react.devsupport.interfaces.DevBundleDownloadListener
+import com.facebook.react.devsupport.interfaces.DevLoadingViewManager
+import com.facebook.react.devsupport.interfaces.DevSupportManager
+import com.facebook.react.devsupport.interfaces.PausedInDebuggerOverlayManager
+import com.facebook.react.devsupport.interfaces.RedBoxHandler
+import com.facebook.react.packagerconnection.RequestHandler
+
+class DevLauncherDevSupportManagerFactory : DevSupportManagerFactory {
+
+  override fun create(
+    applicationContext: Context,
+    reactInstanceDevHelper: ReactInstanceDevHelper,
+    packagerPathForJSBundleName: String?,
+    enableOnCreate: Boolean,
+    redBoxHandler: RedBoxHandler?,
+    devBundleDownloadListener: DevBundleDownloadListener?,
+    minNumShakes: Int,
+    customPackagerCommandHandlers: Map<String, RequestHandler>?,
+    surfaceDelegateFactory: SurfaceDelegateFactory?,
+    devLoadingViewManager: DevLoadingViewManager?,
+    pausedInDebuggerOverlayManager: PausedInDebuggerOverlayManager?
+  ): DevSupportManager {
+    return if (!enableOnCreate) {
+      ReleaseDevSupportManager()
+    } else {
+      DevLauncherBridgeDevSupportManager(
+        applicationContext,
+        reactInstanceDevHelper,
+        packagerPathForJSBundleName,
+        enableOnCreate,
+        redBoxHandler,
+        devBundleDownloadListener,
+        minNumShakes,
+        customPackagerCommandHandlers?.toMutableMap()
+      )
+    }
+  }
+
+  override fun create(
+    applicationContext: Context,
+    reactInstanceDevHelper: ReactInstanceDevHelper,
+    packagerPathForJSBundleName: String?,
+    enableOnCreate: Boolean,
+    redBoxHandler: RedBoxHandler?,
+    devBundleDownloadListener: DevBundleDownloadListener?,
+    minNumShakes: Int,
+    customPackagerCommandHandlers: Map<String, RequestHandler>?,
+    surfaceDelegateFactory: SurfaceDelegateFactory?,
+    devLoadingViewManager: DevLoadingViewManager?,
+    pausedInDebuggerOverlayManager: PausedInDebuggerOverlayManager?,
+    useDevSupport: Boolean
+  ): DevSupportManager {
+    return if (!useDevSupport) {
+      ReleaseDevSupportManager()
+    } else {
+      DevLauncherBridgelessDevSupportManager(
+        applicationContext,
+        reactInstanceDevHelper,
+        packagerPathForJSBundleName,
+        enableOnCreate,
+        redBoxHandler,
+        devBundleDownloadListener,
+        minNumShakes,
+        customPackagerCommandHandlers?.toMutableMap()
+      )
+    }
+  }
+}

package/android/src/rn77/debug/expo/modules/devlauncher/react/DevLauncherDevSupportManagerSwapper.kt

@@ -0,0 +1,179 @@
+package expo.modules.devlauncher.react
+
+import android.util.Log
+import com.facebook.react.ReactHost
+import com.facebook.react.ReactInstanceManager
+import com.facebook.react.ReactNativeHost
+import com.facebook.react.common.ShakeDetector
+import com.facebook.react.devsupport.DevServerHelper
+import com.facebook.react.devsupport.DevSupportManagerBase
+import com.facebook.react.devsupport.ReleaseDevSupportManager
+import com.facebook.react.devsupport.interfaces.DevSupportManager
+import com.facebook.react.packagerconnection.JSPackagerClient
+import com.facebook.react.runtime.ReactHostImpl
+import expo.interfaces.devmenu.ReactHostWrapper
+import expo.modules.devlauncher.helpers.getProtectedFieldValue
+import expo.modules.devlauncher.helpers.setProtectedDeclaredField
+import expo.modules.devlauncher.koin.DevLauncherKoinComponent
+import expo.modules.devlauncher.launcher.DevLauncherControllerInterface
+import expo.modules.devlauncher.react.DevLauncherBridgeDevSupportManager
+import expo.modules.devlauncher.react.DevLauncherBridgelessDevSupportManager
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
+import org.koin.core.component.inject
+
+internal class DevLauncherDevSupportManagerSwapper : DevLauncherKoinComponent {
+  private val controller: DevLauncherControllerInterface by inject()
+
+  fun swapDevSupportManagerImpl(reactHost: ReactHostWrapper) {
+    if (reactHost.isBridgelessMode) {
+      swapDevSupportManagerImpl(reactHost.reactHost)
+    } else {
+      swapDevSupportManagerImpl(reactHost.reactNativeHost)
+    }
+  }
+
+  private fun swapDevSupportManagerImpl(reactNativeHost: ReactNativeHost) {
+    val reactInstanceManager = reactNativeHost.reactInstanceManager
+    val currentDevSupportManager = reactInstanceManager.devSupportManager
+    if (currentDevSupportManager is DevLauncherBridgeDevSupportManager) {
+      // DevSupportManager was swapped by the DevLauncherReactNativeHostHandler
+      return
+    }
+    if (currentDevSupportManager is ReleaseDevSupportManager) {
+      Log.i("DevLauncher", "DevSupportManager is disabled. So we don't want to override it.")
+      return
+    }
+
+    try {
+      val devManagerClass = DevSupportManagerBase::class.java
+      val newDevSupportManager = createDevLauncherBridgeDevSupportManager(devManagerClass, currentDevSupportManager)
+
+      ReactInstanceManager::class.java.setProtectedDeclaredField(reactInstanceManager, "mDevSupportManager", newDevSupportManager)
+
+      closeExistingConnection(devManagerClass, currentDevSupportManager)
+    } catch (e: Exception) {
+      Log.i("DevLauncher", "Couldn't inject `DevLauncherDevSupportManager`.", e)
+    }
+  }
+
+  private fun swapDevSupportManagerImpl(reactHost: ReactHost) {
+    val currentDevSupportManager = requireNotNull(reactHost.devSupportManager)
+    if (currentDevSupportManager is DevLauncherBridgelessDevSupportManager) {
+      // DevSupportManager was swapped by the DevLauncherReactNativeHostHandler
+      return
+    }
+    if (currentDevSupportManager is ReleaseDevSupportManager) {
+      Log.i("DevLauncher", "DevSupportManager is disabled. So we don't want to override it.")
+      return
+    }
+
+    try {
+      val devManagerClass = DevSupportManagerBase::class.java
+      val newDevSupportManager = createDevLauncherBridgelessDevSupportManager(
+        devManagerClass,
+        currentDevSupportManager
+      )
+
+      ReactHostImpl::class.java.setProtectedDeclaredField(reactHost, "mDevSupportManager", newDevSupportManager)
+
+      closeExistingConnection(devManagerClass, currentDevSupportManager)
+    } catch (e: Exception) {
+      Log.i("DevLauncher", "Couldn't inject `DevLauncherDevSupportManager`.", e)
+    }
+  }
+
+  private fun createDevLauncherBridgeDevSupportManager(
+    devManagerClass: Class<*>,
+    currentDevSupportManager: DevSupportManager
+  ): DevLauncherBridgeDevSupportManager {
+    return DevLauncherBridgeDevSupportManager(
+      applicationContext = devManagerClass.getProtectedFieldValue(currentDevSupportManager, "mApplicationContext"),
+      reactInstanceDevHelper = devManagerClass.getProtectedFieldValue(currentDevSupportManager, DevLauncherBridgeDevSupportManager.getDevHelperInternalFieldName()),
+      packagerPathForJSBundleName = devManagerClass.getProtectedFieldValue(currentDevSupportManager, "mJSAppBundleName"),
+      enableOnCreate = true,
+      redBoxHandler = devManagerClass.getProtectedFieldValue(currentDevSupportManager, "mRedBoxHandler"),
+      devBundleDownloadListener = devManagerClass.getProtectedFieldValue(currentDevSupportManager, "mBundleDownloadListener"),
+      minNumShakes = 1,
+      customPackagerCommandHandlers = devManagerClass.getProtectedFieldValue(currentDevSupportManager, "mCustomPackagerCommandHandlers")
+    )
+  }
+
+  private fun createDevLauncherBridgelessDevSupportManager(
+    devManagerClass: Class<*>,
+    currentDevSupportManager: DevSupportManager
+  ): DevLauncherBridgelessDevSupportManager {
+    return DevLauncherBridgelessDevSupportManager(
+      applicationContext = devManagerClass.getProtectedFieldValue(currentDevSupportManager, "mApplicationContext"),
+      reactInstanceDevHelper = devManagerClass.getProtectedFieldValue(currentDevSupportManager, DevLauncherBridgeDevSupportManager.getDevHelperInternalFieldName()),
+      packagerPathForJSBundleName = devManagerClass.getProtectedFieldValue(currentDevSupportManager, "mJSAppBundleName"),
+      enableOnCreate = true,
+      redBoxHandler = devManagerClass.getProtectedFieldValue(currentDevSupportManager, "mRedBoxHandler"),
+      devBundleDownloadListener = devManagerClass.getProtectedFieldValue(currentDevSupportManager, "mBundleDownloadListener"),
+      minNumShakes = 1,
+      customPackagerCommandHandlers = devManagerClass.getProtectedFieldValue(currentDevSupportManager, "mCustomPackagerCommandHandlers")
+    )
+  }
+
+  /**
+   * We need to invalidate the old packager connection.
+   * However, this connection is established in the background
+   * and we don't know when it will be available (see [DevServerHelper.openPackagerConnection]).
+   * So we just wait for connection and then we kill it.
+   */
+  private fun closeExistingConnection(devManagerClass: Class<*>, devSupportManager: DevSupportManager) {
+    controller.coroutineScope.launch {
+      try {
+        while (true) {
+          // Invalidate shake detector - not doing that leads to memory leaks
+          tryToStopShakeDetector(devSupportManager)
+
+          val devServerHelper: DevServerHelper = devManagerClass.getProtectedFieldValue(
+            devSupportManager,
+            "mDevServerHelper"
+          )
+
+          try {
+            val packagerConnectionLock: Boolean = DevServerHelper::class.java.getProtectedFieldValue(
+              devServerHelper,
+              "mPackagerConnectionLock"
+            )
+
+            if (!packagerConnectionLock) {
+              devServerHelper.closePackagerConnection()
+              return@launch
+            }
+          } catch (_: NoSuchFieldException) {
+            // mPackagerConnectionLock was removed from the React Native in v0.63.4
+            val packagerClient: JSPackagerClient? = DevServerHelper::class.java.getProtectedFieldValue(
+              devServerHelper,
+              "mPackagerClient"
+            )
+
+            if (packagerClient != null) {
+              devServerHelper.closePackagerConnection()
+              return@launch
+            }
+          }
+
+          delay(50)
+        }
+      } catch (e: Exception) {
+        Log.w("DevLauncher", "Couldn't close the packager connection: ${e.message}", e)
+      }
+    }
+  }
+
+  private fun tryToStopShakeDetector(currentDevSupportManager: DevSupportManager) {
+    try {
+      val shakeDetector: ShakeDetector =
+        DevSupportManagerBase::class.java.getProtectedFieldValue(
+          currentDevSupportManager,
+          "mShakeDetector"
+        )
+      shakeDetector.stop()
+    } catch (e: Exception) {
+      Log.w("DevLauncher", "Couldn't stop shake detector.", e)
+    }
+  }
+}

package/android/src/rn77/main/com/facebook/react/devsupport/NonFinalBridgeDevSupportManager.java

@@ -0,0 +1,202 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+package com.facebook.react.devsupport;
+
+import android.content.Context;
+import androidx.annotation.Nullable;
+import com.facebook.common.logging.FLog;
+import com.facebook.debug.holder.PrinterHolder;
+import com.facebook.debug.tags.ReactDebugOverlayTags;
+import com.facebook.infer.annotation.Assertions;
+import com.facebook.react.bridge.CatalystInstance;
+import com.facebook.react.bridge.JSBundleLoader;
+import com.facebook.react.bridge.JavaJSExecutor;
+import com.facebook.react.bridge.ReactMarker;
+import com.facebook.react.bridge.ReactMarkerConstants;
+import com.facebook.react.bridge.UiThreadUtil;
+import com.facebook.react.common.ReactConstants;
+import com.facebook.react.common.SurfaceDelegateFactory;
+import com.facebook.react.common.futures.SimpleSettableFuture;
+import com.facebook.react.devsupport.interfaces.DevBundleDownloadListener;
+import com.facebook.react.devsupport.interfaces.DevLoadingViewManager;
+import com.facebook.react.devsupport.interfaces.DevSplitBundleCallback;
+import com.facebook.react.devsupport.interfaces.PausedInDebuggerOverlayManager;
+import com.facebook.react.devsupport.interfaces.RedBoxHandler;
+import com.facebook.react.packagerconnection.RequestHandler;
+import java.io.IOException;
+import java.util.Map;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
+//
+// Expo: This is a copy of react-native's {@link com.facebook.react.devsupport.BridgeDevSupportManager}
+// just removing the "final" modifier that we can inherit and reuse.
+// From time to time for react-native upgrade, just follow the steps to update the code
+//   1. Copy the contents from BridgeDevSupportManager to this file.
+//   2. Rename the class to NonFinalBridgeDevSupportManager.
+//   3. Remove the "final" modifier.
+//   4. Revert the comment
+//
+
+/**
+ * Interface for accessing and interacting with development features. Following features
+ * are supported through this manager class:
+ * 1) Displaying JS errors (aka RedBox)
+ * 2) Displaying developers menu (Reload JS, Debug JS)
+ * 3) Communication with developer server in order to download updated JS bundle
+ * 4) Starting/stopping broadcast receiver for js reload signals
+ * 5) Starting/stopping motion sensor listener that recognize shake gestures which in turn may
+ *    trigger developers menu.
+ * 6) Launching developers settings view
+ *
+ * This class automatically monitors the state of registered views and activities to which they are
+ * bound to make sure that we don't display overlay or that we we don't listen for sensor events
+ * when app is backgrounded.
+ *
+ * {@link com.facebook.react.ReactInstanceManager} implementation is responsible for instantiating
+ * this class as well as for populating with a reference to {@link CatalystInstance} whenever
+ * instance manager recreates it (through {@link #onNewReactContextCreated). Also, instance manager
+ * is responsible for enabling/disabling dev support in case when app is backgrounded or when all
+ * the views has been detached from the instance (through {@link #setDevSupportEnabled} method).
+ */
+public class NonFinalBridgeDevSupportManager extends DevSupportManagerBase {
+    private boolean mIsSamplingProfilerEnabled = false;
+
+    public NonFinalBridgeDevSupportManager(
+            Context applicationContext,
+            ReactInstanceDevHelper reactInstanceManagerHelper,
+            @Nullable String packagerPathForJSBundleName,
+            boolean enableOnCreate,
+            @Nullable RedBoxHandler redBoxHandler,
+            @Nullable DevBundleDownloadListener devBundleDownloadListener,
+            int minNumShakes,
+            @Nullable Map<String, RequestHandler> customPackagerCommandHandlers,
+            @Nullable SurfaceDelegateFactory surfaceDelegateFactory,
+            @Nullable DevLoadingViewManager devLoadingViewManager,
+            @Nullable PausedInDebuggerOverlayManager pausedInDebuggerOverlayManager) {
+        super(
+                applicationContext,
+                reactInstanceManagerHelper,
+                packagerPathForJSBundleName,
+                enableOnCreate,
+                redBoxHandler,
+                devBundleDownloadListener,
+                minNumShakes,
+                customPackagerCommandHandlers,
+                surfaceDelegateFactory,
+                devLoadingViewManager,
+                pausedInDebuggerOverlayManager);
+    }
+
+    @Override
+    protected String getUniqueTag() {
+        return "Bridge";
+    }
+
+    @Override
+    public void loadSplitBundleFromServer(
+            final String bundlePath, final DevSplitBundleCallback callback) {
+        fetchSplitBundleAndCreateBundleLoader(
+                bundlePath,
+                new CallbackWithBundleLoader() {
+                    @Override
+                    public void onSuccess(JSBundleLoader bundleLoader) {
+                        bundleLoader.loadScript(getCurrentReactContext().getCatalystInstance());
+                        getCurrentReactContext()
+                                .getJSModule(HMRClient.class)
+                                .registerBundle(getDevServerHelper().getDevServerSplitBundleURL(bundlePath));
+                        callback.onSuccess();
+                    }
+
+                    @Override
+                    public void onError(String url, Throwable cause) {
+                        callback.onError(url, cause);
+                    }
+                });
+    }
+
+    private WebsocketJavaScriptExecutor.JSExecutorConnectCallback getExecutorConnectCallback(
+            final SimpleSettableFuture<Boolean> future) {
+        return new WebsocketJavaScriptExecutor.JSExecutorConnectCallback() {
+            @Override
+            public void onSuccess() {
+                future.set(true);
+                hideDevLoadingView();
+            }
+
+            @Override
+            public void onFailure(final Throwable cause) {
+                hideDevLoadingView();
+                FLog.e(ReactConstants.TAG, "Failed to connect to debugger!", cause);
+                future.setException(
+                        new IOException(
+                                getApplicationContext().getString(com.facebook.react.R.string.catalyst_debug_error),
+                                cause));
+            }
+        };
+    }
+
+    private void reloadJSInProxyMode() {
+        // When using js proxy, there is no need to fetch JS bundle as proxy executor will do that
+        // anyway
+        getDevServerHelper().launchJSDevtools();
+
+        JavaJSExecutor.Factory factory =
+                new JavaJSExecutor.Factory() {
+                    @Override
+                    public JavaJSExecutor create() throws Exception {
+                        WebsocketJavaScriptExecutor executor = new WebsocketJavaScriptExecutor();
+                        SimpleSettableFuture<Boolean> future = new SimpleSettableFuture<>();
+                        executor.connect(
+                                getDevServerHelper().getWebsocketProxyURL(), getExecutorConnectCallback(future));
+                        // TODO(t9349129) Don't use timeout
+                        try {
+                            future.get(90, TimeUnit.SECONDS);
+                            return executor;
+                        } catch (ExecutionException e) {
+                            throw (Exception) e.getCause();
+                        } catch (InterruptedException | TimeoutException e) {
+                            throw new RuntimeException(e);
+                        }
+                    }
+                };
+        getReactInstanceDevHelper().onReloadWithJSDebugger(factory);
+    }
+
+    @Override
+    public void handleReloadJS() {
+
+        UiThreadUtil.assertOnUiThread();
+
+        ReactMarker.logMarker(
+                ReactMarkerConstants.RELOAD,
+                getDevSettings().getPackagerConnectionSettings().getDebugServerHost());
+
+        // dismiss redbox if exists
+        hideRedboxDialog();
+
+        if (getDevSettings().isRemoteJSDebugEnabled()) {
+            PrinterHolder.getPrinter()
+                    .logMessage(ReactDebugOverlayTags.RN_CORE, "RNCore: load from Proxy");
+            showDevLoadingViewForRemoteJSEnabled();
+            reloadJSInProxyMode();
+        } else {
+            PrinterHolder.getPrinter()
+                    .logMessage(ReactDebugOverlayTags.RN_CORE, "RNCore: load from Server");
+            String bundleURL =
+                    getDevServerHelper()
+                            .getDevServerBundleURL(Assertions.assertNotNull(getJSAppBundleName()));
+            reloadJSFromServer(
+                    bundleURL,
+                    () ->
+                            UiThreadUtil.runOnUiThread(
+                                    () -> getReactInstanceDevHelper().onJSBundleLoadedFromServer()));
+        }
+    }
+}

package/android/src/rn77/main/com/facebook/react/devsupport/NonFinalBridgelessDevSupportManager.java

@@ -0,0 +1,134 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+package com.facebook.react.devsupport;
+
+import android.content.Context;
+import androidx.annotation.Nullable;
+import com.facebook.infer.annotation.Nullsafe;
+import com.facebook.react.bridge.JSBundleLoader;
+import com.facebook.react.bridge.ReactContext;
+import com.facebook.react.bridge.UiThreadUtil;
+import com.facebook.react.common.SurfaceDelegateFactory;
+import com.facebook.react.devsupport.interfaces.DevBundleDownloadListener;
+import com.facebook.react.devsupport.interfaces.DevLoadingViewManager;
+import com.facebook.react.devsupport.interfaces.DevSplitBundleCallback;
+import com.facebook.react.devsupport.interfaces.PausedInDebuggerOverlayManager;
+import com.facebook.react.devsupport.interfaces.RedBoxHandler;
+import com.facebook.react.packagerconnection.RequestHandler;
+import java.util.Map;
+
+//
+// Expo: This is a copy of react-native's {@link com.facebook.react.devsupport.BridgelessDevSupportManager}
+// just removing the "final" modifier that we can inherit and reuse.
+// From time to time for react-native upgrade, just follow the steps to update the code
+//   1. Copy the contents from BridgelessDevSupportManager to this file.
+//   2. Rename the class to NonFinalBridgelessDevSupportManager.
+//   3. Add "public" modifier
+//   4. Revert the comment
+//
+
+/**
+ * An implementation of {@link com.facebook.react.devsupport.interfaces.DevSupportManager} that
+ * extends the functionality in {@link DevSupportManagerBase} with some additional, more flexible
+ * APIs for asynchronously loading the JS bundle.
+ */
+@Nullsafe(Nullsafe.Mode.LOCAL)
+public class NonFinalBridgelessDevSupportManager extends DevSupportManagerBase {
+
+    public NonFinalBridgelessDevSupportManager(
+            Context context,
+            ReactInstanceDevHelper reactInstanceManagerHelper,
+            @Nullable String packagerPathForJSBundleName) {
+        this(
+                context.getApplicationContext(),
+                reactInstanceManagerHelper,
+                packagerPathForJSBundleName,
+                true /* enableOnCreate */,
+                null /* redBoxHandler */,
+                null /* devBundleDownloadListener */,
+                2 /* minNumShakes */,
+                null /* customPackagerCommandHandlers */,
+                null /* surfaceDelegateFactory */,
+                null /* devLoadingViewManager */,
+                null /* pausedInDebuggerOverlayManager */);
+    }
+
+    /**
+     * This constructor mirrors the same constructor we have for {@link BridgeDevSupportManager} and
+     * is kept for backward compatibility.
+     */
+    public NonFinalBridgelessDevSupportManager(
+            Context applicationContext,
+            ReactInstanceDevHelper reactInstanceManagerHelper,
+            @Nullable String packagerPathForJSBundleName,
+            boolean enableOnCreate,
+            @Nullable RedBoxHandler redBoxHandler,
+            @Nullable DevBundleDownloadListener devBundleDownloadListener,
+            int minNumShakes,
+            @Nullable Map<String, RequestHandler> customPackagerCommandHandlers,
+            @Nullable SurfaceDelegateFactory surfaceDelegateFactory,
+            @Nullable DevLoadingViewManager devLoadingViewManager,
+            @Nullable PausedInDebuggerOverlayManager pausedInDebuggerOverlayManager) {
+        super(
+                applicationContext,
+                reactInstanceManagerHelper,
+                packagerPathForJSBundleName,
+                enableOnCreate,
+                redBoxHandler,
+                devBundleDownloadListener,
+                minNumShakes,
+                customPackagerCommandHandlers,
+                surfaceDelegateFactory,
+                devLoadingViewManager,
+                pausedInDebuggerOverlayManager);
+    }
+
+    @Override
+    protected String getUniqueTag() {
+        return "Bridgeless";
+    }
+
+    @Override
+    public void loadSplitBundleFromServer(
+            final String bundlePath, final DevSplitBundleCallback callback) {
+        fetchSplitBundleAndCreateBundleLoader(
+                bundlePath,
+                new CallbackWithBundleLoader() {
+                    @Override
+                    public void onSuccess(final JSBundleLoader bundleLoader) {
+                        try {
+                            mReactInstanceDevHelper.loadBundle(bundleLoader).waitForCompletion();
+                            String bundleURL = getDevServerHelper().getDevServerSplitBundleURL(bundlePath);
+                            ReactContext reactContext = mReactInstanceDevHelper.getCurrentReactContext();
+                            if (reactContext != null) {
+                                reactContext.getJSModule(HMRClient.class).registerBundle(bundleURL);
+                            }
+                            callback.onSuccess();
+                        } catch (InterruptedException e) {
+                            Thread.currentThread().interrupt();
+                            throw new RuntimeException(
+                                    "[BridgelessDevSupportManager]: Got interrupted while loading bundle", e);
+                        }
+                    }
+
+                    @Override
+                    public void onError(String url, Throwable cause) {
+                        callback.onError(url, cause);
+                    }
+                });
+    }
+
+    @Override
+    public void handleReloadJS() {
+        UiThreadUtil.assertOnUiThread();
+
+        // dismiss redbox if exists
+        hideRedboxDialog();
+        mReactInstanceDevHelper.reload("BridgelessDevSupportManager.handleReloadJS()");
+    }
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "expo-dev-launcher",
   "title": "Expo Development Launcher",
-  "version": "5.0.15",
+  "version": "5.0.16",
   "description": "Pre-release version of the Expo development launcher package for testing.",
   "main": "build/DevLauncher.js",
   "types": "build/DevLauncher.d.ts",
@@ -31,7 +31,7 @@
   "homepage": "https://docs.expo.dev",
   "dependencies": {
     "ajv": "8.11.0",
-    "expo-dev-menu": "6.0.10",
+    "expo-dev-menu": "6.0.11",
     "expo-manifests": "~0.15.0",
     "resolve-from": "^5.0.0"
   },
@@ -66,5 +66,5 @@
     ],
     "testTimeout": 15000
   },
-  "gitHead": "128718d43bac2eaed764b3551469b95400f2363e"
+  "gitHead": "6cbc7c671f769d36e4294f25a9445281912e45fd"
 }