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

package/ReactNativeHost.podspec

@@ -9,7 +9,14 @@ repository = package['repository']
 repo_dir = repository['directory']
 
 new_arch_enabled = ENV['RCT_NEW_ARCH_ENABLED'] == '1'
-preprocessor_definitions = ['FOLLY_NO_CONFIG=1', 'FOLLY_MOBILE=1', 'FOLLY_USE_LIBCPP=1']
+preprocessor_definitions = [
+  'FOLLY_CFG_NO_COROUTINES=1',
+  'FOLLY_HAVE_CLOCK_GETTIME=1',
+  'FOLLY_HAVE_PTHREAD=1',
+  'FOLLY_MOBILE=1',
+  'FOLLY_NO_CONFIG=1',
+  'FOLLY_USE_LIBCPP=1',
+]
 if new_arch_enabled
   preprocessor_definitions << 'RCT_NEW_ARCH_ENABLED=1'
   preprocessor_definitions << 'USE_FABRIC=1'
@@ -17,7 +24,7 @@ if new_arch_enabled
 end
 
 Pod::Spec.new do |s|
-  s.name      = 'ReactNativeHost'
+  s.name      = File.basename(__FILE__, '.podspec')
   s.version   = version
   s.author    = { package['author']['name'] => package['author']['email'] }
   s.license   = package['license']
@@ -38,10 +45,11 @@ Pod::Spec.new do |s|
   if new_arch_enabled
     s.dependency 'React-RCTAppDelegate'
     s.dependency 'React-RCTFabric'
+    s.dependency 'Yoga'
   end
 
   s.pod_target_xcconfig = {
-    'CLANG_CXX_LANGUAGE_STANDARD' => 'gnu++17',
+    'CLANG_CXX_LANGUAGE_STANDARD' => 'gnu++20',
     'DEFINES_MODULE' => 'YES',
     'GCC_PREPROCESSOR_DEFINITIONS' => preprocessor_definitions,
     'HEADER_SEARCH_PATHS' => [
@@ -50,6 +58,7 @@ Pod::Spec.new do |s|
       '$(PODS_ROOT)/RCT-Folly',
       '$(PODS_ROOT)/DoubleConversion',
       '$(PODS_ROOT)/Headers/Private/React-Core',
+      '$(PODS_ROOT)/Headers/Private/Yoga',
     ],
   }
 

package/cocoa/RNXTurboModuleAdapter.mm

@@ -1,6 +1,12 @@
 #import "RNXTurboModuleAdapter.h"
 
-#define FOLLY_NO_CONFIG 1
+#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
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wcomma"
 #import <cxxreact/JSExecutor.h>
@@ -21,13 +27,17 @@
 // 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>)
+#import <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>)
 
@@ -48,31 +58,19 @@
     (RCTBridge *)bridge
 {
 #if USE_TURBOMODULE
+    [self registerLegacyViewManagers];
     // jsExecutorFactoryForBridge: (USE_TURBOMODULE=1)
-#if USE_RUNTIME_SCHEDULER
-    _runtimeScheduler =
-        std::make_shared<facebook::react::RuntimeScheduler>(RCTRuntimeExecutorFromBridge(bridge));
-    auto callInvoker =
-        std::make_shared<facebook::react::RuntimeSchedulerCallInvoker>(_runtimeScheduler);
-    _turboModuleManager = [[RCTTurboModuleManager alloc] initWithBridge:bridge
-                                                               delegate:self
-                                                              jsInvoker:callInvoker];
-    return RCTAppSetupDefaultJsExecutorFactory(bridge, _turboModuleManager, _runtimeScheduler);
-#else
-    _turboModuleManager = [[RCTTurboModuleManager alloc] initWithBridge:bridge
-                                                               delegate:self
-                                                              jsInvoker:bridge.jsCallInvoker];
-    return RCTAppSetupDefaultJsExecutorFactory(bridge, _turboModuleManager);
-#endif  // USE_RUNTIME_SCHEDULER
+    return [self initJsExecutorFactoryWithBridge:bridge];
 #else
     // jsExecutorFactoryForBridge: (USE_TURBOMODULE=0)
     return nullptr;
 #endif  // USE_TURBOMODULE
 }
 
