Sweep dead imports and stale bridge comments (#59442)

packages/react-native/Libraries/AppDelegate/RCTAppSetupUtils.h

@@ -6,32 +6,21 @@
  */
 
 #import <Foundation/Foundation.h>
-#import <React/RCTBridge.h>
-#import <React/RCTRootView.h>
 
-#ifdef __cplusplus
+@class RCTBridge;
+@class RCTRootView;
 
-#import <memory>
+#ifdef __cplusplus
 
 #import <ReactCommon/RCTTurboModuleManager.h>
 
 @protocol RCTDependencyProvider;
 
-// Forward declaration to decrease compilation coupling
-namespace facebook::react {
-class JSExecutorFactory;
-class RuntimeScheduler;
-} // namespace facebook::react
 RCT_EXTERN NSArray<NSString *> *RCTAppSetupUnstableModulesRequiringMainQueueSetup(
     id<RCTDependencyProvider> dependencyProvider);
 
 RCT_EXTERN id<RCTTurboModule> RCTAppSetupDefaultModuleFromClass(
     Class moduleClass,
     id<RCTDependencyProvider> dependencyProvider);
 
-std::unique_ptr<facebook::react::JSExecutorFactory> RCTAppSetupDefaultJsExecutorFactory(
-    RCTBridge *bridge,
-    RCTTurboModuleManager *turboModuleManager,
-    const std::shared_ptr<facebook::react::RuntimeScheduler> &runtimeScheduler);
-
 #endif // __cplusplus

packages/react-native/Libraries/AppDelegate/RCTAppSetupUtils.mm

@@ -7,10 +7,6 @@
 
 #import "RCTAppSetupUtils.h"
 
-#import <cxxreact/JSExecutor.h>
-#import <react/renderer/runtimescheduler/RuntimeScheduler.h>
-#import <react/renderer/runtimescheduler/RuntimeSchedulerBinding.h>
-
 // Turbo Module
 #import <React/RCTBundleAssetImageLoader.h>
 #import <React/RCTDataRequestHandler.h>
@@ -92,11 +88,3 @@
   // No custom initializer here.
   return [moduleClass new];
 }
-
-std::unique_ptr<facebook::react::JSExecutorFactory> RCTAppSetupDefaultJsExecutorFactory(
-    RCTBridge *bridge,
-    RCTTurboModuleManager *turboModuleManager,
-    const std::shared_ptr<facebook::react::RuntimeScheduler> &runtimeScheduler)
-{
-  return nullptr;
-}

packages/react-native/Libraries/AppDelegate/RCTDefaultReactNativeFactoryDelegate.mm

@@ -6,6 +6,7 @@
  */
 
 #import "RCTDefaultReactNativeFactoryDelegate.h"
+#import <React/RCTRootView.h>
 #import <ReactCommon/RCTHost.h>
 #import "RCTAppSetupUtils.h"
 #import "RCTDependencyProvider.h"
