expo-modules-core 58.0.11 → 58.0.13

package/CHANGELOG.md

@@ -1,5 +1,29 @@
 # 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
+
+- [Internal][Android] `expoPublish` now formats the updated `expo-module.config.json` with `oxfmt` instead of `prettier`. ([#47438](https://github.com/expo/expo/pull/47438) by [@hassankhan](https://github.com/hassankhan))
+- [iOS] Add `decodableKinds` to `JavaScriptDecodable`: the kinds of JavaScript value (`JavaScriptValueKinds`) that `decode` can accept, so code that picks between several types can skip the ones that can't match. ([#50905](https://github.com/expo/expo/pull/50905) by [@tsapeta](https://github.com/tsapeta))
+- [iOS] Add `JavaScriptValue.withUnownedValue(in:_:)`, and give the owning `JavaScriptDecodable.decode` a default that borrows the value and decodes it through the `JavaScriptUnownedValue` overload, so a conformer can implement only that one. Arrays, dictionaries, dates, records and enums now decode unowned values without copying them first. ([#50960](https://github.com/expo/expo/pull/50960) by [@tsapeta](https://github.com/tsapeta))
+- Fixed native views ignoring `aria-*`, `id` and `tabIndex` props such as `aria-hidden` and `aria-label` ([#50782](https://github.com/expo/expo/issues/50782)). ([#50959](https://github.com/expo/expo/pull/50959) by [@alanjhughes](https://github.com/alanjhughes))
+- Fixed `release()` throwing on a shared object whose JS object is frozen, for example an `ImageRef` passed as a view prop in development ([#50962](https://github.com/expo/expo/issues/50962)). ([#50970](https://github.com/expo/expo/pull/50970) by [@tsapeta](https://github.com/tsapeta))
+- Updated dependencies. ([#50905](https://github.com/expo/expo/pull/50905), [#50698](https://github.com/expo/expo/pull/50698), [#50937](https://github.com/expo/expo/pull/50937), [#50888](https://github.com/expo/expo/pull/50888), [#50960](https://github.com/expo/expo/pull/50960), [#50980](https://github.com/expo/expo/pull/50980), [#50354](https://github.com/expo/expo/pull/50354))
+  - expo-modules-jsi@58.0.8
+
 ## 58.0.11
 
 ### Patch Changes

package/android/build.gradle

@@ -46,7 +46,7 @@ if (shouldIncludeCompose) {
 }
 
 group = 'host.exp.exponent'
-version = '58.0.11'
+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.11"
+    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/build/NativeViewManagerAdapter.native.js

@@ -84,6 +84,51 @@ import { requireNativeModule } from './requireNativeModule';
     }
     return cachedNativeComponent;
 }
+/**
+ * Maps `aria-*`, `id` and `tabIndex` props to native props.
+ * Mirrors `Libraries/Components/View/View.js` in React Native 0.88.
+ */ function mapAriaProps(props) {
+    const { accessibilityState, accessibilityValue, 'aria-busy': ariaBusy, 'aria-checked': ariaChecked, 'aria-disabled': ariaDisabled, 'aria-expanded': ariaExpanded, 'aria-hidden': ariaHidden, 'aria-label': ariaLabel, 'aria-labelledby': ariaLabelledBy, 'aria-live': ariaLive, 'aria-selected': ariaSelected, 'aria-valuemax': ariaValueMax, 'aria-valuemin': ariaValueMin, 'aria-valuenow': ariaValueNow, 'aria-valuetext': ariaValueText, id, tabIndex, ...resolvedProps } = props;
+    if (ariaLabelledBy !== undefined) {
+        resolvedProps.accessibilityLabelledBy = ariaLabelledBy.split(/\s*,\s*/g);
+    }
+    if (ariaLabel !== undefined) {
+        resolvedProps.accessibilityLabel = ariaLabel;
+    }
+    if (ariaLive !== undefined) {
+        resolvedProps.accessibilityLiveRegion = ariaLive === 'off' ? 'none' : ariaLive;
+    }
+    if (ariaHidden !== undefined) {
+        resolvedProps.accessibilityElementsHidden = ariaHidden;
+        if (ariaHidden === true) {
+            resolvedProps.importantForAccessibility = 'no-hide-descendants';
+        }
+    }
+    if (id !== undefined) {
+        resolvedProps.nativeID = id;
+    }
+    if (tabIndex !== undefined) {
+        resolvedProps.focusable = !tabIndex;
+    }
+    if (accessibilityState != null || ariaBusy != null || ariaChecked != null || ariaDisabled != null || ariaExpanded != null || ariaSelected != null) {
+        resolvedProps.accessibilityState = {
+            busy: ariaBusy ?? accessibilityState?.busy,
+            checked: ariaChecked ?? accessibilityState?.checked,
+            disabled: ariaDisabled ?? accessibilityState?.disabled,
+            expanded: ariaExpanded ?? accessibilityState?.expanded,
+            selected: ariaSelected ?? accessibilityState?.selected
+        };
+    }
+    if (accessibilityValue != null || ariaValueMax != null || ariaValueMin != null || ariaValueNow != null || ariaValueText != null) {
+        resolvedProps.accessibilityValue = {
+            max: ariaValueMax ?? accessibilityValue?.max,
+            min: ariaValueMin ?? accessibilityValue?.min,
+            now: ariaValueNow ?? accessibilityValue?.now,
+            text: ariaValueText ?? accessibilityValue?.text
+        };
+    }
+    return resolvedProps;
+}
 /**
  * A drop-in replacement for `requireNativeComponent`.
  */ export function requireNativeViewManager(moduleName, viewName) {
@@ -104,7 +149,7 @@ import { requireNativeModule } from './requireNativeModule';
         }
         render() {
             return /*#__PURE__*/ _jsx(ReactNativeComponent, {
-                ...this.props,
+                ...mapAriaProps(this.props),
                 ref: this.nativeRef
             });
         }

package/build/NativeViewManagerAdapter.native.js.map

@@ -1 +1 @@
-{"version":3,"sources":["NativeViewManagerAdapter.native.tsx"],"sourcesContent":[null],"names":["createRef","PureComponent","findNodeHandle","get","componentRegistryGet","SharedObject","requireNativeModule","nativeComponentsCache","Map","requireNativeComponent","moduleName","viewName","appIdentifier","globalThis","expo","viewNameSuffix","nativeViewName","expoViewConfig","getViewConfig","console","warn","uiViewClassName","directEventTypes","validAttributes","addAttributeProcessing","processPropValue","value","sharedObjectId","__expo_shared_object_id__","descriptor","process","attributes","key","Object","keys","requireCachedNativeComponent","cacheKey","cachedNativeComponent","nativeComponent","set","requireNativeViewManager","ReactNativeComponent","NativeComponent","displayName","nativeRef","nativeTag","componentDidMount","current","getNativeRef","render","props","ref","nativeModule","nativeViewPrototype","ViewPrototypes","assign","prototype"],"mappings":"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"}
+{"version":3,"sources":["NativeViewManagerAdapter.native.tsx"],"sourcesContent":[null],"names":["createRef","PureComponent","findNodeHandle","get","componentRegistryGet","SharedObject","requireNativeModule","nativeComponentsCache","Map","requireNativeComponent","moduleName","viewName","appIdentifier","globalThis","expo","viewNameSuffix","nativeViewName","expoViewConfig","getViewConfig","console","warn","uiViewClassName","directEventTypes","validAttributes","addAttributeProcessing","processPropValue","value","sharedObjectId","__expo_shared_object_id__","descriptor","process","attributes","key","Object","keys","requireCachedNativeComponent","cacheKey","cachedNativeComponent","nativeComponent","set","mapAriaProps","props","accessibilityState","accessibilityValue","ariaBusy","ariaChecked","ariaDisabled","ariaExpanded","ariaHidden","ariaLabel","ariaLabelledBy","ariaLive","ariaSelected","ariaValueMax","ariaValueMin","ariaValueNow","ariaValueText","id","tabIndex","resolvedProps","undefined","accessibilityLabelledBy","split","accessibilityLabel","accessibilityLiveRegion","accessibilityElementsHidden","importantForAccessibility","nativeID","focusable","busy","checked","disabled","expanded","selected","max","min","now","text","requireNativeViewManager","ReactNativeComponent","NativeComponent","displayName","nativeRef","nativeTag","componentDidMount","current","getNativeRef","render","ref","nativeModule","nativeViewPrototype","ViewPrototypes","assign","prototype"],"mappings":"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"}

package/common/cpp/SharedObject.cpp

@@ -38,8 +38,13 @@ void installBaseClass(jsi::Runtime &runtime, const ObjectReleaser& releaser) {
 
         releaser(nativeState->objectId);
 
-        // Should we reset the native state?
-        thisObject.setNativeState(runtime, nullptr);
+        // Resetting the native state throws when the object is frozen, for example a shared object
+        // passed as a view prop, which React Native deep-freezes in development. The native object
+        // is already released, so the native state can stay.
+        try {
+          thisObject.setNativeState(runtime, nullptr);
+        } catch (const jsi::JSIException &) {
+        }
       }
       return jsi::Value::undefined();
     });

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/expo-module-gradle-plugin/src/main/kotlin/expo/modules/plugin/android/MavenPublicationExtension.kt

@@ -204,7 +204,7 @@ private fun Project.expoPublishBody(publicationInfo: PublicationInfo, expoModule
   providers.exec { env ->
     env.workingDir(layout.projectDirectory.file(".."))
     // TODO(@lukmccall): support other package managers
-    env.commandLine("pnpm", "prettier", "--write", "expo-module.config.json")
+    env.commandLine("pnpm", "oxfmt", "--write", "expo-module.config.json")
   }.result.get()
 }
 

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/ArrayBuffers/ArrayBuffer.swift

@@ -225,6 +225,11 @@ public final class ArrayBuffer: AnyArrayBuffer, Sendable {
 }
 
 extension ArrayBuffer: JavaScriptDecodable, JavaScriptEncodable {
+  @inlinable
+  public static var decodableKinds: JavaScriptValueKinds {
+    return .object
+  }
+
   // MARK: - JavaScriptDecodable
   @JavaScriptActor
   @inlinable

package/ios/Core/Coding/JavaScriptCodable+Enumerable.swift

@@ -7,6 +7,12 @@ import ExpoModulesJSI
 // `String` or an integer type), delegating the actual conversion to that raw value's conformance.
 
 extension Enumerable where Self: RawRepresentable, RawValue: JavaScriptCodable {
+  // An enum decodes through its raw value, so it accepts what the raw value accepts.
+  @inlinable
+  public static var decodableKinds: JavaScriptValueKinds {
+    return RawValue.decodableKinds
+  }
+
   @JavaScriptActor
   @inlinable
   public static func decode(_ value: borrowing JavaScriptValue, in runtime: borrowing JavaScriptRuntime) throws -> Self
@@ -15,6 +21,15 @@ extension Enumerable where Self: RawRepresentable, RawValue: JavaScriptCodable {
     return try create(fromRawValue: rawValue)
   }
 
+  @JavaScriptActor
+  @inlinable
+  public static func decode(_ value: borrowing JavaScriptUnownedValue, in runtime: borrowing JavaScriptRuntime) throws
+    -> Self
+  {
+    let rawValue = try RawValue.decode(value, in: runtime)
+    return try create(fromRawValue: rawValue)
+  }
+
   @JavaScriptActor
   @inlinable
   public static func encode(_ value: Self, in runtime: borrowing JavaScriptRuntime) throws -> JavaScriptValue {

package/ios/Core/Coding/JavaScriptCodable+Record.swift

@@ -14,11 +14,16 @@ import ExpoModulesJSI
 // context never prepared has no such state, so recovery returns `nil` and the conversion throws
 // `Exceptions.AppContextNotFound`.
 //
-// Records only implement the owning `decode` overload (the requirement). They walk an object's
-// properties regardless, so the zero-copy `JavaScriptUnownedValue` fast path offers nothing here;
-// the defaulted overload materializes an owning value and forwards.
+// Both `decode` overloads read the object and hand it to `from(object:appContext:)`. The unowned one
+// reads it straight from the borrowed value, so a record argument isn't copied first.
 
 extension Record {
+  // A record decodes only from an object.
+  @inlinable
+  public static var decodableKinds: JavaScriptValueKinds {
+    return .object
+  }
+
   @JavaScriptActor
   @inlinable
   public static func decode(_ value: borrowing JavaScriptValue, in runtime: borrowing JavaScriptRuntime) throws -> Self
@@ -29,6 +34,17 @@ extension Record {
     return try from(object: value.asObject(), appContext: appContext)
   }
 
+  @JavaScriptActor
+  @inlinable
+  public static func decode(_ value: borrowing JavaScriptUnownedValue, in runtime: borrowing JavaScriptRuntime) throws
+    -> Self
+  {
+    guard let appContext = AppContext.from(runtime: runtime) else {
+      throw Exceptions.AppContextNotFound()
+    }
+    return try from(object: value.asObject(in: runtime), appContext: appContext)
+  }
+
   @JavaScriptActor
   @inlinable
   public static func encode(_ value: Self, in runtime: borrowing JavaScriptRuntime) throws -> JavaScriptValue {

package/ios/Core/Coding/JavaScriptCodable+SharedObject.swift

@@ -7,6 +7,11 @@ import ExpoModulesJSI
 // object's structure like `Record`.
 
 extension SharedObject: JavaScriptDecodable, JavaScriptEncodable {
+  @inlinable
+  public static var decodableKinds: JavaScriptValueKinds {
+    return .object
+  }
+
   @JavaScriptActor
   @inlinable
   public static func decode(_ value: borrowing JavaScriptValue, in runtime: borrowing JavaScriptRuntime) throws -> Self

package/ios/Core/Coding/JavaScriptCodable+TypedArray.swift

@@ -8,6 +8,11 @@ import ExpoModulesJSI
 // `TypedArray.swift` / `ConcreteTypedArrays.swift`.
 
 extension TypedArray: JavaScriptDecodable, JavaScriptEncodable {
+  @inlinable
+  public static var decodableKinds: JavaScriptValueKinds {
+    return .object
+  }
+
   @JavaScriptActor
   @inlinable
   public static func encode(_ value: TypedArray, in runtime: borrowing JavaScriptRuntime) throws -> JavaScriptValue {

package/ios/Core/ExpoModulesMacros.swift

@@ -216,7 +216,7 @@ public macro Record() =
 ///     }
 @attached(
   member,
-  names: named(decode), named(encode), named(`as`), named(_payloadTypeName),
+  names: named(decode), named(encode), named(decodableKinds), named(`as`), named(_payloadTypeName),
   named(_assertTypesConformance))
 @attached(extension, conformances: JavaScriptDecodable, JavaScriptEncodable)
 public macro Union() =

package/ios/Core/SharedObjects/SharedObject.swift

@@ -119,13 +119,13 @@ extension SharedObject {
   /// Returns the base `SharedObject`. Callers wanting a concrete subclass use the `as:` overload, which
   /// performs a checked downcast.
   ///
-  /// Throws `NotFoundException` when the object carries no native state.
+  /// Throws `NotFoundException` when the object carries no native state or its native object was released.
   @JavaScriptActor
   public static func native(from jsObject: borrowing JavaScriptObject) throws -> SharedObject {
-    guard let native = jsObject.getNativeState(as: SharedObjectNativeState.self)?.native else {
+    guard let nativeState = jsObject.getNativeState(as: SharedObjectNativeState.self), !nativeState.isReleased else {
       throw NotFoundException()
     }
-    return native
+    return nativeState.native
   }
 
   /// Recovers the native shared object and casts it to the given subclass, e.g.

package/ios/Core/SharedObjects/SharedObjectNativeState.swift

@@ -13,6 +13,10 @@ import ExpoModulesJSI
 internal final class SharedObjectNativeState: JavaScriptNativeState {
   internal let native: SharedObject
 
+  /// Whether the native object was released. A JS object can keep its native state after the release
+  /// (for example a frozen one, whose native state can't be reset), so lookups check this flag.
+  internal private(set) var isReleased = false
+
   /// The JS object paired with the native object in each runtime, keyed by runtime identity and held
   /// weakly. One native object can be exposed to several runtimes (e.g. the main and UI runtimes, or
   /// worklet contexts), each with its own JS counterpart.
@@ -23,6 +27,10 @@ internal final class SharedObjectNativeState: JavaScriptNativeState {
     super.init(factory: factory)
   }
 
+  internal func markReleased() {
+    isReleased = true
+  }
+
   /// Records `jsObject` as the native object's JS counterpart in `runtime`. The caller is responsible
   /// for having attached this native state to `jsObject` (`jsObject.setNativeState(self)`), which reuses
   /// the shared C++ pointee across runtimes.

package/ios/Core/SharedObjects/SharedObjectRegistry.swift

@@ -96,7 +96,8 @@ public final class SharedObjectRegistry: Sendable {
     // A native object that already carries a native state was paired in an earlier runtime. Reuse its
     // id rather than minting a new one: the C++ `NativeState.objectId` is immutable and drives the
     // releaser/`delete`, so a fresh id would disagree with it and leak this object's registry entry.
-    let id = nativeObject.nativeState != nil ? nativeObject.sharedObjectId : pullNextId()
+    let existingNativeState = unreleasedNativeState(of: nativeObject)
+    let id = existingNativeState != nil ? nativeObject.sharedObjectId : pullNextId()
 
     // Assign the ID and the app context to the object.
     nativeObject.sharedObjectId = id
@@ -124,7 +125,7 @@ public final class SharedObjectRegistry: Sendable {
     // Reuse it so all runtimes share one native state (and one underlying C++ pointee, via
     // `acquireShared`); a fresh state per runtime would leave `nativeObject.nativeState` pointing at
     // whichever ran last and lose the earlier runtimes' pairings.
-    let nativeState = nativeObject.nativeState ?? {
+    let nativeState = existingNativeState ?? {
       let releaser: ObjectReleaser = { [weak self] id in
         self?.delete(id)
       }
@@ -169,6 +170,7 @@ public final class SharedObjectRegistry: Sendable {
     state.withLock { state in
       if let nativeState = state.pairs[id] {
         let native = nativeState.native
+        nativeState.markReleased()
         native.sharedObjectWillRelease()
         // Reset an ID on the object.
         native.sharedObjectId = 0
@@ -230,12 +232,21 @@ public final class SharedObjectRegistry: Sendable {
     // The id table and the native object both resolve to the same `SharedObjectNativeState`, which
     // owns the per-runtime JS counterparts, so a single lookup serves both. Prefer the native object's
     // own back-pointer and fall back to the id table for objects whose back-pointer was cleared.
-    let nativeState = nativeObject.nativeState ?? state.withLock { state in
+    let nativeState = unreleasedNativeState(of: nativeObject) ?? state.withLock { state in
       return state.pairs[nativeObject.sharedObjectId]
     }
     return nativeState?.javaScriptObject(in: runtime)
   }
 
+  /// Returns the native object's native state, or `nil` if it was released. A released native state can
+  /// outlive the release on a JS object that couldn't drop it (for example a frozen one).
+  private func unreleasedNativeState(of nativeObject: SharedObject) -> SharedObjectNativeState? {
+    guard let nativeState = nativeObject.nativeState, !nativeState.isReleased else {
+      return nil
+    }
+    return nativeState
+  }
+
   /**
    Creates a plain JS object and pairs it with a given native object.
    */

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.11",
+  "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.7",
-    "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.5",
+    "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",

package/src/NativeViewManagerAdapter.native.tsx

@@ -128,6 +128,86 @@ function requireCachedNativeComponent<Props>(
   return cachedNativeComponent;
 }
 
+/**
+ * Maps `aria-*`, `id` and `tabIndex` props to native props.
+ * Mirrors `Libraries/Components/View/View.js` in React Native 0.88.
+ */
+function mapAriaProps(props: Record<string, any>): Record<string, any> {
+  const {
+    accessibilityState,
+    accessibilityValue,
+    'aria-busy': ariaBusy,
+    'aria-checked': ariaChecked,
+    'aria-disabled': ariaDisabled,
+    'aria-expanded': ariaExpanded,
+    'aria-hidden': ariaHidden,
+    'aria-label': ariaLabel,
+    'aria-labelledby': ariaLabelledBy,
+    'aria-live': ariaLive,
+    'aria-selected': ariaSelected,
+    'aria-valuemax': ariaValueMax,
+    'aria-valuemin': ariaValueMin,
+    'aria-valuenow': ariaValueNow,
+    'aria-valuetext': ariaValueText,
+    id,
+    tabIndex,
+    ...resolvedProps
+  } = props;
+
+  if (ariaLabelledBy !== undefined) {
+    resolvedProps.accessibilityLabelledBy = ariaLabelledBy.split(/\s*,\s*/g);
+  }
+  if (ariaLabel !== undefined) {
+    resolvedProps.accessibilityLabel = ariaLabel;
+  }
+  if (ariaLive !== undefined) {
+    resolvedProps.accessibilityLiveRegion = ariaLive === 'off' ? 'none' : ariaLive;
+  }
+  if (ariaHidden !== undefined) {
+    resolvedProps.accessibilityElementsHidden = ariaHidden;
+    if (ariaHidden === true) {
+      resolvedProps.importantForAccessibility = 'no-hide-descendants';
+    }
+  }
+  if (id !== undefined) {
+    resolvedProps.nativeID = id;
+  }
+  if (tabIndex !== undefined) {
+    resolvedProps.focusable = !tabIndex;
+  }
+  if (
+    accessibilityState != null ||
+    ariaBusy != null ||
+    ariaChecked != null ||
+    ariaDisabled != null ||
+    ariaExpanded != null ||
+    ariaSelected != null
+  ) {
+    resolvedProps.accessibilityState = {
+      busy: ariaBusy ?? accessibilityState?.busy,
+      checked: ariaChecked ?? accessibilityState?.checked,
+      disabled: ariaDisabled ?? accessibilityState?.disabled,
+      expanded: ariaExpanded ?? accessibilityState?.expanded,
+      selected: ariaSelected ?? accessibilityState?.selected,
+    };
+  }
+  if (
+    accessibilityValue != null ||
+    ariaValueMax != null ||
+    ariaValueMin != null ||
+    ariaValueNow != null ||
+    ariaValueText != null
+  ) {
+    resolvedProps.accessibilityValue = {
+      max: ariaValueMax ?? accessibilityValue?.max,
+      min: ariaValueMin ?? accessibilityValue?.min,
+      now: ariaValueNow ?? accessibilityValue?.now,
+      text: ariaValueText ?? accessibilityValue?.text,
+    };
+  }
+  return resolvedProps;
+}
+
 /**
  * A drop-in replacement for `requireNativeComponent`.
  */
@@ -158,7 +238,7 @@ export function requireNativeViewManager<P>(
     }
 
     render() {
-      return <ReactNativeComponent {...this.props} ref={this.nativeRef} />;
+      return <ReactNativeComponent {...mapAriaProps(this.props)} ref={this.nativeRef} />;
     }
   }