expo-modules-core 58.0.12 → 58.0.13

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## 58.0.13
+
+### Patch Changes
+
+- [macOS] Attach SwiftUI hosting views even when no `NSViewController` is in the responder chain, such as a React root view set directly as `NSWindow.contentView`. Previously, `@expo/ui` content in such windows rendered nothing. ([#50995](https://github.com/expo/expo/pull/50995) by [@gabrieldonadel](https://github.com/gabrieldonadel))
+- [iOS] Update `expo-modules-macros` to 0.15.0, which generates only the unowned decode for `@Union` and skips cases whose `decodableKinds` can't match. ([#50894](https://github.com/expo/expo/pull/50894) by [@tsapeta](https://github.com/tsapeta))
+- [Internal] Make `AppContext` non-final, so that `TestAppContext` from `expo-modules-test-core` can subclass it. ([#51015](https://github.com/expo/expo/pull/51015) by [@tsapeta](https://github.com/tsapeta))
+- [Android] Fixed a race where a promise resolved and rejected from different threads at the same time could settle twice and throw on the JavaScript thread. ([#51052](https://github.com/expo/expo/pull/51052) by [@alanjhughes](https://github.com/alanjhughes))
+- [Android] An Expo Modules API 2.0 module that throws a `CodedException` now reports its `code` to JavaScript. ([#51036](https://github.com/expo/expo/pull/51036) by [@lukmccall](https://github.com/lukmccall))
+- Updated dependencies. ([#50859](https://github.com/expo/expo/pull/50859), [#51015](https://github.com/expo/expo/pull/51015), [#51004](https://github.com/expo/expo/pull/51004), [#51040](https://github.com/expo/expo/pull/51040), [#51055](https://github.com/expo/expo/pull/51055))
+  - expo-modules-jsi@58.0.9
+
 ## 58.0.12
 
 ### Patch Changes

package/android/build.gradle

@@ -46,7 +46,7 @@ if (shouldIncludeCompose) {
 }
 
 group = 'host.exp.exponent'
-version = '58.0.12'
+version = '58.0.13'
 
 def isExpoModulesCoreTests = {
   Gradle gradle = getGradle()
@@ -97,7 +97,7 @@ if (workletsProject != null) {
 
 def reactNativeWorkletsRootDir = workletsProject?.projectDir?.parentFile
 
-def expoModulesV2Version = "0.2.2"
+def expoModulesV2Version = "0.2.4"
 
 configurations {
   // Artifact-only: the C++ sources, not something to put on any classpath.
@@ -175,7 +175,7 @@ android {
   defaultConfig {
     consumerProguardFiles 'proguard-rules.pro'
     versionCode 1
-    versionName "58.0.12"
+    versionName "58.0.13"
     buildConfigField "String", "EXPO_MODULES_CORE_VERSION", "\"${versionName}\""
     buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", "true"
 

package/android/cmake/common.cmake

@@ -27,6 +27,8 @@ target_link_libraries(
   ReactAndroid::reactnative
 )
 
+include(${CMAKE_SOURCE_DIR}/cmake/pch-ccache.cmake)
+
 function(use_expo_common target_name)
   target_link_libraries(${target_name} PRIVATE EXPO_COMMON)
 endfunction()
@@ -47,10 +49,12 @@ target_include_directories(
   "${REACT_NATIVE_DIR}/ReactAndroid/src/main/jni"
 )
 
+set(EXPO_PCH_INCLUDE_OPTION "$<$<COMPILE_LANGUAGE:CXX>:-idirafter${CMAKE_SOURCE_DIR}/src/main/cpp>")
+target_compile_options(expo-modules-pch PRIVATE ${EXPO_PCH_INCLUDE_OPTION})
 target_precompile_headers(
   expo-modules-pch
   PRIVATE
-  ${CMAKE_SOURCE_DIR}/src/main/cpp/ExpoHeader.pch
+  "<ExpoHeader.pch>"
 )
 
 # Drop the timestamp embedded in the .pch so it stays bit-for-bit stable across
@@ -60,3 +64,11 @@ target_compile_options(
   PRIVATE
   "$<$<COMPILE_LANGUAGE:CXX>:-Xclang;-fno-pch-timestamp>"
 )
+
+pch_ccache_owner(expo-modules-pch)
+
+function(use_expo_pch target_name)
+  target_precompile_headers(${target_name} REUSE_FROM expo-modules-pch)
+  target_compile_options(${target_name} PRIVATE ${EXPO_PCH_INCLUDE_OPTION})
+  pch_ccache_consumer(${target_name} expo-modules-pch)
+endfunction()

package/android/cmake/jsi.cmake

@@ -10,7 +10,7 @@ add_library(
 
 use_expo_common(expo-modules-jsi)
 
-target_precompile_headers(expo-modules-jsi REUSE_FROM expo-modules-pch)
+use_expo_pch(expo-modules-jsi)
 
 target_include_directories(
   expo-modules-jsi

package/android/cmake/main.cmake

@@ -27,7 +27,7 @@ add_library(
 
 use_expo_common(expo-modules-core)
 
-target_precompile_headers(expo-modules-core REUSE_FROM expo-modules-pch)
+use_expo_pch(expo-modules-core)
 
 target_include_directories(
   expo-modules-core

package/android/cmake/pch-ccache.cmake

@@ -0,0 +1,139 @@
+# Run as custom command
+if(CMAKE_SCRIPT_MODE_FILE)
+  set(target_option)
+  if(COMPILER_TARGET)
+    set(target_option "--target=${COMPILER_TARGET}")
+  endif()
+
+  execute_process(
+    COMMAND "${COMPILER}" ${target_option} -module-file-info "${PCH}"
+    OUTPUT_VARIABLE info
+    RESULT_VARIABLE result
+  )
+
+  if(NOT result EQUAL 0)
+    # Hash the .pch itself, which is what ccache does without a .sum. The build stays correct, but
+    # checkouts at different paths don't share the results of the users of this PCH.
+    message(WARNING "`${COMPILER} -module-file-info ${PCH}` failed, so ccache can't share the results "
+      "of the users of this PCH between checkouts at different paths.")
+    file(SHA256 "${PCH}" digest)
+    file(WRITE "${PCH}.sum" "${digest}\n")
+    return()
+  endif()
+
+  # Remove `ShowColors` and `PCH_CCACHE_BUILD_DIR` 
+  string(REGEX REPLACE "PCH_CCACHE_BUILD_DIR=[^\n]*|ShowColors: [^\n]*" "" info "${info}")
+
+  # Get all input files
+  string(REGEX MATCHALL "Input file: [^\n]*" input_files "${info}")
+  foreach(input_file IN LISTS input_files)
+    string(REGEX REPLACE "^Input file: | \\[[A-Za-z, ]+\\]$" "" path "${input_file}")
+    if(EXISTS "${path}")
+      file(SHA256 "${path}" digest)
+      string(APPEND info "${digest}\n")
+    endif()
+  endforeach()
+
+  # Remove base dir
+  if(BASE_DIR)
+    string(REGEX REPLACE "(.)/+$" "\\1" base_dir "${BASE_DIR}")
+    string(REGEX REPLACE "([][+.*()^$?|\\\\])" "\\\\\\1" base_dir_regex "${base_dir}")
+    # The directory itself or a path in it, followed by a space, a quote or a line break. A directory whose
+    # name only starts with the same text doesn't match.
+    string(REGEX MATCHALL "${base_dir_regex}(/[^ '\n]*)?[ '\n]" paths "${info}")
+    list(REMOVE_DUPLICATES paths)
+    foreach(path IN LISTS paths)
+      string(REGEX REPLACE "[ '\n]$" "" path "${path}")
+      file(RELATIVE_PATH relative_path "${BUILD_DIR}" "${path}")
+      string(REGEX REPLACE "([][+.*()^$?|\\\\])" "\\\\\\1" path_regex "${path}")
+      string(REGEX REPLACE "${path_regex}([ '\n])" "${relative_path}\\1" info "${info}")
+    endforeach()
+  endif()
+
+  string(SHA256 digest "${info}")
+  file(WRITE "${PCH}.sum" "${digest}\n")
+  return()
+endif()
+
+set(PCH_CCACHE_FILE "${CMAKE_CURRENT_LIST_FILE}")
+
+# Find ccache program if it's used by the target
+function(_pch_ccache_program target out_var)
+  get_target_property(launcher ${target} CXX_COMPILER_LAUNCHER)
+  get_property(global_rule GLOBAL PROPERTY RULE_LAUNCH_COMPILE)
+  get_property(directory_rule DIRECTORY PROPERTY RULE_LAUNCH_COMPILE)
+  separate_arguments(rules UNIX_COMMAND "${global_rule} ${directory_rule}")
+  get_filename_component(compiler "${CMAKE_CXX_COMPILER}" REALPATH)
+  foreach(program IN LISTS launcher rules compiler)
+    get_filename_component(name "${program}" NAME_WE)
+    if(name STREQUAL "ccache")
+      find_program(PCH_CCACHE_PROGRAM NAMES "${program}")
+      set(${out_var} "${PCH_CCACHE_PROGRAM}" PARENT_SCOPE)
+      return()
+    endif()
+  endforeach()
+  set(${out_var} "" PARENT_SCOPE)
+endfunction()
+
+function(pch_ccache_owner owner)
+  # CMake's location of the PCH for the Ninja and Makefile generators.
+  set(pch_dir "${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${owner}.dir")
+  set(pch "${pch_dir}/cmake_pch.hxx.pch")
+
+  # Used by the custom command
+  set_property(SOURCE "${pch_dir}/cmake_pch.hxx.cxx" APPEND PROPERTY
+    COMPILE_DEFINITIONS "PCH_CCACHE_BUILD_DIR=${CMAKE_CURRENT_BINARY_DIR}"
+  )
+
+  set(pch_external_checksum "")
+  set(base_dir "")
+  _pch_ccache_program(${owner} ccache)
+  if(NOT ccache AND "$ENV{EXPO_FORCE_PCH_CCACHE_SUM}")
+    # ccache runs through a wrapper, so take its configuration from the ccache on PATH
+    find_program(PCH_CCACHE_PATH_PROGRAM ccache)
+    set(ccache "${PCH_CCACHE_PATH_PROGRAM}")
+  endif()
+  if(ccache)
+    foreach(option IN ITEMS pch_external_checksum base_dir)
+      execute_process(
+        COMMAND "${ccache}" --get-config ${option}
+        OUTPUT_VARIABLE ${option}
+        OUTPUT_STRIP_TRAILING_WHITESPACE
+        ERROR_QUIET
+      )
+    endforeach()
+  endif()
+
+  if("$ENV{EXPO_FORCE_PCH_CCACHE_SUM}")
+    set(pch_external_checksum "true")
+  endif()
+
+  if(NOT pch_external_checksum STREQUAL "true")
+    # Remove the .sum of an earlier configuration: it can belong to an older PCH, and ccache would hash it
+    # if `pch_external_checksum` is enabled later.
+    file(REMOVE "${pch}.sum")
+    return()
+  endif()
+
+  add_custom_command(
+    OUTPUT "${pch}.sum"
+    COMMAND "${CMAKE_COMMAND}"
+      "-DCOMPILER=${CMAKE_CXX_COMPILER}"
+      "-DCOMPILER_TARGET=${CMAKE_CXX_COMPILER_TARGET}"
+      "-DPCH=${pch}"
+      "-DBASE_DIR=${base_dir}"
+      "-DBUILD_DIR=${CMAKE_BINARY_DIR}"
+      -P "${PCH_CCACHE_FILE}"
+    DEPENDS "${pch}" "${PCH_CCACHE_FILE}"
+    COMMENT "Writing the ccache checksum of the ${owner} PCH"
+    VERBATIM
+  )
+  add_custom_target(${owner}-pch-ccache-sum DEPENDS "${pch}.sum")
+endfunction()
+
+function(pch_ccache_consumer consumer owner)
+  # ccache reads the .sum when it compiles a source of <consumer>, so it must be written before.
+  if(TARGET ${owner}-pch-ccache-sum)
+    add_dependencies(${consumer} ${owner}-pch-ccache-sum)
+  endif()
+endfunction()

package/android/cmake/tests.cmake

@@ -14,7 +14,7 @@ add_library(
 
 use_expo_common(expo-modules-core-tests)
 
-target_precompile_headers(expo-modules-core-tests REUSE_FROM expo-modules-pch)
+use_expo_pch(expo-modules-core-tests)
 
 target_include_directories(
   expo-modules-core-tests

package/android/cmake/worklets.cmake

@@ -14,7 +14,7 @@ add_library(
 
 use_expo_common(expo-modules-worklets)
 
-target_precompile_headers(expo-modules-worklets REUSE_FROM expo-modules-pch)
+use_expo_pch(expo-modules-worklets)
 
 target_include_directories(
   expo-modules-worklets

package/android/prebuilt/metadata.json

@@ -1,6 +1,6 @@
 {
     "reactNativeVersion": "0.88.0",
-    "sourceHash": "c852e8e2eba26473f3af1a4e907188f6",
+    "sourceHash": "6f9421c9afcc3239b0995cea1757806a",
     "variants": [
         "debug",
         "release"
@@ -16,5 +16,5 @@
         "libexpo-modules-jsi.so"
     ],
     "stripped": true,
-    "createdAt": "2026-09-25T14:27:57.725201Z"
+    "createdAt": "2026-10-05T21:13:27.466871505Z"
 }

package/android/src/main/java/expo/modules/kotlin/exception/CodedException.kt

@@ -3,6 +3,7 @@ package expo.modules.kotlin.exception
 import com.facebook.react.bridge.ReadableType
 import expo.modules.core.interfaces.DoNotStrip
 import expo.modules.kotlin.types.descriptors.TypeDescriptor
+import io.github.expo.modules.v2.JavaScriptThrowable
 import java.util.*
 import kotlin.reflect.KClass
 import kotlin.reflect.KProperty1
@@ -23,13 +24,13 @@ inline fun Throwable?.toCodedException() = when (this) {
 open class CodedException(
   message: String?,
   cause: Throwable? = null
-) : Exception(message, cause) {
+) : JavaScriptThrowable(message, cause) {
   // We need that secondary property, cause we can't access
   // the javaClass property in the constructor.
   private var providedCode: String? = null
 
   @get:DoNotStrip
-  val code
+  final override val code: String
     get() = providedCode ?: inferCode(javaClass)
 
   constructor(code: String?, message: String?, cause: Throwable?) : this(message = message, cause = cause) {

package/android/src/main/java/expo/modules/kotlin/jni/PromiseImpl.kt

@@ -4,13 +4,15 @@ import expo.modules.core.interfaces.DoNotStrip
 import expo.modules.kotlin.AppContext
 import expo.modules.kotlin.Promise
 import java.lang.ref.WeakReference
+import java.util.concurrent.atomic.AtomicBoolean
 
 @DoNotStrip
 class PromiseImpl @DoNotStrip internal constructor(
   @DoNotStrip internal val callback: JavaCallback
 ) : Promise {
-  internal var wasSettled = false
-    private set
+  private val settled = AtomicBoolean(false)
+  internal val wasSettled: Boolean
+    get() = settled.get()
   private var appContextHolder: WeakReference<AppContext>? = null
   private var fullFunctionName: String? = null
 
@@ -57,12 +59,19 @@ class PromiseImpl @DoNotStrip internal constructor(
   }
 
   private inline fun checkIfWasSettled(body: () -> Unit) {
-    if (wasSettled) {
+    if (!settled.compareAndSet(false, true)) {
       return
     }
 
-    body()
-    wasSettled = true
+    var didSettle = false
+    try {
+      body()
+      didSettle = true
+    } finally {
+      if (!didSettle) {
+        settled.set(false)
+      }
+    }
   }
 
   fun decorateWithDebugInformation(

package/android/src/main/java/expo/modules/v2/ExpoModulesV2Host.kt

@@ -3,7 +3,6 @@ package expo.modules.v2
 import com.facebook.react.bridge.ReactApplicationContext
 import expo.modules.kotlin.logger
 import io.github.expo.modules.v2.Module
-import io.github.expo.modules.v2.modules.ModuleRegistry
 import io.github.expo.modules.v2.react.ReactRuntime
 import java.lang.reflect.Modifier
 
@@ -31,9 +30,16 @@ object ExpoModulesV2Host {
       }
 
       try {
-        val registry = ModuleRegistry()
-        modules.forEach(registry::register)
-        runtime = ReactRuntime.attach(reactContext, registry)
+        // The runtime creates a context of its own, and serves the modules of that context.
+        val attached = ReactRuntime.attach(reactContext)
+        try {
+          modules.forEach(attached.moduleRegistry::register)
+        } catch (e: Throwable) {
+          // Closing the runtime closes its context, so no module stays bound to it.
+          attached.close()
+          throw e
+        }
+        runtime = attached
         logger.info("✅ Expo Modules v2 installed ${modules.size} module(s) on globalThis.expo.modules")
       } catch (e: Throwable) {
         logger.error("❌ Cannot install Expo Modules v2: $e", e)

package/expo-module-gradle-plugin/build.gradle.kts

@@ -33,7 +33,7 @@ dependencies {
   implementation("com.facebook.react:react-native-gradle-plugin")
   implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.3")
   implementation("io.github.expo.pika:pika-gradle:1.1.0")
-  implementation("io.github.expo:expo-modules-v2-gradle-plugin:0.2.2")
+  implementation("io.github.expo:expo-modules-v2-gradle-plugin:0.2.4")
 
   if (isExpoAutolinkingSettingsPluginAvailable) {
     implementation("expo.modules:expo-autolinking-plugin-shared")

package/ios/Core/AppContext.swift

@@ -3,9 +3,10 @@ import ExpoModulesJSI
 
 /**
  The app context is an interface to a single Expo app.
+ Not `final` so that `TestAppContext` from `ExpoModulesTestCore` can subclass it.
  */
 @objc(EXAppContext)
-public final class AppContext: NSObject, EXAppContextProtocol, @unchecked Sendable {
+public class AppContext: NSObject, EXAppContextProtocol, @unchecked Sendable {
   internal static func create() -> AppContext {
     let appContext = AppContext()
 

package/ios/Core/Views/SwiftUI/SwiftUIHostingView.swift

@@ -223,26 +223,35 @@ extension ExpoSwiftUI {
       }
       #endif
 
-      if window != nil, let parentController = reactViewController() {
-        #if !os(macOS)
-        if parentController as? UINavigationController == nil && parentController as? UITabBarController == nil {
-          // Swift automatically adds the hostingController in the correct place when the parentController
-          // is UINavigationController, since its children are supposed to be only screens.
-          // Similarly, for UITabBarController we expect its children to be only tabs.
-          parentController.addChild(hostingController)
-        }
-        #else
-        parentController.addChild(hostingController)
-        #endif
-        addSubview(hostingController.view)
-        #if os(iOS) || os(tvOS)
-        hostingController.didMove(toParent: parentController)
-        #endif
-        setupHostingViewConstraints()
-      } else {
+      guard window != nil else {
+        hostingController.view.removeFromSuperview()
+        hostingController.removeFromParent()
+        return
+      }
+
+      let parentController = reactViewController()
+      #if os(macOS)
+      // An `NSHostingController` view renders without a parent controller, and a React root view used
+      // directly as `NSWindow.contentView` has none in its responder chain, so don't require one.
+      parentController?.addChild(hostingController)
+      #else
+      guard let parentController else {
         hostingController.view.removeFromSuperview()
         hostingController.removeFromParent()
+        return
+      }
+      if parentController as? UINavigationController == nil && parentController as? UITabBarController == nil {
+        // Swift automatically adds the hostingController in the correct place when the parentController
+        // is UINavigationController, since its children are supposed to be only screens.
+        // Similarly, for UITabBarController we expect its children to be only tabs.
+        parentController.addChild(hostingController)
       }
+      #endif
+      addSubview(hostingController.view)
+      #if os(iOS) || os(tvOS)
+      hostingController.didMove(toParent: parentController)
+      #endif
+      setupHostingViewConstraints()
     }
 
 #if os(macOS)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-modules-core",
-  "version": "58.0.12",
+  "version": "58.0.13",
   "description": "The core of Expo Modules architecture",
   "keywords": [
     "expo",
@@ -64,8 +64,8 @@
     "./package.json": "./package.json"
   },
   "dependencies": {
-    "expo-modules-jsi": "~58.0.8",
-    "expo-modules-macros": "0.14.0",
+    "expo-modules-jsi": "~58.0.9",
+    "expo-modules-macros": "0.15.0",
     "invariant": "^2.2.4"
   },
   "devDependencies": {
@@ -73,7 +73,7 @@
     "@types/invariant": "^2.2.33",
     "@types/react": "~19.3.0",
     "@types/react-dom": "^19.1.7",
-    "expo-module-scripts": "56.0.6",
+    "expo-module-scripts": "56.0.7",
     "react-dom": "19.3.0"
   },
   "peerDependencies": {
@@ -89,6 +89,7 @@
   "scripts": {
     "build": "expo-build src",
     "precompile-ios": "et prebuild-package-for-publish",
+    "precompile-android": "et prebuild-android-package-for-publish",
     "clean": "expo-module clean",
     "lint": "oxlint --config oxlint.config.mjs .",
     "format": "expo-module format",