react-native 0.83.0-rc.0 → 0.84.0-nightly-20251106-de5141a3d

package/React/Base/RCTBundleManager.m

@@ -6,9 +6,93 @@
  */
 
 #import "RCTBundleManager.h"
+#import <React/RCTBundleURLProvider.h>
 #import "RCTAssert.h"
 #import "RCTBridge+Private.h"
 #import "RCTBridge.h"
+#import "RCTLog.h"
+
+@implementation RCTBundleConfiguration
+
++ (instancetype)defaultConfiguration
+{
+  return [[self alloc] initWithBundleFilePath:nil packagerServerScheme:nil packagerServerHost:nil bundlePath:nil];
+}
+
+- (instancetype)initWithBundleFilePath:(NSURL *)bundleFilePath
+{
+  return [self initWithBundleFilePath:bundleFilePath packagerServerScheme:nil packagerServerHost:nil bundlePath:nil];
+}
+
+- (instancetype)initWithPackagerServerScheme:(NSString *)packagerServerScheme
+                          packagerServerHost:(NSString *)packagerServerHost
+                                  bundlePath:(NSString *)bundlePath
+{
+  return [self initWithBundleFilePath:nil
+                 packagerServerScheme:packagerServerScheme
+                   packagerServerHost:packagerServerHost
+                           bundlePath:bundlePath];
+}
+
+- (instancetype)initWithBundleFilePath:(NSURL *)bundleFilePath
+                  packagerServerScheme:(NSString *)packagerServerScheme
+                    packagerServerHost:(NSString *)packagerServerHost
+                            bundlePath:(NSString *)bundlePath
+{
+  if (self = [super init]) {
+    _bundleFilePath = bundleFilePath;
+    _packagerServerScheme = packagerServerScheme;
+    _packagerServerHost = packagerServerHost;
+    _bundlePath = bundlePath;
+    _packagerOptionsUpdater = ^NSMutableArray<NSURLQueryItem *> *(NSMutableArray<NSURLQueryItem *> *options)
+    {
+      return options;
+    };
+  }
+
+  return self;
+}
+
+- (NSString *)getPackagerServerScheme
+{
+  if (!_packagerServerScheme) {
+    return [[RCTBundleURLProvider sharedSettings] packagerScheme];
+  }
+
+  return _packagerServerScheme;
+}
+
+- (NSString *)getPackagerServerHost
+{
+  if (!_packagerServerHost) {
+    return [[RCTBundleURLProvider sharedSettings] packagerServerHostPort];
+  }
+
+  return _packagerServerHost;
+}
+
+- (NSURL *)getBundleURL
+{
+  if (_packagerServerScheme && _packagerServerHost) {
+    return [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:_bundlePath
+                                                      packagerServerScheme:_packagerServerScheme
+                                                        packagerServerHost:_packagerServerHost
+                                                    packagerOptionsUpdater:_packagerOptionsUpdater];
+  }
+
+  if (_bundleFilePath) {
+    if (!_bundleFilePath.fileURL) {
+      RCTLogError(@"Bundle file path must be a file URL");
+      return nil;
+    }
+
+    return _bundleFilePath;
+  }
+
+  return nil;
+}
+
+@end
 
 @implementation RCTBundleManager {
 #ifndef RCT_REMOVE_LEGACY_ARCH
@@ -19,6 +103,20 @@
   RCTBridgelessBundleURLGetter _bridgelessBundleURLDefaultGetter;
 }
 
