react-native-tvos 0.82.1-0 → 0.83.0-0

package/React/CoreModules/RCTFPSGraph.mm

@@ -37,7 +37,7 @@
 
 - (instancetype)initWithFrame:(CGRect)frame color:(UIColor *)color
 {
-  if ((self = [super initWithFrame:frame])) {
+  if ((self = [super initWithFrame:frame]) != nullptr) {
     _frameCount = -1;
     _prevTime = -1;
     _maxFPS = 0;
@@ -64,7 +64,7 @@ RCT_NOT_IMPLEMENTED(-(instancetype)initWithCoder : (NSCoder *)aDecoder)
 
 - (CAShapeLayer *)graph
 {
-  if (!_graph) {
+  if (_graph == nullptr) {
     _graph = [CAShapeLayer new];
     _graph.frame = self.bounds;
     _graph.backgroundColor = [_color colorWithAlphaComponent:0.2].CGColor;
@@ -76,7 +76,7 @@ RCT_NOT_IMPLEMENTED(-(instancetype)initWithCoder : (NSCoder *)aDecoder)
 
 - (UILabel *)label
 {
-  if (!_label) {
+  if (_label == nullptr) {
     _label = [[UILabel alloc] initWithFrame:self.bounds];
     _label.font = [UIFont boldSystemFontOfSize:13];
     _label.textAlignment = NSTextAlignmentCenter;

package/React/CoreModules/RCTLogBox.mm

@@ -45,23 +45,23 @@ RCT_EXPORT_METHOD(show)
     __weak RCTLogBox *weakSelf = self;
     dispatch_async(dispatch_get_main_queue(), ^{
       __strong RCTLogBox *strongSelf = weakSelf;
-      if (!strongSelf) {
+      if (strongSelf == nullptr) {
         return;
       }
 
-      if (strongSelf->_view) {
+      if (strongSelf->_view != nullptr) {
         [strongSelf->_view show];
         return;
       }
 
-      if (strongSelf->_bridgelessSurfacePresenter) {
+      if (strongSelf->_bridgelessSurfacePresenter != nullptr) {
         strongSelf->_view = [[RCTLogBoxView alloc] initWithWindow:RCTKeyWindow()
                                                  surfacePresenter:strongSelf->_bridgelessSurfacePresenter];
         [strongSelf->_view show];
       }
-#ifndef RCT_FIT_RM_OLD_RUNTIME
-      else if (strongSelf->_bridge && strongSelf->_bridge.valid) {
-        if (strongSelf->_bridge.surfacePresenter) {
+#ifndef RCT_REMOVE_LEGACY_ARCH
+      else if ((strongSelf->_bridge != nullptr) && strongSelf->_bridge.valid) {
+        if (strongSelf->_bridge.surfacePresenter != nullptr) {
           strongSelf->_view = [[RCTLogBoxView alloc] initWithWindow:RCTKeyWindow()
                                                    surfacePresenter:strongSelf->_bridge.surfacePresenter];
         } else {
@@ -69,7 +69,7 @@ RCT_EXPORT_METHOD(show)
         }
         [strongSelf->_view show];
       }
-#endif // RCT_FIT_RM_OLD_RUNTIME
+#endif // RCT_REMOVE_LEGACY_ARCH
     });
   }
 }
@@ -80,7 +80,7 @@ RCT_EXPORT_METHOD(hide)
     __weak RCTLogBox *weakSelf = self;
     dispatch_async(dispatch_get_main_queue(), ^{
       __strong RCTLogBox *strongSelf = weakSelf;
-      if (!strongSelf) {
+      if (strongSelf == nullptr) {
         return;
       }
       [strongSelf->_view setHidden:YES];

package/React/CoreModules/RCTLogBoxView.h

@@ -16,9 +16,9 @@
 
 - (void)createRootViewController:(UIView *)view;
 
-#ifndef RCT_FIT_RM_OLD_RUNTIME
+#ifndef RCT_REMOVE_LEGACY_ARCH
 - (instancetype)initWithWindow:(UIWindow *)window bridge:(RCTBridge *)bridge;
-#endif // RCT_FIT_RM_OLD_RUNTIME
+#endif // RCT_REMOVE_LEGACY_ARCH
 - (instancetype)initWithWindow:(UIWindow *)window surfacePresenter:(id<RCTSurfacePresenterStub>)surfacePresenter;
 
 - (void)show;

package/React/CoreModules/RCTLogBoxView.mm

@@ -12,14 +12,14 @@
 #import <React/RCTSurfaceHostingView.h>
 
 @implementation RCTLogBoxView {
-#ifndef RCT_FIT_RM_OLD_RUNTIME
+#ifndef RCT_REMOVE_LEGACY_ARCH
   RCTSurface *_surface;
-#endif // RCT_FIT_RM_OLD_RUNTIME
+#endif // RCT_REMOVE_LEGACY_ARCH
 }
 
 - (instancetype)initWithFrame:(CGRect)frame
 {
-  if ((self = [super initWithFrame:frame])) {
+  if ((self = [super initWithFrame:frame]) != nullptr) {
 #if TARGET_OS_TV
       self.windowLevel = UIWindowLevelNormal;
 #else
@@ -39,11 +39,9 @@
   self.rootViewController = _rootViewController;
 }
 
-#ifndef RCT_FIT_RM_OLD_RUNTIME
+#ifndef RCT_REMOVE_LEGACY_ARCH
 - (instancetype)initWithWindow:(UIWindow *)window bridge:(RCTBridge *)bridge
 {
-  RCTErrorNewArchitectureValidation(RCTNotAllowedInFabricWithoutLegacy, @"RCTLogBoxView", nil);
-
   self = [super initWithWindowScene:window.windowScene];
 
 #if TARGET_OS_TV
@@ -63,7 +61,7 @@
 
   return self;
 }
-#endif // RCT_FIT_RM_OLD_RUNTIME
+#endif // RCT_REMOVE_LEGACY_ARCH
 
 - (instancetype)initWithWindow:(UIWindow *)window surfacePresenter:(id<RCTSurfacePresenterStub>)surfacePresenter
 {
@@ -82,9 +80,9 @@
 - (void)layoutSubviews
 {
   [super layoutSubviews];
-#ifndef RCT_FIT_RM_OLD_RUNTIME
+#ifndef RCT_REMOVE_LEGACY_ARCH
   [_surface setSize:self.frame.size];
-#endif // RCT_FIT_RM_OLD_RUNTIME
+#endif // RCT_REMOVE_LEGACY_ARCH
 }
 
 - (void)dealloc

package/React/CoreModules/RCTPerfMonitor.mm

@@ -134,7 +134,7 @@ RCT_EXPORT_MODULE()
 #if __has_include(<React/RCTDevMenu.h>)
 - (RCTDevMenuItem *)devMenuItem
 {
-  if (!_devMenuItem) {
+  if (_devMenuItem == nullptr) {
     __weak __typeof__(self) weakSelf = self;
     __weak RCTDevSettings *devSettings = [self->_moduleRegistry moduleForName:"DevSettings"];
     if (devSettings.isPerfMonitorShown) {
@@ -161,7 +161,7 @@ RCT_EXPORT_MODULE()
 
 - (UIPanGestureRecognizer *)gestureRecognizer
 {
-  if (!_gestureRecognizer) {
+  if (_gestureRecognizer == nullptr) {
     _gestureRecognizer = [[UIPanGestureRecognizer alloc] initWithTarget:self action:@selector(gesture:)];
   }
 
@@ -170,7 +170,7 @@ RCT_EXPORT_MODULE()
 
 - (UIView *)container
 {
-  if (!_container) {
+  if (_container == nullptr) {
     UIEdgeInsets safeInsets = RCTKeyWindow().safeAreaInsets;
 
     _container =
@@ -187,7 +187,7 @@ RCT_EXPORT_MODULE()
 
 - (UILabel *)memory
 {
-  if (!_memory) {
+  if (_memory == nullptr) {
     _memory = [[UILabel alloc] initWithFrame:CGRectMake(0, 0, 44, RCTPerfMonitorBarHeight)];
     _memory.font = [UIFont systemFontOfSize:12];
     _memory.numberOfLines = 3;
@@ -199,7 +199,7 @@ RCT_EXPORT_MODULE()
 
 - (UILabel *)heap
 {
-  if (!_heap) {
+  if (_heap == nullptr) {
     _heap = [[UILabel alloc] initWithFrame:CGRectMake(44, 0, 44, RCTPerfMonitorBarHeight)];
     _heap.font = [UIFont systemFontOfSize:12];
     _heap.numberOfLines = 3;
@@ -211,7 +211,7 @@ RCT_EXPORT_MODULE()
 
 - (UILabel *)views
 {
-  if (!_views) {
+  if (_views == nullptr) {
     _views = [[UILabel alloc] initWithFrame:CGRectMake(88, 0, 44, RCTPerfMonitorBarHeight)];
     _views.font = [UIFont systemFontOfSize:12];
     _views.numberOfLines = 3;
@@ -223,7 +223,7 @@ RCT_EXPORT_MODULE()
 
 - (RCTFPSGraph *)uiGraph
 {
-  if (!_uiGraph) {
+  if (_uiGraph == nullptr) {
     _uiGraph = [[RCTFPSGraph alloc] initWithFrame:CGRectMake(134, 14, 40, 30) color:[UIColor lightGrayColor]];
   }
   return _uiGraph;
@@ -231,7 +231,7 @@ RCT_EXPORT_MODULE()
 
 - (RCTFPSGraph *)jsGraph
 {
-  if (!_jsGraph) {
+  if (_jsGraph == nullptr) {
     _jsGraph = [[RCTFPSGraph alloc] initWithFrame:CGRectMake(178, 14, 40, 30) color:[UIColor lightGrayColor]];
   }
   return _jsGraph;
@@ -239,7 +239,7 @@ RCT_EXPORT_MODULE()
 
 - (UILabel *)uiGraphLabel
 {
-  if (!_uiGraphLabel) {
+  if (_uiGraphLabel == nullptr) {
     _uiGraphLabel = [[UILabel alloc] initWithFrame:CGRectMake(134, 3, 40, 10)];
     _uiGraphLabel.font = [UIFont systemFontOfSize:11];
     _uiGraphLabel.textAlignment = NSTextAlignmentCenter;
@@ -251,7 +251,7 @@ RCT_EXPORT_MODULE()
 
 - (UILabel *)jsGraphLabel
 {
-  if (!_jsGraphLabel) {
+  if (_jsGraphLabel == nullptr) {
     _jsGraphLabel = [[UILabel alloc] initWithFrame:CGRectMake(178, 3, 38, 10)];
     _jsGraphLabel.font = [UIFont systemFontOfSize:11];
     _jsGraphLabel.textAlignment = NSTextAlignmentCenter;
@@ -263,7 +263,7 @@ RCT_EXPORT_MODULE()
 
 - (UITableView *)metrics
 {
-  if (!_metrics) {
+  if (_metrics == nullptr) {
     _metrics = [[UITableView alloc] initWithFrame:CGRectMake(
                                                       0,
                                                       RCTPerfMonitorBarHeight,
@@ -280,7 +280,7 @@ RCT_EXPORT_MODULE()
 
 - (void)show
 {
-  if (_container) {
+  if (_container != nullptr) {
     return;
   }
 
@@ -316,7 +316,7 @@ RCT_EXPORT_MODULE()
 
 - (void)hide
 {
-  if (!_container) {
+  if (_container == nullptr) {
     return;
   }
 
@@ -359,7 +359,7 @@ RCT_EXPORT_MODULE()
   dispatch_io_set_low_water(_io, 20);
 
   dispatch_io_read(_io, 0, SIZE_MAX, _queue, ^(__unused bool done, dispatch_data_t data, __unused int error) {
-    if (!data) {
+    if (data == nullptr) {
       return;
     }
 
@@ -390,7 +390,7 @@ RCT_EXPORT_MODULE()
     GCRegex = [NSRegularExpression regularExpressionWithPattern:pattern options:0 error:nil];
   });
 
-  if (_remaining) {
+  if (_remaining != nullptr) {
     log = [_remaining stringByAppendingString:log];
     _remaining = nil;
   }
@@ -403,7 +403,7 @@ RCT_EXPORT_MODULE()
 
   for (NSString *line in lines) {
     NSTextCheckingResult *match = [GCRegex firstMatchInString:line options:0 range:NSMakeRange(0, line.length)];
-    if (match) {
+    if (match != nullptr) {
       NSString *heapSizeStr = [line substringWithRange:[match rangeAtIndex:2]];
       _heapSize = [heapSizeStr integerValue];
     }
@@ -416,7 +416,7 @@ RCT_EXPORT_MODULE()
   NSUInteger viewCount = views.count;
   NSUInteger visibleViewCount = 0;
   for (UIView *view in views.allValues) {
-    if (view.window || view.superview.window) {
+    if ((view.window != nullptr) || (view.superview.window != nullptr)) {
       visibleViewCount++;
     }
   }
@@ -435,7 +435,7 @@ RCT_EXPORT_MODULE()
   __weak __typeof__(self) weakSelf = self;
   dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
     __strong __typeof__(weakSelf) strongSelf = weakSelf;
-    if (strongSelf && strongSelf->_container.superview) {
+    if ((strongSelf != nullptr) && (strongSelf->_container.superview != nullptr)) {
       [strongSelf updateStats];
     }
   });
@@ -511,7 +511,7 @@ RCT_EXPORT_MODULE()
   UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:RCTPerfMonitorCellIdentifier
                                                           forIndexPath:indexPath];
 
-  if (!cell) {
+  if (cell == nullptr) {
     cell = [[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault
                                   reuseIdentifier:RCTPerfMonitorCellIdentifier];
   }

package/React/CoreModules/RCTTiming.mm

@@ -353,11 +353,9 @@ RCT_EXPORT_MODULE()
  * calculating the timer's target time. We calculate this by passing in
  * Date.now() from JS and then subtracting that from the current time here.
  */
-RCT_EXPORT_METHOD(createTimer
-                  : (double)callbackID duration
-                  : (NSTimeInterval)jsDuration jsSchedulingTime
-                  : (double)jsSchedulingTime repeats
-                  : (BOOL)repeats)
+RCT_EXPORT_METHOD(
+    createTimer : (double)callbackID duration : (NSTimeInterval)jsDuration jsSchedulingTime : (double)
+        jsSchedulingTime repeats : (BOOL)repeats)
 {
   NSNumber *callbackIdObjc = [NSNumber numberWithDouble:callbackID];
   NSDate *schedulingTime = [RCTConvert NSDate:[NSNumber numberWithDouble:jsSchedulingTime]];

package/React/CoreModules/RCTWebSocketModule.mm

@@ -62,11 +62,9 @@ RCT_EXPORT_MODULE()
   }
 }
 
-RCT_EXPORT_METHOD(connect
-                  : (NSURL *)URL protocols
-                  : (NSArray *)protocols options
-                  : (JS::NativeWebSocketModule::SpecConnectOptions &)options socketID
-                  : (double)socketID)
+RCT_EXPORT_METHOD(
+    connect : (NSURL *)URL protocols : (NSArray *)protocols options : (JS::NativeWebSocketModule::SpecConnectOptions &)
+        options socketID : (double)socketID)
 {
   NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:URL];
 

package/React/CoreModules/React-CoreModules.podspec

@@ -61,6 +61,7 @@ Pod::Spec.new do |s|
   add_dependency(s, "React-RCTFBReactNativeSpec")
   add_dependency(s, "ReactCommon", :subspec => "turbomodule/core", :additional_framework_paths => ["react/nativemodule/core"])
   add_dependency(s, "React-NativeModulesApple")
+  add_dependency(s, "React-utils", :additional_framework_paths => ["react/utils/platform/ios"])
 
   add_rn_third_party_dependencies(s)
   add_rncore_dependency(s)

package/React/CxxBridge/RCTCxxBridge.mm

@@ -54,15 +54,11 @@
 #import "RCTMessageThread.h"
 #import "RCTObjcExecutor.h"
 
-#ifdef WITH_FBSYSTRACE
-#import <React/RCTFBSystrace.h>
-#endif
-
 #if RCT_DEV_MENU && __has_include(<React/RCTDevLoadingViewProtocol.h>)
 #import <React/RCTDevLoadingViewProtocol.h>
 #endif
 
-#ifndef RCT_FIT_RM_OLD_RUNTIME
+#ifndef RCT_REMOVE_LEGACY_ARCH
 
 static NSString *const RCTJSThreadName = @"com.facebook.react.JavaScript";
 
@@ -183,7 +179,7 @@ static void registerPerformanceLoggerHooks(RCTPerformanceLogger *performanceLogg
 
 struct RCTInstanceCallback : public InstanceCallback {
   __weak RCTCxxBridge *bridge_;
-  RCTInstanceCallback(RCTCxxBridge *bridge) : bridge_(bridge){};
+  RCTInstanceCallback(RCTCxxBridge *bridge) : bridge_(bridge) {};
   void onBatchComplete() override
   {
     [bridge_ batchDidComplete];
@@ -1124,16 +1120,12 @@ struct RCTInstanceCallback : public InstanceCallback {
   });
 }
 
-RCT_NOT_IMPLEMENTED(-(instancetype)initWithDelegate
-                    : (__unused id<RCTBridgeDelegate>)delegate bundleURL
-                    : (__unused NSURL *)bundleURL moduleProvider
-                    : (__unused RCTBridgeModuleListProvider)block launchOptions
-                    : (__unused NSDictionary *)launchOptions)
+RCT_NOT_IMPLEMENTED(-(instancetype)initWithDelegate : (__unused id<RCTBridgeDelegate>)delegate bundleURL : (
+    __unused NSURL *)bundleURL moduleProvider : (__unused RCTBridgeModuleListProvider)
+                        block launchOptions : (__unused NSDictionary *)launchOptions)
 
-RCT_NOT_IMPLEMENTED(-(instancetype)initWithBundleURL
-                    : (__unused NSURL *)bundleURL moduleProvider
-                    : (__unused RCTBridgeModuleListProvider)block launchOptions
-                    : (__unused NSDictionary *)launchOptions)
+RCT_NOT_IMPLEMENTED(-(instancetype)initWithBundleURL : (__unused NSURL *)bundleURL moduleProvider : (
+    __unused RCTBridgeModuleListProvider)block launchOptions : (__unused NSDictionary *)launchOptions)
 
 /**
  * Prevent super from calling setUp (that'd create another batchedBridge)
@@ -1507,9 +1499,6 @@ RCT_NOT_IMPLEMENTED(-(instancetype)initWithBundleURL
   RCTAssertMainQueue();
 
   [self ensureOnJavaScriptThread:^{
-#if WITH_FBSYSTRACE
-    [RCTFBSystrace registerCallbacks];
-#endif
     RCTProfileInit(self);
 
     [self enqueueJSCall:@"Systrace" method:@"setEnabled" args:@[ @YES ] completion:NULL];
@@ -1525,14 +1514,6 @@ RCT_NOT_IMPLEMENTED(-(instancetype)initWithBundleURL
     RCTProfileEnd(self, ^(NSString *log) {
       NSData *logData = [log dataUsingEncoding:NSUTF8StringEncoding];
       callback(logData);
-#if WITH_FBSYSTRACE
-      if (![RCTFBSystrace verifyTraceSize:logData.length]) {
-        RCTLogWarn(
-            @"Your FBSystrace trace might be truncated, try to bump up the buffer size"
-             " in RCTFBSystrace.m or capture a shorter trace");
-      }
-      [RCTFBSystrace unregisterCallbacks];
-#endif
     });
   }];
 }
@@ -1586,7 +1567,7 @@ RCT_NOT_IMPLEMENTED(-(instancetype)initWithBundleURL
 
 @end
 
-#else // RCT_FIT_RM_OLD_RUNTIME
+#else // RCT_REMOVE_LEGACY_ARCH
 @implementation RCTCxxBridge
 @end
-#endif // RCT_FIT_RM_OLD_RUNTIME
+#endif // RCT_REMOVE_LEGACY_ARCH

package/React/CxxBridge/RCTJSIExecutorRuntimeInstaller.h

@@ -7,7 +7,7 @@
 
 #pragma once
 
-#ifndef RCT_FIT_RM_OLD_RUNTIME
+#ifndef RCT_REMOVE_LEGACY_ARCH
 
 #include <jsireact/JSIExecutor.h>
 
@@ -18,9 +18,8 @@ namespace facebook::react {
  * Apple platforms, such as console logging, performance metrics, etc.
  */
 [[deprecated("This API will be removed along with the legacy architecture.")]]
-JSIExecutor::RuntimeInstaller RCTJSIExecutorRuntimeInstaller(
-    JSIExecutor::RuntimeInstaller runtimeInstallerToWrap);
+JSIExecutor::RuntimeInstaller RCTJSIExecutorRuntimeInstaller(JSIExecutor::RuntimeInstaller runtimeInstallerToWrap);
 
 } // namespace facebook::react
 
-#endif // RCT_FIT_RM_OLD_RUNTIME
+#endif // RCT_REMOVE_LEGACY_ARCH

package/React/CxxBridge/RCTJSIExecutorRuntimeInstaller.mm

@@ -7,7 +7,7 @@
 
 #include "RCTJSIExecutorRuntimeInstaller.h"
 
-#ifndef RCT_FIT_RM_OLD_RUNTIME
+#ifndef RCT_REMOVE_LEGACY_ARCH
 
 #import <React/RCTLog.h>
 #include <chrono>
@@ -31,4 +31,4 @@ JSIExecutor::RuntimeInstaller RCTJSIExecutorRuntimeInstaller(JSIExecutor::Runtim
 
 } // namespace facebook::react
 
-#endif // RCT_FIT_RM_OLD_RUNTIME
+#endif // RCT_REMOVE_LEGACY_ARCH

package/React/CxxBridge/RCTMessageThread.h

@@ -16,18 +16,17 @@
 
 namespace facebook::react {
 
-class RCTMessageThread : public MessageQueueThread,
-                         public std::enable_shared_from_this<RCTMessageThread> {
+class RCTMessageThread : public MessageQueueThread, public std::enable_shared_from_this<RCTMessageThread> {
  public:
-  RCTMessageThread(NSRunLoop* runLoop, RCTJavaScriptCompleteBlock errorBlock);
+  RCTMessageThread(NSRunLoop *runLoop, RCTJavaScriptCompleteBlock errorBlock);
   ~RCTMessageThread() override;
-  void runOnQueue(std::function<void()>&&) override;
-  void runOnQueueSync(std::function<void()>&&) override;
+  void runOnQueue(std::function<void()> && /*func*/) override;
+  void runOnQueueSync(std::function<void()> && /*func*/) override;
   void quitSynchronous() override;
-  void setRunLoop(NSRunLoop* runLoop);
+  void setRunLoop(NSRunLoop *runLoop);
 
  private:
-  void tryFunc(const std::function<void()>& func);
+  void tryFunc(const std::function<void()> &func);
   void runAsync(std::function<void()> func);
   void runSync(std::function<void()> func);
 

package/React/CxxBridge/RCTMessageThread.mm

@@ -66,7 +66,7 @@ void RCTMessageThread::runSync(std::function<void()> func)
 void RCTMessageThread::tryFunc(const std::function<void()> &func)
 {
   NSError *error = tryAndReturnError(func);
-  if (error) {
+  if (error != nullptr) {
     m_errorBlock(error);
   }
 }

package/React/CxxBridge/RCTObjcExecutor.h

@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#ifndef RCT_FIT_RM_OLD_RUNTIME
+#ifndef RCT_REMOVE_LEGACY_ARCH
 
 #include <functional>
 #include <memory>
@@ -16,13 +16,10 @@
 
 namespace facebook::react {
 
-class [[deprecated(
-    "This API will be removed along with the legacy architecture.")]] RCTObjcExecutorFactory
+class [[deprecated("This API will be removed along with the legacy architecture.")]] RCTObjcExecutorFactory
     : public JSExecutorFactory {
  public:
-  RCTObjcExecutorFactory(
-      id<RCTJavaScriptExecutor> jse,
-      RCTJavaScriptCompleteBlock errorBlock);
+  RCTObjcExecutorFactory(id<RCTJavaScriptExecutor> jse, RCTJavaScriptCompleteBlock errorBlock);
   std::unique_ptr<JSExecutor> createJSExecutor(
       std::shared_ptr<ExecutorDelegate> delegate,
       std::shared_ptr<MessageQueueThread> jsQueue) override;
@@ -34,4 +31,4 @@ class [[deprecated(
 
 } // namespace facebook::react
 
-#endif // RCT_FIT_RM_OLD_RUNTIME
+#endif // RCT_REMOVE_LEGACY_ARCH

package/React/CxxBridge/RCTObjcExecutor.mm

@@ -7,7 +7,7 @@
 
 #import "RCTObjcExecutor.h"
 
-#ifndef RCT_FIT_RM_OLD_RUNTIME
+#ifndef RCT_REMOVE_LEGACY_ARCH
 
 #import <React/RCTCxxUtils.h>
 #import <React/RCTJavaScriptExecutor.h>
@@ -41,7 +41,7 @@ class RCTObjcExecutor : public JSExecutor {
       : m_jse(jse), m_errorBlock(errorBlock), m_delegate(std::move(delegate)), m_jsThread(std::move(jsThread))
   {
     m_jsCallback = ^(id json, NSError *error) {
-      if (error) {
+      if (error != nullptr) {
         // Do not use "m_errorBlock" here as the bridge might be in the middle
         // of invalidation as a result of error handling and "this" can be
         // already deallocated.
@@ -81,7 +81,7 @@ class RCTObjcExecutor : public JSExecutor {
                          onComplete:^(NSError *error) {
                            RCTProfileEndFlowEvent();
 
-                           if (error) {
+                           if (error != nullptr) {
                              m_errorBlock(error);
                              return;
                            }
@@ -90,7 +90,7 @@ class RCTObjcExecutor : public JSExecutor {
                          }];
   }
 
-  void setBundleRegistry(std::unique_ptr<RAMBundleRegistry>) override
+  void setBundleRegistry(std::unique_ptr<RAMBundleRegistry> /*bundleRegistry*/) override
   {
     RCTAssert(NO, @"RAM bundles are not supported in RCTObjcExecutor");
   }
@@ -147,4 +147,4 @@ std::unique_ptr<JSExecutor> RCTObjcExecutorFactory::createJSExecutor(
 
 } // namespace facebook::react
 
-#endif // RCT_FIT_RM_OLD_RUNTIME
+#endif // RCT_REMOVE_LEGACY_ARCH

package/React/CxxLogUtils/RCTDefaultCxxLogFunction.h

@@ -11,6 +11,6 @@
 
 namespace facebook::react {
 
-void RCTDefaultCxxLogFunction(ReactNativeLogLevel level, const char* message);
+void RCTDefaultCxxLogFunction(ReactNativeLogLevel level, const char *message);
 
 } // namespace facebook::react

package/React/CxxModule/DispatchMessageQueueThread.h

@@ -10,7 +10,7 @@
 #include <React/RCTLog.h>
 #include <cxxreact/MessageQueueThread.h>
 
-#ifndef RCT_FIT_RM_OLD_RUNTIME
+#ifndef RCT_REMOVE_LEGACY_ARCH
 
 namespace facebook::react {
 
@@ -47,4 +47,4 @@ class [[deprecated("This API will be removed along with the legacy architecture.
 
 } // namespace facebook::react
 
-#endif // RCT_FIT_RM_OLD_RUNTIME
+#endif // RCT_REMOVE_LEGACY_ARCH

package/React/CxxModule/RCTCxxMethod.mm

@@ -26,7 +26,7 @@ using namespace facebook::react;
 
 - (instancetype)initWithCxxMethod:(const CxxModule::Method &)method
 {
-  if ((self = [super init])) {
+  if ((self = [super init]) != nullptr) {
     _method = std::make_unique<CxxModule::Method>(method);
   }
   return self;

package/React/CxxModule/RCTCxxUtils.h

@@ -18,13 +18,13 @@ namespace facebook::react {
 class Instance;
 class NativeModule;
 
-#ifndef RCT_FIT_RM_OLD_RUNTIME
+#ifndef RCT_REMOVE_LEGACY_ARCH
 
 [[deprecated("This API will be removed along with the legacy architecture.")]]
 std::vector<std::unique_ptr<NativeModule>>
 createNativeModules(NSArray<RCTModuleData *> *modules, RCTBridge *bridge, const std::shared_ptr<Instance> &instance);
 
-#endif // RCT_FIT_RM_OLD_RUNTIME
+#endif // RCT_REMOVE_LEGACY_ARCH
 
 NSError *tryAndReturnError(const std::function<void()> &func);
 NSString *deriveSourceURL(NSURL *url);

package/React/CxxModule/RCTCxxUtils.mm

@@ -20,7 +20,7 @@ namespace facebook::react {
 
 using facebook::jsi::JSError;
 
-#ifndef RCT_FIT_RM_OLD_RUNTIME
+#ifndef RCT_REMOVE_LEGACY_ARCH
 
 std::vector<std::unique_ptr<NativeModule>>
 createNativeModules(NSArray<RCTModuleData *> *modules, RCTBridge *bridge, const std::shared_ptr<Instance> &instance)
@@ -28,11 +28,12 @@ createNativeModules(NSArray<RCTModuleData *> *modules, RCTBridge *bridge, const
   std::vector<std::unique_ptr<NativeModule>> nativeModules;
   for (RCTModuleData *moduleData in modules) {
     if ([moduleData.moduleClass isSubclassOfClass:[RCTCxxModule class]]) {
-      nativeModules.emplace_back(std::make_unique<CxxNativeModule>(
-          instance,
-          [moduleData.name UTF8String],
-          [moduleData] { return [(RCTCxxModule *)(moduleData.instance) createModule]; },
-          std::make_shared<DispatchMessageQueueThread>(moduleData)));
+      nativeModules.emplace_back(
+          std::make_unique<CxxNativeModule>(
+              instance,
+              [moduleData.name UTF8String],
+              [moduleData] { return [(RCTCxxModule *)(moduleData.instance) createModule]; },
+              std::make_shared<DispatchMessageQueueThread>(moduleData)));
     } else {
       nativeModules.emplace_back(std::make_unique<RCTNativeModule>(bridge, moduleData));
     }
@@ -40,7 +41,7 @@ createNativeModules(NSArray<RCTModuleData *> *modules, RCTBridge *bridge, const
   return nativeModules;
 }
 
-#endif // RCT_FIT_RM_OLD_RUNTIME
+#endif // RCT_REMOVE_LEGACY_ARCH
 
 static NSError *errorWithException(const std::exception &e)
 {