react-native 0.71.3 → 0.72.0-rc.0

package/Libraries/WebSocket/RCTReconnectingWebSocket.m

@@ -10,16 +10,16 @@
 #import <React/RCTConvert.h>
 #import <React/RCTDefines.h>
 
-#import <React/RCTSRWebSocket.h>
+#import <SocketRocket/SRWebSocket.h>
 
 #if RCT_DEV // Only supported in dev mode
 
-@interface RCTReconnectingWebSocket () <RCTSRWebSocketDelegate>
+@interface RCTReconnectingWebSocket () <SRWebSocketDelegate>
 @end
 
 @implementation RCTReconnectingWebSocket {
   NSURL *_url;
-  RCTSRWebSocket *_socket;
+  SRWebSocket *_socket;
   BOOL _stopped;
 }
 
@@ -39,14 +39,14 @@
 
 - (void)send:(id)data
 {
-  [_socket send:data];
+  [_socket sendData:data error:nil];
 }
 
 - (void)start
 {
   [self stop];
   _stopped = NO;
-  _socket = [[RCTSRWebSocket alloc] initWithURL:_url];
+  _socket = [[SRWebSocket alloc] initWithURL:_url];
   _socket.delegate = self;
   [_socket setDelegateDispatchQueue:_delegateDispatchQueue];
   [_socket open];
@@ -60,7 +60,7 @@
   _socket = nil;
 }
 
-- (void)webSocket:(RCTSRWebSocket *)webSocket didReceiveMessage:(id)message
+- (void)webSocket:(SRWebSocket *)webSocket didReceiveMessage:(id)message
 {
   [_delegate reconnectingWebSocket:self didReceiveMessage:message];
 }
@@ -71,7 +71,7 @@
     return;
   }
 
-  __weak RCTSRWebSocket *socket = _socket;
+  __weak SRWebSocket *socket = _socket;
   __weak __typeof(self) weakSelf = self;
 
   dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
@@ -82,12 +82,12 @@
   });
 }
 
-- (void)webSocketDidOpen:(RCTSRWebSocket *)webSocket
+- (void)webSocketDidOpen:(SRWebSocket *)webSocket
 {
   [_delegate reconnectingWebSocketDidOpen:self];
 }
 
-- (void)webSocket:(RCTSRWebSocket *)webSocket didFailWithError:(NSError *)error
+- (void)webSocket:(SRWebSocket *)webSocket didFailWithError:(NSError *)error
 {
   [_delegate reconnectingWebSocketDidClose:self];
   if ([error code] != ECONNREFUSED) {
@@ -95,7 +95,7 @@
   }
 }
 
-- (void)webSocket:(RCTSRWebSocket *)webSocket
+- (void)webSocket:(SRWebSocket *)webSocket
     didCloseWithCode:(NSInteger)code
               reason:(NSString *)reason
             wasClean:(BOOL)wasClean

package/Libraries/YellowBox/YellowBoxDeprecated.js

@@ -12,7 +12,7 @@
 
 import type {IgnorePattern} from '../LogBox/Data/LogBoxData';
 
-const LogBox = require('../LogBox/LogBox');
+const LogBox = require('../LogBox/LogBox').default;
 const React = require('react');
 
 type Props = $ReadOnly<{||}>;

package/Libraries/vendor/core/ErrorUtils.js

@@ -8,7 +8,7 @@
  * @flow strict
  */
 
-import type {ErrorUtilsT} from '@react-native/polyfills/error-guard';
+import type {ErrorUtilsT} from '@react-native/js-polyfills/error-guard';
 
 /**
  * The particular require runtime that we are using looks for a global

package/Libraries/vendor/emitter/EventEmitter.d.ts

@@ -48,7 +48,7 @@ declare class EventSubscriptionVendor {
    * Removes a bulk set of the subscriptions.
    *
    * @param eventType - Optional name of the event type whose
-   *   registered supscriptions to remove, if null remove all subscriptions.
+   *   registered subscriptions to remove, if null remove all subscriptions.
    */
   removeAllSubscriptions(eventType?: string): void;
 
@@ -104,7 +104,7 @@ interface EmitterSubscription extends EventSubscription {
   remove(): void;
 }
 
