expo 50.0.16 → 51.0.0-beta.0

package/android/build.gradle

@@ -1,34 +1,23 @@
 apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android'
-apply plugin: 'maven-publish'
 
 // Import autolinking script
 apply from: "../scripts/autolinking.gradle"
 
 def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
-if (expoModulesCorePlugin.exists()) {
-  apply from: expoModulesCorePlugin
-  applyKotlinExpoModulesCorePlugin()
-
-  // Remove this check, but keep the contents after SDK49 support is dropped
-  if (safeExtGet("expoProvidesDefaultConfig", false)) {
-    useExpoPublishing()
-  }
-}
+apply from: expoModulesCorePlugin
+applyKotlinExpoModulesCorePlugin()
+useDefaultAndroidSdkVersions()
+useExpoPublishing()
 
 static def versionToNumber(major, minor, patch) {
   return patch * 100 + minor * 10000 + major * 1000000
 }
 
 def getRNVersion() {
-  def nodeModulesVersion = [
-      "node",
-      "-e",
-      "console.log(require('react-native/package.json').version);"
-  ]
-      .execute(null, projectDir)
-      .text
-      .trim()
+  def nodeModulesVersion = providers.exec {
+    workingDir(projectDir)
+    commandLine("node", "-e", "console.log(require('react-native/package.json').version);")
+  }.standardOutput.asText.get().trim()
 
   def version = safeExtGet("reactNativeVersion", nodeModulesVersion)
   def coreVersion = version.split("-")[0]
@@ -44,87 +33,20 @@ def getRNVersion() {
 ensureDependeciesWereEvaluated(project)
 
 group = 'host.exp.exponent'
-version = '50.0.16'
+version = '51.0.0-beta.0'
 
 buildscript {
   // Simple helper that allows the root project to override versions declared by this library.
   ext.safeExtGet = { prop, fallback ->
     rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
   }
-
-  // Ensures backward compatibility
-  ext.getKotlinVersion = {
-    if (ext.has("kotlinVersion")) {
-      ext.kotlinVersion()
-    } else {
-      ext.safeExtGet("kotlinVersion", "1.8.10")
-    }
-  }
-
-  repositories {
-    mavenCentral()
-  }
-
-  dependencies {
-    classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${getKotlinVersion()}")
-  }
-}
-
-// Remove this if and it's contents, when support for SDK49 is dropped
-if (!safeExtGet("expoProvidesDefaultConfig", false)) {
-  afterEvaluate {
-    publishing {
-      publications {
-        release(MavenPublication) {
-          from components.release
-        }
-      }
-      repositories {
-        maven {
-          url = mavenLocal().url
-        }
-      }
-    }
-  }
 }
 
 android {
-  // Remove this if and it's contents, when support for SDK49 is dropped
-  if (!safeExtGet("expoProvidesDefaultConfig", false)) {
-    compileSdkVersion safeExtGet("compileSdkVersion", 34)
-
-    defaultConfig {
-      minSdkVersion safeExtGet("minSdkVersion", 23)
-      targetSdkVersion safeExtGet("targetSdkVersion", 34)
-    }
-
-    publishing {
-      singleVariant("release") {
-        withSourcesJar()
-      }
-    }
-
-    lintOptions {
-      abortOnError false
-    }
-  }
-
-  def agpVersion = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION
-  if (agpVersion.tokenize('.')[0].toInteger() < 8) {
-    compileOptions {
-      sourceCompatibility JavaVersion.VERSION_11
-      targetCompatibility JavaVersion.VERSION_11
-    }
-
-    kotlinOptions {
-      jvmTarget = JavaVersion.VERSION_11.majorVersion
-    }
-  }
-
   namespace "expo.core"
   defaultConfig {
     versionCode 1
-    versionName "50.0.16"
+    versionName "51.0.0-beta.0"
     consumerProguardFiles("proguard-rules.pro")
   }
   testOptions {
@@ -137,14 +59,8 @@ android {
         srcDirs += new File(project.buildDir, generatedFilesSrcDir)
 
         def rnVersion = getRNVersion()
-        if (rnVersion >= versionToNumber(0, 71, 0)) {
-          srcDirs += "src/reactNativeHostWrapper"
-        } else if (rnVersion >= versionToNumber(0, 69, 0)) {
-          srcDirs += "src/reactNativeHostWrapper69"
-        } else if (rnVersion >= versionToNumber(0, 67, 0)) {
-          srcDirs += "src/reactNativeHostWrapper67"
-        } else {
-          srcDirs += "src/reactNativeHostWrapper64"
+        if (rnVersion >= versionToNumber(0, 74, 0)) {
+          srcDirs += "src/reactWrappers"
         }
       }
     }
@@ -165,7 +81,7 @@ dependencies { dependencyHandler ->
 }
 
 // A task generating a package list of expo modules.
-task generateExpoModulesPackageList {
+task generateExpoModulesPackageListTask {
   def modulesConfig = getModulesConfig()
   def outputPath = getGenerateExpoModulesPackagesListPath()
   if (modulesConfig) {
@@ -173,10 +89,11 @@ task generateExpoModulesPackageList {
     inputs.property("modulesConfig", modulesConfig)
   }
 
+  // TOOD(@lukmccall): fix not working with configuration cache enabled
   doLast {
     generateExpoModulesPackageList()
   }
 }
 
 // Run that task during prebuilding phase.
-preBuild.dependsOn "generateExpoModulesPackageList"
+preBuild.dependsOn "generateExpoModulesPackageListTask"

package/android/src/main/java/expo/modules/ExpoReactHostFactory.kt

@@ -0,0 +1,125 @@
+// Copyright 2015-present 650 Industries. All rights reserved.
+
+package expo.modules
+
+import android.content.Context
+import com.facebook.react.JSEngineResolutionAlgorithm
+import com.facebook.react.ReactHost
+import com.facebook.react.ReactInstanceEventListener
+import com.facebook.react.ReactNativeHost
+import com.facebook.react.ReactPackage
+import com.facebook.react.ReactPackageTurboModuleManagerDelegate
+import com.facebook.react.bridge.JSBundleLoader
+import com.facebook.react.bridge.ReactContext
+import com.facebook.react.common.annotations.UnstableReactNativeAPI
+import com.facebook.react.defaults.DefaultComponentsRegistry
+import com.facebook.react.defaults.DefaultTurboModuleManagerDelegate
+import com.facebook.react.fabric.ComponentFactory
+import com.facebook.react.fabric.ReactNativeConfig
+import com.facebook.react.interfaces.exceptionmanager.ReactJsExceptionHandler
+import com.facebook.react.runtime.BindingsInstaller
+import com.facebook.react.runtime.JSCInstance
+import com.facebook.react.runtime.JSRuntimeFactory
+import com.facebook.react.runtime.ReactHostDelegate
+import com.facebook.react.runtime.ReactHostImpl
+import com.facebook.react.runtime.hermes.HermesInstance
+import java.lang.ref.WeakReference
+
+object ExpoReactHostFactory {
+  private var reactHost: ReactHost? = null
+
+  @UnstableReactNativeAPI
+  private class ExpoReactHostDelegate(
+    private val weakContext: WeakReference<Context>,
+    private val reactNativeHostWrapper: ReactNativeHostWrapper,
+    override val bindingsInstaller: BindingsInstaller? = null,
+    private val reactNativeConfig: ReactNativeConfig = ReactNativeConfig.DEFAULT_CONFIG,
+    override val turboModuleManagerDelegateBuilder: ReactPackageTurboModuleManagerDelegate.Builder =
+      DefaultTurboModuleManagerDelegate.Builder()
+  ) : ReactHostDelegate {
+    override val jsBundleLoader: JSBundleLoader
+      get() {
+        val context = weakContext.get() ?: throw IllegalStateException("Unable to get concrete Context")
+        reactNativeHostWrapper.jsBundleFile?.let { jsBundleFile ->
+          if (jsBundleFile.startsWith("assets://")) {
+            return JSBundleLoader.createAssetLoader(context, jsBundleFile, true)
+          }
+          return JSBundleLoader.createFileLoader(jsBundleFile)
+        }
+        val jsBundleAssetPath = reactNativeHostWrapper.bundleAssetName
+        return JSBundleLoader.createAssetLoader(context, "assets://$jsBundleAssetPath", true)
+      }
+
+    override val jsMainModulePath: String
+      get() = reactNativeHostWrapper.jsMainModuleName
+
+    override val jsRuntimeFactory: JSRuntimeFactory
+      get() = if (reactNativeHostWrapper.jsEngineResolutionAlgorithm == JSEngineResolutionAlgorithm.HERMES) {
+        HermesInstance()
+      } else {
+        JSCInstance()
+      }
+
+    override val reactPackages: List<ReactPackage>
+      get() = reactNativeHostWrapper.packages
+
+    override fun getReactNativeConfig(): ReactNativeConfig = reactNativeConfig
+
+    override fun handleInstanceException(error: Exception) {
+      val useDeveloperSupport = reactNativeHostWrapper.useDeveloperSupport
+      reactNativeHostWrapper.reactNativeHostHandlers.forEach { handler ->
+        handler.onReactInstanceException(useDeveloperSupport, error)
+      }
+    }
+  }
+
+  @OptIn(UnstableReactNativeAPI::class)
+  @JvmStatic
+  fun createFromReactNativeHost(
+    context: Context,
+    reactNativeHost: ReactNativeHost
+  ): ReactHost {
+    require(reactNativeHost is ReactNativeHostWrapper) {
+      "You can call createFromReactNativeHost only with instances of ReactNativeHostWrapper"
+    }
+    if (reactHost == null) {
+      val useDeveloperSupport = reactNativeHost.useDeveloperSupport
+      val reactHostDelegate = ExpoReactHostDelegate(WeakReference(context), reactNativeHost)
+      val reactJsExceptionHandler = ReactJsExceptionHandler { _ -> }
+      val componentFactory = ComponentFactory()
+      DefaultComponentsRegistry.register(componentFactory)
+
+      reactNativeHost.reactNativeHostHandlers.forEach { handler ->
+        handler.onWillCreateReactInstance(useDeveloperSupport)
+      }
+
+      val reactHostImpl =
+        ReactHostImpl(
+          context,
+          reactHostDelegate,
+          componentFactory,
+          true,
+          reactJsExceptionHandler,
+          useDeveloperSupport
+        )
+          .apply {
+            jsEngineResolutionAlgorithm = reactNativeHost.jsEngineResolutionAlgorithm
+          }
+
+      reactNativeHost.reactNativeHostHandlers.forEach { handler ->
+        handler.onDidCreateDevSupportManager(reactHostImpl.devSupportManager)
+      }
+
+      reactHostImpl.addReactInstanceEventListener(object : ReactInstanceEventListener {
+        override fun onReactContextInitialized(context: ReactContext) {
+          reactNativeHost.reactNativeHostHandlers.forEach { handler ->
+            handler.onDidCreateReactInstance(useDeveloperSupport, context)
+          }
+        }
+      })
+
+      reactHost = reactHostImpl
+    }
+    return reactHost as ReactHost
+  }
+}

package/android/src/main/java/expo/modules/ReactActivityDelegateWrapper.kt

@@ -3,6 +3,7 @@ package expo.modules
 import android.app.Activity
 import android.content.Context
 import android.content.Intent
+import android.content.res.Configuration
 import android.os.Bundle
 import android.view.KeyEvent
 import android.view.ViewGroup
@@ -10,11 +11,13 @@ import androidx.collection.ArrayMap
 import com.facebook.react.ReactActivity
 import com.facebook.react.ReactActivityDelegate
 import com.facebook.react.ReactDelegate
+import com.facebook.react.ReactHost
 import com.facebook.react.ReactInstanceEventListener
 import com.facebook.react.ReactInstanceManager
 import com.facebook.react.ReactNativeHost
 import com.facebook.react.ReactRootView
 import com.facebook.react.bridge.ReactContext
+import com.facebook.react.config.ReactFeatureFlags
 import com.facebook.react.modules.core.PermissionListener
 import expo.modules.core.interfaces.ReactActivityLifecycleListener
 import expo.modules.kotlin.Utils
@@ -35,9 +38,12 @@ class ReactActivityDelegateWrapper(
   private val reactActivityHandlers = ExpoModulesPackage.packageList
     .flatMap { it.createReactActivityHandlers(activity) }
   private val methodMap: ArrayMap<String, Method> = ArrayMap()
-  private val host: ReactNativeHost by lazy {
+  private val _reactNativeHost: ReactNativeHost by lazy {
     invokeDelegateMethod("getReactNativeHost")
   }
+  private val _reactHost: ReactHost? by lazy {
+    delegate.reactHost
+  }
 
   /**
    * When the app delay for `loadApp`, the ReactInstanceManager's lifecycle will be disrupted.
@@ -51,16 +57,16 @@ class ReactActivityDelegateWrapper(
     return invokeDelegateMethod("getLaunchOptions")
   }
 
-  override fun createRootView(): ReactRootView {
-    val rootView = reactActivityHandlers.asSequence()
-      .mapNotNull { it.createReactRootView(activity) }
-      .firstOrNull() ?: invokeDelegateMethod("createRootView")
-    rootView.setIsFabric(isNewArchitectureEnabled)
-    return rootView
+  override fun createRootView(): ReactRootView? {
+    return invokeDelegateMethod("createRootView")
   }
 
   override fun getReactNativeHost(): ReactNativeHost {
-    return host
+    return _reactNativeHost
+  }
+
+  override fun getReactHost(): ReactHost? {
+    return _reactHost
   }
 
   override fun getReactInstanceManager(): ReactInstanceManager {
@@ -93,18 +99,18 @@ class ReactActivityDelegateWrapper(
     }
 
     val delayLoadAppHandler = reactActivityHandlers.asSequence()
-      .mapNotNull { it.getDelayLoadAppHandler(activity, host) }
+      .mapNotNull { it.getDelayLoadAppHandler(activity, reactNativeHost) }
       .firstOrNull()
     if (delayLoadAppHandler != null) {
+      shouldEmitPendingResume = true
       delayLoadAppHandler.whenReady {
         Utils.assertMainThread()
         invokeDelegateMethod<Unit, String?>("loadApp", arrayOf(String::class.java), arrayOf(appKey))
         reactActivityLifecycleListeners.forEach { listener ->
           listener.onContentChanged(activity)
         }
-        if (shouldEmitPendingResume) {
-          onResume()
-        }
+        shouldEmitPendingResume = false
+        onResume()
       }
       return
     }
@@ -136,15 +142,25 @@ class ReactActivityDelegateWrapper(
       // the calls to `createRootView()` or `getMainComponentName()` have no chances to be our wrapped methods.
       // Instead we intercept `ReactActivityDelegate.onCreate` and replace the `mReactDelegate` with our version.
       // That's not ideal but works.
-      val launchOptions = composeLaunchOptions() as Bundle? // composeLaunchOptions() is nullable but older react-native declares as nonnull.
-      val reactDelegate = object : ReactDelegate(
-        plainActivity,
-        reactNativeHost,
-        mainComponentName,
-        launchOptions
-      ) {
-        override fun createRootView(): ReactRootView {
-          return this@ReactActivityDelegateWrapper.createRootView()
+      val launchOptions = composeLaunchOptions()
+      val reactDelegate: ReactDelegate
+      if (ReactFeatureFlags.enableBridgelessArchitecture) {
+        reactDelegate = ReactDelegate(
+          plainActivity,
+          reactHost,
+          mainComponentName,
+          launchOptions
+        )
+      } else {
+        reactDelegate = object : ReactDelegate(
+          plainActivity,
+          reactNativeHost,
+          mainComponentName,
+          launchOptions
+        ) {
+          override fun createRootView(): ReactRootView {
+            return this@ReactActivityDelegateWrapper.createRootView() ?: super.createRootView()
+          }
         }
       }
       val mReactDelegate = ReactActivityDelegate::class.java.getDeclaredField("mReactDelegate")
@@ -161,22 +177,19 @@ class ReactActivityDelegateWrapper(
   }
 
   override fun onResume() {
-    if (!host.hasInstance()) {
-      shouldEmitPendingResume = true
+    if (shouldEmitPendingResume) {
       return
     }
     invokeDelegateMethod<Unit>("onResume")
     reactActivityLifecycleListeners.forEach { listener ->
       listener.onResume(activity)
     }
-    shouldEmitPendingResume = false
   }
 
   override fun onPause() {
     // If app is stopped before delayed `loadApp`, we should cancel the pending resume
-    shouldEmitPendingResume = false
-    if (!host.hasInstance()) {
-      return
+    if (shouldEmitPendingResume) {
+      shouldEmitPendingResume = false
     }
     reactActivityLifecycleListeners.forEach { listener ->
       listener.onPause(activity)
@@ -186,9 +199,8 @@ class ReactActivityDelegateWrapper(
 
   override fun onDestroy() {
     // If app is stopped before delayed `loadApp`, we should cancel the pending resume
-    shouldEmitPendingResume = false
-    if (!host.hasInstance()) {
-      return
+    if (shouldEmitPendingResume) {
+      shouldEmitPendingResume = false
     }
     reactActivityLifecycleListeners.forEach { listener ->
       listener.onDestroy(activity)
@@ -210,9 +222,9 @@ class ReactActivityDelegateWrapper(
      *
      * TODO (@bbarthec): fix it upstream?
      */
-    if (delegate.reactInstanceManager.currentReactContext == null) {
+    if (!ReactFeatureFlags.enableBridgelessArchitecture && delegate.reactInstanceManager.currentReactContext == null) {
       val reactContextListener = object : ReactInstanceEventListener {
-        override fun onReactContextInitialized(context: ReactContext?) {
+        override fun onReactContextInitialized(context: ReactContext) {
           delegate.reactInstanceManager.removeReactInstanceEventListener(this)
           delegate.onActivityResult(requestCode, resultCode, data)
         }
@@ -279,6 +291,14 @@ class ReactActivityDelegateWrapper(
     return invokeDelegateMethod("isFabricEnabled")
   }
 
+  override fun composeLaunchOptions(): Bundle? {
+    return invokeDelegateMethod("composeLaunchOptions")
+  }
+
+  override fun onConfigurationChanged(newConfig: Configuration?) {
+    delegate.onConfigurationChanged(newConfig)
+  }
+
   //endregion
 
   //region Internals

package/android/src/main/java/expo/modules/ReactNativeHostWrapperBase.kt

@@ -2,21 +2,20 @@ package expo.modules
 
 import android.app.Application
 import androidx.collection.ArrayMap
+import com.facebook.react.ReactInstanceEventListener
 import com.facebook.react.ReactInstanceManager
 import com.facebook.react.ReactNativeHost
 import com.facebook.react.ReactPackage
-import com.facebook.react.bridge.JSIModule
-import com.facebook.react.bridge.JSIModulePackage
-import com.facebook.react.bridge.JSIModuleSpec
-import com.facebook.react.bridge.JavaScriptContextHolder
 import com.facebook.react.bridge.JavaScriptExecutorFactory
-import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.bridge.ReactContext
 import java.lang.reflect.Method
 
 open class ReactNativeHostWrapperBase(
   application: Application,
   protected val host: ReactNativeHost
 ) : ReactNativeHost(application) {
+  // TODO: Inherit from DefaultReactNativeHost when we drop SDK 49 support
+
   internal val reactNativeHostHandlers = ExpoModulesPackage.packageList
     .flatMap { it.createReactNativeHostHandlers(application) }
   private val methodMap: ArrayMap<String, Method> = ArrayMap()
@@ -24,17 +23,23 @@ open class ReactNativeHostWrapperBase(
   override fun createReactInstanceManager(): ReactInstanceManager {
     val developerSupport = useDeveloperSupport
     reactNativeHostHandlers.forEach { handler ->
-      handler.onWillCreateReactInstanceManager(developerSupport)
+      handler.onWillCreateReactInstance(developerSupport)
     }
 
-    val result = reactNativeHostHandlers.asSequence()
-      .mapNotNull { it.createReactInstanceManager(developerSupport) }
-      .firstOrNull() ?: super.createReactInstanceManager()
+    val result = super.createReactInstanceManager()
 
     reactNativeHostHandlers.forEach { handler ->
-      handler.onDidCreateReactInstanceManager(result, developerSupport)
+      handler.onDidCreateDevSupportManager(result.devSupportManager)
     }
 
+    result.addReactInstanceEventListener(object : ReactInstanceEventListener {
+      override fun onReactContextInitialized(context: ReactContext) {
+        reactNativeHostHandlers.forEach { handler ->
+          handler.onDidCreateReactInstance(developerSupport, context)
+        }
+      }
+    })
+
     injectHostReactInstanceManager(result)
 
     return result
@@ -46,22 +51,17 @@ open class ReactNativeHostWrapperBase(
       .firstOrNull() ?: invokeDelegateMethod("getJavaScriptExecutorFactory")
   }
 
-  override fun getJSIModulePackage(): JSIModulePackage? {
-    val userJSIModulePackage = invokeDelegateMethod<JSIModulePackage?>("getJSIModulePackage")
-    return JSIModuleContainerPackage(userJSIModulePackage)
-  }
-
-  override fun getJSMainModuleName(): String {
+  public override fun getJSMainModuleName(): String {
     return invokeDelegateMethod("getJSMainModuleName")
   }
 
-  override fun getJSBundleFile(): String? {
+  public override fun getJSBundleFile(): String? {
     return reactNativeHostHandlers.asSequence()
       .mapNotNull { it.getJSBundleFile(useDeveloperSupport) }
       .firstOrNull() ?: invokeDelegateMethod<String?>("getJSBundleFile")
   }
 
-  override fun getBundleAssetName(): String? {
+  public override fun getBundleAssetName(): String? {
     return reactNativeHostHandlers.asSequence()
       .mapNotNull { it.getBundleAssetName(useDeveloperSupport) }
       .firstOrNull() ?: invokeDelegateMethod<String?>("getBundleAssetName")
@@ -73,7 +73,7 @@ open class ReactNativeHostWrapperBase(
       .firstOrNull() ?: host.useDeveloperSupport
   }
 
-  override fun getPackages(): MutableList<ReactPackage> {
+  public override fun getPackages(): MutableList<ReactPackage> {
     return invokeDelegateMethod("getPackages")
   }
 
@@ -81,19 +81,6 @@ open class ReactNativeHostWrapperBase(
 
   //region Internals
 
-  inner class JSIModuleContainerPackage(userJSIModulePackage: JSIModulePackage?) : JSIModulePackage {
-    private val userJSIModulePackage = userJSIModulePackage
-    override fun getJSIModules(
-      reactApplicationContext: ReactApplicationContext,
-      jsContext: JavaScriptContextHolder
-    ): List<JSIModuleSpec<JSIModule>> {
-      reactNativeHostHandlers.forEach { handler ->
-        handler.onRegisterJSIModules(reactApplicationContext, jsContext, useDeveloperSupport)
-      }
-      return userJSIModulePackage?.getJSIModules(reactApplicationContext, jsContext)?.toList() ?: emptyList()
-    }
-  }
-
   @Suppress("UNCHECKED_CAST")
   internal fun <T> invokeDelegateMethod(name: String): T {
     var method = methodMap[name]
@@ -109,7 +96,7 @@ open class ReactNativeHostWrapperBase(
    * Inject the @{ReactInstanceManager} from the wrapper to the wrapped host.
    * In case the wrapped host to call `getReactInstanceManager` inside its methods.
    */
-  fun injectHostReactInstanceManager(reactInstanceManager: ReactInstanceManager) {
+  private fun injectHostReactInstanceManager(reactInstanceManager: ReactInstanceManager) {
     val mReactInstanceManagerField = ReactNativeHost::class.java.getDeclaredField("mReactInstanceManager")
     mReactInstanceManagerField.isAccessible = true
     mReactInstanceManagerField.set(host, reactInstanceManager)

package/android/src/{reactNativeHostWrapper → reactWrappers}/expo/modules/ReactNativeHostWrapper.kt

@@ -1,9 +1,12 @@
 package expo.modules
 
 import android.app.Application
+import android.content.Context
 import com.facebook.react.JSEngineResolutionAlgorithm
+import com.facebook.react.ReactHost
 import com.facebook.react.ReactNativeHost
 import com.facebook.react.ReactPackageTurboModuleManagerDelegate
+import com.facebook.react.bridge.UIManagerProvider
 import com.facebook.react.common.SurfaceDelegateFactory
 import com.facebook.react.devsupport.DevSupportManagerFactory
 import com.facebook.react.devsupport.interfaces.RedBoxHandler
@@ -24,7 +27,11 @@ class ReactNativeHostWrapper(
     return invokeDelegateMethod("getReactPackageTurboModuleManagerDelegateBuilder")
   }
 
-  override fun getJSEngineResolutionAlgorithm(): JSEngineResolutionAlgorithm? {
+  override fun getUIManagerProvider(): UIManagerProvider? {
+    return invokeDelegateMethod("getUIManagerProvider")
+  }
+
+  public override fun getJSEngineResolutionAlgorithm(): JSEngineResolutionAlgorithm? {
     return invokeDelegateMethod("getJSEngineResolutionAlgorithm")
   }
 
@@ -39,4 +46,11 @@ class ReactNativeHostWrapper(
   override fun getRedBoxHandler(): RedBoxHandler? {
     return invokeDelegateMethod("getRedBoxHandler")
   }
+
+  companion object {
+    @JvmStatic
+    fun createReactHost(context: Context, reactNativeHost: ReactNativeHost): ReactHost {
+      return ExpoReactHostFactory.createFromReactNativeHost(context, reactNativeHost)
+    }
+  }
 }

package/build/Expo.fx.js

@@ -2,7 +2,6 @@
 import './winter';
 import 'expo-asset';
 import * as Font from 'expo-font';
-import { NativeModulesProxy, Platform } from 'expo-modules-core';
 import { StyleSheet } from 'react-native';
 import { isRunningInExpoGo } from './environment/ExpoGo';
 import { createErrorHandler } from './errors/ExpoErrorManager';
@@ -10,19 +9,6 @@ import { createErrorHandler } from './errors/ExpoErrorManager';
 if (StyleSheet.setStyleAttributePreprocessor) {
     StyleSheet.setStyleAttributePreprocessor('fontFamily', Font.processFontFamily);
 }
-// Asserts if bare workflow isn't setup correctly.
-if (NativeModulesProxy.ExpoUpdates?.isMissingRuntimeVersion) {
-    const message = 'expo-updates is installed but there is no runtime or SDK version configured. ' +
-        "You'll need to configure one of these two properties in " +
-        Platform.select({ ios: 'Expo.plist', android: 'AndroidManifest.xml' }) +
-        ' before OTA updates will work properly.';
-    if (__DEV__) {
-        console.warn(message);
-    }
-    else {
-        throw new Error(message);
-    }
-}
 if (isRunningInExpoGo()) {
     // set up some improvements to commonly logged error messages stemming from react-native
     const globalHandler = ErrorUtils.getGlobalHandler();

package/build/Expo.fx.js.map

@@ -1 +1 @@
-{"version":3,"file":"Expo.fx.js","sourceRoot":"","sources":["../src/Expo.fx.tsx"],"names":[],"mappings":"AAAA,mFAAmF;AACnF,OAAO,UAAU,CAAC;AAClB,OAAO,YAAY,CAAC;AAEpB,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAClC,OAAO,EAAE,kBAAkB,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AACjE,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAE/D,4FAA4F;AAC5F,IAAI,UAAU,CAAC,6BAA6B,EAAE;IAC5C,UAAU,CAAC,6BAA6B,CAAC,YAAY,EAAE,IAAI,CAAC,iBAAiB,CAAC,CAAC;CAChF;AAED,kDAAkD;AAClD,IAAI,kBAAkB,CAAC,WAAW,EAAE,uBAAuB,EAAE;IAC3D,MAAM,OAAO,GACX,+EAA+E;QAC/E,0DAA0D;QAC1D,QAAQ,CAAC,MAAM,CAAC,EAAE,GAAG,EAAE,YAAY,EAAE,OAAO,EAAE,qBAAqB,EAAE,CAAC;QACtE,yCAAyC,CAAC;IAC5C,IAAI,OAAO,EAAE;QACX,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;KACvB;SAAM;QACL,MAAM,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC;KAC1B;CACF;AAED,IAAI,iBAAiB,EAAE,EAAE;IACvB,wFAAwF;IACxF,MAAM,aAAa,GAAG,UAAU,CAAC,gBAAgB,EAAE,CAAC;IACpD,UAAU,CAAC,gBAAgB,CAAC,kBAAkB,CAAC,aAAa,CAAC,CAAC,CAAC;CAChE","sourcesContent":["// load expo-asset immediately to set a custom `source` transformer in React Native\nimport './winter';\nimport 'expo-asset';\n\nimport * as Font from 'expo-font';\nimport { NativeModulesProxy, Platform } from 'expo-modules-core';\nimport { StyleSheet } from 'react-native';\n\nimport { isRunningInExpoGo } from './environment/ExpoGo';\nimport { createErrorHandler } from './errors/ExpoErrorManager';\n\n// If expo-font is installed and the style preprocessor is available, use it to parse fonts.\nif (StyleSheet.setStyleAttributePreprocessor) {\n  StyleSheet.setStyleAttributePreprocessor('fontFamily', Font.processFontFamily);\n}\n\n// Asserts if bare workflow isn't setup correctly.\nif (NativeModulesProxy.ExpoUpdates?.isMissingRuntimeVersion) {\n  const message =\n    'expo-updates is installed but there is no runtime or SDK version configured. ' +\n    \"You'll need to configure one of these two properties in \" +\n    Platform.select({ ios: 'Expo.plist', android: 'AndroidManifest.xml' }) +\n    ' before OTA updates will work properly.';\n  if (__DEV__) {\n    console.warn(message);\n  } else {\n    throw new Error(message);\n  }\n}\n\nif (isRunningInExpoGo()) {\n  // set up some improvements to commonly logged error messages stemming from react-native\n  const globalHandler = ErrorUtils.getGlobalHandler();\n  ErrorUtils.setGlobalHandler(createErrorHandler(globalHandler));\n}\n"]}
+{"version":3,"file":"Expo.fx.js","sourceRoot":"","sources":["../src/Expo.fx.tsx"],"names":[],"mappings":"AAAA,mFAAmF;AACnF,OAAO,UAAU,CAAC;AAClB,OAAO,YAAY,CAAC;AAEpB,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAClC,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAE/D,4FAA4F;AAC5F,IAAI,UAAU,CAAC,6BAA6B,EAAE,CAAC;IAC7C,UAAU,CAAC,6BAA6B,CAAC,YAAY,EAAE,IAAI,CAAC,iBAAiB,CAAC,CAAC;AACjF,CAAC;AAED,IAAI,iBAAiB,EAAE,EAAE,CAAC;IACxB,wFAAwF;IACxF,MAAM,aAAa,GAAG,UAAU,CAAC,gBAAgB,EAAE,CAAC;IACpD,UAAU,CAAC,gBAAgB,CAAC,kBAAkB,CAAC,aAAa,CAAC,CAAC,CAAC;AACjE,CAAC","sourcesContent":["// load expo-asset immediately to set a custom `source` transformer in React Native\nimport './winter';\nimport 'expo-asset';\n\nimport * as Font from 'expo-font';\nimport { StyleSheet } from 'react-native';\n\nimport { isRunningInExpoGo } from './environment/ExpoGo';\nimport { createErrorHandler } from './errors/ExpoErrorManager';\n\n// If expo-font is installed and the style preprocessor is available, use it to parse fonts.\nif (StyleSheet.setStyleAttributePreprocessor) {\n  StyleSheet.setStyleAttributePreprocessor('fontFamily', Font.processFontFamily);\n}\n\nif (isRunningInExpoGo()) {\n  // set up some improvements to commonly logged error messages stemming from react-native\n  const globalHandler = ErrorUtils.getGlobalHandler();\n  ErrorUtils.setGlobalHandler(createErrorHandler(globalHandler));\n}\n"]}

package/build/Expo.fx.web.js.map

@@ -1 +1 @@
-{"version":3,"file":"Expo.fx.web.js","sourceRoot":"","sources":["../src/Expo.fx.web.tsx"],"names":[],"mappings":"AAAA,wFAAwF;AACxF,+EAA+E;AAC/E,oFAAoF;AACpF,qEAAqE;AACrE,IAAI,OAAO,EAAE;IACX;IACE,sDAAsD;IACtD,CAAC,CAAC,yBAAyB,IAAI,MAAM,CAAC,EACtC;QACA,MAAM,CAAC,cAAc,CAAC,MAAM,EAAE,yBAAyB,EAAE;YACvD,GAAG;gBACD,MAAM,IAAI,KAAK,CACb,qJAAqJ,CACtJ,CAAC;YACJ,CAAC;SACF,CAAC,CAAC;KACJ;CACF","sourcesContent":["// When users dangerously import a file inside of react-native, it breaks the web alias.\n// This is one of the most common, and cryptic web errors that users encounter.\n// This conditional side-effect provides a more helpful error message for debugging.\n// Use a wrapper `__DEV__` to remove this entire block in production.\nif (__DEV__) {\n  if (\n    // Skip mocking if someone is shimming this value out.\n    !('__fbBatchedBridgeConfig' in global)\n  ) {\n    Object.defineProperty(global, '__fbBatchedBridgeConfig', {\n      get() {\n        throw new Error(\n          \"Your web project is importing a module from 'react-native' instead of 'react-native-web'. Learn more: https://expo.fyi/fb-batched-bridge-config-web\"\n        );\n      },\n    });\n  }\n}\n"]}
+{"version":3,"file":"Expo.fx.web.js","sourceRoot":"","sources":["../src/Expo.fx.web.tsx"],"names":[],"mappings":"AAAA,wFAAwF;AACxF,+EAA+E;AAC/E,oFAAoF;AACpF,qEAAqE;AACrE,IAAI,OAAO,EAAE,CAAC;IACZ;IACE,sDAAsD;IACtD,CAAC,CAAC,yBAAyB,IAAI,MAAM,CAAC,EACtC,CAAC;QACD,MAAM,CAAC,cAAc,CAAC,MAAM,EAAE,yBAAyB,EAAE;YACvD,GAAG;gBACD,MAAM,IAAI,KAAK,CACb,qJAAqJ,CACtJ,CAAC;YACJ,CAAC;SACF,CAAC,CAAC;IACL,CAAC;AACH,CAAC","sourcesContent":["// When users dangerously import a file inside of react-native, it breaks the web alias.\n// This is one of the most common, and cryptic web errors that users encounter.\n// This conditional side-effect provides a more helpful error message for debugging.\n// Use a wrapper `__DEV__` to remove this entire block in production.\nif (__DEV__) {\n  if (\n    // Skip mocking if someone is shimming this value out.\n    !('__fbBatchedBridgeConfig' in global)\n  ) {\n    Object.defineProperty(global, '__fbBatchedBridgeConfig', {\n      get() {\n        throw new Error(\n          \"Your web project is importing a module from 'react-native' instead of 'react-native-web'. Learn more: https://expo.fyi/fb-batched-bridge-config-web\"\n        );\n      },\n    });\n  }\n}\n"]}