expo-dev-menu 58.0.5 → 58.0.6

package/CHANGELOG.md

@@ -10,6 +10,12 @@
 
 ### 💡 Others
 
+## 58.0.6 — 2026-09-23
+
+### 🐛 Bug fixes
+
+- [iOS] Fix a data race on `DevMenuManager`'s registered callbacks and app context that could crash the app when one app context registered its dev menu callbacks while another tore down, such as on a dev-client reload. ([#49559](https://github.com/expo/expo/pull/49559) by [@vonovak](https://github.com/vonovak))
+
 ## 58.0.5 — 2026-09-22
 
 ### 🐛 Bug fixes

package/android/build.gradle

@@ -12,7 +12,7 @@ apply plugin: 'expo-module-gradle-plugin'
 apply plugin: 'org.jetbrains.kotlin.plugin.compose'
 
 group = 'host.exp.exponent'
-version = '58.0.5'
+version = '58.0.6'
 
 def hasDevLauncher = findProject(":expo-dev-launcher") != null
 def configureInRelease = findProperty("expo.devmenu.configureInRelease") == "true"
@@ -29,7 +29,7 @@ android {
 
   defaultConfig {
     versionCode 10
-    versionName '58.0.5'
+    versionName '58.0.6'
   }
 
   buildTypes {

package/expo-dev-menu.podspec

@@ -128,6 +128,9 @@ Pod::Spec.new do |s|
     test_spec.dependency 'React'
     # ExpoModulesCore requires React-hermes or React-jsc in tests, add ExpoModulesTestCore for the underlying dependencies
     test_spec.dependency 'ExpoModulesTestCore'
+    test_spec.pod_target_xcconfig = {
+      'OTHER_LDFLAGS' => '$(inherited) -lc++'
+    }
     test_spec.platforms = {
       :ios => '16.4'
     }

package/ios/DevMenuManager.swift

@@ -55,6 +55,18 @@ class DevMenuCacheContainer<T> {
   }
 }
 
+final class DevMenuCallbacksRegistry {
+  private let storage = Mutex<[DevMenuManager.Callback]>([])
+
+  var callbacks: [DevMenuManager.Callback] {
+    storage.withLock { $0 }
+  }
+
+  func replace(with callbacks: [DevMenuManager.Callback]) {
+    storage.withLock { $0 = callbacks }
+  }
+}
+
 /**
  Manages the dev menu and provides most of the public API.
  */
@@ -74,10 +86,17 @@ open class DevMenuManager: NSObject {
   var canLaunchDevMenuOnStart = true
   @objc public var isReactAppRunning = false
 
+  private let appContextLock = NSLock()
+  private weak var _currentAppContext: AppContext?
+
   /**
    The AppContext for the currently running React app. Set by DevMenuModule.OnCreate.
    */
-  public private(set) weak var currentAppContext: AppContext?
+  public var currentAppContext: AppContext? {
+    appContextLock.lock()
+    defer { appContextLock.unlock() }
+    return _currentAppContext
+  }
 
   @objc public var configuration = DevMenuConfiguration()
 
@@ -179,7 +198,9 @@ open class DevMenuManager: NSObject {
 
   @objc
   public func setAppContext(_ appContext: AppContext?) {
-    currentAppContext = appContext
+    appContextLock.lock()
+    _currentAppContext = appContext
+    appContextLock.unlock()
     if appContext != nil {
       isReloading = false
       lastReloadEventAt = Date()
@@ -202,10 +223,17 @@ open class DevMenuManager: NSObject {
    */
   @objc
   public func clearAppContext(current context: AppContext?) {
-    if currentAppContext != nil && currentAppContext !== context {
+    appContextLock.lock()
+    let shouldClear = _currentAppContext == nil || _currentAppContext === context
+    if shouldClear {
+      _currentAppContext = nil
+    }
+    appContextLock.unlock()
+    guard shouldClear else {
       return
     }
-    setAppContext(nil)
+    isReactAppRunning = false
+    updateAutoLaunchObserver()
   }
 
   @objc
@@ -470,9 +498,18 @@ open class DevMenuManager: NSObject {
     callbacksSubject.eraseToAnyPublisher()
   }
 
-  public var registeredCallbacks: [Callback] = [] {
-    didSet {
-      callbacksSubject.send(registeredCallbacks)
+  private let callbacksRegistry = DevMenuCallbacksRegistry()
+
+  public var registeredCallbacks: [Callback] {
+    get {
+      callbacksRegistry.callbacks
+    }
+    set {
+      callbacksRegistry.replace(with: newValue)
+      // PassthroughSubject doesn't support concurrent sends.
+      DispatchQueue.main.async { [weak self] in
+        self?.callbacksSubject.send(newValue)
+      }
     }
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-dev-menu",
-  "version": "58.0.5",
+  "version": "58.0.6",
   "description": "Expo/React Native module with the developer menu.",
   "keywords": [
     "dev",
@@ -40,7 +40,7 @@
     "expo": "*",
     "react-native": "*"
   },
-  "gitHead": "add8cbf49f477cfd2283ae05af35b4713a773c55",
+  "gitHead": "8aeb4368d396d2d71a2fc8c652c4d1d4d53ed858",
   "scripts": {
     "build": "pnpm run build:lib && pnpm run build:plugin",
     "build:lib": "expo-build src",