expo-brownfield 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 reload that could crash the app or stop the delivery of `onKeyRecreated` events and messages. ([#49560](https://github.com/expo/expo/pull/49560) by [@vonovak](https://github.com/vonovak))
+
 ## 58.0.5 — 2026-09-22
 
 _This version does not introduce any user-facing changes._

package/android/build.gradle

@@ -4,7 +4,7 @@ plugins {
 }
 
 group = 'expo.modules.brownfield'
-version = '58.0.5'
+version = '58.0.6'
 
 expoModule {
   canBePublished false
@@ -14,7 +14,7 @@ android {
   namespace "expo.modules.brownfield"
   defaultConfig {
     versionCode 1
-    versionName '58.0.5'
+    versionName '58.0.6'
   }
 }
 

package/ios/ExpoBrownfieldModule.swift

@@ -15,7 +15,7 @@ public class ExpoBrownfieldModule: Module {
     }
 
     OnStopObserving {
-      BrownfieldMessagingInternal.shared.setExpoModule(nil)
+      BrownfieldMessagingInternal.shared.clearExpoModule(self)
     }
 
     Function("popToNative") { (animated: Bool) in

package/ios/ExpoBrownfieldStateModule.swift

@@ -29,7 +29,7 @@ public class ExpoBrownfieldStateModule: Module {
     }
 
     OnDestroy {
-      BrownfieldStateInternal.shared.setExpoModule(nil)
+      BrownfieldStateInternal.shared.clearExpoModule(self)
     }
 
     Function("getSharedState") { (key: String) -> SharedState in

package/ios/Messaging.swift

@@ -8,6 +8,7 @@ public typealias BrownfieldCallback = (BrownfieldMessage) -> Void
 public class BrownfieldMessagingInternal {
   public static let shared = BrownfieldMessagingInternal()
 
+  private let lock = NSLock()
   private var listeners: [String: BrownfieldCallback] = [:]
   private var expoModule: ExpoBrownfieldModule?
 
@@ -27,7 +28,11 @@ public class BrownfieldMessagingInternal {
   }
 
   public func sendMessage(_ message: BrownfieldMessage) {
-    expoModule?.sendMessage(message)
+    lock.lock()
+    let module = expoModule
+    lock.unlock()
+
+    module?.sendMessage(message)
   }
 
   func emit(_ message: BrownfieldMessage) {
@@ -36,7 +41,17 @@ public class BrownfieldMessagingInternal {
     }
   }
 
-  func setExpoModule(_ expoModule: ExpoBrownfieldModule?) {
+  func setExpoModule(_ expoModule: ExpoBrownfieldModule) {
+    lock.lock()
     self.expoModule = expoModule
+    lock.unlock()
+  }
+
+  func clearExpoModule(_ expoModule: ExpoBrownfieldModule) {
+    lock.lock()
+    if self.expoModule === expoModule {
+      self.expoModule = nil
+    }
+    lock.unlock()
   }
 }

package/ios/State.swift

@@ -78,19 +78,32 @@ public final class BrownfieldStateInternal {
   }
 
   public func maybeNotifyKeyRecreated(_ key: String) {
-    lock.lock()
-    if !deletedKeys.contains(key) {
-      lock.unlock()
-      return
+    let module: ExpoBrownfieldStateModule?
+    do {
+      lock.lock()
+      defer { lock.unlock() }
+      if !deletedKeys.contains(key) {
+        return
+      }
+      deletedKeys.remove(key)
+      module = expoModule
     }
-    deletedKeys.remove(key)
-    lock.unlock()
 
-    expoModule?.notifyKeyRecreated(key)
+    module?.notifyKeyRecreated(key)
   }
 
-  public func setExpoModule(_ expoModule: ExpoBrownfieldStateModule?) {
+  public func setExpoModule(_ expoModule: ExpoBrownfieldStateModule) {
+    lock.lock()
     self.expoModule = expoModule
+    lock.unlock()
+  }
+
+  public func clearExpoModule(_ expoModule: ExpoBrownfieldStateModule) {
+    lock.lock()
+    if self.expoModule === expoModule {
+      self.expoModule = nil
+    }
+    lock.unlock()
   }
 
   public func notifySubscribers(_ key: String, _ value: Any?) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-brownfield",
-  "version": "58.0.5",
+  "version": "58.0.6",
   "description": "Toolkit and APIs for adding brownfield setup to Expo projects",
   "keywords": [
     "brownfield",
@@ -43,7 +43,7 @@
     "chalk": "^4.1.2",
     "commander": "^14.0.3",
     "diff": "^5.2.0",
-    "expo-build-properties": "~58.0.5",
+    "expo-build-properties": "~58.0.6",
     "expo-manifests": "~58.0.0",
     "ora": "^5.4.1",
     "prompts": "^2.4.2"
@@ -56,7 +56,7 @@
     "@types/prompts": "^2.0.6",
     "@types/react": "~19.3.0",
     "create-expo": "5.1.2",
-    "expo": "58.0.0-preview.5",
+    "expo": "58.0.0-preview.6",
     "expo-module-scripts": "56.0.3",
     "glob": "^13.0.6"
   },
@@ -65,7 +65,7 @@
     "react": "*",
     "react-native": "*"
   },
-  "gitHead": "add8cbf49f477cfd2283ae05af35b4713a773c55",
+  "gitHead": "8aeb4368d396d2d71a2fc8c652c4d1d4d53ed858",
   "scripts": {
     "precompile-ios": "et prebuild-package-for-publish",
     "build": "pnpm run build:lib && pnpm run build:plugin && pnpm run build:cli",