@rnx-kit/react-native-host 0.4.4 → 0.4.6

package/README.md

@@ -53,16 +53,18 @@ For example, if you previously had something like this:
 @end
 
 // AppDelegate.m
-@implementation AppDelegate
+@implementation AppDelegate {
+    RCTBridge *_bridge;
+}
 
 - (BOOL)application:(UIApplication *)application
     didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
 {
     ...
 
-    RCTBridge *bridge = [[RCTBridge alloc] initWithDelegate:self
-                                              launchOptions:launchOptions];
-    RCTRootView *rootView = [[RCTRootView alloc] initWithBridge:bridge
+    _bridge = [[RCTBridge alloc] initWithDelegate:self
+                                    launchOptions:launchOptions];
+    RCTRootView *rootView = [[RCTRootView alloc] initWithBridge:_bridge
                                                      moduleName:moduleName
                                               initialProperties:initialProperties];
 
@@ -83,16 +85,18 @@ You should instead have:
 @end
 
 // AppDelegate.m
-@implementation AppDelegate
+@implementation AppDelegate {
+    ReactNativeHost *_host;
+}
 
 - (BOOL)application:(UIApplication *)application
     didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
 {
     ...
 
-    ReactNativeHost *host = [[ReactNativeHost alloc] initWithConfig:self];
-    UIView *rootView = [host viewWithModuleName:moduleName
-                              initialProperties:initialProperties];
+    _host = [[ReactNativeHost alloc] initWithConfig:self];
+    UIView *rootView = [_host viewWithModuleName:moduleName
+                               initialProperties:initialProperties];
 
     ...
 }

package/ReactNativeHost.podspec

@@ -10,12 +10,7 @@ repo_dir = repository['directory']
 
 new_arch_enabled = ENV['RCT_NEW_ARCH_ENABLED'] == '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',
+  '$(inherit)',
   "USE_HERMES=#{ENV['USE_HERMES'] || '0'}",
 ]
 if new_arch_enabled
@@ -51,17 +46,13 @@ Pod::Spec.new do |s|
   end
 
   s.pod_target_xcconfig = {
-    'CLANG_CXX_LANGUAGE_STANDARD' => 'gnu++20',
+    'CLANG_CXX_LANGUAGE_STANDARD' => 'c++20',
     'DEFINES_MODULE' => 'YES',
     'GCC_PREPROCESSOR_DEFINITIONS' => preprocessor_definitions,
     'HEADER_SEARCH_PATHS' => [
-      '$(PODS_ROOT)/boost',
-      '$(PODS_ROOT)/boost-for-react-native',
-      '$(PODS_ROOT)/RCT-Folly',
-      '$(PODS_ROOT)/DoubleConversion',
       '$(PODS_ROOT)/Headers/Private/React-Core',
-      '$(PODS_ROOT)/Headers/Private/Yoga',
-    ],
+      '$(PODS_CONFIGURATION_BUILD_DIR)/React-runtimescheduler/React_runtimescheduler.framework/Headers',
+    ].join(' '),
   }
 
   # Include both package and repository relative paths to allow the podspec to
@@ -71,4 +62,6 @@ Pod::Spec.new do |s|
                            "#{repo_dir}/#{source_files}"         # :podspec
   s.public_header_files  = public_header_files,                  # :path
                            "#{repo_dir}/#{public_header_files}"  # :podspec
+
+  install_modules_dependencies(s)
 end

package/cocoa/RNXBridgelessHeaders.h

@@ -18,6 +18,15 @@ using SharedJSRuntimeFactory = std::shared_ptr<facebook::react::JSEngineInstance
 using SharedJSRuntimeFactory = std::shared_ptr<facebook::react::JSRuntimeFactory>;
 #endif  // __has_include(<react/runtime/JSEngineInstance.h>)
 
