@rnx-kit/react-native-host 0.5.0 → 0.5.2

package/cocoa/RNXBridgelessHeaders.h

@@ -49,10 +49,36 @@ using SharedJSRuntimeFactory = std::shared_ptr<facebook::react::JSRuntimeFactory
 @end
 
 #ifdef USE_FEATURE_FLAGS
+#if __has_include(<React-RCTAppDelegate/RCTArchConfiguratorProtocol.h>) || __has_include(<React_RCTAppDelegate/RCTArchConfiguratorProtocol.h>)
+#define USE_UNIFIED_FEATURE_FLAGS 1
+#endif  // __has_include(<React-RCTAppDelegate/RCTArchConfiguratorProtocol.h>)
+
 // https://github.com/facebook/react-native/blob/0.74-stable/packages/react-native/Libraries/AppDelegate/RCTAppDelegate.mm#L272-L286
 class RNXBridgelessFeatureFlags : public facebook::react::ReactNativeFeatureFlagsDefaults
 {
 public:
+#ifdef USE_UNIFIED_FEATURE_FLAGS  // >= 0.77
+    bool enableBridgelessArchitecture() override
+    {
+        return true;
+    }
+    bool enableFabricRenderer() override
+    {
+        return true;
+    }
+    bool useTurboModules() override
+    {
+        return true;
+    }
+    bool useNativeViewConfigsInBridgelessMode() override
+    {
+        return true;
+    }
+    bool enableFixForViewCommandRace() override
+    {
+        return true;
+    }
+#else   // < 0.77
     bool useModernRuntimeScheduler() override
     {
         return true;
@@ -67,6 +93,7 @@ public:
     {
         return true;
     }
+#endif  // USE_UNIFIED_FEATURE_FLAGS
 };
 #endif  // USE_FEATURE_FLAGS
 

package/cocoa/RNXTurboModuleAdapter.mm

@@ -1,10 +1,6 @@
 #import "RNXTurboModuleAdapter.h"
 
 #include "FollyConfig.h"
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wcomma"
-#import <cxxreact/JSExecutor.h>
-#pragma clang diagnostic pop
 
 #if USE_FABRIC
 #import <React/CoreModulesPlugins.h>
@@ -102,7 +98,11 @@
 
 - (id<RCTTurboModule>)getModuleInstanceFromClass:(Class)moduleClass
 {
+#if __has_include(<React-RCTAppDelegate/RCTDependencyProvider.h>) || __has_include(<React_RCTAppDelegate/RCTDependencyProvider.h>)
+    return RCTAppSetupDefaultModuleFromClass(moduleClass, nil);
+#else
     return RCTAppSetupDefaultModuleFromClass(moduleClass);
+#endif  // __has_include(<React-RCTAppDelegate/RCTArchConfiguratorProtocol.h>)
 }
 
 // MARK: - Private

package/cocoa/ReactNativeHost+View.mm

@@ -59,10 +59,7 @@ static NSString *const kReactConcurrentRoot = @"concurrentRoot";
 #elif USE_BRIDGELESS
     RCTFabricSurface *surface = [self.reactHost createSurfaceWithModuleName:moduleName
                                                           initialProperties:initialProps];
-    RCTSurfaceSizeMeasureMode sizeMeasureMode =
-        RCTSurfaceSizeMeasureModeWidthExact | RCTSurfaceSizeMeasureModeHeightExact;
-    return [[RCTSurfaceHostingProxyRootView alloc] initWithSurface:surface
-                                                   sizeMeasureMode:sizeMeasureMode];
+    return [[RCTSurfaceHostingProxyRootView alloc] initWithSurface:surface];
 #else
     RCTFabricSurface *surface =
         [[RCTFabricSurface alloc] initWithSurfacePresenter:self.surfacePresenter

package/cocoa/ReactNativeHost.mm

@@ -1,10 +1,6 @@
 #import "ReactNativeHost.h"
 
 #include "FollyConfig.h"
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wcomma"
-#import <cxxreact/JSExecutor.h>
-#pragma clang diagnostic pop
 
 #import <React/RCTBridge.h>
 #import <React/RCTBundleURLProvider.h>
@@ -252,7 +248,9 @@ using ReactNativeConfig = facebook::react::EmptyReactNativeConfig const;
     }
 
 #if USE_BRIDGELESS
+#ifndef USE_UNIFIED_FEATURE_FLAGS
     RCTSetUseNativeViewConfigsInBridgelessMode(YES);
+#endif
     RCTEnableTurboModuleInterop(YES);
     RCTEnableTurboModuleInteropBridgeProxy(YES);
 

package/package.json

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