expo 55.0.0-canary-20260119-17896bf → 55.0.0-canary-20260120-bb71700

package/src/dom/dom-entry.tsx

@@ -1,7 +1,6 @@
 // Entry file for a DOM Component.
 import '@expo/metro-runtime';
 
-import { withErrorOverlay } from '@expo/metro-runtime/error-overlay';
 import React from 'react';
 
 import { JSONValue } from './dom.types';
@@ -9,12 +8,13 @@ import { addEventListener, getActionsObject } from './marshal';
 import registerRootComponent from '../launch/registerRootComponent';
 
 interface MarshalledProps {
-  name: string[];
+  names: string[];
   props: Record<string, JSONValue>;
   [key: string]: undefined | JSONValue;
 }
 
 interface WindowType {
+  $$EXPO_DOM_HOST_OS?: string;
   $$EXPO_INITIAL_PROPS?: MarshalledProps;
 }
 
@@ -65,6 +65,13 @@ function convertError(error: any) {
 }
 
 export function registerDOMComponent(AppModule: any) {
+  if (typeof window.$$EXPO_DOM_HOST_OS === 'undefined') {
+    throw new Error(
+      'Top OS ($$EXPO_DOM_HOST_OS) is not defined. This is a bug in the DOM Component runtime.'
+    );
+  }
+  process.env.EXPO_DOM_HOST_OS = window.$$EXPO_DOM_HOST_OS;
+
   function DOMComponentRoot(props: Record<string, unknown>) {
     // Props listeners
     const [marshalledProps, setProps] = React.useState(() => {
@@ -92,7 +99,7 @@ export function registerDOMComponent(AppModule: any) {
       // Create a named map { [name: string]: ProxyFunction }
       // TODO(@kitten): Unclear how this is typed or shaped
       return Object.fromEntries(
-        (marshalledProps.names as string[]).map((key: string) => {
+        marshalledProps.names.map((key: string) => {
           return [key, ACTIONS[key]];
         })
       );
@@ -102,12 +109,12 @@ export function registerDOMComponent(AppModule: any) {
   }
 
   try {
+    if (process.env.NODE_ENV !== 'production') {
+      require('@expo/log-box/lib').setupLogBox();
+    }
+
     React.startTransition(() => {
-      if (process.env.NODE_ENV !== 'production') {
-        registerRootComponent(withErrorOverlay(DOMComponentRoot));
-      } else {
-        registerRootComponent(DOMComponentRoot);
-      }
+      registerRootComponent(DOMComponentRoot);
     });
   } catch (e) {
     const error = convertError(e);

package/src/dom/dom-internal.types.ts

@@ -0,0 +1,9 @@
+import type { DOMProps } from './dom.types';
+
+export interface DOMPropsInternal extends DOMProps {
+  /**
+   * Allows dynamically redirecting a component to a different source, for example prebuilt version.
+   * @internal
+   */
+  sourceOverride?: { uri: string };
+}

package/src/dom/dom.types.ts

@@ -36,4 +36,10 @@ export interface DOMProps extends Omit<RNWebViewProps, 'source'> {
    * @default false
    */
   useExpoDOMWebView?: boolean;
+
+  /**
+   * Allows dynamically redirecting a component to a different source, for example a prebuilt version.
+   * @internal
+   */
+  overrideUri?: string;
 }

package/src/dom/internal.ts

@@ -1,5 +1,7 @@
 export { default as WebView } from './webview-wrapper';
 
+export * from './dom-internal.types';
+
 // Skip all dom-only functions to give 'undefined is not a function' errors.
 export const registerDOMComponent: undefined | typeof import('./dom-entry').registerDOMComponent =
   undefined;

package/src/dom/webview-wrapper.tsx

@@ -1,9 +1,14 @@
 // A webview without babel to test faster.
+//
+// Keep in sync with ExpoLogBox native webview wrappers.
+// Android https://github.com/expo/expo/blob/main/packages/%40expo/log-box/android/src/main/expo/modules/logbox/ExpoLogBoxWebViewWrapper.kt
+// iOS https://github.com/expo/expo/blob/main/packages/%40expo/log-box/ios/ExpoLogBoxWebViewWrapper.swift
 import React from 'react';
 import { AppState } from 'react-native';
 
 import { getBaseURL } from './base';
-import type { BridgeMessage, DOMProps, WebViewProps, WebViewRef } from './dom.types';
+import { DOMPropsInternal } from './dom-internal.types';
+import type { BridgeMessage, WebViewProps, WebViewRef } from './dom.types';
 import { _emitGlobalEvent } from './global-events';
 import {
   getInjectBodySizeObserverScript,
@@ -22,14 +27,15 @@ type RawWebViewProps = React.ComponentProps<Exclude<typeof ExpoDomWebView, undef
 
 interface Props {
   children?: any;
-  dom?: DOMProps;
+  dom?: DOMPropsInternal;
   filePath: string;
   ref: React.Ref<object>;
   [propName: string]: unknown;
 }
 
 const RawWebView = React.forwardRef<object, Props>((props, ref) => {
-  const { children, dom, filePath, ref: _ref, ...marshalProps } = props as Props;
+  const { children, dom: domProps, filePath, ref: _ref, ...marshalProps } = props as Props;
+  const { overrideUri, ...dom } = domProps || {};
   if (__DEV__) {
     if (children !== undefined) {
       throw new Error(
@@ -66,7 +72,7 @@ const RawWebView = React.forwardRef<object, Props>((props, ref) => {
   const webView = resolveWebView(dom?.useExpoDOMWebView ?? false);
   const webviewRef = React.useRef<WebViewRef>(null);
   const domImperativeHandlePropsRef = React.useRef<string[]>([]);
-  const source = { uri: `${getBaseURL()}/${filePath}` };
+  const source = { uri: overrideUri ?? `${getBaseURL()}/${filePath}` };
   const [containerStyle, setContainerStyle] = React.useState<WebViewProps['containerStyle']>(null);
 
   const { debugZeroHeightStyle, debugOnLayout } = useDebugZeroHeight(dom);
@@ -129,10 +135,12 @@ const RawWebView = React.forwardRef<object, Props>((props, ref) => {
         subscription.remove();
       });
     },
-    ...dom,
+    ...domProps,
     containerStyle: [containerStyle, debugZeroHeightStyle, dom?.containerStyle],
-    onLayout: __DEV__ ? debugOnLayout : dom?.onLayout,
+    onLayout: (__DEV__ ? debugOnLayout : dom?.onLayout) as RawWebViewProps['onLayout'],
     injectedJavaScriptBeforeContentLoaded: [
+      // Inject the top-most OS for the DOM component to read.
+      `window.$$EXPO_DOM_HOST_OS = ${JSON.stringify(process.env.EXPO_OS)};true;`,
       // On first mount, inject `$$EXPO_INITIAL_PROPS` with the initial props.
       `window.$$EXPO_INITIAL_PROPS = ${JSON.stringify(smartActions)};true;`,
       dom?.matchContents ? getInjectBodySizeObserverScript() : null,

package/src/hooks/useEvent.ts

@@ -32,7 +32,7 @@ type InferEventParameter<
 /**
  * React hook that listens to events emitted by the given object. The returned value is an event parameter
  * that gets updated whenever a new event is dispatched.
- * @param eventEmitter An object that emits events. For example, a native module or shared object or an instance of [`EventEmitter`](#eventemitter).
+ * @param eventEmitter An object that emits events. For example, a native module or shared object or an instance of [`EventEmitter`](#eventemittertype).
  * @param eventName Name of the event to listen to.
  * @param initialValue An event parameter to use until the event is called for the first time.
  * @returns A parameter of the event listener.
@@ -71,7 +71,7 @@ export function useEvent<
 /**
  * React hook that listens to events emitted by the given object and calls the listener function whenever a new event is dispatched.
  * The event listener is automatically added during the first render and removed when the component unmounts.
- * @param eventEmitter An object that emits events. For example, a native module or shared object or an instance of [`EventEmitter`](#eventemitter).
+ * @param eventEmitter An object that emits events. For example, a native module or shared object or an instance of [`EventEmitter`](#eventemittertype).
  * @param eventName Name of the event to listen to.
  * @param listener A function to call when the event is dispatched.
  * @example

package/types/react-native-web.d.ts

@@ -93,7 +93,7 @@ declare module 'react-native' {
     /** @platform web */
     transitionDelay?: string | string[];
     /** @platform web */
-    transitionDuration?: string | string[];
+    transitionDuration?: string | string[] | number;
     /** @platform web */
     transitionProperty?: string | string[];
     /** @platform web */

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

@@ -1,51 +0,0 @@
-package expo.modules
-
-import android.app.Application
-import android.content.Context
-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
-
-class ReactNativeHostWrapper(
-  application: Application,
-  host: ReactNativeHost
-) : ReactNativeHostWrapperBase(application, host) {
-  override fun getDevSupportManagerFactory(): DevSupportManagerFactory? {
-    return reactNativeHostHandlers
-      .asSequence()
-      .mapNotNull { it.devSupportManagerFactory }
-      .firstOrNull() as DevSupportManagerFactory?
-      ?: invokeDelegateMethod("getDevSupportManagerFactory")
-  }
-
-  override fun getReactPackageTurboModuleManagerDelegateBuilder(): ReactPackageTurboModuleManagerDelegate.Builder? {
-    return invokeDelegateMethod("getReactPackageTurboModuleManagerDelegateBuilder")
-  }
-
-  override fun getUIManagerProvider(): UIManagerProvider? {
-    return invokeDelegateMethod("getUIManagerProvider")
-  }
-
-  override fun getShouldRequireActivity(): Boolean {
-    return host.shouldRequireActivity
-  }
-
-  override fun getSurfaceDelegateFactory(): SurfaceDelegateFactory {
-    return host.surfaceDelegateFactory
-  }
-
-  override fun getRedBoxHandler(): RedBoxHandler? {
-    return invokeDelegateMethod("getRedBoxHandler")
-  }
-
-  companion object {
-    @JvmStatic
-    fun createReactHost(context: Context, reactNativeHost: ReactNativeHost): ReactHost {
-      return ExpoReactHostFactory.createFromReactNativeHost(context, reactNativeHost)
-    }
-  }
-}

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

@@ -1,107 +0,0 @@
-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.JavaScriptExecutorFactory
-import com.facebook.react.bridge.ReactContext
-import com.facebook.react.defaults.DefaultReactNativeHost
-import java.lang.reflect.Method
-
-open class ReactNativeHostWrapperBase(
-  application: Application,
-  protected val host: ReactNativeHost
-) : DefaultReactNativeHost(application) {
-
-  val reactNativeHostHandlers = ExpoModulesPackage.packageList
-    .flatMap { it.createReactNativeHostHandlers(application) }
-  private val methodMap: ArrayMap<String, Method> = ArrayMap()
-
-  override fun createReactInstanceManager(): ReactInstanceManager {
-    val developerSupport = useDeveloperSupport
-    reactNativeHostHandlers.forEach { handler ->
-      handler.onWillCreateReactInstance(developerSupport)
-    }
-
-    val result = super.createReactInstanceManager()
-
-    reactNativeHostHandlers.forEach { handler ->
-      handler.onDidCreateDevSupportManager(result.devSupportManager)
-    }
-
-    result.addReactInstanceEventListener(object : ReactInstanceEventListener {
-      override fun onReactContextInitialized(context: ReactContext) {
-        reactNativeHostHandlers.forEach { handler ->
-          handler.onDidCreateReactInstance(developerSupport, context)
-        }
-      }
-    })
-
-    injectHostReactInstanceManager(result)
-
-    return result
-  }
-
-  override fun getJavaScriptExecutorFactory(): JavaScriptExecutorFactory? {
-    return reactNativeHostHandlers.asSequence()
-      .mapNotNull { it.javaScriptExecutorFactory }
-      .firstOrNull() ?: invokeDelegateMethod("getJavaScriptExecutorFactory")
-  }
-
-  public override fun getJSMainModuleName(): String {
-    return invokeDelegateMethod("getJSMainModuleName")
-  }
-
-  public override fun getJSBundleFile(): String? {
-    return reactNativeHostHandlers.asSequence()
-      .mapNotNull { it.getJSBundleFile(useDeveloperSupport) }
-      .firstOrNull() ?: invokeDelegateMethod("getJSBundleFile")
-  }
-
-  public override fun getBundleAssetName(): String? {
-    return reactNativeHostHandlers.asSequence()
-      .mapNotNull { it.getBundleAssetName(useDeveloperSupport) }
-      .firstOrNull() ?: invokeDelegateMethod("getBundleAssetName")
-  }
-
-  override fun getUseDeveloperSupport(): Boolean {
-    return reactNativeHostHandlers.asSequence()
-      .mapNotNull { it.useDeveloperSupport }
-      .firstOrNull() ?: host.useDeveloperSupport
-  }
-
-  public override fun getPackages(): MutableList<ReactPackage> {
-    return invokeDelegateMethod("getPackages")
-  }
-
-  //endregion
-
-  //region Internals
-
-  // this is to call the methods as overridden in MainApplication.kt
-  @Suppress("UNCHECKED_CAST")
-  internal fun <T> invokeDelegateMethod(name: String): T {
-    var method = methodMap[name]
-    if (method == null) {
-      method = ReactNativeHost::class.java.getDeclaredMethod(name)
-      method.isAccessible = true
-      methodMap[name] = method
-    }
-    return method!!.invoke(host) as T
-  }
-
-  /**
-   * Inject the @{ReactInstanceManager} from the wrapper to the wrapped host.
-   * In case the wrapped host to call `getReactInstanceManager` inside its methods.
-   */
-  private fun injectHostReactInstanceManager(reactInstanceManager: ReactInstanceManager) {
-    val mReactInstanceManagerField = ReactNativeHost::class.java.getDeclaredField("mReactInstanceManager")
-    mReactInstanceManagerField.isAccessible = true
-    mReactInstanceManagerField.set(host, reactInstanceManager)
-  }
-
-  //endregion
-}

package/build/async-require/hmr.native.d.ts

@@ -1,3 +0,0 @@
-declare const HMRClient: any;
-export default HMRClient;
-//# sourceMappingURL=hmr.native.d.ts.map

package/build/async-require/hmr.native.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"hmr.native.d.ts","sourceRoot":"","sources":["../../src/async-require/hmr.native.ts"],"names":[],"mappings":"AAAA,QAAA,MAAM,SAAS,KAAgE,CAAC;AAEhF,eAAe,SAAS,CAAC"}

package/ios/AppDelegates/EXAppDelegateWrapper.h

@@ -1,30 +0,0 @@
-// Copyright 2018-present 650 Industries. All rights reserved.
-
-#import <ExpoModulesCore/Platform.h>
-#import <ExpoModulesCore/EXReactDelegateWrapper.h>
-#import <Expo/RCTAppDelegateUmbrella.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface RCTAppDelegate ()
-
-@end
-
-__deprecated_msg("EXAppDelegateWrapper is deprecated. Migrate your AppDelegate to Swift and use ExpoAppDelegate instead. EXAppDelegateWrapper will be removed in SDK 55.")
-@interface EXAppDelegateWrapper : NSObject <UIApplicationDelegate, UISceneDelegate, RCTReactNativeFactoryDelegate>
-
-@property (nonatomic, strong, readonly) EXReactDelegateWrapper *reactDelegate;
-
-@property (nonatomic, strong, nullable) NSString *moduleName;
-@property (nonatomic, strong, nullable) NSDictionary *initialProps;
-
-/**
- Currently (RN 0.76) `customizeRootView` signature in `RCTAppDelegate` is broken as it uses `RCTRootView` type,
- but this type is no longer used. It should rather be `RCTSurfaceHostingView`, but for simplicity it could be just `UIView`.
- We need a helper function in Objective-C to actually make it to work, otherwise the types will conflict in Swift.
- */
-+ (void)customizeRootView:(nonnull UIView *)rootView byAppDelegate:(nonnull RCTAppDelegate *)appDelegate;
-
-@end
-
-NS_ASSUME_NONNULL_END

package/ios/AppDelegates/EXAppDelegateWrapper.mm

@@ -1,112 +0,0 @@
-// Copyright 2018-present 650 Industries. All rights reserved.
-
-#import <Expo/EXAppDelegateWrapper.h>
-
-#import <Expo/RCTAppDelegateUmbrella.h>
-#import <Expo/Swift.h>
-
-#import <React/RCTComponentViewFactory.h> // Allows non-umbrella since it's coming from React-RCTFabric
-#import <ReactCommon/RCTHost.h> // Allows non-umbrella because the header is not inside a clang module
-
-@implementation EXAppDelegateWrapper {
-  EXExpoAppDelegate *_expoAppDelegate;
-}
-
-- (instancetype)init
-{
-  if (self = [super init]) {
-    _expoAppDelegate = [EXExpoAppDelegate new];
-  }
-  return self;
-}
-
-// This needs to be implemented, otherwise forwarding won't be called.
-// When the app starts, `UIApplication` uses it to check beforehand
-// which `UIApplicationDelegate` selectors are implemented.
-- (BOOL)respondsToSelector:(SEL)selector
-{
-  return [super respondsToSelector:selector] || [_expoAppDelegate respondsToSelector:selector];
-}
-
-// Forwards all invocations to `ExpoAppDelegate` object.
-- (id)forwardingTargetForSelector:(SEL)selector
-{
-  return _expoAppDelegate;
-}
-
-#pragma mark - UIApplicationDelegate
-
-// Make sure to override all necessary methods from `RCTAppDelegate` here, explicitly forwarding everything to `_expoAppDelegate`.
-// `forwardingTargetForSelector` works only for methods that are not specified in this and `RCTAppDelegate` classes.
-
-#if !TARGET_OS_OSX
-- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
-{
-  return [_expoAppDelegate application:application didFinishLaunchingWithOptions:launchOptions];
-}
-
-- (void)applicationDidBecomeActive:(UIApplication *)application
-{
-  return [_expoAppDelegate applicationDidBecomeActive:application];
-}
-#else
-- (void)applicationDidFinishLaunching:(NSNotification *)notification
-{ 
-  return [_expoAppDelegate applicationDidFinishLaunching:notification];
-}
-
-- (void)applicationDidBecomeActive:(NSNotification *)notification
-{
-  return [_expoAppDelegate applicationDidBecomeActive:notification];
-}
-#endif
-
-- (UIViewController *)createRootViewController
-{
-  return [_expoAppDelegate.factory.delegate createRootViewController];
-}
-
-- (void)customizeRootView:(UIView *)rootView
-{
-  [_expoAppDelegate.factory.delegate customizeRootView:rootView];
-}
-
-#pragma mark - RCTComponentViewFactoryComponentProvider
-
-- (NSDictionary<NSString *, Class<RCTComponentViewProtocol>> *)thirdPartyFabricComponents
-{
-  return self.dependencyProvider.thirdPartyFabricComponents;
-}
-
-#pragma mark - RCTHostDelegate
-
-- (void)hostDidStart:(RCTHost *)host
-{
-}
-
-- (void)host:(RCTHost *)host
-    didReceiveJSErrorStack:(NSArray<NSDictionary<NSString *, id> *> *)stack
-                   message:(NSString *)message
-               exceptionId:(NSUInteger)exceptionId
-                   isFatal:(BOOL)isFatal
-{
-}
-
-- (id<RCTTurboModule>)getModuleInstanceFromClass:(Class)moduleClass
-{
-  return [_expoAppDelegate.factory.delegate getModuleInstanceFromClass:moduleClass];
-}
-
-- (Class)getModuleClassFromName:(const char *)name {
-  return [_expoAppDelegate.factory.delegate getModuleClassFromName:name];
-}
-
-
-#pragma mark - Helpers
-
-+ (void)customizeRootView:(nonnull UIView *)rootView byAppDelegate:(nonnull RCTAppDelegate *)appDelegate
-{
-  [appDelegate customizeRootView:(RCTRootView *)rootView];
-}
-
-@end

package/src/async-require/hmr.native.ts

@@ -1,3 +0,0 @@
-const HMRClient = require('react-native/Libraries/Utilities/HMRClient').default;
-
-export default HMRClient;