react-native 0.0.0-17be3a003 → 0.0.0-18697adec

package/Libraries/Utilities/HMRClient.js

@@ -16,8 +16,8 @@ const prettyFormat = require('pretty-format');
 
 import getDevServer from '../Core/Devtools/getDevServer';
 import NativeRedBox from '../NativeModules/specs/NativeRedBox';
-import * as LogBoxData from '../LogBox/Data/LogBoxData';
-import type {ExtendedError} from '../Core/Devtools/parseErrorStack';
+import LogBox from '../LogBox/LogBox';
+import type {ExtendedError} from '../Core/ExtendedError';
 
 const pendingEntryPoints = [];
 let hmrClient = null;
@@ -48,6 +48,7 @@ export type HMRClientNativeInterface = {|
     host: string,
     port: number | string,
     isEnabled: boolean,
+    scheme?: string,
   ): void,
 |};
 
@@ -118,6 +119,7 @@ const HMRClient: HMRClientNativeInterface = {
         JSON.stringify({
           type: 'log',
           level,
+          mode: global.RN$Bridgeless === true ? 'NOBRIDGE' : 'BRIDGE',
           data: data.map(item =>
             typeof item === 'string'
               ? item
@@ -145,6 +147,7 @@ const HMRClient: HMRClientNativeInterface = {
     host: string,
     port: number | string,
     isEnabled: boolean,
+    scheme?: string = 'http',
   ) {
     invariant(platform, 'Missing required parameter `platform`');
     invariant(bundleEntry, 'Missing required parameter `bundleEntry`');
@@ -154,8 +157,12 @@ const HMRClient: HMRClientNativeInterface = {
     // Moving to top gives errors due to NativeModules not being initialized
     const LoadingView = require('./LoadingView');
 
-    const wsHost = port !== null && port !== '' ? `${host}:${port}` : host;
-    const client = new MetroHMRClient(`ws://${wsHost}/hot`);
+    const serverHost = port !== null && port !== '' ? `${host}:${port}` : host;
+
+    const serverScheme = scheme;
+
+    const client = new MetroHMRClient(`${serverScheme}://${serverHost}/hot`);
+
     hmrClient = client;
 
     const {fullBundleUrl} = getDevServer();
@@ -164,9 +171,7 @@ const HMRClient: HMRClientNativeInterface = {
       // there are any important URL parameters we can't reconstruct from
       // `setup()`'s arguments.
       fullBundleUrl ??
-        // The ws://.../hot?bundleEntry= format is an alternative to specifying
-        // a regular HTTP bundle URL.
-        `ws://${wsHost}/hot?bundleEntry=${bundleEntry}&platform=${platform}`,
+        `${serverScheme}://${serverHost}/hot?bundleEntry=${bundleEntry}&platform=${platform}`,
     );
 
     client.on('connection-error', e => {
@@ -206,7 +211,7 @@ Error: ${e.message}`;
     client.on('update', ({isInitialUpdate}) => {
       if (client.isEnabled() && !isInitialUpdate) {
         dismissRedbox();
-        LogBoxData.clear();
+        LogBox.clearAllLogs();
       }
     });
 
@@ -323,6 +328,8 @@ function showCompileError() {
   const message = currentCompileErrorMessage;
   currentCompileErrorMessage = null;
 
+  /* $FlowFixMe[class-object-subtyping] added when improving typing for this
+   * parameters */
   const error: ExtendedError = new Error(message);
   // Symbolicating compile errors is wasted effort
   // because the stack trace is meaningless:

package/Libraries/Utilities/MatrixMath.js

@@ -71,7 +71,7 @@ const MatrixMath = {
    * This create a perspective projection towards negative z
    * Clipping the z range of [-near, -far]
    *
-   * @param fovInRadians - field of view in randians
+   * @param fovInRadians - field of view in radians
    */
   createPerspective: function(fovInRadians, aspect, near, far) {
     const h = 1 / Math.tan(fovInRadians / 2);

package/Libraries/Utilities/NativeDeviceInfo.js

@@ -11,7 +11,7 @@
 import type {TurboModule} from '../TurboModule/RCTExport';
 import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry';
 
-type DisplayMetricsAndroid = {|
+export type DisplayMetricsAndroid = {|
   width: number,
   height: number,
   scale: number,

package/Libraries/Utilities/PerformanceLoggerContext.js

@@ -4,11 +4,12 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @flow strict-local
+ * @flow strict
  * @format
  */
 
 import * as React from 'react';
+import {useContext} from 'react';
 import GlobalPerformanceLogger from './GlobalPerformanceLogger';
 import type {IPerformanceLogger} from './createPerformanceLogger';
 
@@ -24,4 +25,9 @@ const PerformanceLoggerContext: React.Context<IPerformanceLogger> = React.create
 if (__DEV__) {
   PerformanceLoggerContext.displayName = 'PerformanceLoggerContext';
 }
-module.exports = PerformanceLoggerContext;
+
+export function usePerformanceLogger(): IPerformanceLogger {
+  return useContext(PerformanceLoggerContext);
+}
+
+export default PerformanceLoggerContext;

package/Libraries/Utilities/deepFreezeAndThrowOnMutationInDev.js

@@ -42,6 +42,7 @@ function deepFreezeAndThrowOnMutationInDev<T: {...} | Array<mixed>>(
 
     // $FlowFixMe[not-an-object] `object` can be an array, but Object.keys works with arrays too
     const keys = Object.keys((object: {...} | Array<mixed>));
+    // $FlowFixMe[method-unbinding] added when improving typing for this parameters
     const hasOwnProperty = Object.prototype.hasOwnProperty;
 
     for (let i = 0; i < keys.length; i++) {

package/Libraries/Utilities/deprecatedPropType.js

@@ -20,8 +20,8 @@ function deprecatedPropType(
   return function validate(props, propName, componentName, ...rest) {
     // Don't warn for native components.
     if (
-      !global.RN$Bridgeless &&
-      UIManager.hasViewManagerConfig(componentName) &&
+      global.RN$Bridgeless !== true &&
+      !UIManager.hasViewManagerConfig(componentName) &&
       props[propName] !== undefined
     ) {
       console.warn(

package/Libraries/Utilities/useMergeRefs.js

@@ -0,0 +1,44 @@
+/**
+ * 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.
+ *
+ * @flow strict
+ * @format
+ */
+
+import {useCallback} from 'react';
+
+type CallbackRef<T> = T => mixed;
+type ObjectRef<T> = {current: T, ...};
+
+type Ref<T> = CallbackRef<T> | ObjectRef<T>;
+
+/**
+ * Constructs a new ref that forwards new values to each of the given refs. The
+ * given refs will always be invoked in the order that they are supplied.
+ *
+ * WARNING: A known problem of merging refs using this approach is that if any
+ * of the given refs change, the returned callback ref will also be changed. If
+ * the returned callback ref is supplied as a `ref` to a React element, this may
+ * lead to problems with the given refs being invoked more times than desired.
+ */
+export default function useMergeRefs<T>(
+  ...refs: $ReadOnlyArray<?Ref<T>>
+): CallbackRef<T> {
+  return useCallback(
+    (current: T) => {
+      for (const ref of refs) {
+        if (ref != null) {
+          if (typeof ref === 'function') {
+            ref(current);
+          } else {
+            ref.current = current;
+          }
+        }
+      }
+    },
+    [...refs], // eslint-disable-line react-hooks/exhaustive-deps
+  );
+}

package/Libraries/Utilities/useRefEffect.js

@@ -0,0 +1,45 @@
+/**
+ * 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.
+ *
+ * @flow strict
+ * @format
+ */
+
+import {useCallback, useRef} from 'react';
+
+type CallbackRef<T> = T => mixed;
+
+/**
+ * Constructs a callback ref that provides similar semantics as `useEffect`. The
+ * supplied `effect` callback will be called with non-null component instances.
+ * The `effect` callback can also optionally return a cleanup function.
+ *
+ * When a component is updated or unmounted, the cleanup function is called. The
+ * `effect` callback will then be called again, if applicable.
+ *
+ * When a new `effect` callback is supplied, the previously returned cleanup
+ * function will be called before the new `effect` callback is called with the
+ * same instance.
+ *
+ * WARNING: The `effect` callback should be stable (e.g. using `useCallback`).
+ */
+export default function useRefEffect<TInstance>(
+  effect: TInstance => (() => void) | void,
+): CallbackRef<TInstance | null> {
+  const cleanupRef = useRef<(() => void) | void>(undefined);
+  return useCallback(
+    instance => {
+      if (cleanupRef.current) {
+        cleanupRef.current();
+        cleanupRef.current = undefined;
+      }
+      if (instance != null) {
+        cleanupRef.current = effect(instance);
+      }
+    },
+    [effect],
+  );
+}

package/Libraries/Utilities/useWindowDimensions.js

@@ -9,10 +9,15 @@
  */
 
 import Dimensions from './Dimensions';
-import {type DisplayMetrics} from './NativeDeviceInfo';
+import {
+  type DisplayMetrics,
+  type DisplayMetricsAndroid,
+} from './NativeDeviceInfo';
 import {useEffect, useState} from 'react';
 
-export default function useWindowDimensions(): DisplayMetrics {
+export default function useWindowDimensions():
+  | DisplayMetrics
+  | DisplayMetricsAndroid {
   const [dimensions, setDimensions] = useState(() => Dimensions.get('window'));
   useEffect(() => {
     function handleChange({window}) {

package/Libraries/Vibration/RCTVibrationPlugins.mm

@@ -17,12 +17,13 @@
 #import <unordered_map>
 
 Class RCTVibrationClassProvider(const char *name) {
-  static std::unordered_map<std::string, Class (*)(void)> sCoreModuleClassMap = {
+  // Intentionally leak to avoid crashing after static destructors are run.
+  static const auto sCoreModuleClassMap = new const std::unordered_map<std::string, Class (*)(void)>{
     {"Vibration", RCTVibrationCls},
   };
 
-  auto p = sCoreModuleClassMap.find(name);
-  if (p != sCoreModuleClassMap.end()) {
+  auto p = sCoreModuleClassMap->find(name);
+  if (p != sCoreModuleClassMap->end()) {
     auto classFunc = p->second;
     return classFunc();
   }

package/Libraries/Vibration/React-RCTVibration.podspec

@@ -17,7 +17,7 @@ else
 end
 
 folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
-folly_version = '2020.01.13.00'
+folly_version = '2021.06.28.00-v2'
 
 Pod::Spec.new do |s|
   s.name                   = "React-RCTVibration"

package/Libraries/YellowBox/YellowBoxDeprecated.js

@@ -67,6 +67,7 @@ if (__DEV__) {
   };
 }
 
+// $FlowFixMe[method-unbinding]
 module.exports = (YellowBox: Class<React.Component<Props>> & {
   ignoreWarnings($ReadOnlyArray<IgnorePattern>): void,
   install(): void,

package/Libraries/promiseRejectionTrackingOptions.js

@@ -18,8 +18,10 @@ let rejectionTrackingOptions: $Call<ExtractOptionsType, enable> = {
     let message: string;
     let stack: ?string;
 
+    // $FlowFixMe[method-unbinding] added when improving typing for this parameters
     const stringValue = Object.prototype.toString.call(rejection);
     if (stringValue === '[object Error]') {
+      // $FlowFixMe[method-unbinding] added when improving typing for this parameters
       message = Error.prototype.toString.call(rejection);
       const error: Error = (rejection: $FlowFixMe);
       stack = error.stack;

package/Libraries/vendor/emitter/_EventSubscriptionVendor.js

@@ -58,7 +58,7 @@ class EventSubscriptionVendor<EventDefinitions: {...}> {
    * Removes a bulk set of the subscriptions.
    *
    * @param {?string} 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<K: $Keys<EventDefinitions>>(eventType: ?K): void {
     if (eventType == null) {

package/README.md

@@ -10,7 +10,7 @@
 </p>
 
 <p align="center">
-  <a href="https://github.com/facebook/react-native/blob/master/LICENSE">
+  <a href="https://github.com/facebook/react-native/blob/HEAD/LICENSE">
     <img src="https://img.shields.io/badge/license-MIT-blue.svg" alt="React Native is released under the MIT license." />
   </a>
   <a href="https://circleci.com/gh/facebook/react-native">
@@ -38,7 +38,7 @@
   <span> · </span>
   <a href="https://reactnative.dev/help">Community</a>
   <span> · </span>
-  <a href="https://github.com/facebook/react-native/blob/master/.github/SUPPORT.md">Support</a>
+  <a href="https://github.com/facebook/react-native/blob/HEAD/.github/SUPPORT.md">Support</a>
 </h3>
 
 React Native brings [**React**'s][r] declarative UI framework to iOS and Android. With React Native, you use native UI controls and have full access to the native platform.
@@ -52,7 +52,7 @@ React Native is developed and supported by many companies and individual core co
 
 [r]: https://reactjs.org/
 [p]: https://reactnative.dev/docs/out-of-tree-platforms
-[e]: https://github.com/facebook/react-native/blob/master/ECOSYSTEM.md
+[e]: https://github.com/facebook/react-native/blob/HEAD/ECOSYSTEM.md
 
 ## Contents
 
@@ -143,5 +143,5 @@ React Native is MIT licensed, as found in the [LICENSE][l] file.
 
 React Native documentation is Creative Commons licensed, as found in the [LICENSE-docs][ld] file.
 
-[l]: https://github.com/facebook/react-native/blob/master/LICENSE
-[ld]: https://github.com/facebook/react-native/blob/master/LICENSE-docs
+[l]: https://github.com/facebook/react-native/blob/HEAD/LICENSE
+[ld]: https://github.com/facebook/react-native/blob/HEAD/LICENSE-docs

package/React/Base/RCTAssert.h

@@ -20,17 +20,17 @@ RCT_EXTERN BOOL RCTIsMainQueue(void);
  * assert handler through `RCTSetAssertFunction`.
  */
 #ifndef NS_BLOCK_ASSERTIONS
-#define RCTAssert(condition, ...)                                                                      \
-  do {                                                                                                 \
-    if ((condition) == 0) {                                                                            \
-      _RCTAssertFormat(#condition, __FILE__, __LINE__, __func__, __VA_ARGS__);                         \
-      if (RCT_NSASSERT) {                                                                              \
-        [[NSAssertionHandler currentHandler] handleFailureInFunction:(NSString * _Nonnull) @(__func__) \
-                                                                file:(NSString * _Nonnull) @(__FILE__) \
-                                                          lineNumber:__LINE__                          \
-                                                         description:__VA_ARGS__];                     \
-      }                                                                                                \
-    }                                                                                                  \
+#define RCTAssert(condition, ...)                                                                    \
+  do {                                                                                               \
+    if ((condition) == 0) {                                                                          \
+      _RCTAssertFormat(#condition, __FILE__, __LINE__, __func__, __VA_ARGS__);                       \
+      if (RCT_NSASSERT) {                                                                            \
+        [[NSAssertionHandler currentHandler] handleFailureInFunction:(NSString *_Nonnull)@(__func__) \
+                                                                file:(NSString *_Nonnull)@(__FILE__) \
+                                                          lineNumber:__LINE__                        \
+                                                         description:__VA_ARGS__];                   \
+      }                                                                                              \
+    }                                                                                                \
   } while (false)
 #else
 #define RCTAssert(condition, ...) \
@@ -174,6 +174,16 @@ RCT_EXTERN NSString *RCTFormatStackTrace(NSArray<NSDictionary<NSString *, id> *>
  * Controls for ensuring the new architecture runtime assumption holds.
  * Note: this is work in progress.
  */
+
+// Enable reporting of any violation related to the new React Native architecture.
+// If RCT_NEW_ARCHITECTURE is defined, it is already enabled by default, otherwise, no violation will be
+// reported until enabled.
+// Note: enabling this at runtime is not early enough to report issues within ObjC class +load execution.
 __attribute__((used)) RCT_EXTERN void RCTEnableNewArchitectureViolationReporting(BOOL enabled);
-__attribute__((used)) RCT_EXTERN BOOL RCTNewArchitectureViolationReportingEnabled(void);
-__attribute__((used)) RCT_EXTERN void RCTAssertAndTrackNewArchitectureViolation(NSString *violation);
+
+// When reporting is enabled, trigger an assertion.
+__attribute__((used)) RCT_EXTERN void RCTEnforceNotAllowedForNewArchitecture(id context, NSString *extra);
+
+// When reporting is enabled, warn about the violation. Use this to prepare a specific callsite
+// for stricter enforcement. When ready, switch it to use the variant above.
+__attribute__((used)) RCT_EXTERN void RCTWarnNotAllowedForNewArchitecture(id context, NSString *extra);

package/React/Base/RCTAssert.m

@@ -231,28 +231,54 @@ RCTFatalExceptionHandler RCTGetFatalExceptionHandler(void)
   return RCTCurrentFatalExceptionHandler;
 }
 
-// New architecture section.
+// -------------------------
+// New architecture section
+// -------------------------
+
+#if RCT_NEW_ARCHITECTURE
+static BOOL newArchitectureViolationReporting = YES;
+#else
 static BOOL newArchitectureViolationReporting = NO;
+#endif
 
 void RCTEnableNewArchitectureViolationReporting(BOOL enabled)
 {
+#if RCT_NEW_ARCHITECTURE
+  // Cannot disable the reporting in this mode.
+#else
   newArchitectureViolationReporting = enabled;
+#endif
 }
 
-BOOL RCTNewArchitectureViolationReportingEnabled(void)
+static NSString *getNewArchitectureViolationMessage(id context, NSString *extra)
 {
-  return newArchitectureViolationReporting;
+  NSString *tag = @"uncategorized";
+  if ([context isKindOfClass:NSString.class]) {
+    tag = context;
+  } else if (context) {
+    Class klass = [context class];
+    if (klass) {
+      tag = NSStringFromClass(klass);
+    }
+  }
+  NSString *errorMessage = extra ?: @"Unexpectedly reached this code path.";
+  return [NSString stringWithFormat:@"[ReactNative Architecture][%@] %@", tag, errorMessage];
 }
 
-void RCTAssertAndTrackNewArchitectureViolation(NSString *violation)
+void RCTEnforceNotAllowedForNewArchitecture(id context, NSString *extra)
 {
-  if (!RCTNewArchitectureViolationReportingEnabled()) {
+  if (!newArchitectureViolationReporting) {
     return;
   }
 
-#if RCT_NEW_ARCHITECTURE
-  RCTAssert(0, @"New architecture violation assertion: %@", violation);
-#endif
+  RCTAssert(0, @"%@", getNewArchitectureViolationMessage(context, extra));
+}
+
+void RCTWarnNotAllowedForNewArchitecture(id context, NSString *extra)
+{
+  if (!newArchitectureViolationReporting) {
+    return;
+  }
 
-  // TODO: Actually track violations in a global space (separate from assertion).
+  RCTLogWarn(@"%@", getNewArchitectureViolationMessage(context, extra));
 }

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)
@@ -146,6 +154,4 @@ RCT_EXTERN void RCTRegisterModule(Class);
 
 - (instancetype)initWithParentBridge:(RCTBridge *)bridge NS_DESIGNATED_INITIALIZER;
 
-- (void)forceGarbageCollection;
-
 @end

package/React/Base/RCTBridge.h

@@ -160,9 +160,18 @@ RCT_EXTERN void RCTEnableTurboModuleEagerInit(BOOL enabled);
 RCT_EXTERN BOOL RCTTurboModuleSharedMutexInitEnabled(void);
 RCT_EXTERN void RCTEnableTurboModuleSharedMutexInit(BOOL enabled);
 
-// Turn on TurboModule shared mutex initialization
-RCT_EXTERN BOOL RCTTurboModuleBlockGuardEnabled(void);
-RCT_EXTERN void RCTEnableTurboModuleBlockGuard(BOOL enabled);
+// Turn off TurboModule delegate locking
+RCT_EXTERN BOOL RCTTurboModuleManagerDelegateLockingDisabled(void);
+RCT_EXTERN void RCTDisableTurboModuleManagerDelegateLocking(BOOL enabled);
+
+typedef enum {
+  kRCTGlobalScope,
+  kRCTGlobalScopeUsingRetainJSCallback,
+  kRCTTurboModuleManagerScope,
+} RCTTurboModuleCleanupMode;
+
+RCT_EXTERN RCTTurboModuleCleanupMode RCTGetTurboModuleCleanupMode(void);
+RCT_EXTERN void RCTSetTurboModuleCleanupMode(RCTTurboModuleCleanupMode mode);
 
 /**
  * Async batched bridge used to communicate with the JavaScript application.
@@ -231,6 +240,13 @@ RCT_EXTERN void RCTEnableTurboModuleBlockGuard(BOOL enabled);
  */
 - (void)setRCTTurboModuleRegistry:(id<RCTTurboModuleRegistry>)turboModuleRegistry;
 
+/**
+ * This hook is called by the TurboModule infra with every TurboModule that's created.
+ * It allows the bridge to attach properties to TurboModules that give TurboModules
+ * access to Bridge APIs.
+ */
+- (void)attachBridgeAPIsToTurboModule:(id<RCTTurboModule>)module;
+
 /**
  * Convenience method for retrieving all modules conforming to a given protocol.
  * Modules will be synchronously instantiated if they haven't already been,

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"
@@ -58,6 +59,9 @@ NSArray<Class> *RCTGetModuleClasses(void)
 void RCTRegisterModule(Class);
 void RCTRegisterModule(Class moduleClass)
 {
+  RCTWarnNotAllowedForNewArchitecture(
+      @"RCTRegisterModule()", [NSString stringWithFormat:@"'%@' was registered unexpectedly", moduleClass]);
+
   static dispatch_once_t onceToken;
   dispatch_once(&onceToken, ^{
     RCTModuleClasses = [NSMutableArray new];
@@ -135,15 +139,27 @@ void RCTEnableTurboModuleSharedMutexInit(BOOL enabled)
   turboModuleSharedMutexInitEnabled = enabled;
 }
 
-static BOOL turboModuleBlockGuardEnabled = NO;
-BOOL RCTTurboModuleBlockGuardEnabled(void)
+static RCTTurboModuleCleanupMode turboModuleCleanupMode = kRCTGlobalScope;
+RCTTurboModuleCleanupMode RCTGetTurboModuleCleanupMode(void)
 {
-  return turboModuleBlockGuardEnabled;
+  return turboModuleCleanupMode;
 }
 
-void RCTEnableTurboModuleBlockGuard(BOOL enabled)
+void RCTSetTurboModuleCleanupMode(RCTTurboModuleCleanupMode mode)
 {
-  turboModuleBlockGuardEnabled = enabled;
+  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>
@@ -153,15 +169,9 @@ void RCTEnableTurboModuleBlockGuard(BOOL enabled)
   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;
@@ -200,6 +210,7 @@ static RCTBridge *RCTCurrentBridgeInstance = nil;
                    launchOptions:(NSDictionary *)launchOptions
 {
   if (self = [super init]) {
+    RCTEnforceNotAllowedForNewArchitecture(self, nil);
     _delegate = delegate;
     _bundleURL = bundleURL;
     _moduleProvider = block;
@@ -226,6 +237,11 @@ RCT_NOT_IMPLEMENTED(-(instancetype)init)
   [self.batchedBridge setRCTTurboModuleRegistry:turboModuleRegistry];
 }
 
+- (void)attachBridgeAPIsToTurboModule:(id<RCTTurboModule>)module
+{
+  [self.batchedBridge attachBridgeAPIsToTurboModule:module];
+}
+
 - (void)didReceiveReloadCommand
 {
 #if RCT_ENABLE_INSPECTOR
@@ -248,6 +264,11 @@ RCT_NOT_IMPLEMENTED(-(instancetype)init)
   });
 }
 
+- (RCTModuleRegistry *)moduleRegistry
+{
+  return self.batchedBridge.moduleRegistry;
+}
+
 - (NSArray<Class> *)moduleClasses
 {
   return self.batchedBridge.moduleClasses;