@@ -26,13 +27,6 @@ @implementation RCTDefaultReactNativeFactoryDelegate {
 
 @synthesize dependencyProvider;
 
-- (NSURL *_Nullable)sourceURLForBridge:(nonnull RCTBridge *)bridge
-{
-  [NSException raise:@"RCTBridgeDelegate::sourceURLForBridge not implemented"
-              format:@"Subclasses must implement a valid sourceURLForBridge method"];
-  return nil;
-}
-
 - (UIViewController *)createRootViewController
 {
   return [UIViewController new];
@@ -54,10 +48,13 @@ - (JSRuntimeFactoryRef)createJSRuntimeFactory
 #endif
 }
 
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
 - (void)customizeRootView:(RCTRootView *)rootView
 {
   // Override point for customization after application launch.
 }
+#pragma clang diagnostic pop
 
 - (RCTColorSpace)defaultColorSpace
 {
@@ -111,11 +108,6 @@ - (void)hostDidStart:(RCTHost *)host
 
 #pragma mark - RCTArchConfiguratorProtocol
 
-- (BOOL)newArchEnabled
-{
-  return YES;
-}
-
 - (Class)getModuleClassFromName:(const char *)name
 {
   return nullptr;
@@ -126,11 +118,4 @@ - (Class)getModuleClassFromName:(const char *)name
   return nullptr;
 }
 
-- (void)loadSourceForBridge:(RCTBridge *)bridge
-                 onProgress:(RCTSourceLoadProgressBlock)onProgress
-                 onComplete:(RCTSourceLoadBlock)loadCallback
-{
-  [RCTJavaScriptLoader loadBundleAtURL:[self sourceURLForBridge:bridge] onProgress:onProgress onComplete:loadCallback];
-}
-
 @end

packages/react-native/Libraries/AppDelegate/RCTReactNativeFactory.mm

@@ -289,24 +289,12 @@ - (RCTRootViewFactory *)createRCTRootViewFactory
   };
 
   RCTRootViewFactoryConfiguration *configuration =
-      [[RCTRootViewFactoryConfiguration alloc] initWithBundleURLBlock:bundleUrlBlock newArchEnabled:YES];
+      [[RCTRootViewFactoryConfiguration alloc] initWithBundleURLBlock:bundleUrlBlock];
 
   configuration.customizeRootView = ^(UIView *_Nonnull rootView) {
     [weakSelf.delegate customizeRootView:(RCTRootView *)rootView];
   };
 
-  configuration.sourceURLForBridge = ^NSURL *_Nullable(RCTBridge *_Nonnull bridge)
-  {
-    return [weakSelf.delegate bundleURL];
-  };
-
-  if ([self.delegate respondsToSelector:@selector(extraModulesForBridge:)]) {
-    configuration.extraModulesForBridge = ^NSArray<id<RCTBridgeModule>> *_Nonnull(RCTBridge *_Nonnull bridge)
-    {
-      return [weakSelf.delegate extraModulesForBridge:bridge];
-    };
-  }
-
   configuration.jsRuntimeConfiguratorDelegate = self;
 
   return [[RCTRootViewFactory alloc] initWithTurboModuleDelegate:self hostDelegate:self configuration:configuration];

packages/react-native/Libraries/AppDelegate/RCTRootViewFactory.h

@@ -6,18 +6,16 @@
  */
 
 #import <React/RCTBridge.h>
+#import <React/RCTJavaScriptLoader.h>
 #import <React/RCTRootView.h>
 #import <React/RCTUtils.h>
 #import "RCTJSRuntimeConfiguratorProtocol.h"
 
-@protocol RCTCxxBridgeDelegate;
-@protocol RCTComponentViewFactoryComponentProvider;
 @protocol RCTTurboModuleManagerDelegate;
 @protocol RCTHostDelegate;
 @class RCTBridge;
 @class RCTHost;
 @class RCTRootView;
-@class RCTSurfacePresenterBridgeAdapter;
 @class RCTBundleConfiguration;
 @class RCTDevMenuConfiguration;
 
@@ -38,7 +36,6 @@ typedef void (^RCTLoadSourceForBridgeWithProgressBlock)(
     RCTBridge *bridge,
     RCTSourceLoadProgressBlock onProgress,
     RCTSourceLoadBlock loadCallback);
-typedef void (^RCTLoadSourceForBridgeBlock)(RCTBridge *bridge, RCTSourceLoadBlock loadCallback);
 
 #pragma mark - RCTRootViewFactory Configuration
 @interface RCTRootViewFactoryConfiguration : NSObject
@@ -55,10 +52,16 @@ typedef void (^RCTLoadSourceForBridgeBlock)(RCTBridge *bridge, RCTSourceLoadBloc
  * pointing to a path inside the app resources, e.g. `file://.../main.jsbundle`.
  *
  */
+- (instancetype)initWithBundleURLBlock:(RCTBundleURLBlock)bundleURLBlock NS_DESIGNATED_INITIALIZER;
+
+- (instancetype)initWithBundleURL:(NSURL *)bundleURL;
+
 - (instancetype)initWithBundleURLBlock:(RCTBundleURLBlock)bundleURLBlock
-                        newArchEnabled:(BOOL)newArchEnabled NS_DESIGNATED_INITIALIZER;
+                        newArchEnabled:(BOOL)newArchEnabled
+    __deprecated_msg("The flag is ignored; use initWithBundleURLBlock:.");
 
-- (instancetype)initWithBundleURL:(NSURL *)bundleURL newArchEnabled:(BOOL)newArchEnabled;
+- (instancetype)initWithBundleURL:(NSURL *)bundleURL
+                   newArchEnabled:(BOOL)newArchEnabled __deprecated_msg("The flag is ignored; use initWithBundleURL:.");
 
 /**
  * Block that allows to override logic of creating root view instance.
@@ -73,7 +76,8 @@ typedef void (^RCTLoadSourceForBridgeBlock)(RCTBridge *bridge, RCTSourceLoadBloc
  *
  * @returns: a UIView properly configured with a bridge for React Native.
  */
-@property (nonatomic, nullable) RCTCreateRootViewWithBridgeBlock createRootViewWithBridge;
+@property (nonatomic, nullable) RCTCreateRootViewWithBridgeBlock createRootViewWithBridge __deprecated_msg(
+    "This API will be removed along with the legacy architecture.");
 
 /**
  * Block that allows to override default behavior of creating bridge.
@@ -86,7 +90,8 @@ typedef void (^RCTLoadSourceForBridgeBlock)(RCTBridge *bridge, RCTSourceLoadBloc
  *
  * @returns: a newly created instance of RCTBridge.
  */
-@property (nonatomic, nullable) RCTCreateBridgeWithDelegateBlock createBridgeWithDelegate;
+@property (nonatomic, nullable) RCTCreateBridgeWithDelegateBlock createBridgeWithDelegate __deprecated_msg(
+    "This API will be removed along with the legacy architecture.");
 
 /**
  * Block that allows to customize the rootView that is passed to React Native.
@@ -105,7 +110,8 @@ typedef void (^RCTLoadSourceForBridgeBlock)(RCTBridge *bridge, RCTSourceLoadBloc
  * 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`.
  */
-@property (nonatomic, nullable) RCTSourceURLForBridgeBlock sourceURLForBridge;
+@property (nonatomic, nullable) RCTSourceURLForBridgeBlock sourceURLForBridge __deprecated_msg(
+    "This API will be removed along with the legacy architecture.");
 
 /**
  * The bridge initializes any registered RCTBridgeModules automatically, however
@@ -121,12 +127,14 @@ typedef void (^RCTLoadSourceForBridgeBlock)(RCTBridge *bridge, RCTSourceLoadBloc
  * not recommended in most cases - if the module methods and behavior do not
  * match exactly, it may lead to bugs or crashes.
  */
-@property (nonatomic, nullable) RCTExtraModulesForBridgeBlock extraModulesForBridge;
+@property (nonatomic, nullable) RCTExtraModulesForBridgeBlock extraModulesForBridge __deprecated_msg(
+    "This API will be removed along with the legacy architecture.");
 
 /**
  * Retrieve the list of lazy-native-modules names for the given bridge.
  */
-@property (nonatomic, nullable) RCTExtraLazyModuleClassesForBridge extraLazyModuleClassesForBridge;
+@property (nonatomic, nullable) RCTExtraLazyModuleClassesForBridge extraLazyModuleClassesForBridge __deprecated_msg(
+    "This API will be removed along with the legacy architecture.");
 
 /**
  * The bridge will call this block when a module has been called from JS
@@ -135,20 +143,17 @@ typedef void (^RCTLoadSourceForBridgeBlock)(RCTBridge *bridge, RCTSourceLoadBloc
  * 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.
  */
-@property (nonatomic, nullable) RCTBridgeDidNotFindModuleBlock bridgeDidNotFindModule;
+@property (nonatomic, nullable) RCTBridgeDidNotFindModuleBlock bridgeDidNotFindModule __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 setting this property.
  */
-@property (nonatomic, nullable) RCTLoadSourceForBridgeWithProgressBlock loadSourceForBridgeWithProgress;
-
-/**
- * Similar to loadSourceForBridgeWithProgress but without progress
- * reporting.
- */
-@property (nonatomic, nullable) RCTLoadSourceForBridgeBlock loadSourceForBridge;
+@property (nonatomic, nullable)
+    RCTLoadSourceForBridgeWithProgressBlock loadSourceForBridgeWithProgress __deprecated_msg(
+        "This API will be removed along with the legacy architecture.");
 
 @end
 

packages/react-native/Libraries/AppDelegate/RCTRootViewFactory.mm

@@ -229,14 +229,6 @@ - (RCTHost *)createReactHost:(NSDictionary *)launchOptions
       reinterpret_cast<facebook::react::JSRuntimeFactory *>(jsRuntimeFactory), &js_runtime_factory_destroy);
 }
 
-- (NSArray<id<RCTBridgeModule>> *)extraModulesForBridge:(RCTBridge *)bridge
-{
-  if (_configuration.extraModulesForBridge != nil) {
-    return _configuration.extraModulesForBridge(bridge);
-  }
-  return nil;
-}
-
 - (NSURL *)bundleURL
 {
   return self->_configuration.bundleURLBlock();

packages/react-native/React/Base/RCTBridge+Private.h

@@ -16,8 +16,9 @@ RCT_EXTERN void RCTRegisterModule(Class);
 
 @interface RCTBridge ()
 
-+ (instancetype)currentBridge;
-+ (void)setCurrentBridge:(RCTBridge *)bridge;
++ (instancetype)currentBridge __deprecated_msg("This API will be removed along with the legacy architecture.");
++ (void)setCurrentBridge:(RCTBridge *)bridge
+    __deprecated_msg("This API will be removed along with the legacy architecture.");
 
 /**
  * This method is used to invoke a callback that was registered in the