expo-modules-jsi 56.0.3 → 56.0.5

package/CHANGELOG.md

@@ -10,6 +10,17 @@
 
 ### 💡 Others
 
+## 56.0.5 — 2026-05-15
+
+_This version does not introduce any user-facing changes._
+
+## 56.0.4 — 2026-05-13
+
+### 🐛 Bug fixes
+
+- [iOS] Fixed xcframework build cache not invalidating when React-jsi headers change. ([#45735](https://github.com/expo/expo/pull/45735) by [@tsapeta](https://github.com/tsapeta))
+- [iOS] Added support for `facebook::jsi::IRuntime` so the package builds against React Native 0.86+, while staying compatible with 0.85 and react-native-tvos. ([#45728](https://github.com/expo/expo/pull/45728) by [@zoontek](https://github.com/zoontek))
+
 ## 56.0.3 — 2026-05-11
 
 ### 🐛 Bug fixes

package/apple/APINotes/jsi.apinotes

@@ -14,3 +14,11 @@ Namespaces:
       SwiftImportAs: reference
       SwiftReleaseOp: immortal
       SwiftRetainOp: immortal
+    - Name: IRuntime
+      SwiftImportAs: reference
+      SwiftReleaseOp: immortal
+      SwiftRetainOp: immortal
+    - Name: ICast
+      SwiftImportAs: reference
+      SwiftReleaseOp: immortal
+      SwiftRetainOp: immortal

package/apple/Sources/ExpoModulesJSI/Protocols/JSIRepresentable.swift

@@ -7,21 +7,21 @@ internal import ExpoModulesJSI_Cxx
  */
 internal protocol JSIRepresentable: JavaScriptRepresentable, Sendable, ~Copyable {
   /**
-   Creates an instance of this type from the given `facebook.jsi.Value` in `facebook.jsi.Runtime`.
+   Creates an instance of this type from the given `facebook.jsi.Value` in `facebook.jsi.IRuntime`.
    */
-  static func fromJSIValue(_ value: borrowing facebook.jsi.Value, in runtime: facebook.jsi.Runtime) -> Self
+  static func fromJSIValue(_ value: borrowing facebook.jsi.Value, in runtime: facebook.jsi.IRuntime) -> Self
   /**
    Creates a JSI value representing this value in the given JSI runtime.
    */
-  func toJSIValue(in runtime: facebook.jsi.Runtime) -> facebook.jsi.Value
+  func toJSIValue(in runtime: facebook.jsi.IRuntime) -> facebook.jsi.Value
 }
 
 internal extension JSIRepresentable {
-  static func fromJSIValue(_ value: borrowing facebook.jsi.Value, in runtime: facebook.jsi.Runtime) -> Self {
+  static func fromJSIValue(_ value: borrowing facebook.jsi.Value, in runtime: facebook.jsi.IRuntime) -> Self {
     FatalError.unimplemented()
   }
 
-  func toJSIValue(in runtime: facebook.jsi.Runtime) -> facebook.jsi.Value {
+  func toJSIValue(in runtime: facebook.jsi.IRuntime) -> facebook.jsi.Value {
     FatalError.unimplemented()
   }
 }
@@ -29,11 +29,11 @@ internal extension JSIRepresentable {
 // MARK: - Implementations
 
 extension Bool: JSIRepresentable {
-  static func fromJSIValue(_ value: borrowing facebook.jsi.Value, in runtime: facebook.jsi.Runtime) -> Bool {
+  static func fromJSIValue(_ value: borrowing facebook.jsi.Value, in runtime: facebook.jsi.IRuntime) -> Bool {
     return value.getBool()
   }
 
-  func toJSIValue(in runtime: facebook.jsi.Runtime) -> facebook.jsi.Value {
+  func toJSIValue(in runtime: facebook.jsi.IRuntime) -> facebook.jsi.Value {
     return facebook.jsi.Value(self)
   }
 }
@@ -41,19 +41,19 @@ extension Bool: JSIRepresentable {
 internal protocol JSIRepresentableNumber: JSIRepresentable {}
 
 extension JSIRepresentableNumber {
-  static func fromJSIValue(_ value: borrowing facebook.jsi.Value, in runtime: facebook.jsi.Runtime) -> Int where Self: FixedWidthInteger {
+  static func fromJSIValue(_ value: borrowing facebook.jsi.Value, in runtime: facebook.jsi.IRuntime) -> Int where Self: FixedWidthInteger {
     return Int(value.getNumber())
   }
 
-  static func fromJSIValue(_ value: borrowing facebook.jsi.Value, in runtime: facebook.jsi.Runtime) -> Double where Self: BinaryFloatingPoint {
+  static func fromJSIValue(_ value: borrowing facebook.jsi.Value, in runtime: facebook.jsi.IRuntime) -> Double where Self: BinaryFloatingPoint {
     return value.getNumber()
   }
 
-  func toJSIValue(in runtime: facebook.jsi.Runtime) -> facebook.jsi.Value where Self: FixedWidthInteger {
+  func toJSIValue(in runtime: facebook.jsi.IRuntime) -> facebook.jsi.Value where Self: FixedWidthInteger {
     return facebook.jsi.Value(Double(self))
   }
 
-  func toJSIValue(in runtime: facebook.jsi.Runtime) -> facebook.jsi.Value where Self: BinaryFloatingPoint {
+  func toJSIValue(in runtime: facebook.jsi.IRuntime) -> facebook.jsi.Value where Self: BinaryFloatingPoint {
     return facebook.jsi.Value(Double(self))
   }
 }
@@ -74,30 +74,30 @@ extension Float64: JSIRepresentableNumber {}
 extension CGFloat: JSIRepresentableNumber {}
 
 extension String: JSIRepresentable {
-  static func fromJSIValue(_ value: borrowing facebook.jsi.Value, in runtime: facebook.jsi.Runtime) -> String {
+  static func fromJSIValue(_ value: borrowing facebook.jsi.Value, in runtime: facebook.jsi.IRuntime) -> String {
     return String(value.getString(runtime).utf8(runtime))
   }
 
-  func toJSIValue(in runtime: facebook.jsi.Runtime) -> facebook.jsi.Value {
+  func toJSIValue(in runtime: facebook.jsi.IRuntime) -> facebook.jsi.Value {
     return facebook.jsi.Value(runtime, facebook.jsi.String.createFromUtf8(runtime, std.string(self)))
   }
 }
 
 extension Optional: JSIRepresentable where Wrapped: JSIRepresentable {
-  static func fromJSIValue(_ value: borrowing facebook.jsi.Value, in runtime: facebook.jsi.Runtime) -> Self {
+  static func fromJSIValue(_ value: borrowing facebook.jsi.Value, in runtime: facebook.jsi.IRuntime) -> Self {
     if value.isNull() || value.isUndefined() {
       return nil
     }
     return Wrapped.fromJSIValue(value, in: runtime)
   }
 
-  func toJSIValue(in runtime: facebook.jsi.Runtime) -> facebook.jsi.Value {
+  func toJSIValue(in runtime: facebook.jsi.IRuntime) -> facebook.jsi.Value {
     return self?.toJSIValue(in: runtime) ?? .null()
   }
 }
 
 extension Array: JSIRepresentable where Element: JSIRepresentable {
-  static func fromJSIValue(_ value: borrowing facebook.jsi.Value, in runtime: facebook.jsi.Runtime) -> Array<Element> {
+  static func fromJSIValue(_ value: borrowing facebook.jsi.Value, in runtime: facebook.jsi.IRuntime) -> Array<Element> {
     let jsiArray = value.getObject(runtime).getArray(runtime)
     let size = jsiArray.size(runtime)
     var result: Self = []
@@ -110,7 +110,7 @@ extension Array: JSIRepresentable where Element: JSIRepresentable {
     return result
   }
 
-  func toJSIValue(in runtime: facebook.jsi.Runtime) -> facebook.jsi.Value {
+  func toJSIValue(in runtime: facebook.jsi.IRuntime) -> facebook.jsi.Value {
     let jsiArray = facebook.jsi.Array(runtime, count)
 
     for index in 0..<count {
@@ -121,7 +121,7 @@ extension Array: JSIRepresentable where Element: JSIRepresentable {
 }
 
 extension Dictionary: JSIRepresentable where Key == String, Value: JSIRepresentable {
-  static func fromJSIValue(_ value: borrowing facebook.jsi.Value, in runtime: facebook.jsi.Runtime) -> Dictionary<Key, Value> {
+  static func fromJSIValue(_ value: borrowing facebook.jsi.Value, in runtime: facebook.jsi.IRuntime) -> Dictionary<Key, Value> {
     let object = value.getObject(runtime)
     let propertyNames = object.getPropertyNames(runtime)
     let size = propertyNames.size(runtime)
@@ -137,7 +137,7 @@ extension Dictionary: JSIRepresentable where Key == String, Value: JSIRepresenta
     return result
   }
 
-  func toJSIValue(in runtime: facebook.jsi.Runtime) -> facebook.jsi.Value {
+  func toJSIValue(in runtime: facebook.jsi.IRuntime) -> facebook.jsi.Value {
     let object = facebook.jsi.Object(runtime)
 
     for (key, value) in self {

package/apple/Sources/ExpoModulesJSI/Runtime/JavaScriptRef.swift

@@ -91,11 +91,11 @@ public final class JavaScriptRef<T: JavaScriptType & ~Copyable>: JavaScriptType,
 
 extension JavaScriptRef: JavaScriptRepresentable where T: JavaScriptRepresentable & ~Copyable {}
 extension JavaScriptRef: JSIRepresentable where T: JSIRepresentable & ~Copyable {
-  static func fromJSIValue(_ value: borrowing facebook.jsi.Value, in runtime: facebook.jsi.Runtime) -> JavaScriptRef {
+  static func fromJSIValue(_ value: borrowing facebook.jsi.Value, in runtime: facebook.jsi.IRuntime) -> JavaScriptRef {
     FatalError.unimplemented()
   }
 
-  func toJSIValue(in runtime: facebook.jsi.Runtime) -> facebook.jsi.Value {
+  func toJSIValue(in runtime: facebook.jsi.IRuntime) -> facebook.jsi.Value {
     return take()?.toJSIValue(in: runtime) ?? .undefined()
   }
 }

package/apple/Sources/ExpoModulesJSI/Runtime/JavaScriptRuntime.swift

@@ -22,16 +22,38 @@ internal import ExpoModulesJSI_Cxx
  */
 open class JavaScriptRuntime: Equatable, @unchecked Sendable {
   /**
-   The underlying JSI runtime this `JavaScriptRuntime` points to.
-   Note that `facebook.jsi.Runtime` is annotated with `SWIFT_UNSAFE_REFERENCE` in our copy of `jsi.h` header,
-   so for the Swift compiler it is treated as a reference type (like `class` and not `struct`).
-   This is important because the `facebook.jsi.Runtime`:
-   - is an abstract class with many virtual methods. Swift/C++ interop does not support calling pure virtual methods on value types.
-   - is non-copyable. As a value type, we would have to "borrow" it from React Native in an unsafe manner.
-   */
-  internal let pointee: facebook.jsi.Runtime
+   The underlying JSI runtime this `JavaScriptRuntime` points to, exposed as
+   `IRuntime` — the abstract base interface that virtually all JSI value/object/
+   function methods take (`Value::getString`, `Object::setProperty`,
+   `Function::call`, …) since RN 0.86 split the API. Stored as the upcast result
+   of `runtimePointee` because Swift's C++ interop does not auto-upcast between
+   two `SwiftImportAs: reference` types.
+
+   Use ``runtimePointee`` instead when you specifically need a `jsi::Runtime&`
+   (e.g. constructing an `expo.RuntimeScheduler` whose binding lookup is typed on
+   `Runtime&` upstream).
+
+   Note that `facebook.jsi.IRuntime` and `facebook.jsi.Runtime` are imported as
+   reference types so for the Swift compiler they are treated like classes.
+   This is important because they:
+   - are abstract classes with many virtual methods. Swift/C++ interop does not support calling pure virtual methods on value types.
+   - are non-copyable. As value types, we would have to "borrow" them from React Native in an unsafe manner.
+   */
+  internal let pointee: facebook.jsi.IRuntime
+  internal let runtimePointee: facebook.jsi.Runtime
   internal let scheduler: expo.RuntimeScheduler
 
+  /**
+   Thread ID of the JavaScript thread, captured at construction time. Used by `isOnJavaScriptThread()`
+   for a fast integer comparison instead of `Thread.current.name == "..."`.
+   Assumes runtime initializers always run on the JS thread.
+   */
+  private let jsThreadID: UInt64 = {
+    var id: UInt64 = 0
+    pthread_threadid_np(nil, &id)
+    return id
+  }()
+
   /**
    Actor for running runtime work.
    */
@@ -43,7 +65,8 @@ open class JavaScriptRuntime: Equatable, @unchecked Sendable {
    `init(unsafePointer:nativeScheduler:dispatch:)` instead.
    */
   internal init(_ runtime: facebook.jsi.Runtime) {
-    self.pointee = runtime
+    self.runtimePointee = runtime
+    self.pointee = expo.iruntime(runtime)
     self.scheduler = expo.RuntimeScheduler()
   }
 
@@ -52,7 +75,9 @@ open class JavaScriptRuntime: Equatable, @unchecked Sendable {
    no React scheduler is wired up.
    */
   public init() {
-    self.pointee = expo.createHermesRuntime()
+    let runtime = expo.createHermesRuntime()
+    self.runtimePointee = runtime
+    self.pointee = expo.iruntime(runtime)
     self.scheduler = expo.RuntimeScheduler()
   }
 
@@ -63,7 +88,8 @@ open class JavaScriptRuntime: Equatable, @unchecked Sendable {
    */
   public init(unsafePointer: UnsafeMutableRawPointer) {
     let runtime = unsafeBitCast(unsafePointer, to: facebook.jsi.Runtime.self)
-    self.pointee = runtime
+    self.runtimePointee = runtime
+    self.pointee = expo.iruntime(runtime)
     self.scheduler = expo.RuntimeScheduler()
   }
 
@@ -85,7 +111,8 @@ open class JavaScriptRuntime: Equatable, @unchecked Sendable {
   ) {
     let runtime = unsafeBitCast(unsafePointer, to: facebook.jsi.Runtime.self)
     let fn = unsafeBitCast(dispatch, to: expo.RuntimeScheduler.ScheduleFn.self)
-    self.pointee = runtime
+    self.runtimePointee = runtime
+    self.pointee = expo.iruntime(runtime)
     self.scheduler = expo.RuntimeScheduler(scheduler, fn)
   }
 
@@ -94,7 +121,7 @@ open class JavaScriptRuntime: Equatable, @unchecked Sendable {
    The pointer is valid only for the duration of the closure and must not be stored or escaped.
    */
   public func withUnsafePointee<R>(_ body: (UnsafeMutableRawPointer) throws -> R) rethrows -> R {
-    return try body(Unmanaged<facebook.jsi.Runtime>.passUnretained(pointee).toOpaque())
+    return try body(Unmanaged<facebook.jsi.Runtime>.passUnretained(runtimePointee).toOpaque())
   }
 
   /**
@@ -346,7 +373,7 @@ open class JavaScriptRuntime: Equatable, @unchecked Sendable {
       let argumentsRef = arguments.copy().ref()
 
       // Switch to asynchronous context.
-      self.schedule(taskName: "[JS] Async function \(name)") {
+      self.schedule {
         // Invoke the asynchronous function and resolve/reject the promise.
         do {
           let result = try await function(this, argumentsRef.take())
@@ -383,11 +410,10 @@ open class JavaScriptRuntime: Equatable, @unchecked Sendable {
 
   public func schedule(
     priority: SchedulerPriority = .normal,
-    taskName: String? = "[JS] runtime.schedule (\(#function))",
     @_implicitSelfCapture _ closure: @escaping @JavaScriptActor () async throws -> Void
   ) -> Void {
     schedule(priority: priority) {
-      Task.immediate_polyfill(name: taskName) {
+      Task.immediate_polyfill {
         try await closure()
       }
     }
@@ -398,8 +424,14 @@ open class JavaScriptRuntime: Equatable, @unchecked Sendable {
    Not available in async contexts to prevent blocking the cooperative thread pool.
    */
   @available(*, noasync)
+  @discardableResult
   public func execute<R: Sendable>(@_implicitSelfCapture _ closure: @escaping @JavaScriptActor () throws -> R) throws -> sending R {
+    if isOnJavaScriptThread() {
+      return try JavaScriptActor.assumeIsolated(closure)
+    }
+
     var result: Result<R, any Error>!
+    nonisolated(unsafe) let callerRunLoop = CFRunLoopGetCurrent()
 
     scheduler.scheduleTask(.ImmediatePriority) {
       do {
@@ -407,12 +439,23 @@ open class JavaScriptRuntime: Equatable, @unchecked Sendable {
       } catch {
         result = .failure(error)
       }
+      // Wake the caller's run loop so its `CFRunLoopRunInMode(...)` returns immediately
+      // instead of waiting out the timeout backstop.
+      CFRunLoopPerformBlock(callerRunLoop, CFRunLoopMode.commonModes.rawValue) {}
+      CFRunLoopWakeUp(callerRunLoop)
     }
 
-    // Use RunLoop to wait for the task to finish. As opposed to DispatchSemaphore or DispatchGroup,
-    // this solution lets the current run loop to process other events in the meantime.
+    // Pump the caller's run loop until the task finishes. As opposed to DispatchSemaphore
+    // or DispatchGroup, this lets the run loop continue to process other events in the meantime,
+    // and the spin is also faster than a real kernel-mediated context switch when the JS work
+    // is short (the common case). The 100ms timeout is a backstop in case the wakeup is missed;
+    // the common path is woken by `CFRunLoopWakeUp` from the scheduled block above.
+    //
+    // `CFRunLoopRunInMode` is the C API rather than `RunLoop.current.run(mode:before:)` to
+    // avoid the per-iteration `+[NSRunLoop currentRunLoop]` autorelease push and `Date()`
+    // allocation that dominated the caller-thread profile otherwise.
     while result == nil {
-      RunLoop.current.run(mode: .common, before: Date().addingTimeInterval(0.001))
+      CFRunLoopRunInMode(.commonModes, 0.1, false)
     }
     return try result.get()
   }
@@ -422,26 +465,40 @@ open class JavaScriptRuntime: Equatable, @unchecked Sendable {
    Not available in async contexts to prevent blocking the cooperative thread pool.
    */
   @available(*, noasync)
+  @discardableResult
   public func execute<R: Sendable>(
-    taskName: String? = "[JS] runtime.execute (\(#function))",
     @_implicitSelfCapture _ closure: @escaping @JavaScriptActor () async throws -> R
   ) throws -> sending R {
     let result = NonisolatedUnsafeVar<Result<R, any Error>>()
+    let runInline = isOnJavaScriptThread()
+    // Wrapped in `NonisolatedUnsafeVar` instead of `nonisolated(unsafe) let`
+    // to work around a Swift 6.2.3 compiler bug.
+    let callerRunLoop = NonisolatedUnsafeVar(CFRunLoopGetCurrent())
 
-    scheduler.scheduleTask(.ImmediatePriority) {
-      Task.immediate_polyfill(name: taskName, priority: .high) {
+    func body() -> Void {
+      Task.immediate_polyfill(priority: .high) {
         do {
           result.value = .success(try await closure())
         } catch {
           result.value = .failure(error)
         }
+        // Wake the caller's run loop so its `CFRunLoopRunInMode(...)` returns immediately
+        // instead of waiting out the timeout backstop.
+        CFRunLoopPerformBlock(callerRunLoop.value, CFRunLoopMode.commonModes.rawValue) {}
+        CFRunLoopWakeUp(callerRunLoop.value)
       }
     }
+    if runInline {
+      body()
+    } else {
+      scheduler.scheduleTask(.ImmediatePriority, body)
+    }
 
-    // Use RunLoop to wait for the task to finish. As opposed to DispatchSemaphore or DispatchGroup,
-    // this solution lets the current run loop to process other events in the meantime.
+    // Pump the caller's run loop until the task finishes. See the sync overload above for
+    // the rationale on `CFRunLoopRunInMode` vs. `RunLoop.current.run(...)` and on pumping
+    // the run loop instead of blocking on a semaphore.
     while result.value == nil {
-      RunLoop.current.run(mode: .common, before: Date().addingTimeInterval(0.001))
+      CFRunLoopRunInMode(.commonModes, 0.1, false)
     }
     return try result.value.get()
   }
@@ -449,9 +506,13 @@ open class JavaScriptRuntime: Equatable, @unchecked Sendable {
   /**
    Asynchronously executes a sync closure on the JavaScript runtime thread, awaiting its completion without blocking.
    */
+  @discardableResult
   public func execute<R: Sendable>(
     @_implicitSelfCapture _ closure: @escaping @JavaScriptActor () throws -> R
   ) async throws -> sending R {
+    if isOnJavaScriptThread() {
+      return try JavaScriptActor.assumeIsolated(closure)
+    }
     return try await withUnsafeThrowingContinuation { continuation in
       scheduler.scheduleTask(.ImmediatePriority) {
         do {
@@ -466,13 +527,16 @@ open class JavaScriptRuntime: Equatable, @unchecked Sendable {
   /**
    Asynchronously executes an async closure on the JavaScript runtime thread, awaiting its completion without blocking.
    */
+  @discardableResult
   public func execute<R: Sendable>(
-    taskName: String? = "[JS] runtime.execute (async \(#function))",
     @_implicitSelfCapture _ closure: @escaping @JavaScriptActor () async throws -> R
   ) async throws -> sending R {
+    if isOnJavaScriptThread() {
+      return try await Task.immediate_polyfill(priority: .high, operation: closure).value
+    }
     return try await withUnsafeThrowingContinuation { continuation in
       scheduler.scheduleTask(.ImmediatePriority) {
-        Task.immediate_polyfill(name: taskName, priority: .high) { @JavaScriptActor in
+        Task.immediate_polyfill(priority: .high) { @JavaScriptActor in
           do {
             continuation.resume(returning: try await closure())
           } catch {
@@ -486,14 +550,18 @@ open class JavaScriptRuntime: Equatable, @unchecked Sendable {
   /**
    Checks whether the function is called on the JavaScript thread.
    */
-  public func isOnJavaScriptThread() -> Bool {
-    return Thread.current.name == "com.facebook.react.runtime.JavaScript"
+  @inline(__always)
+  public final func isOnJavaScriptThread() -> Bool {
+    var current: UInt64 = 0
+    pthread_threadid_np(nil, &current)
+    return current == jsThreadID
   }
 
   /**
    Asserts whether we are on the JavaScript thread. Helpful for debugging threading issues.
    */
-  public func assertThread(file: String = #file, function: String = #function, line: Int = #line) {
+  @inline(__always)
+  public final func assertThread(file: String = #file, function: String = #function, line: Int = #line) {
     assert(isOnJavaScriptThread(), "Function '\(function)' is not run on the JavaScript thread (\(file):\(line))")
   }
 

package/apple/Sources/ExpoModulesJSI/Runtime/Values/JavaScriptBigInt.swift

@@ -308,11 +308,11 @@ extension JavaScriptBigInt: JavaScriptRepresentable {
 }
 
 extension JavaScriptBigInt: JSIRepresentable {
-  static func fromJSIValue(_ value: borrowing facebook.jsi.Value, in runtime: facebook.jsi.Runtime) -> JavaScriptBigInt {
+  static func fromJSIValue(_ value: borrowing facebook.jsi.Value, in runtime: facebook.jsi.IRuntime) -> JavaScriptBigInt {
     fatalError("Not implemented: Use JavaScriptValue.getBigInt() instead")
   }
 
-  func toJSIValue(in runtime: facebook.jsi.Runtime) -> facebook.jsi.Value {
+  func toJSIValue(in runtime: facebook.jsi.IRuntime) -> facebook.jsi.Value {
     return asJSIValue()
   }
 }

package/apple/Sources/ExpoModulesJSI/Runtime/Values/JavaScriptError.swift

@@ -67,11 +67,11 @@ extension JavaScriptError: JavaScriptRepresentable {
 }
 
 extension JavaScriptError: JSIRepresentable {
-  static func fromJSIValue(_ value: borrowing facebook.jsi.Value, in runtime: facebook.jsi.Runtime) -> JavaScriptError {
+  static func fromJSIValue(_ value: borrowing facebook.jsi.Value, in runtime: facebook.jsi.IRuntime) -> JavaScriptError {
     FatalError.unimplemented()
   }
 
-  func toJSIValue(in runtime: facebook.jsi.Runtime) -> facebook.jsi.Value {
+  func toJSIValue(in runtime: facebook.jsi.IRuntime) -> facebook.jsi.Value {
     return asJSIValue()
   }
 }

package/apple/Sources/ExpoModulesJSI/Runtime/Values/JavaScriptFunction.swift

@@ -130,11 +130,11 @@ extension JavaScriptFunction: JavaScriptRepresentable {
 }
 
 extension JavaScriptFunction: JSIRepresentable {
-  static func fromJSIValue(_ value: borrowing facebook.jsi.Value, in runtime: facebook.jsi.Runtime) -> JavaScriptFunction {
+  static func fromJSIValue(_ value: borrowing facebook.jsi.Value, in runtime: facebook.jsi.IRuntime) -> JavaScriptFunction {
     FatalError.unimplemented()
   }
 
-  func toJSIValue(in runtime: facebook.jsi.Runtime) -> facebook.jsi.Value {
+  func toJSIValue(in runtime: facebook.jsi.IRuntime) -> facebook.jsi.Value {
     return asJSIValue()
   }
 }

package/apple/Sources/ExpoModulesJSI/Runtime/Values/JavaScriptObject.swift

@@ -587,11 +587,11 @@ extension JavaScriptObject: JavaScriptRepresentable {
 }
 
 extension JavaScriptObject: JSIRepresentable {
-  static func fromJSIValue(_ value: borrowing facebook.jsi.Value, in runtime: facebook.jsi.Runtime) -> JavaScriptObject {
+  static func fromJSIValue(_ value: borrowing facebook.jsi.Value, in runtime: facebook.jsi.IRuntime) -> JavaScriptObject {
     FatalError.unimplemented()
   }
 
-  func toJSIValue(in runtime: facebook.jsi.Runtime) -> facebook.jsi.Value {
+  func toJSIValue(in runtime: facebook.jsi.IRuntime) -> facebook.jsi.Value {
     return asJSIValue()
   }
 }

package/apple/Sources/ExpoModulesJSI/Runtime/Values/JavaScriptValue.swift

@@ -704,11 +704,11 @@ extension JavaScriptValue: JavaScriptRepresentable {
 }
 
 extension JavaScriptValue: JSIRepresentable {
-  static func fromJSIValue(_ value: borrowing facebook.jsi.Value, in runtime: facebook.jsi.Runtime) -> JavaScriptValue {
+  static func fromJSIValue(_ value: borrowing facebook.jsi.Value, in runtime: facebook.jsi.IRuntime) -> JavaScriptValue {
     FatalError.unimplemented()
   }
 
-  func toJSIValue(in runtime: facebook.jsi.Runtime) -> facebook.jsi.Value {
+  func toJSIValue(in runtime: facebook.jsi.IRuntime) -> facebook.jsi.Value {
     return facebook.jsi.Value(runtime, pointee)
   }
 }

package/apple/Sources/ExpoModulesJSI-Cxx/TypedArray.cpp

@@ -23,7 +23,7 @@ TypedArrayKind getTypedArrayKindForName(const std::string &name) {
   return nameToKindMap.at(name);
 }
 
-TypedArrayKind getTypedArrayKind(jsi::Runtime &runtime, const jsi::Object &jsObj) {
+TypedArrayKind getTypedArrayKind(jsi::IRuntime &runtime, const jsi::Object &jsObj) {
   auto constructorName = jsObj.getPropertyAsObject(runtime, "constructor")
                              .getProperty(runtime, "name")
                              .asString(runtime)
@@ -31,7 +31,7 @@ TypedArrayKind getTypedArrayKind(jsi::Runtime &runtime, const jsi::Object &jsObj
   return getTypedArrayKindForName(constructorName);
 }
 
-jsi::ArrayBuffer getTypedArrayBuffer(jsi::Runtime &runtime, const jsi::Object &jsObj) {
+jsi::ArrayBuffer getTypedArrayBuffer(jsi::IRuntime &runtime, const jsi::Object &jsObj) {
   auto buffer = jsObj.getProperty(runtime, "buffer");
   if (buffer.isObject() && buffer.asObject(runtime).isArrayBuffer(runtime)) {
     return buffer.asObject(runtime).getArrayBuffer(runtime);
@@ -39,7 +39,7 @@ jsi::ArrayBuffer getTypedArrayBuffer(jsi::Runtime &runtime, const jsi::Object &j
   throw std::runtime_error("no ArrayBuffer attached");
 }
 
-bool isTypedArray(jsi::Runtime &runtime, const jsi::Object &jsObj) {
+bool isTypedArray(jsi::IRuntime &runtime, const jsi::Object &jsObj) {
   jsi::Object ArrayBuffer = runtime
     .global()
     .getPropertyAsObject(runtime, "ArrayBuffer");

package/apple/Sources/ExpoModulesJSI-Cxx/include/CppError.h

@@ -3,7 +3,8 @@
 #include <exception>
 #include <memory>
 #include <swift/bridging>
-#include <jsi/jsi.h>
+
+#include "IRuntimeCompat.h"
 
 namespace expo {
 
@@ -62,7 +63,7 @@ public:
    Returns the underlying JavaScript value of the wrapped `jsi::JSError`.
    This is a JavaScript Error object with all its properties preserved.
    */
-  inline jsi::Value asValue(jsi::Runtime &runtime) noexcept {
+  inline jsi::Value asValue(jsi::IRuntime &runtime) noexcept {
     return jsi::Value(runtime, jsError.value());
   }
 
@@ -72,7 +73,7 @@ public:
    using `getCurrent()`. The function returns `nullptr` when an exception occurs.
    */
   template <typename Result>
-  inline static Result tryCatch(jsi::Runtime &runtime, Result(^block)(void)) {
+  inline static Result tryCatch(jsi::IRuntime &runtime, Result(^block)(void)) {
     try {
       return block();
     } catch (jsi::JSError e) {
@@ -116,7 +117,7 @@ public:
    Sets the current thread's error by creating a `jsi::JSError` from the given message.
    Called from Swift when a host function closure throws a plain error.
    */
-  inline static void setCurrent(jsi::Runtime &runtime, const std::string &message) {
+  inline static void setCurrent(jsi::IRuntime &runtime, const std::string &message) {
     _current = std::make_unique<CppError>(jsi::JSError(runtime, message));
   }
 

package/apple/Sources/ExpoModulesJSI-Cxx/include/HostObject.h

@@ -4,10 +4,10 @@
 
 #include <string>
 #include <vector>
-#include <jsi/jsi.h>
 
 #include "CppError.h"
 #include "HostObjectCallbacks.h"
+#include "IRuntimeCompat.h"
 
 namespace jsi = facebook::jsi;
 
@@ -47,7 +47,7 @@ public:
     return _callbacks.getPropertyNames();
   }
 
-  inline static jsi::Object makeObject(jsi::Runtime &runtime, HostObjectCallbacks callbacks) {
+  inline static jsi::Object makeObject(jsi::IRuntime &runtime, HostObjectCallbacks callbacks) {
     return jsi::Object::createFromHostObject(runtime, std::make_shared<HostObject>(callbacks));
   }
 

package/apple/Sources/ExpoModulesJSI-Cxx/include/IRuntimeCompat.h

@@ -0,0 +1,22 @@
+#pragma once
+#ifdef __cplusplus
+
+#include <jsi/jsi.h>
+
+// React Native 0.86 split the JSI API into the abstract `jsi::IRuntime` base
+// and the concrete `jsi::Runtime` derived class — most value/object/function
+// methods now take `IRuntime&` instead of `Runtime&`. Older React Native
+// versions (e.g. react-native-tvos 0.85) only have `jsi::Runtime`. Alias
+// `IRuntime` to `Runtime` there so the same source compiles against both.
+#if __has_include(<cxxreact/ReactNativeVersion.h>)
+#include <cxxreact/ReactNativeVersion.h>
+#endif
+
+#if !defined(REACT_NATIVE_VERSION_MAJOR) || \
+    (REACT_NATIVE_VERSION_MAJOR == 0 && REACT_NATIVE_VERSION_MINOR < 86)
+namespace facebook::jsi {
+using IRuntime = Runtime;
+} // namespace facebook::jsi
+#endif
+
+#endif // __cplusplus

package/apple/Sources/ExpoModulesJSI-Cxx/include/JSIUtils.h

@@ -3,10 +3,11 @@
 #pragma once
 #ifdef __cplusplus
 
-#include <jsi/jsi.h>
 #include <hermes/hermes.h>
+
 #include "HostFunctionClosure.h"
 #include "CppError.h"
+#include "IRuntimeCompat.h"
 #include "MemoryBuffer.h"
 #include "NativeState.h"
 #include "TypedArray.h"
@@ -19,24 +20,35 @@ namespace jsi = facebook::jsi;
 
 namespace expo {
 
-inline jsi::Value valueFromFunction(jsi::Runtime &runtime, const jsi::Function &function) {
+/**
+ Upcasts a `jsi::Runtime&` to a `jsi::IRuntime&`. RN 0.86 split the JSI API into
+ the abstract `IRuntime` base and concrete `Runtime` derived class — most
+ value/object/function methods now take `IRuntime&`. Swift's C++ interop does
+ not auto-upcast between two `SwiftImportAs: reference` types, so Swift can't
+ pass a `Runtime` reference where `IRuntime` is expected without this helper.
+ */
+inline jsi::IRuntime &iruntime(jsi::Runtime &runtime) noexcept {
+  return runtime;
+}
+
+inline jsi::Value valueFromFunction(jsi::IRuntime &runtime, const jsi::Function &function) {
   return jsi::Value(runtime, function);
 }
 
 // `jsi::Object::setProperty` is a template function that Swift does not support. We need to provide specialized versions.
-inline void setProperty(jsi::Runtime &runtime, const jsi::Object &object, const char *name, const jsi::Value value) {
+inline void setProperty(jsi::IRuntime &runtime, const jsi::Object &object, const char *name, const jsi::Value value) {
   object.setProperty(runtime, name, value);
 }
 
-inline void setProperty(jsi::Runtime &runtime, const jsi::Array &array, const char *name, const jsi::Value &value) {
+inline void setProperty(jsi::IRuntime &runtime, const jsi::Array &array, const char *name, const jsi::Value &value) {
   array.setProperty(runtime, name, value);
 }
 
-inline void setValueAtIndex(jsi::Runtime &runtime, const jsi::Array &array, size_t index, const jsi::Value &value) {
+inline void setValueAtIndex(jsi::IRuntime &runtime, const jsi::Array &array, size_t index, const jsi::Value &value) {
   array.setValueAtIndex(runtime, index, value);
 }
 
-inline void setArrayLength(jsi::Runtime &runtime, const jsi::Array &array, long length) {
+inline void setArrayLength(jsi::IRuntime &runtime, const jsi::Array &array, long length) {
   auto oldLength = (int)array.size(runtime);
   auto newLength = (int)length;
 
@@ -52,15 +64,15 @@ inline void setArrayLength(jsi::Runtime &runtime, const jsi::Array &array, long
   }
 }
 
-inline jsi::Value getProperty(jsi::Runtime &runtime, const jsi::Array &array, const jsi::PropNameID &name) {
+inline jsi::Value getProperty(jsi::IRuntime &runtime, const jsi::Array &array, const jsi::PropNameID &name) {
   return array.getProperty(runtime, name);
 }
 
-inline jsi::Value valueFromArray(jsi::Runtime &runtime, const jsi::Array &array) {
+inline jsi::Value valueFromArray(jsi::IRuntime &runtime, const jsi::Array &array) {
   return jsi::Value(runtime, array);
 }
 
-inline const jsi::Value valueFromError(jsi::Runtime &runtime, const jsi::JSError &error) {
+inline const jsi::Value valueFromError(jsi::IRuntime &runtime, const jsi::JSError &error) {
   return jsi::Value(runtime, error.value());
 }
 
@@ -68,7 +80,7 @@ inline std::shared_ptr<const jsi::Buffer> makeSharedStringBuffer(const std::stri
   return std::make_shared<jsi::StringBuffer>(source);
 }
 
-inline jsi::Function createHostFunction(jsi::Runtime &runtime, const jsi::PropNameID &propName, HostFunctionClosure *closure) {
+inline jsi::Function createHostFunction(jsi::IRuntime &runtime, const jsi::PropNameID &propName, HostFunctionClosure *closure) {
   auto closurePtr = std::shared_ptr<HostFunctionClosure>(closure);
   return jsi::Function::createFromHostFunction(runtime, propName, 0, [closurePtr](jsi::Runtime &runtime, const jsi::Value &thisValue, const jsi::Value *_Nonnull args, size_t count) -> jsi::Value {
     auto result = closurePtr->call(thisValue, args, count);
@@ -82,7 +94,7 @@ inline jsi::Function createHostFunction(jsi::Runtime &runtime, const jsi::PropNa
   });
 }
 
-inline jsi::Function createHostFunction(jsi::Runtime &runtime, const char *name, HostFunctionClosure *closure) {
+inline jsi::Function createHostFunction(jsi::IRuntime &runtime, const char *name, HostFunctionClosure *closure) {
   jsi::PropNameID propName = jsi::PropNameID::forAscii(runtime, name);
   return createHostFunction(runtime, propName, closure);
 }
@@ -93,31 +105,31 @@ inline jsi::Function createHostFunction(jsi::Runtime &runtime, const char *name,
  and by JS engines themselves. Wraps the templated `jsi::Object::isHostObject<T>` so the
  check is callable from Swift, where C++ function templates cannot be imported directly.
  */
-inline bool isHostObject(jsi::Runtime &runtime, const jsi::Object &object) {
+inline bool isHostObject(jsi::IRuntime &runtime, const jsi::Object &object) {
   return object.isHostObject<jsi::HostObject>(runtime);
 }
 
 jsi::Runtime* createHermesRuntime();
 
-inline jsi::Value evaluateJavaScript(jsi::Runtime &runtime, const std::shared_ptr<const jsi::Buffer>& buffer, const std::string& sourceURL) {
+inline jsi::Value evaluateJavaScript(jsi::IRuntime &runtime, const std::shared_ptr<const jsi::Buffer>& buffer, const std::string& sourceURL) {
   return expo::CppError::tryCatch(runtime, ^{
     return runtime.evaluateJavaScript(buffer, sourceURL);
   });
 }
 
-inline jsi::Value callFunction(jsi::Runtime &runtime, const jsi::Function &function, const jsi::Value *_Nullable args, size_t count) {
+inline jsi::Value callFunction(jsi::IRuntime &runtime, const jsi::Function &function, const jsi::Value *_Nullable args, size_t count) {
   return expo::CppError::tryCatch(runtime, ^{
     return function.call(runtime, args, count);
   });
 }
 
-inline jsi::Value callFunctionWithThis(jsi::Runtime &runtime, const jsi::Function &function, const jsi::Object &jsThis, const jsi::Value *_Nullable args, size_t count) {
+inline jsi::Value callFunctionWithThis(jsi::IRuntime &runtime, const jsi::Function &function, const jsi::Object &jsThis, const jsi::Value *_Nullable args, size_t count) {
   return expo::CppError::tryCatch(runtime, ^{
     return function.callWithThis(runtime, jsThis, args, count);
   });
 }
 
-inline jsi::Value callAsConstructor(jsi::Runtime &runtime, const jsi::Function &function, const jsi::Value *_Nullable args, size_t count) {
+inline jsi::Value callAsConstructor(jsi::IRuntime &runtime, const jsi::Function &function, const jsi::Value *_Nullable args, size_t count) {
   return expo::CppError::tryCatch(runtime, ^{
     return function.callAsConstructor(runtime, args, count);
   });
@@ -129,28 +141,28 @@ inline jsi::Value callAsConstructor(jsi::Runtime &runtime, const jsi::Function &
  * Converts a `jsi::ArrayBuffer` to a `jsi::Value`. Needed because Swift/C++ interop
  * does not implicitly upcast `ArrayBuffer` to `Object` for the `Value` constructor.
  */
-inline jsi::Value valueFromArrayBuffer(jsi::Runtime &runtime, const jsi::ArrayBuffer &arrayBuffer) {
+inline jsi::Value valueFromArrayBuffer(jsi::IRuntime &runtime, const jsi::ArrayBuffer &arrayBuffer) {
   return jsi::Value(runtime, arrayBuffer);
 }
 
 /**
  * Returns the size of the array buffer storage in bytes.
  */
-inline size_t arrayBufferSize(jsi::Runtime &runtime, const jsi::ArrayBuffer &arrayBuffer) {
+inline size_t arrayBufferSize(jsi::IRuntime &runtime, const jsi::ArrayBuffer &arrayBuffer) {
   return arrayBuffer.size(runtime);
 }
 
 /**
  * Returns a pointer to the underlying data of the array buffer.
  */
-inline uint8_t *arrayBufferData(jsi::Runtime &runtime, const jsi::ArrayBuffer &arrayBuffer) {
+inline uint8_t *arrayBufferData(jsi::IRuntime &runtime, const jsi::ArrayBuffer &arrayBuffer) {
   return arrayBuffer.data(runtime);
 }
 
 /**
  * Creates a new array buffer of the given size with zero-initialized memory.
  */
-inline jsi::ArrayBuffer createArrayBuffer(jsi::Runtime &runtime, size_t size) {
+inline jsi::ArrayBuffer createArrayBuffer(jsi::IRuntime &runtime, size_t size) {
   uint8_t *data = new uint8_t[size]();
   auto buffer = std::make_shared<MemoryBuffer>(data, size, [data]() { delete[] data; });
   return jsi::ArrayBuffer(runtime, std::move(buffer));
@@ -161,7 +173,7 @@ inline jsi::ArrayBuffer createArrayBuffer(jsi::Runtime &runtime, size_t size) {
  * The cleanup function is called (with the cleanup context) when the ArrayBuffer is deallocated.
  */
 inline jsi::ArrayBuffer createArrayBuffer(
-  jsi::Runtime &runtime,
+  jsi::IRuntime &runtime,
   uint8_t *data,
   size_t size,
   void *_Nonnull cleanupContext,
@@ -179,20 +191,20 @@ inline jsi::ArrayBuffer createArrayBuffer(
 
 // MARK: - Native state
 
-inline bool hasNativeState(jsi::Runtime &runtime, const jsi::Object &object) {
+inline bool hasNativeState(jsi::IRuntime &runtime, const jsi::Object &object) {
   return object.hasNativeState<expo::NativeState>(runtime);
 }
 
-inline void setNativeState(jsi::Runtime &runtime, const jsi::Object &object, expo::NativeState &nativeState) {
+inline void setNativeState(jsi::IRuntime &runtime, const jsi::Object &object, expo::NativeState &nativeState) {
   std::shared_ptr<expo::NativeState> nativeStatePtr = std::shared_ptr<expo::NativeState>(&nativeState);
   object.setNativeState(runtime, nativeStatePtr);
 }
 
-inline void unsetNativeState(jsi::Runtime &runtime, const jsi::Object &object) {
+inline void unsetNativeState(jsi::IRuntime &runtime, const jsi::Object &object) {
   object.setNativeState(runtime, nullptr);
 }
 
-inline expo::NativeState *_Nullable getNativeState(jsi::Runtime &runtime, const jsi::Object &object) {
+inline expo::NativeState *_Nullable getNativeState(jsi::IRuntime &runtime, const jsi::Object &object) {
   if (!object.hasNativeState<expo::NativeState>(runtime)) {
     // JSI's implementation asserts if `hasNativeState` returns true, but we prefer to make it nullable.
     return nullptr;

package/apple/Sources/ExpoModulesJSI-Cxx/include/TypedArray.h

@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include <jsi/jsi.h>
+#include "IRuntimeCompat.h"
 
 namespace jsi = facebook::jsi;
 
@@ -26,19 +26,19 @@ enum class TypedArrayKind {
   BigUint64Array = 11,
 };
 
-bool isTypedArray(jsi::Runtime &runtime, const jsi::Object &jsObj);
+bool isTypedArray(jsi::IRuntime &runtime, const jsi::Object &jsObj);
 
 /**
  * Returns the `TypedArrayKind` of the given typed-array object, derived from its
  * `constructor.name` (e.g. `Uint8Array`, `Float32Array`).
  */
-TypedArrayKind getTypedArrayKind(jsi::Runtime &runtime, const jsi::Object &jsObj);
+TypedArrayKind getTypedArrayKind(jsi::IRuntime &runtime, const jsi::Object &jsObj);
 
 /**
  * Returns the underlying `ArrayBuffer` backing the given typed-array object.
  * Throws if the object has no attached ArrayBuffer.
  */
-jsi::ArrayBuffer getTypedArrayBuffer(jsi::Runtime &runtime, const jsi::Object &jsObj);
+jsi::ArrayBuffer getTypedArrayBuffer(jsi::IRuntime &runtime, const jsi::Object &jsObj);
 
 } // namespace expo
 

package/apple/Tests/JavaScriptRuntimeTests.swift

@@ -1,5 +1,6 @@
 import Testing
 import ExpoModulesJSI
+import Foundation
 
 @Suite
 @JavaScriptActor
@@ -118,6 +119,49 @@ struct JavaScriptRuntimeTests {
     #expect(result == 100)
   }
 
+  // The execute<R> overloads have a same-thread fast path and a cross-thread path that
+  // schedules the closure onto the JS thread and pumps the caller's run loop until it
+  // completes. The tests above run on `@JavaScriptActor` (the JS thread), so they only
+  // exercise the fast path. The next three hop off the JS thread first to cover the
+  // cross-thread scheduling + run-loop pump. The sync overloads of `execute` are
+  // `@available(*, noasync)`, so the caller must be a real synchronous thread — wrapping
+  // in `Task.detached` would stay on the cooperative pool and trip the noasync diagnostic.
+
+  @Test
+  func `execute sync from off-thread caller`() async throws {
+    let runtime = self.runtime
+    let result = try await onSyncOffThread {
+      try runtime.execute { @JavaScriptActor in
+        return runtime.global().hasProperty("Object") ? 1 : 0
+      }
+    }
+    #expect(result == 1)
+  }
+
+  @Test
+  func `execute blocking-async from off-thread caller`() async throws {
+    let runtime = self.runtime
+    let result = try await onSyncOffThread {
+      try runtime.execute { @JavaScriptActor () async in
+        await Task.yield()
+        return runtime.global().hasProperty("Object") ? 1 : 0
+      }
+    }
+    #expect(result == 1)
+  }
+
+  @Test
+  func `execute sync rethrows from off-thread caller`() async throws {
+    let runtime = self.runtime
+    await #expect(throws: ScriptEvaluationError.self) {
+      try await onSyncOffThread {
+        try runtime.execute { @JavaScriptActor in
+          try runtime.eval("invalid syntax +++")
+        }
+      }
+    }
+  }
+
   // MARK: - Host objects
 
   @Test
@@ -698,3 +742,19 @@ struct JavaScriptRuntimeTests {
     #expect(result.getInt() == 3)
   }
 }
+
+/// Runs `body` on a freshly spawned synchronous thread and bridges the result back into the
+/// async test. The thread has a real run loop, which the cross-thread `execute` path pumps.
+private func onSyncOffThread<R: Sendable>(
+  _ body: @escaping @Sendable () throws -> R
+) async throws -> R {
+  return try await withCheckedThrowingContinuation { (continuation: CheckedContinuation<R, any Error>) in
+    Thread.detachNewThread {
+      do {
+        continuation.resume(returning: try body())
+      } catch {
+        continuation.resume(throwing: error)
+      }
+    }
+  }
+}

package/apple/scripts/build-xcframework.sh

@@ -15,10 +15,11 @@
 #   - Cleans .swiftinterface files for cross-compiler compatibility
 #
 # Usage:
-#   PODS_ROOT=/path/to/Pods ./build-xcframework.sh [--clean]
+#   ./build-xcframework.sh [--clean]
 #
 # Environment:
-#   PODS_ROOT       (required) Path to the CocoaPods Pods directory
+#   PODS_ROOT       Path to the CocoaPods Pods directory. Defaults to
+#                   $EXPO_ROOT_DIR/apps/bare-expo/ios/Pods (set by direnv).
 #   PLATFORM_NAME   (optional) Build for a specific platform (e.g. iphoneos, iphonesimulator).
 #                   When unset, builds for both iphoneos and iphonesimulator.
 
@@ -36,6 +37,8 @@ BUILD_PRODUCTS_PATH="${DERIVED_DATA_PATH}/Build/Products"
 
 source "${PACKAGE_DIR}/scripts/xcframework-helpers.sh"
 
+resolve_pods_root "$PACKAGE_DIR"
+
 CLEAN=false
 
 while [[ $# -gt 0 ]]; do
@@ -74,6 +77,10 @@ SOURCE_FILES=(
   "${PACKAGE_DIR}/scripts/build-xcframework.sh"
   "${PACKAGE_DIR}/scripts/create-stub-xcframework.sh"
   "${PACKAGE_DIR}/scripts/xcframework-helpers.sh"
+  # JSI headers we compile against. `cat` follows the symlinks CocoaPods
+  # installs into Pods/Headers/Public so the real header contents get hashed.
+  "${PODS_ROOT}/Headers/Public/React-jsi/jsi/jsi.h"
+  "${PODS_ROOT}/Headers/Public/React-jsi/jsi/jsi-inl.h"
 )
 
 compute_hash() {

package/apple/scripts/test.sh

@@ -29,26 +29,11 @@ set -eo pipefail
 
 PACKAGE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
 
-# --- PODS_ROOT ---
-#
-# Prefer an explicit PODS_ROOT (e.g. to test against a different app's Pods).
-# Otherwise fall back to bare-expo under EXPO_ROOT_DIR (set by the repo's
-# direnv config). Without either, point at a likely repo root computed from
-# this script's location so the script still works outside a direnv shell.
-
-if [[ -z "${PODS_ROOT:-}" ]]; then
-  : "${EXPO_ROOT_DIR:=$(cd "${PACKAGE_DIR}/../../.." && pwd)}"
-  PODS_ROOT="${EXPO_ROOT_DIR}/apps/bare-expo/ios/Pods"
-fi
-if [[ ! -d "$PODS_ROOT" ]]; then
-  echo "error: PODS_ROOT does not exist: $PODS_ROOT" >&2
-  echo "       Run \`pod install\` in apps/bare-expo/ios first, or set PODS_ROOT explicitly." >&2
-  exit 1
-fi
-PODS_ROOT="$(cd "$PODS_ROOT" && pwd)"
-# Export so xcodebuild forwards it to SwiftPM's manifest evaluation, where
-# Package.swift reads it via resolvePodsRoot().
-export PODS_ROOT
+source "${PACKAGE_DIR}/scripts/xcframework-helpers.sh"
+
+# Resolve PODS_ROOT with fallback logic (from xcframework-helpers.sh).
+# Must be passed to subprocess calls, not exported, to avoid polluting the environment.
+resolve_pods_root "$PACKAGE_DIR"
 
 # --- Symlink xcframeworks for SwiftPM binary targets ---
 
@@ -79,7 +64,7 @@ link_xcframework "ReactNativeDependencies" \
 
 # --- Generate the jsi module map ---
 
-"${PACKAGE_DIR}/scripts/generate-modulemap.sh"
+env PODS_ROOT="$PODS_ROOT" "${PACKAGE_DIR}/scripts/generate-modulemap.sh"
 
 # --- Pick a simulator destination ---
 
@@ -113,7 +98,7 @@ fi
 # --- Run the tests ---
 
 cd "$PACKAGE_DIR"
-exec xcodebuild test \
+exec env PODS_ROOT="$PODS_ROOT" xcodebuild test \
   -scheme ExpoModulesJSI \
   -destination "$DESTINATION" \
   -derivedDataPath "${PACKAGE_DIR}/.DerivedData" \

package/apple/scripts/xcframework-helpers.sh

@@ -4,6 +4,24 @@
 # canonical slice metadata and the Info.plist writer used by both scripts so
 # the manifest is produced from a single place.
 
+# resolve_pods_root PACKAGE_DIR
+# Sets PODS_ROOT, preferring an explicit value (e.g. from CocoaPods build phase)
+# over a fallback to bare-expo under EXPO_ROOT_DIR. Exits if PODS_ROOT doesn't exist.
+resolve_pods_root() {
+  local package_dir="$1"
+
+  if [[ -z "${PODS_ROOT:-}" ]]; then
+    : "${EXPO_ROOT_DIR:=$(cd "${package_dir}/../../.." && pwd)}"
+    PODS_ROOT="${EXPO_ROOT_DIR}/apps/bare-expo/ios/Pods"
+  fi
+  if [[ ! -d "$PODS_ROOT" ]]; then
+    echo "error: PODS_ROOT does not exist: $PODS_ROOT" >&2
+    echo "       Run \`pod install\` in apps/bare-expo/ios first, or set PODS_ROOT explicitly." >&2
+    exit 1
+  fi
+  PODS_ROOT="$(cd "$PODS_ROOT" && pwd)"
+}
+
 # All slice IDs known to the xcframework, mapped to their plist metadata.
 # CocoaPods reads Info.plist at `pod install` time and generates a per-slice
 # copy script; any slice missing from this table will be skipped by

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-modules-jsi",
-  "version": "56.0.3",
+  "version": "56.0.5",
   "description": "The JavaScript Interface for Expo Modules",
   "main": "index.js",
   "sideEffects": [],
@@ -41,7 +41,7 @@
       "./apple/scripts/test.sh"
     ]
   },
-  "gitHead": "42013232893cb2aa71ab218e9b422d4a8476b3f0",
+  "gitHead": "f26be3dd9396bf7c399a1d607865d0fabdbc0d64",
   "scripts": {
     "build": "apple/scripts/build-xcframework.sh",
     "test": "apple/scripts/test.sh"