react-native 0.66.0-rc.4 → 0.67.0-rc.1

package/Libraries/Share/Share.js

@@ -51,7 +51,7 @@ class Share {
    *
    * #### iOS
    *
-   *  - `url` - an URL to share
+   *  - `url` - a URL to share
    *
    * At least one of URL and message is required.
    *

package/Libraries/StyleSheet/normalizeColor.js

@@ -10,7 +10,7 @@
 
 /* eslint no-bitwise: 0 */
 
-import normalizeColorBase from '@react-native/normalize-color/base';
+import _normalizeColor from '@react-native/normalize-color';
 
 import type {ColorValue} from './StyleSheet';
 import type {ProcessedColorValue} from './processColor';
@@ -27,7 +27,7 @@ function normalizeColor(
   }
 
   if (typeof color === 'string' || typeof color === 'number') {
-    return normalizeColorBase(color);
+    return _normalizeColor(color);
   }
 }
 

package/Libraries/Text/TextInput/Multiline/RCTUITextView.m

@@ -182,12 +182,14 @@ static UIColor *defaultPlaceholderColor()
   _textWasPasted = YES;
 }
 
+// Turn off scroll animation to fix flaky scrolling.
+// This is only necessary for iOS <= 13.
+#if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED < 140000
 - (void)setContentOffset:(CGPoint)contentOffset animated:(__unused BOOL)animated
 {
-  // Turning off scroll animation.
-  // This fixes the problem also known as "flaky scrolling".
   [super setContentOffset:contentOffset animated:NO];
 }
+#endif
 
 - (void)selectAll:(id)sender
 {

package/Libraries/Text/TextInput/RCTBaseTextInputView.m

@@ -242,20 +242,10 @@ RCT_NOT_IMPLEMENTED(- (instancetype)initWithFrame:(CGRect)frame)
                           @"streetAddressLine2": UITextContentTypeStreetAddressLine2,
                           @"sublocality": UITextContentTypeSublocality,
                           @"telephoneNumber": UITextContentTypeTelephoneNumber,
+                          @"username": UITextContentTypeUsername,
+                          @"password": UITextContentTypePassword,
                           };
 
-      #if __IPHONE_OS_VERSION_MAX_ALLOWED >= 110000 /* __IPHONE_11_0 */
-        if (@available(iOS 11.0, *)) {
-          NSDictionary<NSString *, NSString *> * iOS11extras = @{@"username": UITextContentTypeUsername,
-                                                                  @"password": UITextContentTypePassword};
-
-          NSMutableDictionary<NSString *, NSString *> * iOS11baseMap = [contentTypeMap mutableCopy];
-          [iOS11baseMap addEntriesFromDictionary:iOS11extras];
-
-          contentTypeMap = [iOS11baseMap copy];
-        }
-      #endif
-
       #if __IPHONE_OS_VERSION_MAX_ALLOWED >= 120000 /* __IPHONE_12_0 */
         if (@available(iOS 12.0, *)) {
           NSDictionary<NSString *, NSString *> * iOS12extras = @{@"newPassword": UITextContentTypeNewPassword,

package/Libraries/Text/TextInput/RCTInputAccessoryViewContent.m

@@ -30,17 +30,10 @@
     _heightConstraint = [_safeAreaContainer.heightAnchor constraintEqualToConstant:0];
     _heightConstraint.active = YES;
 
-    if (@available(iOS 11.0, *)) {
-      [_safeAreaContainer.bottomAnchor constraintEqualToAnchor:self.safeAreaLayoutGuide.bottomAnchor].active = YES;
-      [_safeAreaContainer.topAnchor constraintEqualToAnchor:self.safeAreaLayoutGuide.topAnchor].active = YES;
-      [_safeAreaContainer.leadingAnchor constraintEqualToAnchor:self.safeAreaLayoutGuide.leadingAnchor].active = YES;
-      [_safeAreaContainer.trailingAnchor constraintEqualToAnchor:self.safeAreaLayoutGuide.trailingAnchor].active = YES;
-    } else {
-      [_safeAreaContainer.bottomAnchor constraintEqualToAnchor:self.bottomAnchor].active = YES;
-      [_safeAreaContainer.topAnchor constraintEqualToAnchor:self.topAnchor].active = YES;
-      [_safeAreaContainer.leadingAnchor constraintEqualToAnchor:self.leadingAnchor].active = YES;
-      [_safeAreaContainer.trailingAnchor constraintEqualToAnchor:self.trailingAnchor].active = YES;
-    }
+    [_safeAreaContainer.bottomAnchor constraintEqualToAnchor:self.safeAreaLayoutGuide.bottomAnchor].active = YES;
+    [_safeAreaContainer.topAnchor constraintEqualToAnchor:self.safeAreaLayoutGuide.topAnchor].active = YES;
+    [_safeAreaContainer.leadingAnchor constraintEqualToAnchor:self.safeAreaLayoutGuide.leadingAnchor].active = YES;
+    [_safeAreaContainer.trailingAnchor constraintEqualToAnchor:self.safeAreaLayoutGuide.trailingAnchor].active = YES;
   }
   return self;
 }

