expo-modules-jsi 58.0.3 → 58.0.5

package/CHANGELOG.md

@@ -1,14 +1,18 @@
 # Changelog
 
-## Unpublished
+## 58.0.5
 
-### 🛠 Breaking changes
+### Patch Changes
 
-### 🎉 New features
+- Force-bump all packages, due to migration to changesets. ([#50762](https://github.com/expo/expo/pull/50762) by [@kitten](https://github.com/kitten))
+
+## 58.0.4 — 2026-09-25
 
 ### 🐛 Bug fixes
 
-### 💡 Others
+- [iOS] Fix the `.swiftinterface` failing to compile with Xcode 27 (Swift 6.4), because a C++ type extension was no longer stripped from it. ([#50569](https://github.com/expo/expo/pull/50569) by [@chrfalch](https://github.com/chrfalch))
+- [iOS] Fix the xcframework build phase failing iOS archives under Xcode 27. ([#50587](https://github.com/expo/expo/pull/50587) by [@tsapeta](https://github.com/tsapeta))
+- [iOS] Fix the xcframework build warning about jsi headers missing from the umbrella header. ([#50588](https://github.com/expo/expo/pull/50588) by [@tsapeta](https://github.com/tsapeta))
 
 ## 58.0.3 — 2026-09-21
 

package/apple/Package.swift

@@ -99,6 +99,12 @@ let package = Package(
           "-Xfrontend",
           "-clang-header-expose-decls=has-expose-attr",
 
+          // Xcode 27 reports a warning left on a SwiftCompile task as "the following command
+          // failed with exit code 0 but produced no further output" and fails the host app's
+          // build phase, with nothing pointing at the cause. This group is the one that has
+          // actually bitten us, so reject it at the line that causes it.
+          "-Werror", "ImplicitStrongCapture",
+
           // Module map for the `jsi` Clang module, generated by build-xcframework.sh
           // before xcodebuild runs.
           "-Xcc", "-fmodule-map-file=\(generatedModuleMap)",

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

@@ -242,7 +242,7 @@ public struct JavaScriptPromise: JavaScriptType, ~Copyable {
     // thread, the same hop `resolve` and `reject` make. `@JavaScriptActor` does not get there on
     // its own: its executor runs jobs inline on the calling thread. `execute` runs the closure
     // inline when the caller is already on the JavaScript thread.
-    try await runtime.execute { [longLivedState] in
+    try await runtime.execute { [longLivedState, deferredPromise] in
       let onFulfilled = runtime.createFunction { [weak deferredPromise] this, arguments in
         guard let deferredPromise else { return .undefined }
         let value = arguments[0]

package/apple/scripts/build-xcframework.sh

@@ -78,6 +78,9 @@ SOURCE_FILES=(
   "${PACKAGE_DIR}/scripts/build-xcframework.sh"
   "${PACKAGE_DIR}/scripts/create-stub-xcframework.sh"
   "${PACKAGE_DIR}/scripts/xcframework-helpers.sh"
+  # Defines the `jsi` module the slices compile against, so its contents change
+  # the build output the same way a source file does.
+  "${PACKAGE_DIR}/scripts/generate-modulemap.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"
@@ -284,7 +287,8 @@ build_slice() {
 
   # Strip declarations from public .swiftinterface that external consumers can't resolve:
   # - C++ type extensions (__ObjC) — entire blocks including their closing braces
-  #   e.g. "extension __ObjC.expo.CppError : Swift.Error { ... }"
+  #   e.g. "extension __ObjC.expo.CppError : Swift.Error { ... }", or with the module
+  #   selectors Swift 6.4 prints: "extension __ObjC::expo.__ObjC::CppError : Swift::Error { ... }"
   # - Package-internal conformances (_ConstraintThatIsNotPartOfTheAPIOfThisLibrary)
   #   e.g. "extension Swift.Optional : where Wrapped : _Constraint... {}"
   # - @usableFromInline attributes preceding the _Constraint protocol definition
@@ -297,7 +301,7 @@ build_slice() {
   # filename, failing with "can't read …: No such file or directory".
   while IFS= read -r swiftinterface; do
     local stripped_swiftinterface="${swiftinterface}.stripped"
-    sed '/^extension __ObjC\./,/^}/d;/^@usableFromInline$/{N;/_ConstraintThatIsNotPartOfTheAPIOfThisLibrary/d;};/_ConstraintThatIsNotPartOfTheAPIOfThisLibrary/d' "$swiftinterface" > "$stripped_swiftinterface"
+    sed -E '/^extension __ObjC(\.|::)/,/^}/d;/^@usableFromInline$/{N;/_ConstraintThatIsNotPartOfTheAPIOfThisLibrary/d;};/_ConstraintThatIsNotPartOfTheAPIOfThisLibrary/d' "$swiftinterface" > "$stripped_swiftinterface"
     mv "$stripped_swiftinterface" "$swiftinterface"
   done < <(find "${modules_dir}/${PACKAGE_NAME}.swiftmodule" -name '*.swiftinterface')
 

package/apple/scripts/generate-modulemap.sh

@@ -2,15 +2,14 @@
 #
 # Writes `.generated/module.modulemap` for the `jsi` Clang module.
 #
-# The umbrella header is referenced by absolute path so the modulemap works
-# regardless of where Pods lives. The `Pods/Headers/Public` path exists in
-# non-frameworks and prebuilt-RN layouts; under static frameworks +
-# source-built RN it doesn't, so we fall back to the canonical RN source.
-# Stored outside `.build/` so SwiftPM state can be wiped without losing this
-# file.
+# Headers are referenced by absolute path so the modulemap works regardless of
+# where Pods lives. The `Pods/Headers/Public` path exists in non-frameworks and
+# prebuilt-RN layouts; under static frameworks + source-built RN it doesn't, so
+# we fall back to the canonical RN source. Stored outside `.build/` so SwiftPM
+# state can be wiped without losing this file.
 #
 # Idempotent: re-running with the same inputs rewrites identical content.
-# Switching PODS_ROOT updates the umbrella header path.
+# Switching PODS_ROOT updates the header paths.
 #
 # Used by build-xcframework.sh and test.sh; can also be run manually before
 # opening the package in Xcode.
@@ -36,32 +35,40 @@ GENERATED_DIR="${PACKAGE_DIR}/.generated"
 GENERATED_MODULE_MAP="${GENERATED_DIR}/module.modulemap"
 mkdir -p "$GENERATED_DIR"
 
-JSI_UMBRELLA="${PODS_ROOT}/Headers/Public/React-jsi/jsi/jsi.h"
-if [[ ! -f "$JSI_UMBRELLA" ]]; then
+JSI_HEADER="${PODS_ROOT}/Headers/Public/React-jsi/jsi/jsi.h"
+if [[ ! -f "$JSI_HEADER" ]]; then
   # Resolution order matches build-xcframework.sh: RN_ROOT (forwarded by the
   # build script), REACT_NATIVE_PATH (exported by Xcode for hosts like Expo Go
   # that build RN from a submodule), node resolve, then a relative fallback.
   RN="${RN_ROOT:-${REACT_NATIVE_PATH:-$(node -p 'require("path").dirname(require.resolve("react-native/package.json"))' 2>/dev/null || echo "${PODS_ROOT}/../../node_modules/react-native")}}"
-  JSI_UMBRELLA="${RN}/ReactCommon/jsi/jsi/jsi.h"
+  JSI_HEADER="${RN}/ReactCommon/jsi/jsi/jsi.h"
 fi
-[[ -f "$JSI_UMBRELLA" ]] || { echo "error: cannot locate jsi.h" >&2; exit 1; }
+[[ -f "$JSI_HEADER" ]] || { echo "error: cannot locate jsi.h" >&2; exit 1; }
 
-# The umbrella header doesn't include `instrumentation.h`, so declare it explicitly.
-# Otherwise including it warns about a missing `jsi.instrumentation` submodule.
-JSI_INSTRUMENTATION="$(dirname "$JSI_UMBRELLA")/instrumentation.h"
-JSI_EXTRA_HEADERS=""
-if [[ -f "$JSI_INSTRUMENTATION" ]]; then
-  JSI_EXTRA_HEADERS="
-  header \"${JSI_INSTRUMENTATION}\""
-fi
+JSI_DIR="$(dirname "$JSI_HEADER")"
+
+# The two headers this package includes, listed one by one instead of behind an `umbrella header`.
+# An umbrella claims every header sitting next to jsi.h, and the JSI pod ships several that jsi.h
+# doesn't include (decorator.h, hermes-interfaces.h, JSIDynamic.h, jsilib.h, threadsafe.h). Clang
+# warns "umbrella header for module 'jsi' does not include header ..." once per file, on every
+# build of every slice. JSIDynamic.h would also pull in folly.
+# jsi-inl.h needs no entry: jsi.h includes it, and Clang takes it textually from there.
+JSI_HEADERS=""
+for header in jsi.h instrumentation.h; do
+  if [[ -f "${JSI_DIR}/${header}" ]]; then
+    JSI_HEADERS="${JSI_HEADERS}
+  header \"${JSI_DIR}/${header}\""
+  fi
+done
 
 # Avoid touching the file when contents would be identical, so the xcframework
 # hash cache and Xcode don't see a spurious change when inputs are unchanged.
-NEW_CONTENT="module jsi {
-  umbrella header \"${JSI_UMBRELLA}\"${JSI_EXTRA_HEADERS}
+#
+# No `module * { export * }`: inferred submodules require an umbrella, and with headers listed
+# explicitly there are no submodules to infer.
+NEW_CONTENT="module jsi {${JSI_HEADERS}
 
   export *
-  module * { export * }
 }"
 if [[ ! -f "$GENERATED_MODULE_MAP" ]] || [[ "$(cat "$GENERATED_MODULE_MAP")" != "$NEW_CONTENT" ]]; then
   printf '%s\n' "$NEW_CONTENT" > "$GENERATED_MODULE_MAP"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-modules-jsi",
-  "version": "58.0.3",
+  "version": "58.0.5",
   "description": "The JavaScript Interface for Expo Modules",
   "main": "index.js",
   "sideEffects": [],
@@ -41,7 +41,6 @@
       "./apple/scripts/test.sh"
     ]
   },
-  "gitHead": "ebb1fd7569c9c9e172cb9abd73dfede027c1d674",
   "scripts": {
     "benchmark": "TEST_RUNNER_EXPO_BENCHMARK=1 DESTINATION=\"${DESTINATION:-platform=macOS,variant=Mac Catalyst}\" apple/scripts/test.sh -configuration Release -only-testing Benchmarks -enableCodeCoverage NO",
     "build:xcframework": "apple/scripts/build-xcframework.sh",

package/apple/.generated/module.modulemap

@@ -1,7 +0,0 @@
-module jsi {
-  umbrella header "/Users/alanhughes/Work/expo/packages/expo-modules-jsi/.expo-prebuild/pods-stage/Headers/Public/React-jsi/jsi/jsi.h"
-  header "/Users/alanhughes/Work/expo/packages/expo-modules-jsi/.expo-prebuild/pods-stage/Headers/Public/React-jsi/jsi/instrumentation.h"
-
-  export *
-  module * { export * }
-}

package/apple/Products/ExpoModulesJSI.xcframework/Info.plist

@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-  <key>AvailableLibraries</key>
-  <array>
-    <dict>
-      <key>BinaryPath</key>
-      <string>ExpoModulesJSI.framework/ExpoModulesJSI</string>
-      <key>LibraryIdentifier</key>
-      <string>ios-arm64</string>
-      <key>LibraryPath</key>
-      <string>ExpoModulesJSI.framework</string>
-      <key>SupportedArchitectures</key>
-      <array>
-        <string>arm64</string>
-      </array>
-      <key>SupportedPlatform</key>
-      <string>ios</string>
-    </dict>
-    <dict>
-      <key>BinaryPath</key>
-      <string>ExpoModulesJSI.framework/ExpoModulesJSI</string>
-      <key>LibraryIdentifier</key>
-      <string>ios-arm64_x86_64-maccatalyst</string>
-      <key>LibraryPath</key>
-      <string>ExpoModulesJSI.framework</string>
-      <key>SupportedArchitectures</key>
-      <array>
-        <string>arm64</string>
-        <string>x86_64</string>
-      </array>
-      <key>SupportedPlatform</key>
-      <string>ios</string>
-      <key>SupportedPlatformVariant</key>
-      <string>maccatalyst</string>
-    </dict>
-    <dict>
-      <key>BinaryPath</key>
-      <string>ExpoModulesJSI.framework/ExpoModulesJSI</string>
-      <key>LibraryIdentifier</key>
-      <string>ios-arm64_x86_64-simulator</string>
-      <key>LibraryPath</key>
-      <string>ExpoModulesJSI.framework</string>
-      <key>SupportedArchitectures</key>
-      <array>
-        <string>arm64</string>
-        <string>x86_64</string>
-      </array>
-      <key>SupportedPlatform</key>
-      <string>ios</string>
-      <key>SupportedPlatformVariant</key>
-      <string>simulator</string>
-    </dict>
-    <dict>
-      <key>BinaryPath</key>
-      <string>ExpoModulesJSI.framework/ExpoModulesJSI</string>
-      <key>LibraryIdentifier</key>
-      <string>macos-arm64_x86_64</string>
-      <key>LibraryPath</key>
-      <string>ExpoModulesJSI.framework</string>
-      <key>SupportedArchitectures</key>
-      <array>
-        <string>arm64</string>
-        <string>x86_64</string>
-      </array>
-      <key>SupportedPlatform</key>
-      <string>macos</string>
-    </dict>
-    <dict>
-      <key>BinaryPath</key>
-      <string>ExpoModulesJSI.framework/ExpoModulesJSI</string>
-      <key>LibraryIdentifier</key>
-      <string>tvos-arm64</string>
-      <key>LibraryPath</key>
-      <string>ExpoModulesJSI.framework</string>
-      <key>SupportedArchitectures</key>
-      <array>
-        <string>arm64</string>
-      </array>
-      <key>SupportedPlatform</key>
-      <string>tvos</string>
-    </dict>
-    <dict>
-      <key>BinaryPath</key>
-      <string>ExpoModulesJSI.framework/ExpoModulesJSI</string>
-      <key>LibraryIdentifier</key>
-      <string>tvos-arm64_x86_64-simulator</string>
-      <key>LibraryPath</key>
-      <string>ExpoModulesJSI.framework</string>
-      <key>SupportedArchitectures</key>
-      <array>
-        <string>arm64</string>
-        <string>x86_64</string>
-      </array>
-      <key>SupportedPlatform</key>
-      <string>tvos</string>
-      <key>SupportedPlatformVariant</key>
-      <string>simulator</string>
-    </dict>
-  </array>
-  <key>CFBundlePackageType</key>
-  <string>XFWK</string>
-  <key>XCFrameworkFormatVersion</key>
-  <string>1.0</string>
-</dict>
-</plist>