-export declare class EventEmitter {
+export default class EventEmitter {
   /**
    *
    * @param subscriber - Optional subscriber instance

package/Libraries/vendor/emitter/EventEmitter.js

@@ -74,7 +74,15 @@ export default class EventEmitter<TEventToArgsMap: {...}>
     listener: (...args: $ElementType<TEventToArgsMap, TEvent>) => mixed,
     context: mixed,
   ): EventSubscription {
-    const registrations = allocate(this._registry, eventType);
+    if (typeof listener !== 'function') {
+      throw new TypeError(
+        'EventEmitter.addListener(...): 2nd argument must be a function.',
+      );
+    }
+    const registrations = allocate<_, _, TEventToArgsMap[TEvent]>(
+      this._registry,
+      eventType,
+    );
     const registration: Registration<$ElementType<TEventToArgsMap, TEvent>> = {
       context,
       listener,

package/README.md

@@ -77,7 +77,7 @@ Follow the [Getting Started guide](https://reactnative.dev/docs/getting-started)
 - [Creating a New Application][new-app]
 - [Adding React Native to an Existing Application][existing]
 
-[hello-world]: https://snack.expo.dev/@hramos/hello,-world!
+[hello-world]: https://snack.expo.dev/@samples/hello-world
 [new-app]: https://reactnative.dev/docs/getting-started
 [existing]: https://reactnative.dev/docs/integration-with-existing-apps
 

package/React/Base/RCTBridge+Private.h

@@ -97,7 +97,7 @@ RCT_EXTERN void RCTRegisterModule(Class);
 - (void)registerModuleForFrameUpdates:(id<RCTBridgeModule>)module withModuleData:(RCTModuleData *)moduleData;
 
 /**
- * Dispatch work to a module's queue - this is also suports the fake RCTJSThread
+ * Dispatch work to a module's queue - this is also supports the fake RCTJSThread
  * queue. Exposed for the RCTProfiler
  */
 - (void)dispatchBlock:(dispatch_block_t)block queue:(dispatch_queue_t)queue;

package/React/Base/RCTBridge.h

@@ -52,19 +52,10 @@ RCT_EXTERN void RCTEnableTurboModule(BOOL enabled);
 RCT_EXTERN BOOL RCTTurboModuleEagerInitEnabled(void);
 RCT_EXTERN void RCTEnableTurboModuleEagerInit(BOOL enabled);
 
-// Turn on TurboModule shared mutex initialization
-RCT_EXTERN BOOL RCTTurboModuleSharedMutexInitEnabled(void);
-RCT_EXTERN void RCTEnableTurboModuleSharedMutexInit(BOOL enabled);
-
 // Turn off TurboModule delegate locking
 RCT_EXTERN BOOL RCTTurboModuleManagerDelegateLockingDisabled(void);
 RCT_EXTERN void RCTDisableTurboModuleManagerDelegateLocking(BOOL enabled);
 
-// Turn off validAttribute: entries inside ViewConfigs for events
-// TODO(109509380): Remove this gating
-RCT_EXTERN BOOL RCTViewConfigEventValidAttributesDisabled(void);
-RCT_EXTERN void RCTDisableViewConfigEventValidAttributes(BOOL disabled);
-
 typedef enum {
   kRCTGlobalScope,
   kRCTGlobalScopeUsingRetainJSCallback,
@@ -84,7 +75,7 @@ RCT_EXTERN void RCTSetTurboModuleCleanupMode(RCTTurboModuleCleanupMode mode);
  *
  * All the interaction with the JavaScript context should be done using the bridge
  * instance of the RCTBridgeModules. Modules will be automatically instantiated
- * using the default contructor, but you can optionally pass in an array of
+ * using the default constructor, but you can optionally pass in an array of
  * pre-initialized module instances if they require additional init parameters
  * or configuration.
  */
@@ -96,7 +87,7 @@ RCT_EXTERN void RCTSetTurboModuleCleanupMode(RCTTurboModuleCleanupMode mode);
  * The designated initializer. This creates a new bridge on top of the specified
  * executor. The bridge should then be used for all subsequent communication
  * with the JavaScript code running in the executor. Modules will be automatically
- * instantiated using the default contructor, but you can optionally pass in an
+ * instantiated using the default constructor, but you can optionally pass in an
  * array of pre-initialized module instances if they require additional init
  * parameters or configuration.
  */

package/React/Base/RCTBridge.m

@@ -108,28 +108,6 @@ void RCTEnableTurboModuleEagerInit(BOOL enabled)
   turboModuleEagerInitEnabled = enabled;
 }
 
-static BOOL turboModuleSharedMutexInitEnabled = NO;
-BOOL RCTTurboModuleSharedMutexInitEnabled(void)
-{
-  return turboModuleSharedMutexInitEnabled;
-}
-
-void RCTEnableTurboModuleSharedMutexInit(BOOL enabled)
-{
-  turboModuleSharedMutexInitEnabled = enabled;
-}
-
-static RCTTurboModuleCleanupMode turboModuleCleanupMode = kRCTGlobalScope;
-RCTTurboModuleCleanupMode RCTGetTurboModuleCleanupMode(void)
-{
-  return turboModuleCleanupMode;
-}
-
-void RCTSetTurboModuleCleanupMode(RCTTurboModuleCleanupMode mode)
-{
-  turboModuleCleanupMode = mode;
-}
-
 // Turn off TurboModule delegate locking
 static BOOL turboModuleManagerDelegateLockingDisabled = YES;
 BOOL RCTTurboModuleManagerDelegateLockingDisabled(void)
@@ -142,18 +120,6 @@ void RCTDisableTurboModuleManagerDelegateLocking(BOOL disabled)
   turboModuleManagerDelegateLockingDisabled = disabled;
 }
 
-// Turn off TurboModule delegate locking
-static BOOL viewConfigEventValidAttributesDisabled = NO;
-BOOL RCTViewConfigEventValidAttributesDisabled(void)
-{
-  return viewConfigEventValidAttributesDisabled;
-}
-
-void RCTDisableViewConfigEventValidAttributes(BOOL disabled)
-{
-  viewConfigEventValidAttributesDisabled = disabled;
-}
-
 @interface RCTBridge () <RCTReloadListener>
 @end
 

package/React/Base/RCTBridgeModuleDecorator.h

@@ -13,7 +13,7 @@
 @class RCTViewRegistry;
 
 /**
- RCTBridgeModuleDecorator contains instances that can be intialized with @synthesize
+ RCTBridgeModuleDecorator contains instances that can be initialized with @synthesize
  in RCTBridgeModules. For the Fabric interop layer.
 
  In Bridgeless, @synthesize ivars are passed from RCTBridgeModuleDecorator.

package/React/Base/RCTBundleURLProvider.mm

@@ -74,7 +74,7 @@ static NSURL *serverRootWithHostPort(NSString *hostPort, NSString *scheme)
                                                          (unsigned long)kRCTBundleURLProviderDefaultPort]];
 }
 
-#if RCT_DEV_MENU
+#if RCT_DEV_MENU | RCT_PACKAGER_LOADING_FUNCTIONALITY
 + (BOOL)isPackagerRunning:(NSString *)hostPort
 {
   return [RCTBundleURLProvider isPackagerRunning:hostPort scheme:nil];
@@ -82,6 +82,10 @@ static NSURL *serverRootWithHostPort(NSString *hostPort, NSString *scheme)
 
 + (BOOL)isPackagerRunning:(NSString *)hostPort scheme:(NSString *)scheme
 {
+  if (!kRCTAllowPackagerAccess) {
+    return NO;
+  }
+
   NSURL *url = [serverRootWithHostPort(hostPort, scheme) URLByAppendingPathComponent:@"status"];
 
   NSURLSession *session = [NSURLSession sharedSession];

package/React/Base/RCTConvert.h

@@ -71,6 +71,7 @@ typedef NSURL RCTFileURL;
 + (UIKeyboardType)UIKeyboardType:(id)json;
 + (UIKeyboardAppearance)UIKeyboardAppearance:(id)json;
 + (UIReturnKeyType)UIReturnKeyType:(id)json;
++ (UIUserInterfaceStyle)UIUserInterfaceStyle:(id)json API_AVAILABLE(ios(12));
 #if !TARGET_OS_TV
 + (UIDataDetectorTypes)UIDataDetectorTypes:(id)json;
 #endif
@@ -173,7 +174,7 @@ RCT_EXTERN NSArray *RCTConvertArrayValue(SEL, id);
  * avoid repeating the same boilerplate for every error message.
  */
 #define RCTLogConvertError(json, typeName) \
-  RCTLogError(@"JSON value '%@' of type %@ cannot be converted to %@", json, [json classForCoder], typeName)
+  RCTLogInfo(@"JSON value '%@' of type %@ cannot be converted to %@", json, [json classForCoder], typeName)
 
 /**
  * This macro is used for creating simple converter functions that just call

package/React/Base/RCTConvert.m

@@ -69,7 +69,7 @@ RCT_CUSTOM_CONVERTER(NSData *, NSData, [json dataUsingEncoding:NSUTF8StringEncod
   for (NSNumber *number in json) {
     NSInteger index = number.integerValue;
     if (RCT_DEBUG && index < 0) {
-      RCTLogError(@"Invalid index value %lld. Indices must be positive.", (long long)index);
+      RCTLogInfo(@"Invalid index value %lld. Indices must be positive.", (long long)index);
     }
     [indexSet addIndex:index];
   }
@@ -169,7 +169,7 @@ RCT_ENUM_CONVERTER(
       __block BOOL allHeadersAreStrings = YES;
       [headers enumerateKeysAndObjectsUsingBlock:^(NSString *key, id header, BOOL *stop) {
         if (![header isKindOfClass:[NSString class]]) {
-          RCTLogError(
+          RCTLogInfo(
               @"Values of HTTP headers passed must be  of type string. "
                "Value of header '%@' is not a string.",
               key);
@@ -200,11 +200,11 @@ RCT_ENUM_CONVERTER(
 {
   NSURL *fileURL = [self NSURL:json];
   if (!fileURL.fileURL) {
-    RCTLogError(@"URI must be a local file, '%@' isn't.", fileURL);
+    RCTLogInfo(@"URI must be a local file, '%@' isn't.", fileURL);
     return nil;
   }
   if (![[NSFileManager defaultManager] fileExistsAtPath:fileURL.path]) {
-    RCTLogError(@"File '%@' could not be found.", fileURL);
+    RCTLogInfo(@"File '%@' could not be found.", fileURL);
     return nil;
   }
   return fileURL;
@@ -225,7 +225,7 @@ RCT_ENUM_CONVERTER(
     });
     NSDate *date = [formatter dateFromString:json];
     if (!date) {
-      RCTLogError(
+      RCTLogInfo(
           @"JSON String '%@' could not be interpreted as a date. "
            "Expected format: YYYY-MM-DD'T'HH:mm:ss.sssZ",
           json);
@@ -242,7 +242,7 @@ RCT_ENUM_CONVERTER(
   if ([json isKindOfClass:[NSString class]]) {
     NSLocale *locale = [[NSLocale alloc] initWithLocaleIdentifier:json];
     if (!locale) {
-      RCTLogError(@"JSON String '%@' could not be interpreted as a valid locale. ", json);
+      RCTLogInfo(@"JSON String '%@' could not be interpreted as a valid locale. ", json);
     }
     return locale;
   } else if (json) {
@@ -267,15 +267,15 @@ NSNumber *RCTConvertEnumValue(const char *typeName, NSDictionary *mapping, NSNum
     if ([allValues containsObject:json] || [json isEqual:defaultValue]) {
       return json;
     }
-    RCTLogError(@"Invalid %s '%@'. should be one of: %@", typeName, json, allValues);
+    RCTLogInfo(@"Invalid %s '%@'. should be one of: %@", typeName, json, allValues);
     return defaultValue;
   }
   if (RCT_DEBUG && ![json isKindOfClass:[NSString class]]) {
-    RCTLogError(@"Expected NSNumber or NSString for %s, received %@: %@", typeName, [json classForCoder], json);
+    RCTLogInfo(@"Expected NSNumber or NSString for %s, received %@: %@", typeName, [json classForCoder], json);
   }
   id value = mapping[json];
   if (RCT_DEBUG && !value && [json description].length > 0) {
-    RCTLogError(
+    RCTLogInfo(
         @"Invalid %s '%@'. should be one of: %@",
         typeName,
         json,
@@ -501,6 +501,16 @@ RCT_ENUM_CONVERTER(
     UIReturnKeyDefault,
     integerValue)
 
+RCT_ENUM_CONVERTER(
+    UIUserInterfaceStyle,
+    (@{
+      @"unspecified" : @(UIUserInterfaceStyleUnspecified),
+      @"light" : @(UIUserInterfaceStyleLight),
+      @"dark" : @(UIUserInterfaceStyleDark),
+    }),
+    UIUserInterfaceStyleUnspecified,
+    integerValue)
+
 RCT_ENUM_CONVERTER(
     UIViewContentMode,
     (@{
@@ -541,7 +551,7 @@ static void convertCGStruct(const char *type, NSArray *fields, CGFloat *result,
   NSUInteger count = fields.count;
   if ([json isKindOfClass:[NSArray class]]) {
     if (RCT_DEBUG && [json count] != count) {
-      RCTLogError(
+      RCTLogInfo(
           @"Expected array with count %llu, but count is %llu: %@",
           (unsigned long long)count,
           (unsigned long long)[json count],
@@ -992,12 +1002,15 @@ static NSString *RCTSemanticColorNames()
     if ([s isEqualToString:@"auto"]) {
       return (YGValue){YGUndefined, YGUnitAuto};
     } else if ([s hasSuffix:@"%"]) {
-      return (YGValue){[[s substringToIndex:s.length] floatValue], YGUnitPercent};
+      float floatValue;
+      if ([[NSScanner scannerWithString:s] scanFloat:&floatValue]) {
+        return (YGValue){floatValue, YGUnitPercent};
+      }
     } else {
-      RCTLogConvertError(json, @"a YGValue. Did you forget the % or pt suffix?");
+      RCTLogAdvice(
+          @"\"%@\" is not a valid dimension. Dimensions must be a number, \"auto\", or a string suffixed with \"%%\".",
+          s);
     }
-  } else {
-    RCTLogConvertError(json, @"a YGValue.");
   }
   return YGValueUndefined;
 }
@@ -1295,7 +1308,7 @@ RCT_ENUM_CONVERTER(
   }
 
   if (!CGSizeEqualToSize(imageSource.size, CGSizeZero) && !CGSizeEqualToSize(imageSource.size, image.size)) {
-    RCTLogError(
+    RCTLogInfo(
         @"Image source %@ size %@ does not match loaded image size %@.",
         URL.path.lastPathComponent,
         NSStringFromCGSize(imageSource.size),

package/React/Base/RCTDefines.h

@@ -46,6 +46,43 @@
 #endif
 #endif
 
+/**
+ * RCT_REMOTE_PROFILE: RCT_PROFILE + RCT_ENABLE_INSPECTOR + enable the
+ * connectivity functionality to control the profiler remotely, such as via Chrome DevTools or
+ * Flipper.
+ */
+#ifndef RCT_REMOTE_PROFILE
+#define RCT_REMOTE_PROFILE RCT_DEV
+#endif
+
+/**
+ * Enable the code to support making calls to the underlying sampling profiler mechanism.
+ */
+#ifndef RCT_PROFILE
+#define RCT_PROFILE RCT_REMOTE_PROFILE
+#endif
+
+#ifndef RCT_ENABLE_INSPECTOR
+#if (RCT_DEV || RCT_REMOTE_PROFILE) && __has_include(<React/RCTInspectorDevServerHelper.h>)
+#define RCT_ENABLE_INSPECTOR 1
+#else
+#define RCT_ENABLE_INSPECTOR 0
+#endif
+#endif
+
+/**
+ * Sanity check that these compile-time flags are compatible. RCT_REMOTE_PROFILE requires RCT_PROFILE and
+ * RCT_ENABLE_INSPECTOR
+ */
+#if RCT_REMOTE_PROFILE
+#if !RCT_PROFILE
+#error "RCT_PROFILE needs to be set to fulfill RCT_REMOTE_PROFILE"
+#endif // RCT_PROFILE
+#if !RCT_ENABLE_INSPECTOR
+#error "RCT_ENABLE_INSPECTOR needs to be set to fulfill RCT_REMOTE_PROFILE"
+#endif // RCT_ENABLE_INSPECTOR
+#endif // RCT_REMOTE_PROFILE
+
 /**
  * RCT_DEV_MENU can be used to toggle the dev menu separately from RCT_DEV.
  * By default though, it will inherit from RCT_DEV.
@@ -63,14 +100,6 @@
 #define RCT_ENABLE_LOADING_FROM_PACKAGER RCT_DEV_MENU
 #endif
 
-#ifndef RCT_ENABLE_INSPECTOR
-#if RCT_DEV && __has_include(<React/RCTInspectorDevServerHelper.h>)
-#define RCT_ENABLE_INSPECTOR 1
-#else
-#define RCT_ENABLE_INSPECTOR 0
-#endif
-#endif
-
 #ifndef RCT_DEV_SETTINGS_ENABLE_PACKAGER_CONNECTION
 #if RCT_DEV && (__has_include("RCTPackagerConnection.h") || __has_include(<React/RCTPackagerConnection.h>))
 #define RCT_DEV_SETTINGS_ENABLE_PACKAGER_CONNECTION 1

package/React/Base/RCTDisplayLink.m

@@ -95,6 +95,13 @@
 
 - (void)invalidate
 {
+  // ensure observer callbacks do not hold a reference to weak self via pauseCallback
+  for (RCTModuleData *moduleData in _frameUpdateObservers) {
+    id<RCTFrameUpdateObserver> observer = (id<RCTFrameUpdateObserver>)moduleData.instance;
+    [observer setPauseCallback:nil];
+  }
+  [_frameUpdateObservers removeAllObjects]; // just to be explicit
+
   [_jsDisplayLink invalidate];
 }
 

package/React/Base/RCTJSScriptLoaderModule.h

@@ -7,12 +7,16 @@
 
 @class RCTSource;
 
+NS_ASSUME_NONNULL_BEGIN
+
 /**
  * This protocol should be adopted when a turbo module needs to tell React Native to load a script.
  * In bridge-less React Native, it is a replacement for [_bridge loadAndExecuteSplitBundleURL:].
  */
 @protocol RCTJSScriptLoaderModule <NSObject>
 
-@property (nonatomic, copy, nonnull) void (^loadScript)(RCTSource *source);
+@property (nonatomic, copy) void (^loadScript)(RCTSource *source);
 
 @end
+
+NS_ASSUME_NONNULL_END

package/React/Base/RCTRootContentView.h

@@ -27,6 +27,6 @@
 - (instancetype)initWithFrame:(CGRect)frame
                        bridge:(RCTBridge *)bridge
                      reactTag:(NSNumber *)reactTag
-               sizeFlexiblity:(RCTRootViewSizeFlexibility)sizeFlexibility NS_DESIGNATED_INITIALIZER;
+              sizeFlexibility:(RCTRootViewSizeFlexibility)sizeFlexibility NS_DESIGNATED_INITIALIZER;
 
 @end

package/React/Base/RCTRootContentView.m

@@ -20,7 +20,7 @@
 - (instancetype)initWithFrame:(CGRect)frame
                        bridge:(RCTBridge *)bridge
                      reactTag:(NSNumber *)reactTag
-               sizeFlexiblity:(RCTRootViewSizeFlexibility)sizeFlexibility
+              sizeFlexibility:(RCTRootViewSizeFlexibility)sizeFlexibility
 {
   if ((self = [super initWithFrame:frame])) {
     _bridge = bridge;

package/React/Base/RCTRootView.m

@@ -283,7 +283,7 @@ RCT_NOT_IMPLEMENTED(-(instancetype)initWithCoder : (NSCoder *)aDecoder)
   _contentView = [[RCTRootContentView alloc] initWithFrame:self.bounds
                                                     bridge:bridge
                                                   reactTag:self.reactTag
-                                            sizeFlexiblity:_sizeFlexibility];
+                                           sizeFlexibility:_sizeFlexibility];
   [self runApplication:bridge];
 
   _contentView.passThroughTouches = _passThroughTouches;

package/React/Base/RCTVersion.m

@@ -22,9 +22,9 @@ NSDictionary* RCTGetReactNativeVersion(void)
   dispatch_once(&onceToken, ^(void){
     __rnVersion = @{
                   RCTVersionMajor: @(0),
-                  RCTVersionMinor: @(71),
-                  RCTVersionPatch: @(3),
-                  RCTVersionPrerelease: [NSNull null],
+                  RCTVersionMinor: @(72),
+                  RCTVersionPatch: @(0),
+                  RCTVersionPrerelease: @"rc.0",
                   };
   });
   return __rnVersion;

package/React/Base/Surface/RCTSurfaceRootShadowViewDelegate.h

@@ -13,7 +13,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 @protocol RCTSurfaceRootShadowViewDelegate <NSObject>
 
-- (void)rootShadowView:(RCTSurfaceRootShadowView *)rootShadowView didChangeIntrinsicSize:(CGSize)instrinsicSize;
+- (void)rootShadowView:(RCTSurfaceRootShadowView *)rootShadowView didChangeIntrinsicSize:(CGSize)intrinsicSize;
 - (void)rootShadowViewDidStartRendering:(RCTSurfaceRootShadowView *)rootShadowView;
 - (void)rootShadowViewDidStartLayingOut:(RCTSurfaceRootShadowView *)rootShadowView;
 

package/React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingView.h

@@ -36,7 +36,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 /**
  * Designated initializer.
- * Instanciates a view with given Surface object.
+ * Instantiates a view with given Surface object.
  * Note: The view retains the surface object.
  */
 - (instancetype)initWithSurface:(id<RCTSurfaceProtocol>)surface
@@ -44,8 +44,8 @@ NS_ASSUME_NONNULL_BEGIN
 
 /**
  * Convenience initializer.
- * Instanciates a Surface object with given `bridge`, `moduleName`, and
- * `initialProperties`, and then use it to instanciate a view.
+ * Instantiates a Surface object with given `bridge`, `moduleName`, and
+ * `initialProperties`, and then use it to instantiate a view.
  */
 - (instancetype)initWithBridge:(RCTBridge *)bridge
                     moduleName:(NSString *)moduleName

package/React/CoreModules/BUCK

@@ -22,17 +22,13 @@ rn_apple_library(
     ],
     contacts = ["oncall+react_native@xmail.facebook.com"],
     enable_exceptions = True,
-    exported_linker_flags = [
-        "-weak_framework",
-        "UserNotifications",
-        "-weak_framework",
-        "WebKit",
-    ],
     exported_preprocessor_flags = rn_extra_build_flags(),
     extension_api_only = True,
     frameworks = [
         "Foundation",
         "UIKit",
+        "UserNotifications",
+        "WebKit",
     ],
     header_path_prefix = "React",
     labels = [
@@ -134,6 +130,7 @@ rn_apple_library(
         "//xplat/js/react-native-github:FBReactNativeSpecApple",
         "//xplat/js/react-native-github:RCTLinkingApple",
         "//xplat/js/react-native-github:RCTPushNotificationApple",
+        "//xplat/js/react-native-github:RCTSettingsApple",
         "//xplat/js/react-native-github:ReactInternalApple",
     ],
 )

package/React/CoreModules/RCTAccessibilityManager+Internal.h

@@ -16,7 +16,7 @@ RCT_EXTERN_C_BEGIN
 // Only to be used for testing and internal tooling. Do not use this in
 // production.
 void RCTAccessibilityManagerSetIsVoiceOverEnabled(
-    RCTAccessibilityManager *accessibiltyManager,
+    RCTAccessibilityManager *accessibilityManager,
     BOOL isVoiceOverEnabled);
 
 RCT_EXTERN_C_END

package/React/CoreModules/RCTAlertManager.mm

@@ -32,20 +32,6 @@ RCT_ENUM_CONVERTER(
 
 @end
 
-@implementation RCTConvert (UIUserInterfaceStyle)
-
-RCT_ENUM_CONVERTER(
-    UIUserInterfaceStyle,
-    (@{
-      @"unspecified" : @(UIUserInterfaceStyleUnspecified),
-      @"light" : @(UIUserInterfaceStyleLight),
-      @"dark" : @(UIUserInterfaceStyleDark),
-    }),
-    UIUserInterfaceStyleUnspecified,
-    integerValue)
-
-@end
-
 @interface RCTAlertManager () <NativeAlertManagerSpec>
 
 @end

package/React/CoreModules/RCTAppearance.h

@@ -8,6 +8,7 @@
 #import <UIKit/UIKit.h>
 
 #import <React/RCTBridgeModule.h>
+#import <React/RCTConvert.h>
 #import <React/RCTEventEmitter.h>
 
 RCT_EXTERN void RCTEnableAppearancePreference(BOOL enabled);