expo-dev-launcher 4.0.28 → 4.0.29

package/CHANGELOG.md

@@ -10,6 +10,12 @@
 
 ### 💡 Others
 
+## 4.0.29 — 2024-11-06
+
+### 🐛 Bug fixes
+
+- [Android] Fixed mutiple reload when pressing `r` in CLI on react-native old architecture mode. ([#32532](https://github.com/expo/expo/pull/32532) by [@kudo](https://github.com/kudo))
+
 ## 4.0.28 — 2024-10-08
 
 _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 "4.0.28"
+    versionName "4.0.29"
   }
 
   buildTypes {

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

@@ -85,7 +85,7 @@ class DevLauncherController private constructor() :
   override val devClientHost by lazy {
     ReactHostWrapper(
       reactNativeHost = DevLauncherReactNativeHost(context as Application, DEV_LAUNCHER_HOST),
-      reactHost = DevLauncherReactHost.create(context as Application, DEV_LAUNCHER_HOST)
+      reactHostProvider = { DevLauncherReactHost.create(context as Application, DEV_LAUNCHER_HOST) }
     )
   }
 
@@ -427,7 +427,7 @@ class DevLauncherController private constructor() :
 
     @JvmStatic
     fun initialize(reactApplication: ReactApplication, additionalPackages: List<ReactPackage>? = null, launcherClass: Class<*>? = null) {
-      initialize(reactApplication as Context, ReactHostWrapper(reactApplication.reactNativeHost, reactApplication.reactHost))
+      initialize(reactApplication as Context, ReactHostWrapper(reactApplication.reactNativeHost, { reactApplication.reactHost }))
       sAdditionalPackages = additionalPackages
       sLauncherClass = launcherClass
     }

package/android/src/debug/java/expo/modules/devlauncher/launcher/loaders/DevLauncherAppLoader.kt

@@ -10,6 +10,8 @@ import com.facebook.react.ReactInstanceEventListener
 import com.facebook.react.bridge.ReactContext
 import expo.interfaces.devmenu.ReactHostWrapper
 import expo.modules.devlauncher.launcher.DevLauncherControllerInterface
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
 import kotlin.coroutines.Continuation
 import kotlin.coroutines.resume
 import kotlin.coroutines.suspendCoroutine
@@ -70,8 +72,8 @@ abstract class DevLauncherAppLoader(
     }
   }
 
-  open suspend fun launch(intent: Intent): Boolean {
-    return suspendCoroutine { callback ->
+  open suspend fun launch(intent: Intent): Boolean = withContext(Dispatchers.Main) {
+    suspendCoroutine { callback ->
       if (injectBundleLoader()) {
         continuation = callback
         launchIntent(intent)

package/android/src/react-native-75/debug/expo/modules/devlauncher/helpers/DevLauncherReactUtils.kt

@@ -222,11 +222,17 @@ fun injectDevServerHelper(context: Context, devSupportManager: DevSupportManager
     devSettings = devSettings,
     packagerConnection = devSettings.public_getPackagerConnectionSettings()
   )
+  val oldDevServerHelper: DevServerHelper = DevSupportManagerBase::class.java.getProtectedFieldValue(
+    devSupportManager,
+    "mDevServerHelper"
+  )
   DevSupportManagerBase::class.java.setProtectedDeclaredField(
     devSupportManager,
     "mDevServerHelper",
     devLauncherDevServerHelper
   )
+  oldDevServerHelper.closePackagerConnection()
+  oldDevServerHelper.closeInspectorConnection()
 }
 
 fun findDevMenuPackage(): ReactPackage? {

package/android/src/release/java/expo/modules/devlauncher/DevLauncherController.kt

@@ -111,7 +111,7 @@ class DevLauncherController private constructor() : DevLauncherControllerInterfa
 
     @JvmStatic
     fun initialize(reactApplication: ReactApplication, additionalPackages: List<*>? = null, launcherClass: Class<*>? = null) {
-      initialize(reactApplication as Context, ReactHostWrapper(reactApplication.reactNativeHost, reactApplication.reactHost))
+      initialize(reactApplication as Context, ReactHostWrapper(reactApplication.reactNativeHost, { reactApplication.reactHost }))
     }
 
     @JvmStatic

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "expo-dev-launcher",
   "title": "Expo Development Launcher",
-  "version": "4.0.28",
+  "version": "4.0.29",
   "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": "5.0.22",
+    "expo-dev-menu": "5.0.23",
     "expo-manifests": "~0.14.0",
     "resolve-from": "^5.0.0",
     "semver": "^7.6.0"
@@ -66,5 +66,5 @@
       "./setupTests.ts"
     ]
   },
-  "gitHead": "826560298c428d3e57db0f06cb65306b824082b4"
+  "gitHead": "6583b7c637a965a9a9872efee9905b11ea806e28"
 }