package/Libraries/Text/TextProps.js

@@ -66,13 +66,7 @@ export type TextProps = $ReadOnly<{|
    * Set hyphenation strategy on Android.
    *
    */
-  android_hyphenationFrequency?: ?(
-    | 'normal'
-    | 'none'
-    | 'full'
-    | 'high'
-    | 'balanced'
-  ),
+  android_hyphenationFrequency?: ?('normal' | 'none' | 'full'),
   children?: ?Node,
 
   /**

package/Libraries/TurboModule/TurboModuleRegistry.js

@@ -16,7 +16,7 @@ const turboModuleProxy = global.__turboModuleProxy;
 
 function requireModule<T: TurboModule>(name: string): ?T {
   // Bridgeless mode requires TurboModules
-  if (!global.RN$Bridgeless) {
+  if (global.RN$Bridgeless !== true) {
     // Backward compatibility layer during migration.
     const legacyModule = NativeModules[name];
     if (legacyModule != null) {

package/Libraries/Utilities/HMRClient.js

@@ -119,7 +119,7 @@ const HMRClient: HMRClientNativeInterface = {
         JSON.stringify({
           type: 'log',
           level,
-          mode: global.RN$Bridgeless ? 'NOBRIDGE' : 'BRIDGE',
+          mode: global.RN$Bridgeless === true ? 'NOBRIDGE' : 'BRIDGE',
           data: data.map(item =>
             typeof item === 'string'
               ? item

package/README.md

@@ -32,7 +32,7 @@
   <span> · </span>
   <a href="https://reactnative.dev/docs/tutorial">Learn the Basics</a>
   <span> · </span>
-  <a href="https://reactnative.dev/showcase.html">Showcase</a>
+  <a href="https://reactnative.dev/showcase">Showcase</a>
   <span> · </span>
   <a href="https://reactnative.dev/docs/contributing">Contribute</a>
   <span> · </span>

package/React/Base/RCTBridge+Private.h

@@ -7,6 +7,7 @@
 
 #import <React/RCTBridge.h>
 
+@class RCTModuleRegistry;
 @class RCTModuleData;
 @protocol RCTJavaScriptExecutor;
 
@@ -62,6 +63,13 @@ RCT_EXTERN void RCTRegisterModule(Class);
  */
 @property (nonatomic, strong, readwrite) NSURL *bundleURL;
 
+/**
+ * An object that allows one to require NativeModules/TurboModules.
+ * RCTModuleRegistry is implemented in bridgeless mode and bridge mode.
+ * Used by RCTRootView.
+ */
+@property (nonatomic, strong, readonly) RCTModuleRegistry *moduleRegistry;
+
 @end
 
 @interface RCTBridge (RCTCxxBridge)

package/React/Base/RCTBridge.h

@@ -160,6 +160,10 @@ RCT_EXTERN void RCTEnableTurboModuleEagerInit(BOOL enabled);
 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);