+// For details, see
+// https://github.com/facebook/react-native/commit/c3b0a8f1626939cf5c7b3864a5acf9d3dad26fb3
+@interface RCTHost (Compatibility)
+@property (nonatomic, readonly) RCTModuleRegistry *moduleRegistry;      // Introduced in 0.74
+@property (nonatomic, readonly) RCTSurfacePresenter *surfacePresenter;  // Introduced in 0.74
+- (RCTModuleRegistry *)getModuleRegistry;      // Deprecated in 0.74, and removed in 0.75
+- (RCTSurfacePresenter *)getSurfacePresenter;  // Deprecated in 0.74, and removed in 0.75
+@end
+
 #elif USE_FABRIC
 
 #import <React/RCTSurfacePresenterBridgeAdapter.h>

package/cocoa/RNXHostReleaser.mm

@@ -34,9 +34,9 @@
 #if !TARGET_OS_OSX
     // This may initialize `RCTAccessibilityManager` and must therefore be run
     // on the main queue.
-    __weak typeof(self) weakSelf = self;
+    __weak __typeof(self) weakSelf = self;
     RCTExecuteOnMainQueue(^{
-      typeof(self) strongSelf = weakSelf;
+      __typeof(self) strongSelf = weakSelf;
       if (strongSelf == nil) {
           return;
       }
@@ -50,7 +50,7 @@
       RCTExecuteOnUIManagerQueue(^{
         [manager addUIBlock:^(RCTUIManager *uiManager,
                               NSDictionary<NSNumber *, UIView *> *viewRegistry) {
-          typeof(self) strongSelf = weakSelf;
+          __typeof(self) strongSelf = weakSelf;
           if (strongSelf == nil) {
               return;
           }

package/cocoa/RNXTurboModuleAdapter.mm

@@ -13,23 +13,36 @@
 #if __has_include(<React/RCTAppSetupUtils.h>)  // <0.72
 #import <React/RCTAppSetupUtils.h>
 #else
+
+#if __has_include(<React-RCTAppDelegate/RCTAppSetupUtils.h>)
 #import <React-RCTAppDelegate/RCTAppSetupUtils.h>
+#elif __has_include(<React_RCTAppDelegate/RCTAppSetupUtils.h>)  // use_frameworks!
+#import <React_RCTAppDelegate/RCTAppSetupUtils.h>
+#endif  // __has_include(<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, `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
+#elif __has_include(<React_RCTAppDelegate/RCTLegacyInteropComponents.h>)  // use_frameworks!
+#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 USE_RUNTIME_SCHEDULER 1
 #endif  // __has_include(<react/renderer/runtimescheduler/SchedulerPriorityUtils.h>)
 

package/cocoa/ReactNativeHost.mm

@@ -104,7 +104,9 @@ using ReactNativeConfig = facebook::react::EmptyReactNativeConfig const;
 - (RCTSurfacePresenter *)surfacePresenter
 {
 #if USE_BRIDGELESS
-    return [_reactHost getSurfacePresenter];
+    return [_reactHost respondsToSelector:@selector(surfacePresenter)]
+               ? _reactHost.surfacePresenter
+               : [_reactHost getSurfacePresenter];
 #elif USE_FABRIC
     return [_surfacePresenterBridgeAdapter surfacePresenter];
 #else
@@ -144,7 +146,10 @@ using ReactNativeConfig = facebook::react::EmptyReactNativeConfig const;
 
 #if USE_BRIDGELESS
     const char *moduleName = RCTBridgeModuleNameForClass(moduleClass).UTF8String;
-    block([[_reactHost getModuleRegistry] moduleForName:moduleName]);
+    RCTModuleRegistry *moduleRegistry = [_reactHost respondsToSelector:@selector(moduleRegistry)]
+                                            ? _reactHost.moduleRegistry
+                                            : [_reactHost getModuleRegistry];
+    block([moduleRegistry moduleForName:moduleName]);
 #endif  // USE_BRIDGELESS
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rnx-kit/react-native-host",
-  "version": "0.4.4",
+  "version": "0.4.6",
   "description": "Simplify React Native initialization",
   "homepage": "https://github.com/microsoft/rnx-kit/tree/main/packages/react-native-host#readme",
   "license": "MIT",
@@ -10,8 +10,10 @@
   },
   "files": [
     "ReactNativeHost.podspec",
-    "android/",
-    "cocoa/"
+    "android/build.gradle",
+    "android/gradle.properties",
+    "android/src",
+    "cocoa"
   ],
   "repository": {
     "type": "git",