react-native-tvos 0.73.7-1 → 0.74.0-0

package/Libraries/Utilities/useMergeRefs.js

@@ -8,13 +8,9 @@
  * @format
  */
 
+import * as React from 'react';
 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.
@@ -24,11 +20,11 @@ type Ref<T> = CallbackRef<T> | ObjectRef<T>;
  * 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> {
+export default function useMergeRefs<Instance>(
+  ...refs: $ReadOnlyArray<?React.RefSetter<Instance>>
+): (Instance | null) => void {
   return useCallback(
-    (current: T) => {
+    (current: Instance | null) => {
       for (const ref of refs) {
         if (ref != null) {
           if (typeof ref === 'function') {

package/Libraries/Vibration/NativeVibration.js

@@ -8,31 +8,6 @@
  * @format
  */
 
-import type {TurboModule} from '../TurboModule/RCTExport';
-
-import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry';
-import Platform from '../Utilities/Platform';
-
-export interface Spec extends TurboModule {
-  +getConstants: () => {...};
-  +vibrate: (pattern: number) => void;
-
-  // Android only
-  +vibrateByPattern: (pattern: Array<number>, repeat: number) => void;
-  +cancel: () => void;
-}
-
-const Placeholder = {
-  getConstants: () => {
-    return {};
-  },
-  vibrate: (pattern: number) => {},
-  vibrateByPattern: (pattern: Array<number>, repeat: number) => {},
-  cancel: () => {},
-};
-
-const NativeVibration: Spec = Platform.isTVOS
-  ? (Placeholder: Spec)
-  : (TurboModuleRegistry.getEnforcing<Spec>('Vibration'): Spec);
-
+export * from '../../src/private/specs/modules/NativeVibration';
+import NativeVibration from '../../src/private/specs/modules/NativeVibration';
 export default NativeVibration;

package/Libraries/Vibration/React-RCTVibration.podspec

@@ -16,8 +16,9 @@ else
   source[:tag] = "v#{version}"
 end
 
-folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -DFOLLY_CFG_NO_COROUTINES=1 -Wno-comma -Wno-shorten-64-to-32'
-folly_version = '2022.05.16.00'
+folly_config = get_folly_config()
+folly_compiler_flags = folly_config[:compiler_flags]
+folly_version = folly_config[:version]
 
 header_search_paths = [
   "\"$(PODS_ROOT)/RCT-Folly\"",

package/Libraries/Vibration/Vibration.js

@@ -9,9 +9,9 @@
  * @jsdoc
  */
 
-import NativeVibration from './NativeVibration';
-
+// import NativeVibration from './NativeVibration';
 const Platform = require('../Utilities/Platform');
+const NativeVibration = require('./NativeVibration');
 
 /**
  * Vibration API
@@ -75,6 +75,9 @@ const Vibration = {
     pattern: number | Array<number> = _default_vibration_length,
     repeat: boolean = false,
   ) {
+    if (Platform.isTV) {
+      return;
+    }
     if (Platform.OS === 'android') {
       if (typeof pattern === 'number') {
         NativeVibration.vibrate(pattern);
@@ -102,6 +105,9 @@ const Vibration = {
    * See https://reactnative.dev/docs/vibration#cancel
    */
   cancel: function () {
+    if (Platform.isTV) {
+      return;
+    }
     if (Platform.OS === 'ios') {
       _vibrating = false;
     } else {

package/Libraries/WebSocket/NativeWebSocketModule.js

@@ -4,31 +4,10 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @flow
+ * @flow strict-local
  * @format
  */
 
-import type {TurboModule} from '../TurboModule/RCTExport';
-
-import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry';
-
-export interface Spec extends TurboModule {
-  +connect: (
-    url: string,
-    protocols: ?Array<string>,
-    options: {|headers?: Object|},
-    socketID: number,
-  ) => void;
-  +send: (message: string, forSocketID: number) => void;
-  +sendBinary: (base64String: string, forSocketID: number) => void;
-  +ping: (socketID: number) => void;
-  +close: (code: number, reason: string, socketID: number) => void;
-
-  // RCTEventEmitter
-  +addListener: (eventName: string) => void;
-  +removeListeners: (count: number) => void;
-}
-
-export default (TurboModuleRegistry.getEnforcing<Spec>(
-  'WebSocketModule',
-): Spec);
+export * from '../../src/private/specs/modules/NativeWebSocketModule';
+import NativeWebSocketModule from '../../src/private/specs/modules/NativeWebSocketModule';
+export default NativeWebSocketModule;

package/Libraries/YellowBox/YellowBoxDeprecated.js

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @flow
+ * @flow strict-local
  * @format
  */
 

package/Libraries/vendor/emitter/EventEmitter.js

@@ -35,6 +35,7 @@ interface Registration<TArgs> {
   +remove: () => void;
 }
 
+// $FlowFixMe[deprecated-type]
 type Registry<TEventToArgsMap: {...}> = $ObjMap<
   TEventToArgsMap,
   <TArgs>(TArgs) => Set<Registration<TArgs>>,

package/README.md

@@ -2,7 +2,7 @@
 
 Apple TV and Android TV support for React Native are maintained here and in the corresponding `react-native-tvos` NPM package, and not in the [core repo](https://github.com/facebook/react-native/).  This is a full fork of the main repository, with only the changes needed to support Apple TV and Android TV.
 
-Releases of `react-native-tvos` will be based on a public release of `react-native`; e.g. the 0.72.4-0 release of this package will be derived from the 0.72.4 release of `react-native`. All releases of this repo will follow the 0.xx.x-y format, where x digits are from a specific RN core release, and y represents the additional versioning from this repo.
+Releases of `react-native-tvos` will be based on a public release of `react-native`; e.g. the 0.74.0-0 release of this package will be derived from the 0.74.0 release of `react-native`. All releases of this repo will follow the 0.xx.x-y format, where x digits are from a specific RN core release, and y represents the additional versioning from this repo.
 
 Releases will be published on npmjs.org and you may find the latest release version here: https://www.npmjs.com/package/react-native-tvos?activeTab=versions or use the tag `@latest`
 
@@ -16,6 +16,11 @@ To build your project for Apple TV, you should change your `package.json` import
 
 You cannot use this package and the core react-native package simultaneously in a project.
 
+This README covers only TV-specific features. For more general documentation and for changes between versions, you should also see these resources:
+
+- React Native documentation: https://reactnative.dev
+- The React Native changelog: https://github.com/facebook/react-native/blob/main/CHANGELOG.md
+
 ### Hermes JS support
 
 As of the 0.71 release, Hermes is fully working on both Apple TV and Android TV, and is enabled by default.
@@ -25,6 +30,17 @@ As of the 0.71 release, Hermes is fully working on both Apple TV and Android TV,
 - _Apple TV_: Modify your app's Podfile to set the `:fabric_enabled` value to `true` in both iOS and tvOS targets. After that, run `pod install` to pick up the additional pods needed for the new architecture. Some components (TVTextScrollView, TabBarIOS) have not been reimplemented in the new architecture so they will show up as an "unimplemented component".
 - _Android TV_: To enable Fabric, modify `android/gradle.properties` in your app and set `newArchEnabled=true`, then rebuild your app.
 
+As of the 0.74 release, bridgeless is the default when Fabric is enabled.
+
+Known issue: The `TVFocusGuide` `autofocus` API has problems on Apple TV when bridgeless is enabled. If you need to use Fabric without bridgeless on Apple TV, you can override the default by adding the method below in `AppDelegate.mm`:
+
+```objc
+- (BOOL)bridgelessEnabled
+{
+  return false;
+}
+```
+
 ### Typescript
 
 Typescript types for TV-specific components and APIs have been added to `types/public`.
@@ -33,21 +49,26 @@ Typescript types for TV-specific components and APIs have been added to `types/p
 
 TV device support has been implemented with the intention of making existing React Native applications "just work" on TV, with few or no changes needed in the JavaScript code for the applications.
 
-The RNTester app supports Apple TV and Android TV.  In this repo, `RNTester/Podfile` and `RNTester/RNTesterPods.xcodeproj` have been modified to work for tvOS.  Run `pod install`, then open `RNTesterPods.xcworkspace` and build.
+The RNTester app supports Apple TV and Android TV.  In this repo, `RNTester/Podfile` and `RNTester/RNTesterPods.xcodeproj` have been modified to work for tvOS.
 
+Minimum operating system versions:
 
-You should also install `yarn` globally, as it should be used instead of `npm` for working in React Native projects.
+- Apple TV: tvOS 13.4
+- Android TV:
+  - API level 21 (for the 0.73 releases)
+  - API level 23 (for the 0.74 release)
 
 ## Build changes
 
 - _Native layer for Apple TV_: React Native Xcode projects all now have Apple TV build targets, with names ending in the string '-tvOS'.  Changes in the React Native podspecs in 0.73 now require that your application `Podfile` only have one target. This repo supports either an iOS target or a tvOS target, but both targets should not be active at the same time. The new app template now has the iOS target commented out.
-- _Maven artifacts for Android TV_: In 0.71, the React Native Android prebuilt archives are published to Maven instead of being included in the NPM. We are following the same model, except that the Maven artifacts will be in group `io.github.react-native-tvos` instead of `com.facebook.react`. The `@react-native/gradle-plugin` module has been upgraded so that the Android dependencies will be detected correctly during build.
+- _Maven artifacts for Android TV_: In 0.71 and later releases, the React Native Android prebuilt archives are published to Maven instead of being included in the NPM. We are following the same model, except that the Maven artifacts will be in group `io.github.react-native-tvos` instead of `com.facebook.react`. The `@react-native/gradle-plugin` module has been upgraded so that the Android dependencies will be detected correctly during build.
 
 ## _(New)_ Project creation using the Expo CLI
 
 > _Pitfall:_ Make sure you do not globally install `react-native` or `react-native-tvos`. If you have done this the wrong way, you may get error messages like `ld: library not found for -lPods-TestApp-tvOS`.
 
 We strongly recommend [Yarn](https://classic.yarnpkg.com/en/docs/install) as the package manager.
+You should install `yarn` globally, as it should be used instead of `npm` for working in React Native projects.
 
 To create a new project, use `yarn create react-native-app` as shown below. (This will install the Expo tool `create-react-native-app` for you if it is not already present.)
 
@@ -59,12 +80,12 @@ yarn create react-native-app TestApp --template https://github.com/react-native-
 cd TestApp
 # Now build and start the app in the tvOS Simulator - this will only work on a macOS machine.
 # This command can also be run via "yarn tvos".
-npx expo run:ios --scheme TestApp-tvOS --device "Apple TV"
+npx expo run:ios --scheme MyApp-tvOS --device "Apple TV"
 # You can also build and start the app on an iOS phone simulator.
 # This command can also be run via "yarn ios".
 npx expo run:ios
 # or specify a simulator:
-npx expo run:ios --scheme TestApp --device "iPhone 15"
+npx expo run:ios --scheme MyApp --device "iPhone 15"
 # This command builds and starts the app in an Android TV emulator or a phone emulator (needs to be created in advance).
 # This command can also be run via "yarn android".
 npx expo run:android --device tv_api_31
@@ -104,8 +125,6 @@ var running_on_tv = Platform.isTV;
 var running_on_apple_tv = Platform.isTVOS;
 ```
 
-
-
 - _Common codebase for iOS and tvOS_: Since tvOS and iOS share most Objective-C and JavaScript code in common, most documentation for iOS applies equally to tvOS. Apple TV specific changes in native code are all wrapped by the TARGET_OS_TV define. These include changes to suppress APIs that are not supported on tvOS (e.g. web views, sliders, switches, status bar, etc.), and changes to support user input from the TV remote or keyboard.
 
 - _Common codebase for Android phone and Android TV_: Apps built for Android using this repo will run on both Android phone and Android TV. Most of the changes for TV are specific to handling focus-based navigation on a TV using the D-Pad on the remote control.
@@ -114,9 +133,10 @@ var running_on_apple_tv = Platform.isTVOS;
 
   - `onFocus` will be executed when the touchable view goes into focus
   - `onBlur` will be executed when the touchable view goes out of focus
-  - `onPress` will be executed when the touchable view is actually selected by pressing the "select" button on the TV remote.
+  - `onPress` will be executed when the touchable view is actually selected by pressing the "select" button on the TV remote (center button on Apple TV remote, or center button on Android TV DPad).
+  - `onLongPress` will be executed twice if the "select" button is held down for a length of time. The two events passed into `onLongPress()` will have different values for their `eventKeyAction` property, 0 for key down (start) and 1 for key up (end).
 
-- _Pressable controls_: The `Pressable` API works with TV.  Additional `onFocus` and `onBlur` props are provided to allow you to customize behavior when a Pressable enters or leaves focus. Similar to the `pressed` state that is true while a user is pressing the component on a touchscreen, the `focused` state will be true when it is focused on TV.  `PressableExample` in RNTester has been modified appropriately.
+- _Pressable controls_: The `Pressable` API works with TV.  Additional `onFocus` and `onBlur` props are provided to allow you to customize behavior when a Pressable enters or leaves focus. Similar to the `pressed` state that is true while a user is pressing the component on a touchscreen, the `focused` state will be true when it is focused on TV.  `PressableExample` in RNTester has been modified appropriately. The `onPress()` and `onLongPress()` methods work the same way as with `Touchable` components.
 
 - _TV remote/keyboard input_: Application code that needs to implement custom handling of TV remote events can create an instance of `TVEventHandler` and listen for these events.  For a more convenient API, we provide `useTVEventHandler`.
 
@@ -189,7 +209,7 @@ class Game2048 extends React.Component {
 
 - _Flipper_: We do not support Flipper.
 
-- _LogBox_: The new LogBox error/warning display (which replaced YellowBox in 0.63) is working as expected on TV platforms, after a few adjustments to make the controls accessible to the focus engine.
+- _LogBox_: The LogBox error/warning display (which replaced YellowBox in 0.63) is working as expected on TV platforms, after a few adjustments to make the controls accessible to the focus engine.
 
 - _Dev Menu support_: On the Apple TV simulator, cmd-D will bring up the developer menu, just like on iOS. To bring it up on a real Apple TV device, make a long press on the play/pause button on the remote. (Please do not shake the Apple TV device, that will not work :) ). Android TV dev menu behavior is the same as on Android phone.
 

package/React/Base/RCTAssert.m

@@ -234,7 +234,7 @@ RCTFatalExceptionHandler RCTGetFatalExceptionHandler(void)
 
 // MARK: - New Architecture Validation - Enable Reporting
 
-#if RCT_ONLY_NEW_ARCHITECTURE
+#if RCT_ONLY_NEW_ARCHITECTURE_EXPERIMENTAL_DO_NOT_USE
 static RCTNotAllowedValidation minValidationLevel = RCTNotAllowedInBridgeless;
 #else
 static RCTNotAllowedValidation minValidationLevel = RCTNotAllowedValidationDisabled;
@@ -242,7 +242,7 @@ static RCTNotAllowedValidation minValidationLevel = RCTNotAllowedValidationDisab
 
 __attribute__((used)) RCT_EXTERN void RCTNewArchitectureSetMinValidationLevel(RCTNotAllowedValidation level)
 {
-#if RCT_ONLY_NEW_ARCHITECTURE
+#if RCT_ONLY_NEW_ARCHITECTURE_EXPERIMENTAL_DO_NOT_USE
   // Cannot disable the reporting in this mode.
 #else
   minValidationLevel = level;
@@ -325,7 +325,7 @@ void RCTEnforceNewArchitectureValidation(RCTNotAllowedValidation type, id contex
 
 void RCTErrorNewArchitectureValidation(RCTNotAllowedValidation type, id context, NSString *extra)
 {
-#if RCT_ONLY_NEW_ARCHITECTURE
+#if RCT_ONLY_NEW_ARCHITECTURE_EXPERIMENTAL_DO_NOT_USE
   newArchitectureValidationInternal(RCTLogLevelFatal, type, context, extra);
 #else
   newArchitectureValidationInternal(RCTLogLevelError, type, context, extra);
@@ -339,7 +339,7 @@ void RCTLogNewArchitectureValidation(RCTNotAllowedValidation type, id context, N
 
 void RCTNewArchitectureValidationPlaceholder(RCTNotAllowedValidation type, id context, NSString *extra)
 {
-#if RCT_ONLY_NEW_ARCHITECTURE
+#if RCT_ONLY_NEW_ARCHITECTURE_EXPERIMENTAL_DO_NOT_USE
   newArchitectureValidationInternal(RCTLogLevelInfo, type, context, extra);
 #endif
 }

package/React/Base/RCTBridge+Inspector.h

@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#import <React/RCTBridge.h>
+
+#ifdef __cplusplus
+#import <jsinspector-modern/ReactCdp.h>
+#endif
+
+@interface RCTBridge (Inspector)
+
+/**
+ * The HostTarget for this bridge, if one has been created. Exposed for RCTCxxBridge only.
+ */
+@property (nonatomic, assign, readonly)
+#ifdef __cplusplus
+    facebook::react::jsinspector_modern::PageTarget *
+#else
+    // The inspector infrastructure cannot be used in C or Swift code.
+    void *
+#endif
+        inspectorTarget;
+
+@property (nonatomic, readonly, getter=isInspectable) BOOL inspectable;
+
+@end

package/React/Base/RCTBridge+Private.h

@@ -141,12 +141,6 @@ RCT_EXTERN void RCTRegisterModule(Class);
 
 @end
 
-@interface RCTBridge (Inspector)
-
-@property (nonatomic, readonly, getter=isInspectable) BOOL inspectable;
-
-@end
-
 @interface RCTCxxBridge : RCTBridge
 
 // TODO(cjhopman): this seems unsafe unless we require that it is only called on the main js queue.

package/React/Base/RCTBridge.h

@@ -31,25 +31,42 @@
  */
 typedef NSArray<id<RCTBridgeModule>> * (^RCTBridgeModuleListProvider)(void);
 
+RCT_EXTERN_C_BEGIN
+
 /**
  * This function returns the module name for a given class.
  */
-RCT_EXTERN NSString *RCTBridgeModuleNameForClass(Class bridgeModuleClass);
+NSString *RCTBridgeModuleNameForClass(Class bridgeModuleClass);
 
 /**
  * Experimental.
  * Check/set if JSI-bound NativeModule is enabled. By default it's off.
  */
-RCT_EXTERN BOOL RCTTurboModuleEnabled(void);
-RCT_EXTERN void RCTEnableTurboModule(BOOL enabled);
+BOOL RCTTurboModuleEnabled(void);
+void RCTEnableTurboModule(BOOL enabled);
 
 // Turn on TurboModule interop
-RCT_EXTERN BOOL RCTTurboModuleInteropEnabled(void);
-RCT_EXTERN void RCTEnableTurboModuleInterop(BOOL enabled);
+BOOL RCTTurboModuleInteropEnabled(void);
+void RCTEnableTurboModuleInterop(BOOL enabled);
 
 // Turn on TurboModule interop's Bridge proxy
-RCT_EXTERN BOOL RCTTurboModuleInteropBridgeProxyEnabled(void);
-RCT_EXTERN void RCTEnableTurboModuleInteropBridgeProxy(BOOL enabled);
+BOOL RCTTurboModuleInteropBridgeProxyEnabled(void);
+void RCTEnableTurboModuleInteropBridgeProxy(BOOL enabled);
+
+// Turn on the fabric interop layer
+BOOL RCTFabricInteropLayerEnabled(void);
+void RCTEnableFabricInteropLayer(BOOL enabled);
+
+// Turn on TurboModule sync execution of void methods
+BOOL RCTTurboModuleSyncVoidMethodsEnabled(void);
+void RCTEnableTurboModuleSyncVoidMethods(BOOL enabled);
+
+// Use a shared queue for executing module methods
+BOOL RCTTurboModuleSharedQueueEnabled(void);
+void RCTEnableTurboModuleSharedQueue(BOOL enabled);
+
+BOOL RCTUIManagerDispatchAccessibilityManagerInitOntoMain(void);
+void RCTUIManagerSetDispatchAccessibilityManagerInitOntoMain(BOOL enabled);
 
 typedef enum {
   kRCTBridgeProxyLoggingLevelNone,
@@ -57,12 +74,12 @@ typedef enum {
   kRCTBridgeProxyLoggingLevelError,
 } RCTBridgeProxyLoggingLevel;
 
-RCT_EXTERN RCTBridgeProxyLoggingLevel RCTTurboModuleInteropBridgeProxyLogLevel(void);
-RCT_EXTERN void RCTSetTurboModuleInteropBridgeProxyLogLevel(RCTBridgeProxyLoggingLevel logLevel);
+RCTBridgeProxyLoggingLevel RCTTurboModuleInteropBridgeProxyLogLevel(void);
+void RCTSetTurboModuleInteropBridgeProxyLogLevel(RCTBridgeProxyLoggingLevel logLevel);
 
 // Route all TurboModules through TurboModule interop
-RCT_EXTERN BOOL RCTTurboModuleInteropForAllTurboModulesEnabled(void);
-RCT_EXTERN void RCTEnableTurboModuleInteropForAllTurboModules(BOOL enabled);
+BOOL RCTTurboModuleInteropForAllTurboModulesEnabled(void);
+void RCTEnableTurboModuleInteropForAllTurboModules(BOOL enabled);
 
 typedef enum {
   kRCTGlobalScope,
@@ -70,8 +87,10 @@ typedef enum {
   kRCTTurboModuleManagerScope,
 } RCTTurboModuleCleanupMode;
 
-RCT_EXTERN RCTTurboModuleCleanupMode RCTGetTurboModuleCleanupMode(void);
-RCT_EXTERN void RCTSetTurboModuleCleanupMode(RCTTurboModuleCleanupMode mode);
+RCTTurboModuleCleanupMode RCTGetTurboModuleCleanupMode(void);
+void RCTSetTurboModuleCleanupMode(RCTTurboModuleCleanupMode mode);
+
+RCT_EXTERN_C_END
 
 /**
  * Async batched bridge used to communicate with the JavaScript application.

package/React/Base/RCTBridge.mm

@@ -6,6 +6,7 @@
  */
 
 #import "RCTBridge.h"
+#import "RCTBridge+Inspector.h"
 #import "RCTBridge+Private.h"
 
 #import <objc/runtime.h>
@@ -14,6 +15,10 @@
 #if RCT_ENABLE_INSPECTOR
 #import "RCTInspectorDevServerHelper.h"
 #endif
+#import <jsinspector-modern/InspectorFlags.h>
+#import <jsinspector-modern/InspectorInterfaces.h>
+#import <jsinspector-modern/ReactCdp.h>
+#import <optional>
 #import "RCTDevLoadingViewProtocol.h"
 #import "RCTJSThread.h"
 #import "RCTLog.h"
@@ -118,6 +123,17 @@ void RCTEnableTurboModuleInteropBridgeProxy(BOOL enabled)
   turboModuleInteropBridgeProxyEnabled = enabled;
 }
 
+static BOOL fabricInteropLayerEnabled = YES;
+BOOL RCTFabricInteropLayerEnabled()
+{
+  return fabricInteropLayerEnabled;
+}
+
+void RCTEnableFabricInteropLayer(BOOL enabled)
+{
+  fabricInteropLayerEnabled = enabled;
+}
+
 static RCTBridgeProxyLoggingLevel bridgeProxyLoggingLevel = kRCTBridgeProxyLoggingLevelNone;
 RCTBridgeProxyLoggingLevel RCTTurboModuleInteropBridgeProxyLogLevel(void)
 {
@@ -139,11 +155,63 @@ void RCTEnableTurboModuleInteropForAllTurboModules(BOOL enabled)
   useTurboModuleInteropForAllTurboModules = enabled;
 }
 
+// Turn on TurboModule sync execution of void methods
+static BOOL gTurboModuleEnableSyncVoidMethods = NO;
+BOOL RCTTurboModuleSyncVoidMethodsEnabled(void)
+{
+  return gTurboModuleEnableSyncVoidMethods;
+}
+void RCTEnableTurboModuleSyncVoidMethods(BOOL enabled)
+{
+  gTurboModuleEnableSyncVoidMethods = enabled;
+}
+
+// Use a shared queue for executing module methods
+static BOOL gTurboModuleEnableSharedQueue = NO;
+BOOL RCTTurboModuleSharedQueueEnabled(void)
+{
+  return gTurboModuleEnableSharedQueue;
+}
+
+void RCTEnableTurboModuleSharedQueue(BOOL enabled)
+{
+  gTurboModuleEnableSharedQueue = enabled;
+}
+
+BOOL kDispatchAccessibilityManagerInitOntoMain = NO;
+BOOL RCTUIManagerDispatchAccessibilityManagerInitOntoMain(void)
+{
+  return kDispatchAccessibilityManagerInitOntoMain;
+}
+
+void RCTUIManagerSetDispatchAccessibilityManagerInitOntoMain(BOOL enabled)
+{
+  kDispatchAccessibilityManagerInitOntoMain = enabled;
+}
+
+class RCTBridgePageTargetDelegate : public facebook::react::jsinspector_modern::PageTargetDelegate {
+ public:
+  RCTBridgePageTargetDelegate(RCTBridge *bridge) : bridge_(bridge) {}
+
+  void onReload(const PageReloadRequest &request) override
+  {
+    RCTAssertMainQueue();
+    [bridge_ reload];
+  }
+
+ private:
+  __weak RCTBridge *bridge_;
+};
+
 @interface RCTBridge () <RCTReloadListener>
 @end
 
 @implementation RCTBridge {
   NSURL *_delegateBundleURL;
+
+  std::unique_ptr<RCTBridgePageTargetDelegate> _inspectorPageDelegate;
+  std::shared_ptr<facebook::react::jsinspector_modern::PageTarget> _inspectorTarget;
+  std::optional<int> _inspectorPageId;
 }
 
 + (void)initialize
@@ -192,6 +260,7 @@ static RCTBridge *RCTCurrentBridgeInstance = nil;
     _bundleURL = bundleURL;
     _moduleProvider = block;
     _launchOptions = [launchOptions copy];
+    _inspectorPageDelegate = std::make_unique<RCTBridgePageTargetDelegate>(self);
 
     [self setUp];
   }
@@ -206,7 +275,14 @@ RCT_NOT_IMPLEMENTED(-(instancetype)init)
    * This runs only on the main thread, but crashes the subclass
    * RCTAssertMainQueue();
    */
+  // NOTE: RCTCxxBridge will use _inspectorTarget during [self invalidate], so we must
+  // keep it alive until after the call returns.
   [self invalidate];
+  if (_inspectorPageId.has_value()) {
+    facebook::react::jsinspector_modern::getInspectorInstance().removePage(*_inspectorPageId);
+    _inspectorPageId.reset();
+    _inspectorTarget.reset();
+  }
 }
 
 - (void)setRCTTurboModuleRegistry:(id<RCTTurboModuleRegistry>)turboModuleRegistry
@@ -222,8 +298,11 @@ RCT_NOT_IMPLEMENTED(-(instancetype)init)
 - (void)didReceiveReloadCommand
 {
 #if RCT_ENABLE_INSPECTOR
-  // Disable debugger to resume the JsVM & avoid thread locks while reloading
-  [RCTInspectorDevServerHelper disableDebugger];
+  auto &inspectorFlags = facebook::react::jsinspector_modern::InspectorFlags::getInstance();
+  if (!inspectorFlags.getEnableModernCDPRegistry()) {
+    // Disable debugger to resume the JsVM & avoid thread locks while reloading
+    [RCTInspectorDevServerHelper disableDebugger];
+  }
 #endif
 
   [[NSNotificationCenter defaultCenter] postNotificationName:RCTBridgeWillReloadNotification object:self userInfo:nil];
@@ -332,6 +411,34 @@ RCT_NOT_IMPLEMENTED(-(instancetype)init)
   [_performanceLogger markStartForTag:RCTPLBridgeStartup];
   [_performanceLogger markStartForTag:RCTPLTTI];
 
+  auto &inspectorFlags = facebook::react::jsinspector_modern::InspectorFlags::getInstance();
+  if (inspectorFlags.getEnableModernCDPRegistry() && !_inspectorPageId.has_value()) {
+    _inspectorTarget =
+        facebook::react::jsinspector_modern::PageTarget::create(*_inspectorPageDelegate, [](auto callback) {
+          RCTExecuteOnMainQueue(^{
+            callback();
+          });
+        });
+    __weak RCTBridge *weakSelf = self;
+    _inspectorPageId = facebook::react::jsinspector_modern::getInspectorInstance().addPage(
+        "React Native Bridge (Experimental)",
+        /* vm */ "",
+        [weakSelf](std::unique_ptr<facebook::react::jsinspector_modern::IRemoteConnection> remote)
+            -> std::unique_ptr<facebook::react::jsinspector_modern::ILocalConnection> {
+          RCTBridge *strongSelf = weakSelf;
+          if (!strongSelf) {
+            // This can happen if we're about to be dealloc'd. Reject the connection.
+            return nullptr;
+          }
+          return strongSelf->_inspectorTarget->connect(
+              std::move(remote),
+              {
+                  .integrationName = "iOS Bridge (RCTBridge)",
+              });
+        },
+        {.nativePageReloads = true});
+  }
+
   Class bridgeClass = self.bridgeClass;
 
   // Only update bundleURL from delegate if delegate bundleURL has changed
@@ -420,4 +527,8 @@ RCT_NOT_IMPLEMENTED(-(instancetype)init)
   [self.batchedBridge registerSegmentWithId:segmentId path:path];
 }
 
+- (facebook::react::jsinspector_modern::PageTarget *)inspectorTarget
+{
+  return _inspectorTarget.get();
+}
 @end

package/React/Base/RCTBridgeDelegate.h

@@ -10,6 +10,8 @@
 @class RCTBridge;
 @protocol RCTBridgeModule;
 
+NS_ASSUME_NONNULL_BEGIN
+
 @protocol RCTBridgeDelegate <NSObject>
 
 /**
@@ -18,7 +20,7 @@
  * When running from a locally bundled JS file, this should be a `file://` url
  * pointing to a path inside the app resources, e.g. `file://.../main.jsbundle`.
  */
-- (NSURL *)sourceURLForBridge:(RCTBridge *)bridge;
+- (NSURL *__nullable)sourceURLForBridge:(RCTBridge *)bridge;
 
 @optional
 
@@ -77,3 +79,5 @@
 - (NSDictionary<NSString *, Class> *)extraLazyModuleClassesForBridge:(RCTBridge *)bridge;
 
 @end
+
+NS_ASSUME_NONNULL_END