+
 typedef enum {
   kRCTGlobalScope,
   kRCTGlobalScopeUsingRetainJSCallback,

package/React/Base/RCTBridge.m

@@ -15,6 +15,7 @@
 #import "RCTInspectorDevServerHelper.h"
 #endif
 #import "RCTDevLoadingViewProtocol.h"
+#import "RCTJSThread.h"
 #import "RCTLog.h"
 #import "RCTModuleData.h"
 #import "RCTPerformanceLogger.h"
@@ -149,6 +150,18 @@ void RCTSetTurboModuleCleanupMode(RCTTurboModuleCleanupMode mode)
   turboModuleCleanupMode = mode;
 }
 
+// Turn off TurboModule delegate locking
+static BOOL turboModuleManagerDelegateLockingDisabled = YES;
+BOOL RCTTurboModuleManagerDelegateLockingDisabled(void)
+{
+  return turboModuleManagerDelegateLockingDisabled;
+}
+
+void RCTDisableTurboModuleManagerDelegateLocking(BOOL disabled)
+{
+  turboModuleManagerDelegateLockingDisabled = disabled;
+}
+
 @interface RCTBridge () <RCTReloadListener>
 @end
 
@@ -156,15 +169,9 @@ void RCTSetTurboModuleCleanupMode(RCTTurboModuleCleanupMode mode)
   NSURL *_delegateBundleURL;
 }
 
-dispatch_queue_t RCTJSThread;
-
 + (void)initialize
 {
-  static dispatch_once_t onceToken;
-  dispatch_once(&onceToken, ^{
-    // Set up JS thread
-    RCTJSThread = (id)kCFNull;
-  });
+  _RCTInitializeJSThreadConstantInternal();
 }
 
 static RCTBridge *RCTCurrentBridgeInstance = nil;
@@ -257,6 +264,11 @@ RCT_NOT_IMPLEMENTED(-(instancetype)init)
   });
 }
 
