react-native-tvos 0.86.0-2 → 0.87.0-0

package/React/Base/RCTBridge+Private.h

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

package/React/Base/RCTBridge.h

@@ -44,23 +44,25 @@ NSString *RCTBridgeModuleNameForClass(Class bridgeModuleClass);
 NSMutableArray<NSString *> *getModulesLoadedWithOldArch(void);
 
 /**
- * Experimental.
- * Check/set if JSI-bound NativeModule is enabled. By default it's off.
+ * The New Architecture is enabled by default. These APIs are no-ops and will
+ * be removed in a future release.
  */
-BOOL RCTTurboModuleEnabled(void);
-void RCTEnableTurboModule(BOOL enabled);
+BOOL RCTTurboModuleEnabled(void)
+    __attribute__((deprecated("TurboModules are always enabled; this always returns YES (NO in test env).")));
+void RCTEnableTurboModule(BOOL enabled)
+    __attribute__((deprecated("No-op. The New Architecture is enabled by default.")));
 
+#ifndef RCT_REMOVE_LEGACY_MODULE_INTEROP
 // Turn on TurboModule interop
 BOOL RCTTurboModuleInteropEnabled(void);
 void RCTEnableTurboModuleInterop(BOOL enabled);
+#endif // RCT_REMOVE_LEGACY_MODULE_INTEROP
 
-// Turn on TurboModule interop's Bridge proxy
-BOOL RCTTurboModuleInteropBridgeProxyEnabled(void);
-void RCTEnableTurboModuleInteropBridgeProxy(BOOL enabled);
-
+#ifndef RCT_REMOVE_LEGACY_COMPONENT_INTEROP
 // Turn on the fabric interop layer
 BOOL RCTFabricInteropLayerEnabled(void);
 void RCTEnableFabricInteropLayer(BOOL enabled);
+#endif // RCT_REMOVE_LEGACY_COMPONENT_INTEROP
 
 BOOL RCTUIManagerDispatchAccessibilityManagerInitOntoMain(void);
 void RCTUIManagerSetDispatchAccessibilityManagerInitOntoMain(BOOL enabled);

package/React/Base/RCTBridge.mm

@@ -182,16 +182,9 @@ NSString *RCTBridgeModuleNameForClass(Class cls)
   return RCTDropReactPrefixes(name);
 }
 
-static const BOOL turboModuleEnabled = YES;
 BOOL RCTTurboModuleEnabled(void)
 {
-#if RCT_DEBUG
-  // TODO(T53341772): Allow TurboModule for test environment. Right now this breaks RNTester tests if enabled.
-  if (RCTRunningInTestEnvironment()) {
-    return NO;
-  }
-#endif
-  return turboModuleEnabled;
+  return YES;
 }
 
 void RCTEnableTurboModule(BOOL enabled)
@@ -199,6 +192,7 @@ void RCTEnableTurboModule(BOOL enabled)
   // The new Architecture is enabled by default and we are ignoring changes to the TurboModule system.
 }
 
