fix(react-native-host): detect when bridgeless mode is required (#3753)

Author: tido64

.changeset/metal-trees-dress.md

@@ -0,0 +1,5 @@
+---
+"@rnx-kit/react-native-host": patch
+---
+
+Detect when bridgeless mode is required

packages/react-native-host/cocoa/RNXBridgelessHeaders.h

@@ -1,8 +1,6 @@
-#if USE_BRIDGELESS
-
-// clang-format off
 #import "RNXFeatureMacros.h"
-// clang-format on
+
+#if USE_BRIDGELESS
 
 #import <React/RCTSurfacePresenterBridgeAdapter.h>
 #import <ReactCommon/RCTHost+Internal.h>

packages/react-native-host/cocoa/RNXFabricAdapter.mm

@@ -1,5 +1,7 @@
 #import "RNXFabricAdapter.h"
 
+#import "RNXFeatureMacros.h"
+
 #if USE_FABRIC && !USE_BRIDGELESS
 #include "FollyConfig.h"
 #pragma clang diagnostic push

packages/react-native-host/cocoa/RNXFeatureMacros.h

@@ -1,10 +1,19 @@
+// Force enable Hermes if JSC is not available
 #if !__has_include(<ReactCommon/RCTJscInstance.h>)
 #ifdef USE_HERMES
 #undef USE_HERMES
-#endif  // !USE_HERMES
+#endif  // USE_HERMES
 #define USE_HERMES 1
 #endif  // !__has_include(<ReactCommon/RCTJscInstance.h>)
 
+// Force enable bridgeless mode if New Architecture is enabled and requires it
+#if USE_FABRIC && !__has_include(<react/config/ReactNativeConfig.h>)
+#ifdef USE_BRIDGELESS
+#undef USE_BRIDGELESS
+#endif  // USE_BRIDGELESS
+#define USE_BRIDGELESS 1
+#endif  // USE_FABRIC && !__has_include(<react/config/ReactNativeConfig.h>)
+
 #if USE_BRIDGELESS
 
 #if __has_include(<react/config/ReactNativeConfig.h>)

packages/react-native-host/cocoa/ReactNativeHost+View.mm

@@ -1,4 +1,8 @@
+// clang-format off
 #import "ReactNativeHost+Private.h"
+// clang-format on
+
+#import "RNXFeatureMacros.h"
 
 #ifdef USE_FABRIC
 #if __has_include(<React/RCTFabricSurfaceHostingProxyRootView.h>)

packages/react-native-host/cocoa/ReactNativeHost.mm

@@ -12,6 +12,7 @@
 
 #import "RNXBridgelessHeaders.h"
 #import "RNXFabricAdapter.h"
+#import "RNXFeatureMacros.h"
 #import "RNXHostConfig.h"
 #import "RNXHostReleaser.h"
 #import "RNXTurboModuleAdapter.h"