-// MARK: - RCTTurboModuleManagerDelegate details
 #if USE_TURBOMODULE
 
+// MARK: - RCTTurboModuleManagerDelegate details
+
 - (Class)getModuleClassFromName:(const char *)name
 {
     return RCTCoreModulesClassProvider(name);
@@ -90,6 +88,36 @@
     return RCTAppSetupDefaultModuleFromClass(moduleClass);
 }
 
+// MARK: - Private
+
+- (std::unique_ptr<facebook::react::JSExecutorFactory>)initJsExecutorFactoryWithBridge:(RCTBridge *)bridge
+{
+#if USE_RUNTIME_SCHEDULER
+    _runtimeScheduler =
+        std::make_shared<facebook::react::RuntimeScheduler>(RCTRuntimeExecutorFromBridge(bridge));
+    auto callInvoker =
+        std::make_shared<facebook::react::RuntimeSchedulerCallInvoker>(_runtimeScheduler);
+    _turboModuleManager = [[RCTTurboModuleManager alloc] initWithBridge:bridge
+                                                               delegate:self
+                                                              jsInvoker:callInvoker];
+    return RCTAppSetupDefaultJsExecutorFactory(bridge, _turboModuleManager, _runtimeScheduler);
+#else
+    _turboModuleManager = [[RCTTurboModuleManager alloc] initWithBridge:bridge
+                                                               delegate:self
+                                                              jsInvoker:bridge.jsCallInvoker];
+    return RCTAppSetupDefaultJsExecutorFactory(bridge, _turboModuleManager);
+#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+View.mm

@@ -1,8 +1,13 @@
 #import "ReactNativeHost.h"
 
 #ifdef USE_FABRIC
+#if __has_include(<React/RCTFabricSurfaceHostingProxyRootView.h>)
 #import <React/RCTFabricSurfaceHostingProxyRootView.h>
 #else
+#import <React/RCTFabricSurface.h>
+#import <React/RCTSurfaceHostingProxyRootView.h>
+#endif  // __has_include(<React/RCTFabricSurfaceHostingProxyRootView.h>)
+#else
 #import <React/RCTRootView.h>
 #endif  // USE_FABRIC
 
@@ -31,9 +36,16 @@
               initialProperties:(NSDictionary *)initialProperties;
 {
 #ifdef USE_FABRIC
+#if __has_include(<React/RCTFabricSurfaceHostingProxyRootView.h>)
     return [[RCTFabricSurfaceHostingProxyRootView alloc] initWithBridge:self.bridge
                                                              moduleName:moduleName
                                                       initialProperties:initialProperties];
+#else
+    RCTFabricSurface *surface = [[RCTFabricSurface alloc] initWithBridge:self.bridge
+                                                              moduleName:moduleName
+                                                       initialProperties:initialProperties];
+    return [[RCTSurfaceHostingProxyRootView alloc] initWithSurface:surface];
+#endif  // __has_include(<React/RCTFabricSurfaceHostingProxyRootView.h>)
 #else
     return [[RCTRootView alloc] initWithBridge:self.bridge
                                     moduleName:moduleName

package/cocoa/ReactNativeHost.mm

@@ -1,6 +1,12 @@
 #import "ReactNativeHost.h"
 
-#define FOLLY_NO_CONFIG 1
+#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
 #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.2.8",
+  "version": "0.3.0",
   "description": "Simplify React Native initialization",
   "homepage": "https://github.com/microsoft/rnx-kit/tree/main/packages/react-native-host#readme",
   "license": "MIT",
@@ -21,10 +21,10 @@
   "scripts": {
     "format": "rnx-kit-scripts format",
     "format:c": "clang-format -i $(git ls-files '*.c' '*.cpp' '*.h' '*.m' '*.mm')",
-    "lint:kt": "ktlint --relative --verbose 'android/src/**/*.kt'"
+    "lint:kt": "ktlint --relative 'android/src/**/*.kt'"
   },
   "peerDependencies": {
-    "react-native": ">=0.64"
+    "react-native": ">=0.66"
   },
   "devDependencies": {
     "@rnx-kit/scripts": "*",