+- (instancetype)initWithBundleConfig:(RCTBundleConfiguration *)bundleConfig
+{
+  if (self = [super init]) {
+    self.bundleConfig = bundleConfig ? bundleConfig : [RCTBundleConfiguration defaultConfiguration];
+  }
+
+  return self;
+}
+
+- (instancetype)init
+{
+  return [self initWithBundleConfig:[RCTBundleConfiguration defaultConfiguration]];
+}
+
 #ifndef RCT_REMOVE_LEGACY_ARCH
 - (void)setBridge:(RCTBridge *)bridge
 {

package/React/Base/RCTBundleURLProvider.h

@@ -7,6 +7,7 @@
 
 #import <Foundation/Foundation.h>
 
+#import "RCTBundleManager.h"
 #import "RCTDefines.h"
 
 RCT_EXTERN NSString *_Nonnull const RCTBundleURLProviderUpdatedNotification;
@@ -88,6 +89,16 @@ NS_ASSUME_NONNULL_BEGIN
  */
 - (NSURL *__nullable)jsBundleURLForFallbackExtension:(NSString *__nullable)extension;
 
+/**
+ * Returns the jsBundleURL for a given bundle entrypoint,
+ * the packager scheme, server host and options updater
+ * for modifying default packager options.
+ */
+- (NSURL *__nullable)jsBundleURLForBundleRoot:(NSString *)bundleRoot
+                         packagerServerScheme:(NSString *)packagerServerScheme
+                           packagerServerHost:(NSString *)packagerServerHost
+                       packagerOptionsUpdater:(RCTPackagerOptionsUpdater)packagerOptionsUpdater;
+
 /**
  * Returns the resourceURL for a given bundle entrypoint and
  * the fallback offline resource file if the packager is not running.
@@ -97,6 +108,19 @@ NS_ASSUME_NONNULL_BEGIN
                               resourceExtension:(NSString *)extension
                                   offlineBundle:(NSBundle *)offlineBundle;
 
+/**
+ * Returns the query items for given options used to create the jsBundleURL.
+ */
++ (NSArray<NSURLQueryItem *> *)createJSBundleURLQuery:(NSString *)packagerHost
+                                       packagerScheme:(NSString *__nullable)scheme
+                                            enableDev:(BOOL)enableDev
+                                   enableMinification:(BOOL)enableMinification
+                                      inlineSourceMap:(BOOL)inlineSourceMap
+                                          modulesOnly:(BOOL)modulesOnly
+                                            runModule:(BOOL)runModule
+                                    additionalOptions:
+                                        (NSDictionary<NSString *, NSString *> *__nullable)additionalOptions;
+
 /**
  * The IP address or hostname of the packager.
  */

package/React/Base/RCTBundleURLProvider.mm

@@ -313,6 +313,54 @@ static NSURL *serverRootWithHostPort(NSString *hostPort, NSString *scheme)
                             additionalOptions:(NSDictionary<NSString *, NSString *> *__nullable)additionalOptions
 {
   NSString *path = [NSString stringWithFormat:@"/%@.bundle", bundleRoot];
+  NSArray<NSURLQueryItem *> *queryItems = [self createJSBundleURLQuery:packagerHost
+                                                        packagerScheme:scheme
+                                                             enableDev:enableDev
+                                                    enableMinification:enableMinification
+                                                       inlineSourceMap:inlineSourceMap
+                                                           modulesOnly:modulesOnly
+                                                             runModule:runModule
+                                                     additionalOptions:additionalOptions];
+
+  return [RCTBundleURLProvider resourceURLForResourcePath:path
+                                             packagerHost:packagerHost
+                                                   scheme:scheme
+                                               queryItems:[queryItems copy]];
+}
+
+- (NSURL *)jsBundleURLForBundleRoot:(NSString *)bundleRoot
+               packagerServerScheme:(NSString *)packagerServerScheme
+                 packagerServerHost:(NSString *)packagerServerHost
+             packagerOptionsUpdater:(RCTPackagerOptionsUpdater)packagerOptionsUpdater
+{
+  NSArray<NSURLQueryItem *> *queryItems = [RCTBundleURLProvider createJSBundleURLQuery:packagerServerHost
+                                                                        packagerScheme:packagerServerScheme
+                                                                             enableDev:[self enableDev]
+                                                                    enableMinification:[self enableMinification]
+                                                                       inlineSourceMap:[self inlineSourceMap]
+                                                                           modulesOnly:NO
+                                                                             runModule:YES
+                                                                     additionalOptions:nil];
+
+  NSArray<NSURLQueryItem *> *updatedQueryItems = packagerOptionsUpdater((NSMutableArray *)queryItems);
+  NSString *path = [NSString stringWithFormat:@"/%@.bundle", bundleRoot];
+
+  return [RCTBundleURLProvider resourceURLForResourcePath:path
+                                             packagerHost:packagerServerHost
+                                                   scheme:packagerServerScheme
+                                               queryItems:updatedQueryItems];
+}
+
++ (NSArray<NSURLQueryItem *> *)createJSBundleURLQuery:(NSString *)packagerHost
+                                       packagerScheme:(NSString *__nullable)scheme
+                                            enableDev:(BOOL)enableDev
+                                   enableMinification:(BOOL)enableMinification
+                                      inlineSourceMap:(BOOL)inlineSourceMap
+                                          modulesOnly:(BOOL)modulesOnly
+                                            runModule:(BOOL)runModule
+                                    additionalOptions:
+                                        (NSDictionary<NSString *, NSString *> *__nullable)additionalOptions
+{
   BOOL lazy = enableDev;
   NSMutableArray<NSURLQueryItem *> *queryItems = [[NSMutableArray alloc] initWithArray:@[
     [[NSURLQueryItem alloc] initWithName:@"platform" value:RCTPlatformName],
@@ -345,10 +393,7 @@ static NSURL *serverRootWithHostPort(NSString *hostPort, NSString *scheme)
     }
   }
 
-  return [[self class] resourceURLForResourcePath:path
-                                     packagerHost:packagerHost
-                                           scheme:scheme
-                                       queryItems:[queryItems copy]];
+  return queryItems;
 }
 
 + (NSURL *)resourceURLForResourcePath:(NSString *)path

package/React/Base/RCTVersion.m

@@ -22,9 +22,9 @@ NSDictionary* RCTGetReactNativeVersion(void)
   dispatch_once(&onceToken, ^(void){
     __rnVersion = @{
                   RCTVersionMajor: @(0),
-                  RCTVersionMinor: @(83),
+                  RCTVersionMinor: @(84),
                   RCTVersionPatch: @(0),
-                  RCTVersionPrerelease: @"rc.0",
+                  RCTVersionPrerelease: @"nightly-20251106-de5141a3d",
                   };
   });
   return __rnVersion;

package/React/CoreModules/RCTAccessibilityManager.mm

@@ -33,7 +33,10 @@ NSString *const RCTAccessibilityManagerDidUpdateMultiplierNotification =
 @synthesize moduleRegistry = _moduleRegistry;
 @synthesize multipliers = _multipliers;
 
-RCT_EXPORT_MODULE()
++ (NSString *)moduleName
+{
+  return @"AccessibilityManager";
+}
 
 + (BOOL)requiresMainQueueSetup
 {

package/React/CoreModules/RCTActionSheetManager.mm

@@ -42,7 +42,10 @@ using namespace facebook::react;
   return NO;
 }
 
-RCT_EXPORT_MODULE()
++ (NSString *)moduleName
+{
+  return @"ActionSheetManager";
+}
 
 @synthesize viewRegistry_DEPRECATED = _viewRegistry_DEPRECATED;
 

package/React/CoreModules/RCTAlertManager.mm

@@ -40,7 +40,10 @@ RCT_ENUM_CONVERTER(
   NSHashTable *_alertControllers;
 }
 
-RCT_EXPORT_MODULE()
++ (NSString *)moduleName
+{
+  return @"AlertManager";
+}
 
 - (dispatch_queue_t)methodQueue
 {

package/React/CoreModules/RCTAppState.mm

@@ -43,7 +43,10 @@ static NSString *RCTCurrentAppState()
   facebook::react::ModuleConstants<JS::NativeAppState::Constants> _constants;
 }
 
-RCT_EXPORT_MODULE()
++ (NSString *)moduleName
+{
+  return @"AppState";
+}
 
 + (BOOL)requiresMainQueueSetup
 {

package/React/CoreModules/RCTAppearance.mm

@@ -92,7 +92,10 @@ NSString *RCTColorSchemePreference(UITraitCollection *traitCollection)
   return self;
 }
 
-RCT_EXPORT_MODULE(Appearance)
++ (NSString *)moduleName
+{
+  return @"Appearance";
+}
 
 + (BOOL)requiresMainQueueSetup
 {

package/React/CoreModules/RCTClipboard.mm

@@ -19,7 +19,10 @@ using namespace facebook::react;
 
 @implementation RCTClipboard
 
-RCT_EXPORT_MODULE()
++ (NSString *)moduleName
+{
+  return @"Clipboard";
+}
 
 - (dispatch_queue_t)methodQueue
 {

package/React/CoreModules/RCTDevLoadingView.mm

@@ -37,7 +37,10 @@ using namespace facebook::react;
   dispatch_block_t _initialMessageBlock;
 }
 
-RCT_EXPORT_MODULE()
++ (NSString *)moduleName
+{
+  return @"DevLoadingView";
+}
 
 - (instancetype)init
 {

package/React/CoreModules/RCTDevMenu.mm

@@ -124,7 +124,10 @@ typedef void (^RCTDevMenuAlertActionHandler)(UIAlertAction *action);
 @synthesize callableJSModules = _callableJSModules;
 @synthesize bundleManager = _bundleManager;
 
-RCT_EXPORT_MODULE()
++ (NSString *)moduleName
+{
+  return @"DevMenu";
+}
 
 + (void)initialize
 {

package/React/CoreModules/RCTDevSettings.mm

@@ -134,7 +134,10 @@ static std::atomic<int> numInitializedModules{0};
 @synthesize isInspectable = _isInspectable;
 @synthesize bundleManager = _bundleManager;
 
-RCT_EXPORT_MODULE()
++ (NSString *)moduleName
+{
+  return @"RCTDevSettings";
+}
 
 - (instancetype)init
 {

package/React/CoreModules/RCTDevToolsRuntimeSettingsModule.mm

@@ -23,7 +23,11 @@ static Config _config;
 @end
 
 @implementation RCTDevToolsRuntimeSettingsModule
-RCT_EXPORT_MODULE(ReactDevToolsRuntimeSettingsModule)
+
++ (NSString *)moduleName
+{
+  return @"ReactDevToolsRuntimeSettingsModule)";
+}
 
 RCT_EXPORT_METHOD(
     setReloadAndProfileConfig : (JS::NativeReactDevToolsRuntimeSettingsModule::PartialReloadAndProfileConfig &)config)

package/React/CoreModules/RCTDeviceInfo.mm

@@ -39,7 +39,10 @@ static NSString *const kFrameKeyPath = @"frame";
 
 @synthesize moduleRegistry = _moduleRegistry;
 
-RCT_EXPORT_MODULE()
++ (NSString *)moduleName
+{
+  return @"DeviceInfo";
+}
 
 - (instancetype)init
 {

package/React/CoreModules/RCTEventDispatcher.mm

@@ -44,7 +44,10 @@ static uint16_t RCTUniqueCoalescingKeyGenerator = 0;
 @synthesize dispatchToJSThread = _dispatchToJSThread;
 @synthesize callableJSModules = _callableJSModules;
 
-RCT_EXPORT_MODULE()
++ (NSString *)moduleName
+{
+  return @"EventDispatcher";
+}
 
 - (void)initialize
 {

package/React/CoreModules/RCTExceptionsManager.mm

@@ -26,7 +26,10 @@
 
 @synthesize moduleRegistry = _moduleRegistry;
 
-RCT_EXPORT_MODULE()
++ (NSString *)moduleName
+{
+  return @"ExceptionManager";
+}
 
 - (instancetype)initWithDelegate:(id<RCTExceptionsManagerDelegate>)delegate
 {

package/React/CoreModules/RCTI18nManager.mm

@@ -19,7 +19,10 @@ using namespace facebook::react;
 
 @implementation RCTI18nManager
 
-RCT_EXPORT_MODULE()
++ (NSString *)moduleName
+{
+  return @"I18nManager";
+}
 
 + (BOOL)requiresMainQueueSetup
 {

package/React/CoreModules/RCTKeyboardObserver.mm

@@ -20,7 +20,10 @@ static NSDictionary *RCTParseKeyboardNotification(NSNotification *notification);
 
 @implementation RCTKeyboardObserver
 
-RCT_EXPORT_MODULE()
++ (NSString *)moduleName
+{
+  return @"KeyboardObserver";
+}
 
 - (void)startObserving
 {

package/React/CoreModules/RCTLogBox.mm

@@ -27,7 +27,10 @@
 
 @synthesize bridge = _bridge;
 
-RCT_EXPORT_MODULE()
++ (NSString *)moduleName
+{
+  return @"LogBox";
+}
 
 + (BOOL)requiresMainQueueSetup
 {

package/React/CoreModules/RCTPerfMonitor.mm

@@ -114,7 +114,10 @@ static vm_size_t RCTGetResidentMemorySize(void)
 @synthesize bridge = _bridge;
 @synthesize moduleRegistry = _moduleRegistry;
 
-RCT_EXPORT_MODULE()
++ (NSString *)moduleName
+{
+  return @"PerfMonitor";
+}
 
 + (BOOL)requiresMainQueueSetup
 {

package/React/CoreModules/RCTPlatform.mm

@@ -31,10 +31,11 @@ static NSString *interfaceIdiom(UIUserInterfaceIdiom idiom)
       return @"tv";
     case UIUserInterfaceIdiomCarPlay:
       return @"carplay";
-#if TARGET_OS_VISION
     case UIUserInterfaceIdiomVision:
       return @"vision";
-#endif
+    case UIUserInterfaceIdiomMac:
+      return @"mac";
+    case UIUserInterfaceIdiomUnspecified:
     default:
       return @"unknown";
   }
@@ -47,7 +48,10 @@ static NSString *interfaceIdiom(UIUserInterfaceIdiom idiom)
   ModuleConstants<JS::NativePlatformConstantsIOS::Constants> _constants;
 }
 
-RCT_EXPORT_MODULE(PlatformConstants)
++ (NSString *)moduleName
+{
+  return @"PlatformConstants";
+}
 
 + (BOOL)requiresMainQueueSetup
 {

package/React/CoreModules/RCTRedBox.mm

@@ -480,7 +480,10 @@ RCT_NOT_IMPLEMENTED(-(instancetype)initWithCoder : (NSCoder *)aDecoder)
 @synthesize moduleRegistry = _moduleRegistry;
 @synthesize bundleManager = _bundleManager;
 
-RCT_EXPORT_MODULE()
++ (NSString *)moduleName
+{
+  return @"RedBox";
+}
 
 - (void)registerErrorCustomizer:(id<RCTErrorCustomizer>)errorCustomizer
 {

package/React/CoreModules/RCTSourceCode.mm

@@ -18,7 +18,10 @@ using namespace facebook::react;
 
 @implementation RCTSourceCode
 
-RCT_EXPORT_MODULE()
++ (NSString *)moduleName
+{
+  return @"SourceCode";
+}
 
 @synthesize bundleManager = _bundleManager;
 

package/React/CoreModules/RCTStatusBarManager.mm

@@ -68,7 +68,10 @@ static BOOL RCTViewControllerBasedStatusBarAppearance()
   return value;
 }
 
-RCT_EXPORT_MODULE()
++ (NSString *)moduleName
+{
+  return @"StatusBarManager";
+}
 
 + (BOOL)requiresMainQueueSetup
 {

package/React/CoreModules/RCTTiming.mm

@@ -107,7 +107,10 @@ static const NSTimeInterval kIdleCallbackFrameDeadline = 0.001;
 @synthesize paused = _paused;
 @synthesize pauseCallback = _pauseCallback;
 
-RCT_EXPORT_MODULE()
++ (NSString *)moduleName
+{
+  return @"Timing";
+}
 
 - (instancetype)initWithDelegate:(id<RCTTimingDelegate>)delegate
 {

package/React/CoreModules/RCTWebSocketModule.mm

@@ -39,7 +39,10 @@
   NSMutableDictionary<NSNumber *, id<RCTWebSocketContentHandler>> *_contentHandlers;
 }
 
-RCT_EXPORT_MODULE()
++ (NSString *)moduleName
+{
+  return @"WebSocketModule";
+}
 
 - (dispatch_queue_t)methodQueue
 {

package/React/CoreModules/React-CoreModules.podspec

@@ -61,6 +61,7 @@ Pod::Spec.new do |s|
   add_dependency(s, "React-RCTFBReactNativeSpec")
   add_dependency(s, "ReactCommon", :subspec => "turbomodule/core", :additional_framework_paths => ["react/nativemodule/core"])
   add_dependency(s, "React-NativeModulesApple")
+  add_dependency(s, "React-utils", :additional_framework_paths => ["react/utils/platform/ios"])
 
   add_rn_third_party_dependencies(s)
   add_rncore_dependency(s)

package/React/CxxBridge/RCTCxxBridge.mm

@@ -19,7 +19,6 @@
 #import <React/RCTConstants.h>
 #import <React/RCTConvert.h>
 #import <React/RCTCxxBridgeDelegate.h>
-#import <React/RCTCxxModule.h>
 #import <React/RCTCxxUtils.h>
 #import <React/RCTDevSettings.h>
 #import <React/RCTDisplayLink.h>
@@ -992,7 +991,7 @@ struct RCTInstanceCallback : public InstanceCallback {
       // modules on the main thread in parallel with loading the JS code, so
       // they will already be available before they are ever required.
       dispatch_block_t block = ^{
-        if (self.valid && ![moduleData.moduleClass isSubclassOfClass:[RCTCxxModule class]]) {
+        if (self.valid) {
           [self->_performanceLogger appendStartForTag:RCTPLNativeModuleMainThread];
           (void)[moduleData instance];
           [moduleData gatherConstants];

package/React/CxxModule/RCTCxxUtils.mm

@@ -13,7 +13,6 @@
 #import <jsi/jsi.h>
 
 #import "DispatchMessageQueueThread.h"
-#import "RCTCxxModule.h"
 #import "RCTNativeModule.h"
 
 namespace facebook::react {
@@ -27,16 +26,7 @@ createNativeModules(NSArray<RCTModuleData *> *modules, RCTBridge *bridge, const
 {
   std::vector<std::unique_ptr<NativeModule>> nativeModules;
   for (RCTModuleData *moduleData in modules) {
-    if ([moduleData.moduleClass isSubclassOfClass:[RCTCxxModule class]]) {
-      nativeModules.emplace_back(
-          std::make_unique<CxxNativeModule>(
-              instance,
-              [moduleData.name UTF8String],
-              [moduleData] { return [(RCTCxxModule *)(moduleData.instance) createModule]; },
-              std::make_shared<DispatchMessageQueueThread>(moduleData)));
-    } else {
-      nativeModules.emplace_back(std::make_unique<RCTNativeModule>(bridge, moduleData));
-    }
+    nativeModules.emplace_back(std::make_unique<RCTNativeModule>(bridge, moduleData));
   }
   return nativeModules;
 }