expo 55.0.0-canary-20251008-6acbc1c → 55.0.0-canary-20251009-9919e08

package/src/async-require/hmr.ts

@@ -8,7 +8,6 @@
  * Based on this but with web support:
  * https://github.com/facebook/react-native/blob/086714b02b0fb838dee5a66c5bcefe73b53cf3df/Libraries/Utilities/HMRClient.js
  */
-import { parseWebHmrBuildErrors, type MetroBuildError } from '@expo/log-box/utils';
 import MetroHMRClient from '@expo/metro/metro-runtime/modules/HMRClient';
 import prettyFormat, { plugins } from 'pretty-format';
 import { DeviceEventEmitter } from 'react-native';
@@ -29,9 +28,17 @@ const pendingEntryPoints: string[] = [];
 // @ts-expect-error: Account for multiple versions of pretty-format inside of a monorepo.
 const prettyFormatFunc = typeof prettyFormat === 'function' ? prettyFormat : prettyFormat.default;
 
-let hmrClient: MetroHMRClient | null = null;
+type HMRClientType = {
+  send: (msg: string) => void;
+  isEnabled: () => boolean;
+  disable: () => void;
+  enable: () => void;
+  hasPendingUpdates: () => boolean;
+};
+
+let hmrClient: HMRClientType | null = null;
 let hmrUnavailableReason: string | null = null;
-const buildErrorQueue = new Set<MetroBuildError>();
+let currentCompileErrorMessage: string | null = null;
 let didConnect: boolean = false;
 const pendingLogs: [LogLevel, any[]][] = [];
 
@@ -46,6 +53,14 @@ type LogLevel =
   | 'groupEnd'
   | 'debug';
 
+export type HMRClientNativeInterface = {
+  enable(): void;
+  disable(): void;
+  registerBundle(requestUrl: string): void;
+  log(level: LogLevel, data: any[]): void;
+  setup(props: { isEnabled: boolean }): void;
+};
+
 function assert(foo: any, msg: string): asserts foo {
   if (!foo) throw new Error(msg);
 }
