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

package/React/Base/RCTAssert.m

@@ -22,7 +22,7 @@ RCTAssertFunction RCTCurrentAssertFunction = nil;
 RCTFatalHandler RCTCurrentFatalHandler = nil;
 RCTFatalExceptionHandler RCTCurrentFatalExceptionHandler = nil;
 
-NSException *_RCTNotImplementedException(SEL, Class);
+NSException *_RCTNotImplementedException(SEL /*cmd*/, Class /*cls*/);
 NSException *_RCTNotImplementedException(SEL cmd, Class cls)
 {
   NSString *msg = [NSString stringWithFormat:
@@ -231,115 +231,3 @@ RCTFatalExceptionHandler RCTGetFatalExceptionHandler(void)
 {
   return RCTCurrentFatalExceptionHandler;
 }
-
-// MARK: - New Architecture Validation - Enable Reporting
-
-#if RCT_ONLY_NEW_ARCHITECTURE_EXPERIMENTAL_DO_NOT_USE
-static RCTNotAllowedValidation minValidationLevel = RCTNotAllowedInBridgeless;
-#else
-static RCTNotAllowedValidation minValidationLevel = RCTNotAllowedValidationDisabled;
-#endif
-
-__attribute__((used)) RCT_EXTERN void RCTNewArchitectureSetMinValidationLevel(RCTNotAllowedValidation level)
-{
-#if RCT_ONLY_NEW_ARCHITECTURE_EXPERIMENTAL_DO_NOT_USE
-  // Cannot disable the reporting in this mode.
-#else
-  minValidationLevel = level;
-#endif
-}
-
-// MARK: - New Architecture Validation - Private
-
-static BOOL shouldEnforceValidation(RCTNotAllowedValidation type)
-{
-  return type >= minValidationLevel;
-}
-
-static NSString *stringDescribingContext(id context)
-{
-  if ([context isKindOfClass:NSString.class]) {
-    return context;
-  } else if (context) {
-    Class klass = [context class];
-    if (klass) {
-      return NSStringFromClass(klass);
-    }
-  }
-  return @"uncategorized";
-}
-
-static NSString *validationMessage(RCTNotAllowedValidation type, id context, NSString *extra)
-{
-  NSString *notAllowedType;
-  switch (type) {
-    case RCTNotAllowedValidationDisabled:
-      RCTAssert(0, @"RCTNotAllowedValidationDisabled not a validation type.");
-      return nil;
-    case RCTNotAllowedInFabricWithoutLegacy:
-      notAllowedType = @"Fabric";
-      break;
-    case RCTNotAllowedInBridgeless:
-      notAllowedType = @"Bridgeless";
-      break;
-  }
-
-  return
-      [NSString stringWithFormat:@"[ReactNative Architecture][NotAllowedIn%@] Unexpectedly reached code path in %@. %@",
-                                 notAllowedType,
-                                 stringDescribingContext(context),
-                                 extra ?: @""];
-}
-
-static void
-newArchitectureValidationInternal(RCTLogLevel level, RCTNotAllowedValidation type, id context, NSString *extra)
-{
-  if (!shouldEnforceValidation(type)) {
-    return;
-  }
-
-  NSString *msg = validationMessage(type, context, extra);
-  if (msg) {
-    switch (level) {
-      case RCTLogLevelInfo:
-        RCTLogInfo(@"%@", msg);
-        break;
-      case RCTLogLevelError:
-        RCTLogError(@"%@", msg);
-        break;
-      case RCTLogLevelFatal:
-        RCTAssert(0, @"%@", msg);
-        break;
-      default:
-        RCTAssert(0, @"New architecture validation is only for info, error, and fatal levels.");
-    }
-  }
-}
-
-// MARK: - New Architecture Validation - Public
-
-void RCTEnforceNewArchitectureValidation(RCTNotAllowedValidation type, id context, NSString *extra)
-{
-  newArchitectureValidationInternal(RCTLogLevelFatal, type, context, extra);
-}
-
-void RCTErrorNewArchitectureValidation(RCTNotAllowedValidation type, id context, NSString *extra)
-{
-#if RCT_ONLY_NEW_ARCHITECTURE_EXPERIMENTAL_DO_NOT_USE
-  newArchitectureValidationInternal(RCTLogLevelFatal, type, context, extra);
-#else
-  newArchitectureValidationInternal(RCTLogLevelError, type, context, extra);
-#endif
-}
-
-void RCTLogNewArchitectureValidation(RCTNotAllowedValidation type, id context, NSString *extra)
-{
-  newArchitectureValidationInternal(RCTLogLevelInfo, type, context, extra);
-}
-
-void RCTNewArchitectureValidationPlaceholder(RCTNotAllowedValidation type, id context, NSString *extra)
-{
-#if RCT_ONLY_NEW_ARCHITECTURE_EXPERIMENTAL_DO_NOT_USE
-  newArchitectureValidationInternal(RCTLogLevelInfo, type, context, extra);
-#endif
-}

package/React/Base/RCTBridge+Private.h

@@ -16,7 +16,7 @@ RCT_EXTERN void RCTRegisterModule(Class);
 
 @interface RCTBridge ()
 
-#ifndef RCT_FIT_RM_OLD_RUNTIME
+#ifndef RCT_REMOVE_LEGACY_ARCH
 // Private designated initializer
 - (instancetype)initWithDelegate:(id<RCTBridgeDelegate>)delegate
                        bundleURL:(NSURL *)bundleURL
@@ -24,7 +24,7 @@ RCT_EXTERN void RCTRegisterModule(Class);
                    launchOptions:(NSDictionary *)launchOptions NS_DESIGNATED_INITIALIZER
     __deprecated_msg("This API will be removed along with the legacy architecture.");
 
-#endif // RCT_FIT_RM_OLD_RUNTIME
+#endif // RCT_REMOVE_LEGACY_ARCH
 
 // Used for the profiler flow events between JS and native
 @property (nonatomic, assign) int64_t flowID;
@@ -150,9 +150,9 @@ RCT_EXTERN void RCTRegisterModule(Class);
 // TODO(cjhopman): this seems unsafe unless we require that it is only called on the main js queue.
 @property (nonatomic, readonly) void *runtime;
 
-#ifndef RCT_FIT_RM_OLD_RUNTIME
+#ifndef RCT_REMOVE_LEGACY_ARCH
 - (instancetype)initWithParentBridge:(RCTBridge *)bridge NS_DESIGNATED_INITIALIZER
     __deprecated_msg("This API will be removed along with the legacy architecture.");
-#endif // RCT_FIT_RM_OLD_RUNTIME
+#endif // RCT_REMOVE_LEGACY_ARCH
 
 @end

package/React/Base/RCTBridge.mm

@@ -117,7 +117,7 @@ NSSet<NSString *> *getCoreModuleClasses(void)
 }
 
 static NSMutableArray<NSString *> *modulesLoadedWithOldArch;
-void addModuleLoadedWithOldArch(NSString *);
+void addModuleLoadedWithOldArch(NSString * /*moduleName*/);
 void addModuleLoadedWithOldArch(NSString *moduleName)
 {
   static dispatch_once_t onceToken;
@@ -138,7 +138,7 @@ NSMutableArray<NSString *> *getModulesLoadedWithOldArch(void)
  * prior to the first bridge initialization.
  * TODO: (T115656171) Refactor RCTRegisterModule out of Bridge.m since it doesn't use the Bridge.
  */
-void RCTRegisterModule(Class);
+void RCTRegisterModule(Class /*moduleClass*/);
 void RCTRegisterModule(Class moduleClass)
 {
   if (RCTAreLegacyLogsEnabled() && ![getCoreModuleClasses() containsObject:[moduleClass description]]) {
@@ -264,7 +264,7 @@ void RCTUIManagerSetDispatchAccessibilityManagerInitOntoMain(BOOL enabled)
   kDispatchAccessibilityManagerInitOntoMain = enabled;
 }
 
-#ifndef RCT_FIT_RM_OLD_RUNTIME
+#ifndef RCT_REMOVE_LEGACY_ARCH
 class RCTBridgeHostTargetDelegate : public facebook::react::jsinspector_modern::HostTargetDelegate {
  public:
   RCTBridgeHostTargetDelegate(RCTBridge *bridge)
@@ -386,7 +386,6 @@ static RCTBridge *RCTCurrentBridgeInstance = nil;
 #endif
 
   if (self = [super init]) {
-    RCTEnforceNewArchitectureValidation(RCTNotAllowedInBridgeless, self, nil);
     _delegate = delegate;
     _bundleURL = bundleURL;
     _moduleProvider = block;
@@ -691,7 +690,7 @@ RCT_NOT_IMPLEMENTED(-(instancetype)init)
   return _inspectorTarget.get();
 }
 @end
-#else // RCT_FIT_RM_OLD_RUNTIME
+#else // RCT_REMOVE_LEGACY_ARCH
 @implementation RCTBridge
 - (instancetype)initWithDelegate:(id<RCTBridgeDelegate>)delegate launchOptions:(NSDictionary *)launchOptions
 {
@@ -797,4 +796,4 @@ RCT_NOT_IMPLEMENTED(-(instancetype)init)
 }
 
 @end
-#endif // RCT_FIT_RM_OLD_RUNTIME
+#endif // RCT_REMOVE_LEGACY_ARCH

package/React/Base/RCTBridgeDelegate.h

@@ -13,7 +13,7 @@
 NS_ASSUME_NONNULL_BEGIN
 
 @protocol RCTBridgeDelegate <NSObject>
-#ifndef RCT_FIT_RM_OLD_RUNTIME
+#ifndef RCT_REMOVE_LEGACY_ARCH
 
 /**
  * The location of the JavaScript source file. When running from the packager
@@ -78,7 +78,7 @@ NS_ASSUME_NONNULL_BEGIN
 - (NSDictionary<NSString *, Class> *)extraLazyModuleClassesForBridge:(RCTBridge *)bridge
     __deprecated_msg("This API will be removed along with the legacy architecture.");
 
-#endif // RCT_FIT_RM_OLD_RUNTIME
+#endif // RCT_REMOVE_LEGACY_ARCH
 @end
 
 NS_ASSUME_NONNULL_END

package/React/Base/RCTBridgeModule.h

@@ -69,6 +69,7 @@ RCT_EXTERN_C_END
  * will be used as the JS module name. If omitted, the JS module name will
  * match the Objective-C class name.
  */
+#ifndef RCT_DISABLE_STATIC_MODULE_REGISTRATION
 #define RCT_EXPORT_MODULE(js_name)          \
   RCT_EXTERN void RCTRegisterModule(Class); \
   +(NSString *)moduleName                   \
@@ -80,6 +81,17 @@ RCT_EXTERN_C_END
     RCTRegisterModule(self);                \
   }
 
+#else
+
+#define RCT_EXPORT_MODULE(js_name)          \
+  RCT_EXTERN void RCTRegisterModule(Class); \
+  +(NSString *)moduleName                   \
+  {                                         \
+    return @ #js_name;                      \
+  }
+
+#endif // RCT_DISABLE_STATIC_MODULE_REGISTRATION
+
 /**
  * Same as RCT_EXPORT_MODULE, but uses __attribute__((constructor)) for module
  * registration. Useful for registering swift classes that forbids use of load
@@ -283,10 +295,12 @@ RCT_EXTERN_C_END
 /**
  * Like RCT_EXTERN_MODULE, but allows setting a custom JavaScript name.
  */
-#define RCT_EXTERN_REMAP_MODULE(js_name, objc_name, objc_supername)                      \
-  objc_name : objc_supername @end @interface objc_name(RCTExternModule)<RCTBridgeModule> \
-  @end                                                                                   \
-  @implementation objc_name (RCTExternModule)                                            \
+#define RCT_EXTERN_REMAP_MODULE(js_name, objc_name, objc_supername) \
+  objc_name:                                                        \
+  objc_supername @                                                  \
+  end @interface objc_name(RCTExternModule)<RCTBridgeModule>        \
+  @end                                                              \
+  @implementation objc_name (RCTExternModule)                       \
   RCT_EXPORT_MODULE_NO_LOAD(js_name, objc_name)
 
 /**
@@ -354,9 +368,9 @@ RCT_EXTERN_C_END
  * A class that allows NativeModules and TurboModules to look up one another.
  */
 @interface RCTModuleRegistry : NSObject
-#ifndef RCT_FIT_RM_OLD_RUNTIME
+#ifndef RCT_REMOVE_LEGACY_ARCH
 - (void)setBridge:(RCTBridge *)bridge;
-#endif // RCT_FIT_RM_OLD_RUNTIME
+#endif // RCT_REMOVE_LEGACY_ARCH
 - (void)setTurboModuleRegistry:(id<RCTTurboModuleRegistry>)turboModuleRegistry;
 
 - (id)moduleForName:(const char *)moduleName;
@@ -375,9 +389,9 @@ typedef void (^RCTViewRegistryUIBlock)(RCTViewRegistry *viewRegistry);
  * A class that allows NativeModules to query for views, given React Tags.
  */
 @interface RCTViewRegistry : NSObject
-#ifndef RCT_FIT_RM_OLD_RUNTIME
+#ifndef RCT_REMOVE_LEGACY_ARCH
 - (void)setBridge:(RCTBridge *)bridge;
-#endif // RCT_FIT_RM_OLD_RUNTIME
+#endif // RCT_REMOVE_LEGACY_ARCH
 - (void)setBridgelessComponentViewProvider:(RCTBridgelessComponentViewProvider)bridgelessComponentViewProvider;
 
 - (UIView *)viewForReactTag:(NSNumber *)reactTag;
@@ -395,9 +409,9 @@ typedef void (^RCTBridgelessJSModuleMethodInvoker)(
  * as callable with React Native.
  */
 @interface RCTCallableJSModules : NSObject
-#ifndef RCT_FIT_RM_OLD_RUNTIME
+#ifndef RCT_REMOVE_LEGACY_ARCH
 - (void)setBridge:(RCTBridge *)bridge;
-#endif // RCT_FIT_RM_OLD_RUNTIME
+#endif // RCT_REMOVE_LEGACY_ARCH
 - (void)setBridgelessJSModuleMethodInvoker:(RCTBridgelessJSModuleMethodInvoker)bridgelessJSModuleMethodInvoker;
 
 - (void)invokeModule:(NSString *)moduleName method:(NSString *)methodName withArgs:(NSArray *)args;

package/React/Base/RCTBridgeProxy.mm

@@ -53,7 +53,7 @@ using namespace facebook;
                        launchOptions:(nullable NSDictionary *)launchOptions
 {
   self = [super self];
-  if (self) {
+  if (self != nullptr) {
     _uiManagerProxy = [[RCTUIManagerProxy alloc] initWithViewRegistry:viewRegistry];
     _moduleRegistry = moduleRegistry;
     _bundleManager = bundleManager;
@@ -75,7 +75,7 @@ using namespace facebook;
 
   if (queue == RCTJSThread) {
     _dispatchToJSThread(block);
-  } else if (queue) {
+  } else if (queue != nullptr) {
     dispatch_async(queue, block);
   }
 }
@@ -308,7 +308,7 @@ using namespace facebook;
            cmd:_cmd];
 }
 
-#ifndef RCT_FIT_RM_OLD_RUNTIME
+#ifndef RCT_REMOVE_LEGACY_ARCH
 - (void)registerModuleForFrameUpdates:(id<RCTBridgeModule>)module withModuleData:(RCTModuleData *)moduleData
 {
   [self logError:@"This method is not supported. Nooping" cmd:_cmd];
@@ -319,7 +319,7 @@ using namespace facebook;
   [self logError:@"This method is not supported. Returning nil." cmd:_cmd];
   return nil;
 }
-#endif // RCT_FIT_RM_OLD_RUNTIME
+#endif // RCT_REMOVE_LEGACY_ARCH
 
 - (void)registerAdditionalModuleClasses:(NSArray<Class> *)newModules
 {
@@ -427,7 +427,7 @@ using namespace facebook;
 - (instancetype)initWithViewRegistry:(RCTViewRegistry *)viewRegistry
 {
   self = [super self];
-  if (self) {
+  if (self != nullptr) {
     _viewRegistry = viewRegistry;
     _legacyViewRegistry = [NSMutableDictionary new];
   }
@@ -443,8 +443,8 @@ using namespace facebook;
 {
   [self logWarning:@"Please migrate to RCTViewRegistry: @synthesize viewRegistry_DEPRECATED = _viewRegistry_DEPRECATED."
                cmd:_cmd];
-  UIView *view = [_viewRegistry viewForReactTag:reactTag] ? [_viewRegistry viewForReactTag:reactTag]
-                                                          : [_legacyViewRegistry objectForKey:reactTag];
+  UIView *view = ([_viewRegistry viewForReactTag:reactTag] != nullptr) ? [_viewRegistry viewForReactTag:reactTag]
+                                                                       : [_legacyViewRegistry objectForKey:reactTag];
   return RCTPaperViewOrCurrentView(view);
 }
 
@@ -457,7 +457,7 @@ using namespace facebook;
   __weak __typeof(self) weakSelf = self;
   RCTExecuteOnMainQueue(^{
     __typeof(self) strongSelf = weakSelf;
-    if (strongSelf) {
+    if (strongSelf != nullptr) {
       RCTUIManager *proxiedManager = (RCTUIManager *)strongSelf;
       RCTComposedViewRegistry *composedViewRegistry =
           [[RCTComposedViewRegistry alloc] initWithUIManager:proxiedManager

package/React/Base/RCTBundleManager.h

@@ -16,9 +16,9 @@ typedef void (^RCTBridgelessBundleURLSetter)(NSURL *bundleURL);
  * A class that allows NativeModules/TurboModules to read/write the bundleURL, with or without the bridge.
  */
 @interface RCTBundleManager : NSObject
-#ifndef RCT_FIT_RM_OLD_RUNTIME
+#ifndef RCT_REMOVE_LEGACY_ARCH
 - (void)setBridge:(RCTBridge *)bridge;
-#endif // RCT_FIT_RM_OLD_RUNTIME
+#endif // RCT_REMOVE_LEGACY_ARCH
 - (void)setBridgelessBundleURLGetter:(RCTBridgelessBundleURLGetter)getter
                            andSetter:(RCTBridgelessBundleURLSetter)setter
                     andDefaultGetter:(RCTBridgelessBundleURLGetter)defaultGetter;

package/React/Base/RCTBundleManager.m

@@ -11,20 +11,20 @@
 #import "RCTBridge.h"
 
 @implementation RCTBundleManager {
-#ifndef RCT_FIT_RM_OLD_RUNTIME
+#ifndef RCT_REMOVE_LEGACY_ARCH
   __weak RCTBridge *_bridge;
-#endif // RCT_FIT_RM_OLD_RUNTIME
+#endif // RCT_REMOVE_LEGACY_ARCH
   RCTBridgelessBundleURLGetter _bridgelessBundleURLGetter;
   RCTBridgelessBundleURLSetter _bridgelessBundleURLSetter;
   RCTBridgelessBundleURLGetter _bridgelessBundleURLDefaultGetter;
 }
 
-#ifndef RCT_FIT_RM_OLD_RUNTIME
+#ifndef RCT_REMOVE_LEGACY_ARCH
 - (void)setBridge:(RCTBridge *)bridge
 {
   _bridge = bridge;
 }
-#endif // RCT_FIT_RM_OLD_RUNTIME
+#endif // RCT_REMOVE_LEGACY_ARCH
 
 - (void)setBridgelessBundleURLGetter:(RCTBridgelessBundleURLGetter)getter
                            andSetter:(RCTBridgelessBundleURLSetter)setter
@@ -37,12 +37,12 @@
 
 - (void)setBundleURL:(NSURL *)bundleURL
 {
-#ifndef RCT_FIT_RM_OLD_RUNTIME
+#ifndef RCT_REMOVE_LEGACY_ARCH
   if (_bridge) {
     _bridge.bundleURL = bundleURL;
     return;
   }
-#endif // RCT_FIT_RM_OLD_RUNTIME
+#endif // RCT_REMOVE_LEGACY_ARCH
 
   RCTAssert(
       _bridgelessBundleURLSetter != nil,
@@ -52,11 +52,11 @@
 
 - (NSURL *)bundleURL
 {
-#ifndef RCT_FIT_RM_OLD_RUNTIME
+#ifndef RCT_REMOVE_LEGACY_ARCH
   if (_bridge) {
     return _bridge.bundleURL;
   }
-#endif // RCT_FIT_RM_OLD_RUNTIME
+#endif // RCT_REMOVE_LEGACY_ARCH
 
   RCTAssert(
       _bridgelessBundleURLGetter != nil,
@@ -67,13 +67,13 @@
 
 - (void)resetBundleURL
 {
-#ifndef RCT_FIT_RM_OLD_RUNTIME
+#ifndef RCT_REMOVE_LEGACY_ARCH
   RCTBridge *strongBridge = _bridge;
   if (strongBridge) {
     strongBridge.bundleURL = [strongBridge.delegate sourceURLForBridge:strongBridge];
     return;
   }
-#endif // RCT_FIT_RM_OLD_RUNTIME
+#endif // RCT_REMOVE_LEGACY_ARCH
 
   RCTAssert(
       _bridgelessBundleURLDefaultGetter != nil,

package/React/Base/RCTBundleURLProvider.mm

@@ -18,7 +18,7 @@ NSString *const RCTBundleURLProviderUpdatedNotification = @"RCTBundleURLProvider
 
 const NSUInteger kRCTBundleURLProviderDefaultPort = RCT_METRO_PORT;
 
-#if RCT_DEV_MENU | RCT_PACKAGER_LOADING_FUNCTIONALITY
+#if RCT_DEV | RCT_PACKAGER_LOADING_FUNCTIONALITY
 static BOOL kRCTAllowPackagerAccess = YES;
 void RCTBundleURLProviderAllowPackagerServerAccess(BOOL allowed)
 {
@@ -78,7 +78,7 @@ static NSURL *serverRootWithHostPort(NSString *hostPort, NSString *scheme)
                                                          (unsigned long)kRCTBundleURLProviderDefaultPort]];
 }
 
-#if RCT_DEV_MENU | RCT_PACKAGER_LOADING_FUNCTIONALITY
+#if RCT_DEV | RCT_PACKAGER_LOADING_FUNCTIONALITY
 + (BOOL)isPackagerRunning:(NSString *)hostPort
 {
   return [RCTBundleURLProvider isPackagerRunning:hostPort scheme:nil];
@@ -155,14 +155,14 @@ static NSURL *serverRootWithHostPort(NSString *hostPort, NSString *scheme)
 
 - (NSString *)packagerServerHostPort
 {
-#if RCT_DEV_MENU | RCT_PACKAGER_LOADING_FUNCTIONALITY
+#if RCT_DEV | RCT_PACKAGER_LOADING_FUNCTIONALITY
   if (!kRCTAllowPackagerAccess) {
     RCTLogInfo(@"Packager server access is disabled in this environment");
     return nil;
   }
 #endif
   NSString *location = [self jsLocation];
-#if RCT_DEV_MENU
+#if RCT_DEV
   NSString *scheme = [self packagerScheme];
   if ([location length] && ![RCTBundleURLProvider isPackagerRunning:location scheme:scheme]) {
     location = nil;

package/React/Base/RCTCallableJSModules.m

@@ -10,17 +10,17 @@
 
 @implementation RCTCallableJSModules {
   RCTBridgelessJSModuleMethodInvoker _bridgelessJSModuleMethodInvoker;
-#ifndef RCT_FIT_RM_OLD_RUNTIME
+#ifndef RCT_REMOVE_LEGACY_ARCH
   __weak RCTBridge *_bridge;
-#endif // RCT_FIT_RM_OLD_RUNTIME
+#endif // RCT_REMOVE_LEGACY_ARCH
 }
 
-#ifndef RCT_FIT_RM_OLD_RUNTIME
+#ifndef RCT_REMOVE_LEGACY_ARCH
 - (void)setBridge:(RCTBridge *)bridge
 {
   _bridge = bridge;
 }
-#endif // RCT_FIT_RM_OLD_RUNTIME
+#endif // RCT_REMOVE_LEGACY_ARCH
 
 - (void)setBridgelessJSModuleMethodInvoker:(RCTBridgelessJSModuleMethodInvoker)bridgelessJSModuleMethodInvoker
 {
@@ -37,13 +37,13 @@
             withArgs:(NSArray *)args
           onComplete:(dispatch_block_t)onComplete
 {
-#ifndef RCT_FIT_RM_OLD_RUNTIME
+#ifndef RCT_REMOVE_LEGACY_ARCH
   RCTBridge *bridge = _bridge;
   if (bridge) {
     [bridge enqueueJSCall:moduleName method:methodName args:args completion:onComplete];
     return;
   }
-#endif // RCT_FIT_RM_OLD_RUNTIME
+#endif // RCT_REMOVE_LEGACY_ARCH
 
   if (_bridgelessJSModuleMethodInvoker) {
     _bridgelessJSModuleMethodInvoker(moduleName, methodName, args, onComplete);

package/React/Base/RCTConvert.h

@@ -184,9 +184,14 @@ typedef NSArray UIColorArray __deprecated_msg("Use NSArray<UIColor *>");
 /**
  * Underlying implementations of RCT_XXX_CONVERTER macros. Ignore these.
  */
-RCT_EXTERN NSNumber *RCTConvertEnumValue(const char *, NSDictionary *, NSNumber *, id);
-RCT_EXTERN NSNumber *RCTConvertMultiEnumValue(const char *, NSDictionary *, NSNumber *, id);
-RCT_EXTERN NSArray *RCTConvertArrayValue(SEL, id);
+RCT_EXTERN NSNumber *
+RCTConvertEnumValue(const char * /*typeName*/, NSDictionary * /*mapping*/, NSNumber * /*defaultValue*/, id /*json*/);
+RCT_EXTERN NSNumber *RCTConvertMultiEnumValue(
+    const char * /*typeName*/,
+    NSDictionary * /*mapping*/,
+    NSNumber * /*defaultValue*/,
+    id /*json*/);
+RCT_EXTERN NSArray *RCTConvertArrayValue(SEL /*type*/, id /*json*/);
 
 /**
  * This macro is used for logging conversion errors. This is just used to

package/React/Base/RCTConvert.mm

@@ -878,7 +878,7 @@ static UIColor *RCTColorFromSemanticColorName(NSString *semanticColorName)
     RCTAssert([UIColor respondsToSelector:selector], @"RCTUIColor does not respond to a semantic color selector.");
     Class klass = [UIColor class];
     IMP imp = [klass methodForSelector:selector];
-    id (*getSemanticColorObject)(id, SEL) = (id(*)(id, SEL))imp;
+    id (*getSemanticColorObject)(id, SEL) = (id (*)(id, SEL))imp;
     id colorObject = getSemanticColorObject(klass, selector);
     if ([colorObject isKindOfClass:[UIColor class]]) {
       color = colorObject;
@@ -1094,7 +1094,7 @@ NSArray *RCTConvertArrayValue(SEL type, id json)
   __block BOOL copy = NO;
   __block NSArray *values = json = [RCTConvert NSArray:json];
   [json enumerateObjectsUsingBlock:^(id jsonValue, NSUInteger idx, __unused BOOL *stop) {
-    id value = ((id(*)(Class, SEL, id))objc_msgSend)([RCTConvert class], type, jsonValue);
+    id value = ((id (*)(Class, SEL, id))objc_msgSend)([RCTConvert class], type, jsonValue);
     if (copy) {
       if (value) {
         [(NSMutableArray *)values addObject:value];

package/React/Base/RCTDefines.h

@@ -175,13 +175,3 @@
     @throw _RCTNotImplementedException(_cmd, [self class]);                                             \
   }                                                                                                     \
   _Pragma("clang diagnostic pop")
-
-/**
- * Controls for activating the new architecture without the legacy system.
- * Note: this is work in progress.
- */
-#ifdef REACT_NATIVE_FORCE_NEW_ARCHITECTURE_EXPERIMENTAL_DO_NOT_USE
-#define RCT_ONLY_NEW_ARCHITECTURE_EXPERIMENTAL_DO_NOT_USE 1
-#else
-#define RCT_ONLY_NEW_ARCHITECTURE_EXPERIMENTAL_DO_NOT_USE 0
-#endif

package/React/Base/RCTJavaScriptExecutor.h

@@ -15,7 +15,7 @@ typedef void (^RCTJavaScriptCompleteBlock)(NSError *__strong)
 typedef void (^RCTJavaScriptCallback)(__strong id, NSError *__strong)
     __deprecated_msg("This api will be removed along with the bridge.");
 
-#ifndef RCT_FIT_RM_OLD_RUNTIME
+#ifndef RCT_REMOVE_LEGACY_ARCH
 /**
  * Abstracts away a JavaScript execution context - we may be running code in a
  * web view (for debugging purposes), or may be running code in a `JSContext`.
@@ -82,4 +82,4 @@ __deprecated_msg("This api will be removed along with the bridge.")
 - (void)executeAsyncBlockOnJavaScriptQueue:(dispatch_block_t)block;
 
 @end
-#endif // RCT_FIT_RM_OLD_RUNTIME
+#endif // RCT_REMOVE_LEGACY_ARCH

package/React/Base/RCTLog.h

@@ -75,12 +75,12 @@ RCTFormatLog(NSDate *timestamp, RCTLogLevel level, NSString *fileName, NSNumber
 /**
  * A method to generate a string RCTLogLevel
  */
-RCT_EXTERN NSString *RCTFormatLogLevel(RCTLogLevel);
+RCT_EXTERN NSString *RCTFormatLogLevel(RCTLogLevel /*level*/);
 
 /**
  * A method to generate a string from a RCTLogSource
  */
-RCT_EXTERN NSString *RCTFormatLogSource(RCTLogSource);
+RCT_EXTERN NSString *RCTFormatLogSource(RCTLogSource /*source*/);
 
 /**
  * The default logging function used by RCTLogXX.
@@ -149,5 +149,7 @@ RCT_EXTERN void RCTLogSetBridgelessCallableJSModules(RCTCallableJSModules *calla
   } while (0)
 #endif
 
-RCT_EXTERN void _RCTLogNativeInternal(RCTLogLevel, const char *, int, NSString *, ...) NS_FORMAT_FUNCTION(4, 5);
-RCT_EXTERN void _RCTLogJavaScriptInternal(RCTLogLevel, NSString *);
+RCT_EXTERN void
+_RCTLogNativeInternal(RCTLogLevel /*level*/, const char * /*fileName*/, int /*lineNumber*/, NSString * /*format*/, ...)
+    NS_FORMAT_FUNCTION(4, 5);
+RCT_EXTERN void _RCTLogJavaScriptInternal(RCTLogLevel /*level*/, NSString * /*message*/);

package/React/Base/RCTMockDef.h

@@ -44,12 +44,9 @@
  */
 
 #ifdef RCT_DEV
-#define RCT_MOCK_DEF(context, api) \
-  __typeof(__typeof(api)*) mockptr_##context##_##api = &api;
-#define RCT_MOCK_REF(context, api) \
-  extern __typeof(__typeof(api)*) mockptr_##context##_##api;
-#define RCT_MOCK_SET(context, api, mockapi) \
-  (mockptr_##context##_##api = &mockapi)
+#define RCT_MOCK_DEF(context, api) __typeof(__typeof(api) *) mockptr_##context##_##api = &api;
+#define RCT_MOCK_REF(context, api) extern __typeof(__typeof(api) *) mockptr_##context##_##api;
+#define RCT_MOCK_SET(context, api, mockapi) (mockptr_##context##_##api = &mockapi)
 #define RCT_MOCK_RESET(context, api) (mockptr_##context##_##api = &api)
 #define RCT_MOCK_USE(context, api) (*mockptr_##context##_##api)
 #else

package/React/Base/RCTModuleData.mm

@@ -7,7 +7,7 @@
 
 #import "RCTModuleData.h"
 
-#ifndef RCT_FIT_RM_OLD_RUNTIME
+#ifndef RCT_REMOVE_LEGACY_ARCH
 
 #import <objc/runtime.h>
 #import <atomic>
@@ -488,7 +488,7 @@ RCT_NOT_IMPLEMENTED(-(instancetype)init);
 
 @end
 
-#else // RCT_FIT_RM_OLD_RUNTIME
+#else // RCT_REMOVE_LEGACY_ARCH
 @implementation RCTModuleData
 
 - (instancetype)initWithModuleClass:(Class)moduleClass
@@ -521,4 +521,4 @@ RCT_NOT_IMPLEMENTED(-(instancetype)init);
 
 @end
 
-#endif // RCT_FIT_RM_OLD_RUNTIME
+#endif // RCT_REMOVE_LEGACY_ARCH