+#ifndef RCT_REMOVE_LEGACY_MODULE_INTEROP
 static BOOL turboModuleInteropEnabled = NO;
 BOOL RCTTurboModuleInteropEnabled(void)
 {
@@ -208,18 +202,9 @@ void RCTEnableTurboModuleInterop(BOOL enabled)
 {
   turboModuleInteropEnabled = enabled;
 }
+#endif // RCT_REMOVE_LEGACY_MODULE_INTEROP
 
-static BOOL turboModuleInteropBridgeProxyEnabled = NO;
-BOOL RCTTurboModuleInteropBridgeProxyEnabled(void)
-{
-  return turboModuleInteropBridgeProxyEnabled;
-}
-
-void RCTEnableTurboModuleInteropBridgeProxy(BOOL enabled)
-{
-  turboModuleInteropBridgeProxyEnabled = enabled;
-}
-
+#ifndef RCT_REMOVE_LEGACY_COMPONENT_INTEROP
 static BOOL fabricInteropLayerEnabled = YES;
 BOOL RCTFabricInteropLayerEnabled()
 {
@@ -230,6 +215,7 @@ void RCTEnableFabricInteropLayer(BOOL enabled)
 {
   fabricInteropLayerEnabled = enabled;
 }
+#endif // RCT_REMOVE_LEGACY_COMPONENT_INTEROP
 
 static RCTBridgeProxyLoggingLevel bridgeProxyLoggingLevel = kRCTBridgeProxyLoggingLevelNone;
 RCTBridgeProxyLoggingLevel RCTTurboModuleInteropBridgeProxyLogLevel(void)
@@ -253,433 +239,6 @@ void RCTUIManagerSetDispatchAccessibilityManagerInitOntoMain(BOOL enabled)
   kDispatchAccessibilityManagerInitOntoMain = enabled;
 }
 
-#ifndef RCT_REMOVE_LEGACY_ARCH
-class RCTBridgeHostTargetDelegate : public facebook::react::jsinspector_modern::HostTargetDelegate {
- public:
-  RCTBridgeHostTargetDelegate(RCTBridge *bridge)
-      : bridge_(bridge),
-        pauseOverlayController_([[RCTPausedInDebuggerOverlayController alloc] init]),
-        networkHelper_([[RCTInspectorNetworkHelper alloc] init])
-  {
-  }
-
-  facebook::react::jsinspector_modern::HostTargetMetadata getMetadata() override
-  {
-    auto metadata = [RCTInspectorUtils getHostMetadata];
-
-    return {
-        .appDisplayName = [metadata.appDisplayName UTF8String],
-        .appIdentifier = [metadata.appIdentifier UTF8String],
-        .deviceName = [metadata.deviceName UTF8String],
-        .integrationName = "iOS Bridge (RCTBridge)",
-        .platform = [metadata.platform UTF8String],
-        .reactNativeVersion = [metadata.reactNativeVersion UTF8String],
-    };
-  }
-
-  void onReload(const PageReloadRequest &request) override
-  {
-    RCTAssertMainQueue();
-    RCTTriggerReloadCommandListeners(@"Reloading due to PageReloadRequest from DevTools.");
-  }
-
-  void onSetPausedInDebuggerMessage(const OverlaySetPausedInDebuggerMessageRequest &request) override
-  {
-    RCTAssertMainQueue();
-    if (!request.message.has_value()) {
-      [pauseOverlayController_ hide];
-    } else {
-      __weak RCTBridge *bridgeWeak = bridge_;
-      [pauseOverlayController_ showWithMessage:@(request.message.value().c_str())
-                                      onResume:^{
-                                        RCTAssertMainQueue();
-                                        RCTBridge *bridgeStrong = bridgeWeak;
-                                        if (!bridgeStrong) {
-                                          return;
-                                        }
-                                        if (!bridgeStrong.inspectorTarget) {
-                                          return;
-                                        }
-                                        bridgeStrong.inspectorTarget->sendCommand(
-                                            facebook::react::jsinspector_modern::HostCommand::DebuggerResume);
-                                      }];
-    }
-  }
-
-  void loadNetworkResource(const RCTInspectorLoadNetworkResourceRequest &params, RCTInspectorNetworkExecutor executor)
-      override
-  {
-    [networkHelper_ loadNetworkResourceWithParams:params executor:executor];
-  }
-
- private:
-  __weak RCTBridge *bridge_;
-  RCTPausedInDebuggerOverlayController *pauseOverlayController_;
-  RCTInspectorNetworkHelper *networkHelper_;
-};
-
-@interface RCTBridge () <RCTReloadListener>
-@end
-
-@implementation RCTBridge {
-  NSURL *_delegateBundleURL;
-
-  std::unique_ptr<RCTBridgeHostTargetDelegate> _inspectorHostDelegate;
-  std::shared_ptr<facebook::react::jsinspector_modern::HostTarget> _inspectorTarget;
-  std::optional<int> _inspectorPageId;
-}
-
-+ (void)initialize
-{
-  _RCTInitializeJSThreadConstantInternal();
-}
-
-static RCTBridge *RCTCurrentBridgeInstance = nil;
-
-/**
- * The last current active bridge instance. This is set automatically whenever
- * the bridge is accessed. It can be useful for static functions or singletons
- * that need to access the bridge for purposes such as logging, but should not
- * be relied upon to return any particular instance, due to race conditions.
- */
-+ (instancetype)currentBridge
-{
-  return RCTCurrentBridgeInstance;
-}
-
-+ (void)setCurrentBridge:(RCTBridge *)currentBridge
-{
-  RCTCurrentBridgeInstance = currentBridge;
-}
-
-- (instancetype)initWithDelegate:(id<RCTBridgeDelegate>)delegate launchOptions:(NSDictionary *)launchOptions
-{
-  return [self initWithDelegate:delegate bundleURL:nil moduleProvider:nil launchOptions:launchOptions];
-}
-
-- (instancetype)initWithBundleURL:(NSURL *)bundleURL
-                   moduleProvider:(RCTBridgeModuleListProvider)block
-                    launchOptions:(NSDictionary *)launchOptions
-{
-  return [self initWithDelegate:nil bundleURL:bundleURL moduleProvider:block launchOptions:launchOptions];
-}
-
-- (instancetype)initWithDelegate:(id<RCTBridgeDelegate>)delegate
-                       bundleURL:(NSURL *)bundleURL
-                  moduleProvider:(RCTBridgeModuleListProvider)block
-                   launchOptions:(NSDictionary *)launchOptions
-{
-  // Only enable this assertion in OSS
-#if COCOAPODS
-  [RCTBridge throwIfOnLegacyArch];
-#endif
-
-  if (self = [super init]) {
-    _delegate = delegate;
-    _bundleURL = bundleURL;
-    _moduleProvider = block;
-    _launchOptions = [launchOptions copy];
-    _inspectorHostDelegate = std::make_unique<RCTBridgeHostTargetDelegate>(self);
-
-    [self setUp];
-  }
-  return self;
-}
-
-// Wrap the exception throwing in a static method to avoid the warning: "The code following the exception will never be
-// executed". This might create build failures internally where we treat warnings as errors.
-+ (void)throwIfOnLegacyArch
-{
-  @throw [NSException
-      exceptionWithName:NSInternalInconsistencyException
-                 reason:
-                     @"You are trying to initialize the legacy architecture. This is not supported anymore and will be removed in the next version of React Native. Please use the New Architecture instead."
-               userInfo:nil];
-}
-
-RCT_NOT_IMPLEMENTED(-(instancetype)init)
-
-- (void)dealloc
-{
-  RCTBridge *batchedBridge = self.batchedBridge;
-  /**
-   * 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];
-
-  // `invalidate` is asynchronous if we aren't on the main queue. Unregister
-  // the HostTarget on the main queue so that `invalidate` can complete safely
-  // in that case.
-  if (_inspectorPageId.has_value()) {
-    // Since we can't keep using `self` after dealloc, steal its inspector
-    // state into block-mutable variables
-    __block auto inspectorPageId = std::move(_inspectorPageId);
-    __block auto inspectorTarget = std::move(_inspectorTarget);
-    RCTExecuteOnMainQueue(^{
-      facebook::react::jsinspector_modern::getInspectorInstance().removePage(*inspectorPageId);
-      inspectorPageId.reset();
-      // NOTE: RCTBridgeHostTargetDelegate holds a weak reference to RCTBridge.
-      // Conditionally call `inspectorTarget.reset()` to avoid a crash.
-      if (batchedBridge) {
-        [batchedBridge
-            dispatchBlock:^{
-              inspectorTarget.reset();
-            }
-                    queue:RCTJSThread];
-      } else {
-        inspectorTarget.reset();
-      }
-    });
-  }
-}
-
-- (void)setRCTTurboModuleRegistry:(id<RCTTurboModuleRegistry>)turboModuleRegistry
-{
-  [self.batchedBridge setRCTTurboModuleRegistry:turboModuleRegistry];
-}
-
-- (RCTBridgeModuleDecorator *)bridgeModuleDecorator
-{
-  return [self.batchedBridge bridgeModuleDecorator];
-}
-
-- (void)didReceiveReloadCommand
-{
-#if RCT_ENABLE_INSPECTOR
-  auto &inspectorFlags = facebook::react::jsinspector_modern::InspectorFlags::getInstance();
-  if (!inspectorFlags.getFuseboxEnabled()) {
-    // Disable debugger to resume the JsVM & avoid thread locks while reloading
-    [RCTInspectorDevServerHelper disableDebugger];
-  }
-#endif
-
-  [[NSNotificationCenter defaultCenter] postNotificationName:RCTBridgeWillReloadNotification object:self userInfo:nil];
-
-  /**
-   * Any thread
-   */
-  dispatch_async(dispatch_get_main_queue(), ^{
-    // WARNING: Invalidation is async, so it may not finish before re-setting up the bridge,
-    // causing some issues. TODO: revisit this post-Fabric/TurboModule.
-    [self invalidate];
-    // Reload is a special case, do not preserve launchOptions and treat reload as a fresh start
-    self->_launchOptions = nil;
-    [self setUp];
-  });
-}
-
-- (RCTModuleRegistry *)moduleRegistry
-{
-  return self.batchedBridge.moduleRegistry;
-}
-
-- (NSArray<Class> *)moduleClasses
-{
-  return self.batchedBridge.moduleClasses;
-}
-
-- (id)moduleForName:(NSString *)moduleName
-{
-  return [self.batchedBridge moduleForName:moduleName];
-}
-
-- (id)moduleForName:(NSString *)moduleName lazilyLoadIfNecessary:(BOOL)lazilyLoad
-{
-  return [self.batchedBridge moduleForName:moduleName lazilyLoadIfNecessary:lazilyLoad];
-}
-
-- (id)moduleForClass:(Class)moduleClass
-{
-  id module = [self.batchedBridge moduleForClass:moduleClass];
-  if (!module) {
-    module = [self moduleForName:RCTBridgeModuleNameForClass(moduleClass)];
-  }
-  return module;
-}
-
-- (NSArray *)modulesConformingToProtocol:(Protocol *)protocol
-{
-  NSMutableArray *modules = [NSMutableArray new];
-  for (Class moduleClass in [self.moduleClasses copy]) {
-    if ([moduleClass conformsToProtocol:protocol]) {
-      id module = [self moduleForClass:moduleClass];
-      if (module) {
-        [modules addObject:module];
-      }
-    }
-  }
-  return [modules copy];
-}
-
-- (BOOL)moduleIsInitialized:(Class)moduleClass
-{
-  return [self.batchedBridge moduleIsInitialized:moduleClass];
-}
-
-/**
- * DEPRECATED - please use RCTReloadCommand.
- */
-- (void)reload
-{
-  RCTTriggerReloadCommandListeners(@"Unknown from bridge");
-}
-
-/**
- * DEPRECATED - please use RCTReloadCommand.
- */
-- (void)reloadWithReason:(NSString *)reason
-{
-  RCTTriggerReloadCommandListeners(reason);
-}
-
-- (void)onFastRefresh
-{
-  [[NSNotificationCenter defaultCenter] postNotificationName:RCTBridgeFastRefreshNotification object:self];
-}
-
-/**
- * DEPRECATED - please use RCTReloadCommand.
- */
-- (void)requestReload
-{
-  [self reloadWithReason:@"Requested from bridge"];
-}
-
-- (Class)bridgeClass
-{
-  return [RCTCxxBridge class];
-}
-
-- (void)setUp
-{
-  RCT_PROFILE_BEGIN_EVENT(0, @"-[RCTBridge setUp]", nil);
-
-  _performanceLogger = [RCTPerformanceLogger new];
-  [_performanceLogger markStartForTag:RCTPLInitReactRuntime];
-  [_performanceLogger markStartForTag:RCTPLBridgeStartup];
-  [_performanceLogger markStartForTag:RCTPLTTI];
-
-  auto &inspectorFlags = facebook::react::jsinspector_modern::InspectorFlags::getInstance();
-  if (inspectorFlags.getFuseboxEnabled() && !_inspectorPageId.has_value()) {
-    _inspectorTarget =
-        facebook::react::jsinspector_modern::HostTarget::create(*_inspectorHostDelegate, [](auto callback) {
-          RCTExecuteOnMainQueue(^{
-            callback();
-          });
-        });
-    __weak RCTBridge *weakSelf = self;
-    _inspectorPageId = facebook::react::jsinspector_modern::getInspectorInstance().addPage(
-        "React Native Bridge",
-        /* 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));
-        },
-        {.nativePageReloads = true});
-  }
-
-  Class bridgeClass = self.bridgeClass;
-
-  // Only update bundleURL from delegate if delegate bundleURL has changed
-  NSURL *previousDelegateURL = _delegateBundleURL;
-  _delegateBundleURL = [self.delegate sourceURLForBridge:self];
-  if (_delegateBundleURL && ![_delegateBundleURL isEqual:previousDelegateURL]) {
-    _bundleURL = _delegateBundleURL;
-  }
-
-  // Sanitize the bundle URL
-  _bundleURL = [RCTConvert NSURL:_bundleURL.absoluteString];
-
-  RCTExecuteOnMainQueue(^{
-    RCTRegisterReloadCommandListener(self);
-    RCTReloadCommandSetBundleURL(self->_bundleURL);
-  });
-
-  self.batchedBridge = [[bridgeClass alloc] initWithParentBridge:self];
-  [self.batchedBridge start];
-
-  RCT_PROFILE_END_EVENT(RCTProfileTagAlways, @"");
-}
-
-- (BOOL)isLoading
-{
-  return self.batchedBridge.loading;
-}
-
-- (BOOL)isValid
-{
-  return self.batchedBridge.valid;
-}
-
-- (BOOL)isBatchActive
-{
-  return [_batchedBridge isBatchActive];
-}
-
-- (void)invalidate
-{
-  [[NSNotificationCenter defaultCenter] postNotificationName:RCTBridgeWillBeInvalidatedNotification object:self];
-
-  RCTBridge *batchedBridge = self.batchedBridge;
-  self.batchedBridge = nil;
-
-  if (batchedBridge) {
-    RCTExecuteOnMainQueue(^{
-      [batchedBridge invalidate];
-    });
-  }
-}
-
-- (void)updateModuleWithInstance:(id<RCTBridgeModule>)instance
-{
-  [self.batchedBridge updateModuleWithInstance:instance];
-}
-
-- (void)registerAdditionalModuleClasses:(NSArray<Class> *)modules
-{
-  [self.batchedBridge registerAdditionalModuleClasses:modules];
-}
-
-- (void)enqueueJSCall:(NSString *)moduleDotMethod args:(NSArray *)args
-{
-  NSArray<NSString *> *ids = [moduleDotMethod componentsSeparatedByString:@"."];
-  NSString *module = ids[0];
-  NSString *method = ids[1];
-  [self enqueueJSCall:module method:method args:args completion:NULL];
-}
-
-- (void)enqueueJSCall:(NSString *)module
-               method:(NSString *)method
-                 args:(NSArray *)args
-           completion:(dispatch_block_t)completion
-{
-  [self.batchedBridge enqueueJSCall:module method:method args:args completion:completion];
-}
-
-- (void)enqueueCallback:(NSNumber *)cbID args:(NSArray *)args
-{
-  [self.batchedBridge enqueueCallback:cbID args:args];
-}
-
-- (void)registerSegmentWithId:(NSUInteger)segmentId path:(NSString *)path
-{
-  [self.batchedBridge registerSegmentWithId:segmentId path:path];
-}
-
-- (facebook::react::jsinspector_modern::HostTarget *)inspectorTarget
-{
-  return _inspectorTarget.get();
-}
-@end
-#else // RCT_REMOVE_LEGACY_ARCH
 @implementation RCTBridge
 - (instancetype)initWithDelegate:(id<RCTBridgeDelegate>)delegate launchOptions:(NSDictionary *)launchOptions
 {
@@ -785,4 +344,3 @@ RCT_NOT_IMPLEMENTED(-(instancetype)init)
 }
 
 @end
-#endif // RCT_REMOVE_LEGACY_ARCH

package/React/Base/RCTBridgeDelegate.h

@@ -23,62 +23,7 @@ NS_ASSUME_NONNULL_BEGIN
  */
 - (NSURL *__nullable)sourceURLForBridge:(RCTBridge *)bridge
     __deprecated_msg("This API will be removed along with the legacy architecture.");
-
-@optional
-
-/**
- * The bridge initializes any registered RCTBridgeModules automatically, however
- * if you wish to instantiate your own module instances, you can return them
- * from this method.
- *
- * Note: You should always return a new instance for each call, rather than
- * returning the same instance each time the bridge is reloaded. Module instances
- * should not be shared between bridges, and this may cause unexpected behavior.
- *
- * It is also possible to override standard modules with your own implementations
- * by returning a class with the same `moduleName` from this method, but this is
- * not recommended in most cases - if the module methods and behavior do not
- * match exactly, it may lead to bugs or crashes.
- */
-- (NSArray<id<RCTBridgeModule>> *)extraModulesForBridge:(RCTBridge *)bridge
-    __deprecated_msg("This API will be removed along with the legacy architecture.");
-
-/**
- * The bridge will call this method when a module been called from JS
- * cannot be found among registered modules.
- * It should return YES if the module with name 'moduleName' was registered
- * in the implementation, and the system must attempt to look for it again among registered.
- * If the module was not registered, return NO to prevent further searches.
- */
-- (BOOL)bridge:(RCTBridge *)bridge
-    didNotFindModule:(NSString *)moduleName
-    __deprecated_msg("This API will be removed along with the legacy architecture.");
-
-/**
- * The bridge will automatically attempt to load the JS source code from the
- * location specified by the `sourceURLForBridge:` method, however, if you want
- * to handle loading the JS yourself, you can do so by implementing this method.
- */
-- (void)loadSourceForBridge:(RCTBridge *)bridge
-                 onProgress:(RCTSourceLoadProgressBlock)onProgress
-                 onComplete:(RCTSourceLoadBlock)loadCallback
-    __deprecated_msg("This API will be removed along with the legacy architecture.");
-
-/**
- * Similar to loadSourceForBridge:onProgress:onComplete: but without progress
- * reporting.
- */
-- (void)loadSourceForBridge:(RCTBridge *)bridge
-                  withBlock:(RCTSourceLoadBlock)loadCallback
-    __deprecated_msg("This API will be removed along with the legacy architecture.");
-
-/**
- * Retrieve the list of lazy-native-modules names for the given bridge.
- */
-- (NSDictionary<NSString *, Class> *)extraLazyModuleClassesForBridge:(RCTBridge *)bridge
-    __deprecated_msg("This API will be removed along with the legacy architecture.");
-
-#endif // RCT_REMOVE_LEGACY_ARCH
+#endif
 @end
 
 NS_ASSUME_NONNULL_END

package/React/Base/RCTBridgeModule.h

@@ -368,9 +368,6 @@ RCT_EXTERN_C_END
  * A class that allows NativeModules and TurboModules to look up one another.
  */
 @interface RCTModuleRegistry : NSObject
-#ifndef RCT_REMOVE_LEGACY_ARCH
-- (void)setBridge:(RCTBridge *)bridge;
-#endif // RCT_REMOVE_LEGACY_ARCH
 - (void)setTurboModuleRegistry:(id<RCTTurboModuleRegistry>)turboModuleRegistry;
 
 - (id)moduleForName:(const char *)moduleName;
@@ -389,9 +386,6 @@ typedef void (^RCTViewRegistryUIBlock)(RCTViewRegistry *viewRegistry);
  * A class that allows NativeModules to query for views, given React Tags.
  */
 @interface RCTViewRegistry : NSObject
-#ifndef RCT_REMOVE_LEGACY_ARCH
-- (void)setBridge:(RCTBridge *)bridge;
-#endif // RCT_REMOVE_LEGACY_ARCH
 - (void)setBridgelessComponentViewProvider:(RCTBridgelessComponentViewProvider)bridgelessComponentViewProvider;
 
 - (UIView *)viewForReactTag:(NSNumber *)reactTag;
@@ -409,9 +403,6 @@ typedef void (^RCTBridgelessJSModuleMethodInvoker)(
  * as callable with React Native.
  */
 @interface RCTCallableJSModules : NSObject
-#ifndef RCT_REMOVE_LEGACY_ARCH
-- (void)setBridge:(RCTBridge *)bridge;
-#endif // RCT_REMOVE_LEGACY_ARCH
 - (void)setBridgelessJSModuleMethodInvoker:(RCTBridgelessJSModuleMethodInvoker)bridgelessJSModuleMethodInvoker;
 
 - (void)invokeModule:(NSString *)moduleName method:(NSString *)methodName withArgs:(NSArray *)args;

package/React/Base/RCTBridgeProxy.h

@@ -14,6 +14,7 @@ NS_ASSUME_NONNULL_BEGIN
 @class RCTBundleManager;
 @class RCTCallableJSModules;
 @class RCTModuleRegistry;
+@class RCTPerformanceLogger;
 @class RCTViewRegistry;
 
 @interface RCTBridgeProxy : NSProxy
@@ -21,6 +22,13 @@ NS_ASSUME_NONNULL_BEGIN
 - (instancetype)init NS_UNAVAILABLE;
 + (instancetype)new NS_UNAVAILABLE;
 
+/**
+ * The performance logger for this React instance. In bridgeless mode it is
+ * injected by RCTInstance so that consumers reading `[bridge performanceLogger]`
+ * on `RCTJavaScriptDidLoadNotification` keep working; previously it returned nil.
+ */
+@property (nonatomic, strong, nullable) RCTPerformanceLogger *performanceLogger;
+
 - (instancetype)initWithViewRegistry:(RCTViewRegistry *)viewRegistry
                       moduleRegistry:(RCTModuleRegistry *)moduleRegistry
                        bundleManager:(RCTBundleManager *)bundleManager