@@ -54,7 +69,7 @@ function assert(foo: any, msg: string): asserts foo {
  * HMR Client that receives from the server HMR updates and propagates them
  * runtime to reflects those changes.
  */
-const HMRClient = {
+const HMRClient: HMRClientNativeInterface = {
   enable() {
     if (hmrUnavailableReason !== null) {
       // If HMR became unavailable while you weren't using it,
@@ -166,10 +181,10 @@ const HMRClient = {
     );
 
     client.on('connection-error', (e: Error) => {
-      let error = `Cannot connect to Expo CLI.
+      let error = `Cannot connect to Metro.
  
  Try the following to fix the issue:
- - Ensure the Expo dev server is running and available on the same network as this device`;
+ - Ensure the Metro dev server is running and available on the same network as this device`;
       error += `
  
  URL: ${window.location.host}
@@ -180,7 +195,7 @@ const HMRClient = {
     });
 
     client.on('update-start', ({ isInitialUpdate }: { isInitialUpdate?: boolean }) => {
-      buildErrorQueue.clear();
+      currentCompileErrorMessage = null;
       didConnect = true;
 
       if (client.isEnabled() && !isInitialUpdate) {
@@ -190,11 +205,10 @@ const HMRClient = {
 
     client.on('update', ({ isInitialUpdate }: { isInitialUpdate?: boolean }) => {
       if (client.isEnabled() && !isInitialUpdate) {
-        // dismissRedbox();
+        dismissRedbox();
         // @ts-expect-error
         globalThis.__expo_dev_resetErrors?.();
         // LogBox.clearAllLogs();
-        // dismissGlobalErrorOverlay();
       }
     });
 
@@ -202,7 +216,22 @@ const HMRClient = {
       hideLoading();
     });
 
-    client.on('error', (data) => this._onMetroError(data));
+    client.on('error', (data: { type: string; message: string }) => {
+      hideLoading();
+
+      if (data.type === 'GraphNotFoundError') {
+        client.close();
+        setHMRUnavailableReason('Metro has restarted since the last edit. Reload to reconnect.');
+      } else if (data.type === 'RevisionNotFoundError') {
+        client.close();
+        setHMRUnavailableReason('Metro and the client are out of sync. Reload to reconnect.');
+      } else {
+        currentCompileErrorMessage = `${data.type} ${data.message}`;
+        if (client.isEnabled()) {
+          showCompileError();
+        }
+      }
+    });
 
     client.on('close', (closeEvent: { code: number; reason: string }) => {
       hideLoading();
@@ -213,19 +242,19 @@ const HMRClient = {
         closeEvent == null ||
         closeEvent.code === 1000 ||
         closeEvent.code === 1005 ||
-        closeEvent.code === 1006 ||
         closeEvent.code == null;
 
       setHMRUnavailableReason(
         `${
           isNormalOrUnsetCloseReason
-            ? 'Disconnected from Expo CLI.'
-            : `Disconnected from Expo CLI (${closeEvent.code}: "${closeEvent.reason}").`
+            ? 'Disconnected from Metro.'
+            : `Disconnected from Metro (${closeEvent.code}: "${closeEvent.reason}").`
         }
 
 To reconnect:
-- Start the dev server with: npx expo
-- Reload the ${process.env.EXPO_OS === 'web' ? 'page' : 'app'}`
+- Ensure that Metro is running and available on the same network
+- Reload this app (will trigger further help if Metro cannot be connected to)
+      `
       );
     });
 
@@ -238,41 +267,6 @@ To reconnect:
     registerBundleEntryPoints(hmrClient);
     flushEarlyLogs();
   },
-
-  _onMetroError(data: unknown) {
-    if (!hmrClient) {
-      return;
-    }
-
-    assert(typeof data === 'object' && data != null, 'Expected data to be an object');
-
-    hideLoading();
-
-    if ('type' in data) {
-      if (data.type === 'GraphNotFoundError') {
-        hmrClient.close();
-        setHMRUnavailableReason('Expo CLI has restarted since the last edit. Reload to reconnect.');
-        return;
-      } else if (data.type === 'RevisionNotFoundError') {
-        hmrClient.close();
-        setHMRUnavailableReason(
-          `Expo CLI and the ${process.env.EXPO_OS} client are out of sync. Reload to reconnect.`
-        );
-        return;
-      }
-    }
-
-    // Fallback for resolution errors which don't return a type
-    // https://github.com/facebook/metro/blob/a3fac645dc377f78bd4182ca0ca73629b2707d5b/packages/metro/src/lib/formatBundlingError.js#L65-L73
-    // https://github.com/facebook/metro/pull/1487
-    const error = parseWebHmrBuildErrors(data);
-
-    buildErrorQueue.add(error);
-
-    if (hmrClient.isEnabled()) {
-      showCompileError();
-    }
-  },
 };
 
 function setHMRUnavailableReason(reason: string) {
@@ -292,7 +286,7 @@ function setHMRUnavailableReason(reason: string) {
   }
 }
 
-function registerBundleEntryPoints(client: MetroHMRClient | null) {
+function registerBundleEntryPoints(client: HMRClientType | null) {
   if (hmrUnavailableReason != null) {
     // "Bundle Splitting – Metro disconnected"
     window.location.reload();
@@ -320,17 +314,27 @@ function flushEarlyLogs() {
   }
 }
 
+function dismissRedbox() {
+  // TODO(EvanBacon): Error overlay for web.
+}
+
 function showCompileError() {
-  if (buildErrorQueue.size === 0) {
+  if (currentCompileErrorMessage === null) {
     return;
   }
 
   // Even if there is already a redbox, syntax errors are more important.
   // Otherwise you risk seeing a stale runtime error while a syntax error is more recent.
-  // dismissGlobalErrorOverlay();
+  dismissRedbox();
+
+  const message = currentCompileErrorMessage;
+  currentCompileErrorMessage = null;
 
-  const error = buildErrorQueue.values().next().value;
-  buildErrorQueue.clear();
+  const error = new Error(message);
+  // Symbolicating compile errors is wasted effort
+  // because the stack trace is meaningless:
+  // @ts-expect-error
+  error.preventSymbolication = true;
   throw error;
 }
 

package/src/dom/dom-entry.tsx

@@ -1,15 +1,15 @@
 // 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';
 import { addEventListener, getActionsObject } from './marshal';
 import registerRootComponent from '../launch/registerRootComponent';
-import { useLogBox } from '@expo/log-box';
 
 interface MarshalledProps {
-  name: string[];
+  names: string[];
   props: Record<string, JSONValue>;
   [key: string]: undefined | JSONValue;
 }
@@ -92,7 +92,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 +102,12 @@ export function registerDOMComponent(AppModule: any) {
   }
 
   try {
-    if (process.env.NODE_ENV !== 'production') {
-      useLogBox();
-    }
-
     React.startTransition(() => {
-      registerRootComponent(DOMComponentRoot);
+      if (process.env.NODE_ENV !== 'production') {
+        registerRootComponent(withErrorOverlay(DOMComponentRoot));
+      } else {
+        registerRootComponent(DOMComponentRoot);
+      }
     });
   } catch (e) {
     const error = convertError(e);

package/src/dom/internal.ts

@@ -1,7 +1,5 @@
 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

@@ -3,7 +3,7 @@ import React from 'react';
 import { AppState } from 'react-native';
 
 import { getBaseURL } from './base';
-import type { BridgeMessage, WebViewProps, WebViewRef } from './dom.types';
+import type { BridgeMessage, DOMProps, WebViewProps, WebViewRef } from './dom.types';
 import { _emitGlobalEvent } from './global-events';
 import {
   getInjectBodySizeObserverScript,
@@ -16,14 +16,13 @@ import {
 import ExpoDomWebView from './webview/ExpoDOMWebView';
 import RNWebView from './webview/RNWebView';
 import { useDebugZeroHeight } from './webview/useDebugZeroHeight';
-import { DOMPropsInternal } from './dom-internal.types';
 
 type RawWebViewProps = React.ComponentProps<Exclude<typeof ExpoDomWebView, undefined>> &
   React.ComponentProps<Exclude<typeof RNWebView, undefined>>;
 
 interface Props {
   children?: any;
-  dom?: DOMPropsInternal;
+  dom?: DOMProps;
   filePath: string;
   ref: React.Ref<object>;
   [propName: string]: unknown;
@@ -31,8 +30,6 @@ interface Props {
 
 const RawWebView = React.forwardRef<object, Props>((props, ref) => {
   const { children, dom, filePath, ref: _ref, ...marshalProps } = props as Props;
-  const { sourceOverride, ...domProps } = dom || {};
-
   if (__DEV__) {
     if (children !== undefined) {
       throw new Error(
@@ -69,7 +66,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 = sourceOverride ?? { uri: `${getBaseURL()}/${filePath}` };
+  const source = { uri: `${getBaseURL()}/${filePath}` };
   const [containerStyle, setContainerStyle] = React.useState<WebViewProps['containerStyle']>(null);
 
   const { debugZeroHeightStyle, debugOnLayout } = useDebugZeroHeight(dom);
@@ -132,7 +129,7 @@ const RawWebView = React.forwardRef<object, Props>((props, ref) => {
         subscription.remove();
       });
     },
-    ...domProps,
+    ...dom,
     containerStyle: [containerStyle, debugZeroHeightStyle, dom?.containerStyle],
     onLayout: __DEV__ ? debugOnLayout : dom?.onLayout,
     injectedJavaScriptBeforeContentLoaded: [

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

@@ -1,135 +0,0 @@
-/*
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-package expo.modules
-
-import android.content.Context
-import com.facebook.react.bridge.ReadableArray
-import com.facebook.react.bridge.UiThreadUtil
-import com.facebook.react.common.SurfaceDelegate
-import com.facebook.react.common.SurfaceDelegateFactory
-import com.facebook.react.devsupport.DevSupportManagerBase
-import com.facebook.react.devsupport.ReactInstanceDevHelper
-import com.facebook.react.devsupport.interfaces.DevBundleDownloadListener
-import com.facebook.react.devsupport.interfaces.DevLoadingViewManager
-import com.facebook.react.devsupport.interfaces.DevSupportManager
-import com.facebook.react.devsupport.interfaces.PausedInDebuggerOverlayManager
-import com.facebook.react.devsupport.interfaces.RedBoxHandler
-import com.facebook.react.packagerconnection.RequestHandler
-import expo.modules.logbox.ExpoLogBoxSurfaceDelegate
-import com.facebook.react.devsupport.StackTraceHelper.convertJavaStackTrace
-import com.facebook.react.devsupport.StackTraceHelper.convertJsStackTrace
-import com.facebook.react.devsupport.interfaces.StackFrame
-
-/**
- * An implementation of [DevSupportManager] that extends the functionality in
- * [DevSupportManagerBase] with some additional, more flexible APIs for asynchronously loading the
- * JS bundle.
- *
- * @constructor The primary constructor mirrors the same constructor we have for
- *   [BridgeDevSupportManager] and
- *     * is kept for backward compatibility.
- */
-internal open class ExpoBridgelessDevSupportManager(
-    applicationContext: Context,
-    reactInstanceManagerHelper: ReactInstanceDevHelper,
-    packagerPathForJSBundleName: String?,
-    enableOnCreate: Boolean,
-    redBoxHandler: RedBoxHandler?,
-    devBundleDownloadListener: DevBundleDownloadListener?,
-    minNumShakes: Int,
-    customPackagerCommandHandlers: Map<String, RequestHandler>?,
-    surfaceDelegateFactory: SurfaceDelegateFactory?,
-    devLoadingViewManager: DevLoadingViewManager?,
-    pausedInDebuggerOverlayManager: PausedInDebuggerOverlayManager?
-) :
-    DevSupportManagerBase(
-        applicationContext,
-        reactInstanceManagerHelper,
-        packagerPathForJSBundleName,
-        enableOnCreate,
-        redBoxHandler,
-        devBundleDownloadListener,
-        minNumShakes,
-        customPackagerCommandHandlers,
-        surfaceDelegateFactory,
-        devLoadingViewManager,
-        pausedInDebuggerOverlayManager) {
-
-    override val uniqueTag: String
-        get() = "Bridgeless"
-
-    override fun handleReloadJS() {
-        UiThreadUtil.assertOnUiThread()
-        // dismiss redbox if exists
-        hideRedboxDialog()
-        reactInstanceDevHelper.reload("BridgelessDevSupportManager.handleReloadJS()")
-    }
-}
-
-internal class ExpoDevSupportManagerWithLogBoxOverride(
-    applicationContext: Context,
-    reactInstanceManagerHelper: ReactInstanceDevHelper,
-    packagerPathForJSBundleName: String?,
-    enableOnCreate: Boolean,
-    redBoxHandler: RedBoxHandler?,
-    devBundleDownloadListener: DevBundleDownloadListener?,
-    minNumShakes: Int,
-    customPackagerCommandHandlers: Map<String, RequestHandler>?,
-    surfaceDelegateFactory: SurfaceDelegateFactory?,
-    devLoadingViewManager: DevLoadingViewManager?,
-    pausedInDebuggerOverlayManager: PausedInDebuggerOverlayManager?
-) :
-    ExpoBridgelessDevSupportManager(
-        applicationContext,
-        reactInstanceManagerHelper,
-        packagerPathForJSBundleName,
-        enableOnCreate,
-        redBoxHandler,
-        devBundleDownloadListener,
-        minNumShakes,
-        customPackagerCommandHandlers,
-        surfaceDelegateFactory,
-        devLoadingViewManager,
-        pausedInDebuggerOverlayManager) {
-
-    private var redBoxSurfaceDelegate: SurfaceDelegate? = null
-
-    override fun hideRedboxDialog() {
-        redBoxSurfaceDelegate?.hide()
-    }
-
-    override fun showNewJavaError(message: String?, e: Throwable) {
-        showNewError(message, convertJavaStackTrace(e))
-    }
-
-    override fun showNewJSError(message: String?, details: ReadableArray?, errorCookie: Int) {
-        showNewError(message, convertJsStackTrace(details))
-    }
-
-    private fun showNewError(message: String?, stack: Array<StackFrame>) {
-        UiThreadUtil.runOnUiThread {
-            lastErrorTitle = message
-            lastErrorStack = stack
-
-            if (redBoxSurfaceDelegate == null) {
-                this.redBoxSurfaceDelegate =
-                    createSurfaceDelegate("RedBox")
-                        ?: ExpoLogBoxSurfaceDelegate(this@ExpoDevSupportManagerWithLogBoxOverride).apply {
-                            createContentView("RedBox")
-                        }
-            }
-
-            if (redBoxSurfaceDelegate?.isShowing() == true) {
-                // Sometimes errors cause multiple errors to be thrown in JS in quick succession. Only
-                // show the first and most actionable one.
-                return@runOnUiThread
-            }
-            redBoxSurfaceDelegate?.show()
-        }
-    }
-}

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

@@ -1,145 +0,0 @@
-/*
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-package expo.modules
-
-import android.content.Context
-import com.facebook.react.common.SurfaceDelegateFactory
-import com.facebook.react.common.build.ReactBuildConfig
-import com.facebook.react.devsupport.interfaces.DevBundleDownloadListener
-import com.facebook.react.devsupport.interfaces.DevLoadingViewManager
-import com.facebook.react.devsupport.interfaces.DevSupportManager
-import com.facebook.react.devsupport.interfaces.PausedInDebuggerOverlayManager
-import com.facebook.react.devsupport.interfaces.RedBoxHandler
-import com.facebook.react.packagerconnection.RequestHandler
-import java.lang.StringBuilder
-import com.facebook.react.devsupport.DevSupportManagerFactory
-import com.facebook.react.devsupport.ReactInstanceDevHelper
-import com.facebook.react.devsupport.ReleaseDevSupportManager
-
-/**
- * A simple factory that creates instances of [DevSupportManager] implementations. Uses reflection
- * to create BridgeDevSupportManager if it exists. This allows ProGuard to strip that class and its
- * dependencies in release builds. If the class isn't found, [PerftestDevSupportManager] is returned
- * instead.
- */
-internal class ExpoDefaultDevSupportManagerFactory : DevSupportManagerFactory {
-
-    override fun create(
-        applicationContext: Context,
-        reactInstanceManagerHelper: ReactInstanceDevHelper,
-        packagerPathForJSBundleName: String?,
-        enableOnCreate: Boolean,
-        redBoxHandler: RedBoxHandler?,
-        devBundleDownloadListener: DevBundleDownloadListener?,
-        minNumShakes: Int,
-        customPackagerCommandHandlers: Map<String, RequestHandler>?,
-        surfaceDelegateFactory: SurfaceDelegateFactory?,
-        devLoadingViewManager: DevLoadingViewManager?,
-        pausedInDebuggerOverlayManager: PausedInDebuggerOverlayManager?
-    ): DevSupportManager {
-        return if (!enableOnCreate) {
-            ReleaseDevSupportManager()
-        } else
-            try {
-                // Developer support is enabled, we now must choose whether to return a DevSupportManager,
-                // or a more lean profiling-only PerftestDevSupportManager. We make the choice by first
-                // trying to return the full support DevSupportManager and if it fails, then just
-                // return PerftestDevSupportManager.
-
-                // ProGuard is surprisingly smart in this case and will keep a class if it detects a call
-                // to
-                // Class.forName() with a static string. So instead we generate a quasi-dynamic string to
-                // confuse it.
-                val className =
-                    StringBuilder(DEVSUPPORT_IMPL_PACKAGE)
-                        .append(".")
-                        .append(DEVSUPPORT_IMPL_CLASS)
-                        .toString()
-                val devSupportManagerClass = Class.forName(className)
-                val constructor =
-                    devSupportManagerClass.getConstructor(
-                        Context::class.java,
-                        ReactInstanceDevHelper::class.java,
-                        String::class.java,
-                        Boolean::class.javaPrimitiveType,
-                        RedBoxHandler::class.java,
-                        DevBundleDownloadListener::class.java,
-                        Int::class.javaPrimitiveType,
-                        MutableMap::class.java,
-                        SurfaceDelegateFactory::class.java,
-                        DevLoadingViewManager::class.java,
-                        PausedInDebuggerOverlayManager::class.java)
-                constructor.newInstance(
-                    applicationContext,
-                    reactInstanceManagerHelper,
-                    packagerPathForJSBundleName,
-                    true,
-                    redBoxHandler,
-                    devBundleDownloadListener,
-                    minNumShakes,
-                    customPackagerCommandHandlers,
-                    surfaceDelegateFactory,
-                    devLoadingViewManager,
-                    pausedInDebuggerOverlayManager) as DevSupportManager
-            } catch (e: Exception) {
-                throw e
-                // Original implementation
-                // https://github.com/facebook/react-native/blob/50273758510a6d756494d05dc91055516c2a6aca/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/DefaultDevSupportManagerFactory.kt#L95
-
-                // React Native implementation fallback is PerftestDevSupportManager(applicationContext)
-                // but that's internal class we would have to vendor, so this impl re-throws.
-                // https://github.com/facebook/react-native/blob/50273758510a6d756494d05dc91055516c2a6aca/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/PerftestDevSupportManager.kt#L17
-            }
-    }
-
-    override fun create(
-        applicationContext: Context,
-        reactInstanceManagerHelper: ReactInstanceDevHelper,
-        packagerPathForJSBundleName: String?,
-        enableOnCreate: Boolean,
-        redBoxHandler: RedBoxHandler?,
-        devBundleDownloadListener: DevBundleDownloadListener?,
-        minNumShakes: Int,
-        customPackagerCommandHandlers: Map<String, RequestHandler>?,
-        surfaceDelegateFactory: SurfaceDelegateFactory?,
-        devLoadingViewManager: DevLoadingViewManager?,
-        pausedInDebuggerOverlayManager: PausedInDebuggerOverlayManager?,
-        useDevSupport: Boolean
-    ): DevSupportManager =
-        if (ReactBuildConfig.UNSTABLE_ENABLE_FUSEBOX_RELEASE) {
-            // Should never happen as ExpoDefaultDevSupportManagerFactory is only used if useDevSupport = true
-            throw Error("ExpoDefaultDevSupportManagerFactory supports debug builds only. ReactBuildConfig.UNSTABLE_ENABLE_FUSEBOX_RELEASE is unsupported.")
-
-            // Original implementation
-            // https://github.com/facebook/react-native/blob/50273758510a6d756494d05dc91055516c2a6aca/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/DefaultDevSupportManagerFactory.kt#L114
-
-            // React Native implementation uses PerftestDevSupportManager(applicationContext)
-            // but that's internal class we would have to vendor, so this impl re-throws.
-            // https://github.com/facebook/react-native/blob/50273758510a6d756494d05dc91055516c2a6aca/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/PerftestDevSupportManager.kt#L17
-        } else if (useDevSupport) {
-            ExpoDevSupportManagerWithLogBoxOverride(
-                applicationContext,
-                reactInstanceManagerHelper,
-                packagerPathForJSBundleName,
-                enableOnCreate,
-                redBoxHandler,
-                devBundleDownloadListener,
-                minNumShakes,
-                customPackagerCommandHandlers,
-                surfaceDelegateFactory,
-                devLoadingViewManager,
-                pausedInDebuggerOverlayManager)
-        } else {
-            ReleaseDevSupportManager()
-        }
-
-    private companion object {
-        private const val DEVSUPPORT_IMPL_PACKAGE = "com.facebook.react.devsupport"
-        private const val DEVSUPPORT_IMPL_CLASS = "BridgeDevSupportManager"
-    }
-}

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)
-    }
-  }
-}