@rnx-kit/react-native-host 0.3.0 → 0.3.2

package/ReactNativeHost.podspec

@@ -8,7 +8,7 @@ version = package['version']
 repository = package['repository']
 repo_dir = repository['directory']
 
-new_arch_enabled = ENV['RCT_NEW_ARCH_ENABLED'] == '1'
+new_arch_enabled = ENV['RCT_NEW_ARCH_ENABLED'] == '1' && ENV['USE_NEW_ARCH'] != '0'
 preprocessor_definitions = [
   'FOLLY_CFG_NO_COROUTINES=1',
   'FOLLY_HAVE_CLOCK_GETTIME=1',

package/cocoa/FollyConfig.h

@@ -0,0 +1,7 @@
+#include <folly/Portability.h>
+#if FOLLY_HAS_COROUTINES
+// TODO: `FOLLY_CFG_NO_COROUTINES` was added in 0.73. We can drop this block
+// when we drop support for 0.72:
+// https://github.com/facebook/react-native/commit/17154a661fe06ed25bf599f47bd4193eba011971
+#define FOLLY_HAS_COROUTINES 0
+#endif

package/cocoa/RNXFabricAdapter.mm

@@ -1,6 +1,7 @@
 #import "RNXFabricAdapter.h"
 
 #ifdef USE_FABRIC
+#include "FollyConfig.h"
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wcomma"
 #pragma clang diagnostic ignored "-Wdocumentation"

package/cocoa/RNXTurboModuleAdapter.mm

@@ -1,12 +1,6 @@
 #import "RNXTurboModuleAdapter.h"
 
-#include <folly/Portability.h>
-#if FOLLY_HAS_COROUTINES
-// TODO: `FOLLY_CFG_NO_COROUTINES` was added in 0.73. We can drop this block
-// when we drop support for 0.72:
-// https://github.com/facebook/react-native/commit/17154a661fe06ed25bf599f47bd4193eba011971
-#define FOLLY_HAS_COROUTINES 0
-#endif
+#include "FollyConfig.h"
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wcomma"
 #import <cxxreact/JSExecutor.h>
@@ -18,28 +12,26 @@
 
 #if __has_include(<React/RCTAppSetupUtils.h>)  // <0.72
 #import <React/RCTAppSetupUtils.h>
-#define USE_RUNTIME_SCHEDULER 0
 #else
 #import <React-RCTAppDelegate/RCTAppSetupUtils.h>
 #import <React/RCTSurfacePresenterBridgeAdapter.h>
 
 // We still get into this path because react-native-macos 0.71 picked up some
-// 0.72 bits. AFAICT, `RCTLegacyInteropComponents.h` is a new addition in 0.72
-// in both react-native and react-native-macos.
-#if __has_include(<React-RCTAppDelegate/RCTLegacyInteropComponents.h>)
+// 0.72 bits. AFAICT, `SchedulerPriorityUtils.h` is a new addition in 0.72 in
+// both react-native and react-native-macos.
+#if __has_include(<react/renderer/runtimescheduler/SchedulerPriorityUtils.h>)
+#if __has_include(<React-RCTAppDelegate/RCTLegacyInteropComponents.h>)  // <0.74
 #import <React-RCTAppDelegate/RCTLegacyInteropComponents.h>
+#define MANUALLY_REGISTER_LEGACY_COMPONENTS 1
+#endif  // __has_include(<React-RCTAppDelegate/RCTLegacyInteropComponents.h>)
 #import <React/RCTLegacyViewManagerInteropComponentView.h>
 #import <react/renderer/runtimescheduler/RuntimeScheduler.h>
 #import <react/renderer/runtimescheduler/RuntimeSchedulerCallInvoker.h>
 #if __has_include(<React/RCTRuntimeExecutorFromBridge.h>)
 #import <React/RCTRuntimeExecutorFromBridge.h>
 #endif  // __has_include(<React/RCTRuntimeExecutorFromBridge.h>)
-#define SUPPORTS_LEGACY_COMPONENTS 1
 #define USE_RUNTIME_SCHEDULER 1
-#else
-#define SUPPORTS_LEGACY_COMPONENTS 0
-#define USE_RUNTIME_SCHEDULER 0
-#endif  // __has_include(<React-RCTAppDelegate/RCTLegacyInteropComponents.h>)
+#endif  // __has_include(<react/renderer/runtimescheduler/SchedulerPriorityUtils.h>)
 
 #endif  // __has_include(<React/RCTAppSetupUtils.h>)
 
@@ -58,7 +50,11 @@
     (RCTBridge *)bridge
 {
 #if USE_TURBOMODULE
-    [self registerLegacyViewManagers];
+#if MANUALLY_REGISTER_LEGACY_COMPONENTS
+    for (NSString *legacyComponent in [RCTLegacyInteropComponents legacyInteropComponents]) {
+        [RCTLegacyViewManagerInteropComponentView supportLegacyViewManagerWithName:legacyComponent];
+    }
+#endif  // MANUALLY_REGISTER_LEGACY_COMPONENTS
     // jsExecutorFactoryForBridge: (USE_TURBOMODULE=1)
     return [self initJsExecutorFactoryWithBridge:bridge];
 #else
@@ -90,7 +86,8 @@
 
 // MARK: - Private
 
-- (std::unique_ptr<facebook::react::JSExecutorFactory>)initJsExecutorFactoryWithBridge:(RCTBridge *)bridge
+- (std::unique_ptr<facebook::react::JSExecutorFactory>)initJsExecutorFactoryWithBridge:
+    (RCTBridge *)bridge
 {
 #if USE_RUNTIME_SCHEDULER
     _runtimeScheduler =
@@ -109,15 +106,6 @@
 #endif  // USE_RUNTIME_SCHEDULER
 }
 
-- (void)registerLegacyViewManagers
-{
-#if SUPPORTS_LEGACY_COMPONENTS
-    for (NSString *legacyComponent in [RCTLegacyInteropComponents legacyInteropComponents]) {
-        [RCTLegacyViewManagerInteropComponentView supportLegacyViewManagerWithName:legacyComponent];
-    }
-#endif  // SUPPORTS_LEGACY_COMPONENTS
-}
-
 #endif  // USE_TURBOMODULE
 
 @end

package/cocoa/ReactNativeHost.mm

@@ -1,12 +1,6 @@
 #import "ReactNativeHost.h"
 
-#include <folly/Portability.h>
-#if FOLLY_HAS_COROUTINES
-// TODO: `FOLLY_CFG_NO_COROUTINES` was added in 0.73. We can drop this block
-// when we drop support for 0.72:
-// https://github.com/facebook/react-native/commit/17154a661fe06ed25bf599f47bd4193eba011971
-#define FOLLY_HAS_COROUTINES 0
-#endif
+#include "FollyConfig.h"
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wcomma"
 #import <cxxreact/JSExecutor.h>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rnx-kit/react-native-host",
-  "version": "0.3.0",
+  "version": "0.3.2",
   "description": "Simplify React Native initialization",
   "homepage": "https://github.com/microsoft/rnx-kit/tree/main/packages/react-native-host#readme",
   "license": "MIT",
@@ -28,6 +28,7 @@
   },
   "devDependencies": {
     "@rnx-kit/scripts": "*",
+    "@rnx-kit/tsconfig": "*",
     "prettier": "^3.0.0"
   }
 }