+- (RCTModuleRegistry *)moduleRegistry
+{
+  return self.batchedBridge.moduleRegistry;
+}
+
 - (NSArray<Class> *)moduleClasses
 {
   return self.batchedBridge.moduleClasses;

package/React/Base/RCTBridgeModule.h

@@ -9,6 +9,7 @@
 #import <UIKit/UIKit.h>
 
 #import <React/RCTDefines.h>
+#import <React/RCTJSThread.h>
 
 @class RCTBridge;
 @protocol RCTBridgeMethod;
@@ -42,16 +43,6 @@ typedef void (^RCTPromiseResolveBlock)(id result);
  */
 typedef void (^RCTPromiseRejectBlock)(NSString *code, NSString *message, NSError *error);
 
-/**
- * This constant can be returned from +methodQueue to force module
- * methods to be called on the JavaScript thread. This can have serious
- * implications for performance, so only use this if you're sure it's what
- * you need.
- *
- * NOTE: RCTJSThread is not a real libdispatch queue
- */
-RCT_EXTERN dispatch_queue_t RCTJSThread;
-
 RCT_EXTERN_C_BEGIN
 
 typedef struct RCTMethodInfo {
@@ -124,7 +115,7 @@ RCT_EXTERN_C_END
  * moduleRegistry = _moduleRegistry;`. If using Swift, add
  * `@objc var moduleRegistry: RCTModuleRegistry!` to your module.
  */
-@property (nonatomic, weak, readonly) RCTModuleRegistry *moduleRegistry;
+@property (nonatomic, weak, readwrite) RCTModuleRegistry *moduleRegistry;
 
 /**
  * A reference to the RCTViewRegistry. Useful for modules that query UIViews,

package/React/Base/RCTBundleURLProvider.h

@@ -12,7 +12,7 @@
 RCT_EXTERN NSString *const RCTBundleURLProviderUpdatedNotification;
 RCT_EXTERN const NSUInteger kRCTBundleURLProviderDefaultPort;
 
-#if RCT_DEV_MENU
+#if RCT_DEV_MENU | RCT_PACKAGER_LOADING_FUNCTIONALITY
 /**
  * Allow/disallow accessing the packager server for various runtime scenario.
  * For instance, if a test run should never access the packager, disable it

package/React/Base/RCTBundleURLProvider.mm

@@ -15,7 +15,7 @@ NSString *const RCTBundleURLProviderUpdatedNotification = @"RCTBundleURLProvider
 
 const NSUInteger kRCTBundleURLProviderDefaultPort = RCT_METRO_PORT;
 
-#if RCT_DEV_MENU
+#if RCT_DEV_MENU | RCT_PACKAGER_LOADING_FUNCTIONALITY
 static BOOL kRCTAllowPackagerAccess = YES;
 void RCTBundleURLProviderAllowPackagerServerAccess(BOOL allowed)
 {
@@ -90,7 +90,9 @@ static NSURL *serverRootWithHostPort(NSString *hostPort, NSString *scheme)
   NSURL *url = [serverRootWithHostPort(hostPort, scheme) URLByAppendingPathComponent:@"status"];
 
   NSURLSession *session = [NSURLSession sharedSession];
-  NSURLRequest *request = [NSURLRequest requestWithURL:url];
+  NSURLRequest *request = [NSURLRequest requestWithURL:url
+                                           cachePolicy:NSURLRequestUseProtocolCachePolicy
+                                       timeoutInterval:10];
   __block NSURLResponse *response;
   __block NSData *data;
 
@@ -150,7 +152,7 @@ static NSURL *serverRootWithHostPort(NSString *hostPort, NSString *scheme)
 
 - (NSString *)packagerServerHostPort
 {
-#if RCT_DEV_MENU
+#if RCT_DEV_MENU | RCT_PACKAGER_LOADING_FUNCTIONALITY
   if (!kRCTAllowPackagerAccess) {
     RCTLogInfo(@"Packager server access is disabled in this environment");
     return nil;

package/React/Base/RCTConstants.h

@@ -16,12 +16,6 @@ RCT_EXTERN NSString *const RCTUserInterfaceStyleDidChangeNotificationTraitCollec
 RCT_EXTERN BOOL RCTExperimentGetPreemptiveViewAllocationDisabled(void);
 RCT_EXTERN void RCTExperimentSetPreemptiveViewAllocationDisabled(BOOL value);
 
-/*
- * Initial maximum surface size
- */
-RCT_EXTERN BOOL RCTGetInitialMaxSizeEnabled(void);
-RCT_EXTERN void RCTSetInitialMaxSizeEnabled(BOOL value);
-
 /*
  * Remove clipped subviews
  */

package/React/Base/RCTConstants.m

@@ -25,21 +25,6 @@ void RCTExperimentSetPreemptiveViewAllocationDisabled(BOOL value)
   RCTExperimentPreemptiveViewAllocationDisabled = value;
 }
 
-/*
- * Initial maximum surface size
- */
-static BOOL RCTInitialMaxSizeEnabled = NO;
-
-BOOL RCTGetInitialMaxSizeEnabled()
-{
-  return RCTInitialMaxSizeEnabled;
-}
-
-void RCTSetInitialMaxSizeEnabled(BOOL value)
-{
-  RCTInitialMaxSizeEnabled = value;
-}
-
 /*
  * Remove clipped subviews
  */

package/React/Base/RCTConvert.h

@@ -74,7 +74,7 @@ typedef NSURL RCTFileURL;
 #endif
 
 #if TARGET_OS_IPHONE
-+ (WKDataDetectorTypes)WKDataDetectorTypes:(id)json API_AVAILABLE(ios(10.0));
++ (WKDataDetectorTypes)WKDataDetectorTypes:(id)json;
 #endif
 
 + (UIViewContentMode)UIViewContentMode:(id)json;

package/React/Base/RCTDefines.h

@@ -54,6 +54,15 @@
 #define RCT_DEV_MENU RCT_DEV
 #endif
 
+/**
+ * Controls for the core packgaer loading functionality
+ * By default, this inherits from RCT_DEV_MENU but it also gives the capability to
+ * enable the packager functionality without the rest of the dev tools from RCT_DEV_MENU
+ */
+#ifndef RCT_ENABLE_LOADING_FROM_PACKAGER
+#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
@@ -62,11 +71,11 @@
 #endif
 #endif
 
-#ifndef ENABLE_PACKAGER_CONNECTION
+#ifndef RCT_DEV_SETTINGS_ENABLE_PACKAGER_CONNECTION
 #if RCT_DEV && (__has_include("RCTPackagerConnection.h") || __has_include(<React/RCTPackagerConnection.h>))
-#define ENABLE_PACKAGER_CONNECTION 1
+#define RCT_DEV_SETTINGS_ENABLE_PACKAGER_CONNECTION 1
 #else
-#define ENABLE_PACKAGER_CONNECTION 0
+#define RCT_DEV_SETTINGS_ENABLE_PACKAGER_CONNECTION 0
 #endif
 #endif
 

package/React/Base/RCTEventDispatcherProtocol.h

@@ -81,6 +81,8 @@ typedef NS_ENUM(NSInteger, RCTTextEventType) {
  */
 @protocol RCTEventDispatcherProtocol <RCTBridgeModule, RCTJSDispatcherModule>
 
+- (void)sendViewEventWithName:(NSString *)name reactTag:(NSNumber *)reactTag;
+
 /**
  * Deprecated, do not use.
  */

package/React/Base/RCTJSThread.h

@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
+
+#import <React/RCTDefines.h>
+
+/**
+ * This constant can be returned from +methodQueue to force module
+ * methods to be called on the JavaScript thread. This can have serious
+ * implications for performance, so only use this if you're sure it's what
+ * you need.
+ *
+ * NOTE: RCTJSThread is not a real libdispatch queue
+ */
+RCT_EXTERN dispatch_queue_t RCTJSThread;
+
+/**
+ * Initializes the RCTJSThread constant.
+ * Exported because the bridgeless initialization layer needs to initialize
+ * RCTJSThread. In bridgeless mode, RCTBridge isn't accessed, and RCTJSThread
+ * therefore isn't initialized.
+ */
+RCT_EXTERN void _RCTInitializeJSThreadConstantInternal(void);

package/React/Base/RCTJSThread.m

@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#import "RCTJSThread.h"
+
+dispatch_queue_t RCTJSThread;
+
+void _RCTInitializeJSThreadConstantInternal(void)
+{
+  static dispatch_once_t onceToken;
+  dispatch_once(&onceToken, ^{
+    // Set up JS thread
+    RCTJSThread = (id)kCFNull;
+  });
+}

package/React/Base/RCTRootView.h

@@ -8,6 +8,8 @@
 #import <UIKit/UIKit.h>
 
 #import <React/RCTBridge.h>
+#import <React/RCTBridgeModule.h>
+#import <React/RCTEventDispatcherProtocol.h>
 
 @protocol RCTRootViewDelegate;
 
@@ -75,6 +77,19 @@ extern
                 initialProperties:(nullable NSDictionary *)initialProperties
                     launchOptions:(nullable NSDictionary *)launchOptions;
 
+/**
+ * This API allows RCTRootView users to know if the root view is backed by the bridge.
+ */
+@property (nonatomic, readonly) BOOL hasBridge;
+
+/**
+ * This API allows users of RCTRootView to access other NativeModules, without
+ * directly accessing the bridge.
+ */
+@property (nonatomic, strong, readonly) RCTModuleRegistry *moduleRegistry;
+
+@property (nonatomic, strong, readonly) id<RCTEventDispatcherProtocol> eventDispatcher;
+
 /**
  * The name of the JavaScript module to execute within the
  * specified scriptURL (required). Setting this will not have

package/React/Base/RCTRootView.m

@@ -116,6 +116,21 @@ NSString *const RCTContentDidAppearNotification = @"RCTContentDidAppearNotificat
 RCT_NOT_IMPLEMENTED(-(instancetype)initWithFrame : (CGRect)frame)
 RCT_NOT_IMPLEMENTED(-(instancetype)initWithCoder : (NSCoder *)aDecoder)
 
+- (BOOL)hasBridge
+{
+  return _bridge != nil;
+}
+
+- (RCTModuleRegistry *)moduleRegistry
+{
+  return _bridge.moduleRegistry;
+}
+
+- (id<RCTEventDispatcherProtocol>)eventDispatcher
+{
+  return [self.moduleRegistry moduleForName:"EventDispatcher"];
+}
+
 #pragma mark - passThroughTouches
 
 - (BOOL)passThroughTouches

package/React/Base/RCTTouchHandler.m

@@ -8,7 +8,6 @@
 #import "RCTTouchHandler.h"
 
 #import <UIKit/UIGestureRecognizerSubclass.h>
-#import <UIKit/UIKit.h>
 
 #import "RCTAssert.h"
 #import "RCTBridge.h"
@@ -40,10 +39,6 @@
 
   __weak UIView *_cachedRootView;
 
-  // See Touch.h and usage. This gives us a time-basis for a monotonic
-  // clock that acts like a timestamp of milliseconds elapsed since UNIX epoch.
-  NSTimeInterval _unixEpochBasisTime;
-
   uint16_t _coalescingKey;
 }
 
@@ -58,9 +53,6 @@
     _reactTouches = [NSMutableArray new];
     _touchViews = [NSMutableArray new];
 
-    // Get a UNIX epoch basis time:
-    _unixEpochBasisTime = [[NSDate date] timeIntervalSince1970] - [NSProcessInfo processInfo].systemUptime;
-
     // `cancelsTouchesInView` and `delaysTouches*` are needed in order to be used as a top level
     // event delegated recognizer. Otherwise, lower-level components not built
     // using RCT, will fail to recognize gestures.
@@ -167,7 +159,7 @@ RCT_NOT_IMPLEMENTED(-(instancetype)initWithTarget : (id)target action : (SEL)act
   reactTouch[@"pageY"] = @(RCTSanitizeNaNValue(rootViewLocation.y, @"touchEvent.pageY"));
   reactTouch[@"locationX"] = @(RCTSanitizeNaNValue(touchViewLocation.x, @"touchEvent.locationX"));
   reactTouch[@"locationY"] = @(RCTSanitizeNaNValue(touchViewLocation.y, @"touchEvent.locationY"));
-  reactTouch[@"timestamp"] = @((_unixEpochBasisTime + nativeTouch.timestamp) * 1000); // in ms, for JS
+  reactTouch[@"timestamp"] = @(nativeTouch.timestamp * 1000); // in ms, for JS
 
   // TODO: force for a 'normal' touch is usually 1.0;
   // should we expose a `normalTouchForce` constant somewhere (which would

package/React/Base/RCTUtils.h

@@ -40,6 +40,9 @@ RCT_EXTERN void RCTExecuteOnMainQueue(dispatch_block_t block);
 // Please do not use this unless you know what you're doing.
 RCT_EXTERN void RCTUnsafeExecuteOnMainQueueSync(dispatch_block_t block);
 
+// Get screen scale, can be only used on main
+RCT_EXTERN void RCTComputeScreenScale(void);
+
 // Get screen metrics in a thread-safe way
 RCT_EXTERN CGFloat RCTScreenScale(void);
 RCT_EXTERN CGFloat RCTFontSizeMultiplier(void);

package/React/Base/RCTUtils.m

@@ -296,16 +296,23 @@ static void RCTUnsafeExecuteOnMainQueueOnceSync(dispatch_once_t *onceToken, disp
   }
 }
 
-CGFloat RCTScreenScale()
+static dispatch_once_t onceTokenScreenScale;
+static CGFloat screenScale;
+
+void RCTComputeScreenScale()
 {
-  static dispatch_once_t onceToken;
-  static CGFloat scale;
+  dispatch_once(&onceTokenScreenScale, ^{
+    screenScale = [UIScreen mainScreen].scale;
+  });
+}
 
-  RCTUnsafeExecuteOnMainQueueOnceSync(&onceToken, ^{
-    scale = [UIScreen mainScreen].scale;
+CGFloat RCTScreenScale()
+{
+  RCTUnsafeExecuteOnMainQueueOnceSync(&onceTokenScreenScale, ^{
+    screenScale = [UIScreen mainScreen].scale;
   });
 
-  return scale;
+  return screenScale;
 }
 
 CGFloat RCTFontSizeMultiplier()
@@ -334,7 +341,7 @@ CGFloat RCTFontSizeMultiplier()
 
 CGSize RCTScreenSize()
 {
-  // FIXME: this caches the bounds at app start, whatever those were, and then
+  // FIXME: this caches whatever the bounds were when it was first called, and then
   // doesn't update when the device is rotated. We need to find another thread-
   // safe way to get the screen size.
 

package/React/Base/RCTVersion.m

@@ -22,9 +22,9 @@ NSDictionary* RCTGetReactNativeVersion(void)
   dispatch_once(&onceToken, ^(void){
     __rnVersion = @{
                   RCTVersionMajor: @(0),
-                  RCTVersionMinor: @(66),
+                  RCTVersionMinor: @(67),
                   RCTVersionPatch: @(0),
-                  RCTVersionPrerelease: @"rc.4",
+                  RCTVersionPrerelease: @"rc.1",
                   };
   });
   return __rnVersion;

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

@@ -7,6 +7,7 @@
 
 #import <UIKit/UIKit.h>
 
+#import <React/RCTBridgeModule.h>
 #import <React/RCTRootView.h>
 
 #import "RCTSurfaceHostingView.h"
@@ -26,6 +27,9 @@ NS_ASSUME_NONNULL_BEGIN
 
 @property (nonatomic, copy, readonly) NSString *moduleName;
 @property (nonatomic, strong, readonly) RCTBridge *bridge;
+@property (nonatomic, readonly) BOOL hasBridge;
+@property (nonatomic, strong, readonly) RCTModuleRegistry *moduleRegistry;
+@property (nonatomic, strong, readonly) id<RCTEventDispatcherProtocol> eventDispatcher;
 @property (nonatomic, copy, readwrite) NSDictionary *appProperties;
 @property (nonatomic, assign) RCTRootViewSizeFlexibility sizeFlexibility;
 @property (nonatomic, weak) id<RCTRootViewDelegate> delegate;
@@ -46,6 +50,13 @@ NS_ASSUME_NONNULL_BEGIN
                 initialProperties:(NSDictionary *)initialProperties
                     launchOptions:(NSDictionary *)launchOptions;
 
+/**
+ * Bridgeless mode initializer
+ */
+- (instancetype)initWithSurface:(id<RCTSurfaceProtocol>)surface
+                sizeMeasureMode:(RCTSurfaceSizeMeasureMode)sizeMeasureMode
+                 moduleRegistry:(RCTModuleRegistry *)moduleRegistry;
+
 - (void)cancelTouches;
 
 @end