react-native-tvos 0.83.2-0 → 0.84.0-0

package/Libraries/Utilities/codegenNativeCommands.js

@@ -17,7 +17,7 @@ type NativeCommandsOptions<T = string> = $ReadOnly<{
 function codegenNativeCommands<T: interface {}>(
   options: NativeCommandsOptions<$Keys<T>>,
 ): T {
-  const commandObj: {[$Keys<T>]: (...$ReadOnlyArray<mixed>) => void} = {};
+  const commandObj: {[$Keys<T>]: (...$ReadOnlyArray<unknown>) => void} = {};
 
   options.supportedCommands.forEach(command => {
     // $FlowFixMe[missing-local-annot]

package/Libraries/Utilities/deepFreezeAndThrowOnMutationInDev.js

@@ -27,7 +27,7 @@
  * Freezing the object and adding the throw mechanism is expensive and will
  * only be used in DEV.
  */
-function deepFreezeAndThrowOnMutationInDev<T: {...} | Array<mixed>>(
+function deepFreezeAndThrowOnMutationInDev<T: {...} | Array<unknown>>(
   object: T,
 ): T {
   if (__DEV__) {
@@ -43,7 +43,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>));
+    const keys = Object.keys((object: {...} | Array<unknown>));
     // $FlowFixMe[method-unbinding] added when improving typing for this parameters
     const hasOwnProperty = Object.prototype.hasOwnProperty;
 
@@ -85,7 +85,7 @@ function throwOnImmutableMutation(key: empty, value) {
   );
 }
 
-function identity(value: mixed) {
+function identity(value: unknown) {
   return value;
 }
 

package/Libraries/Utilities/logError.js

@@ -15,7 +15,7 @@
  * `console.error` as a failure callback - it's not properly bound.  If passes an
  * `Error` object, it will print the message and stack.
  */
-const logError = function (...args: $ReadOnlyArray<mixed>) {
+const logError = function (...args: $ReadOnlyArray<unknown>) {
   if (args.length === 1 && args[0] instanceof Error) {
     const err = args[0];
     console.error('Error: "' + err.message + '".  Stack:\n' + err.stack);

package/Libraries/Utilities/stringifySafe.js

@@ -19,17 +19,17 @@ export function createStringifySafeWithLimits(limits: {
   maxStringLimit?: number,
   maxArrayLimit?: number,
   maxObjectKeysLimit?: number,
-}): mixed => string {
+}): unknown => string {
   const {
     maxDepth = Number.POSITIVE_INFINITY,
     maxStringLimit = Number.POSITIVE_INFINITY,
     maxArrayLimit = Number.POSITIVE_INFINITY,
     maxObjectKeysLimit = Number.POSITIVE_INFINITY,
   } = limits;
-  const stack: Array<mixed> = [];
+  const stack: Array<unknown> = [];
   /* $FlowFixMe[missing-this-annot] The 'this' type annotation(s) required by
    * Flow's LTI update could not be added via codemod */
-  function replacer(key: string, value: mixed): mixed {
+  function replacer(key: string, value: unknown): unknown {
     while (stack.length && this !== stack[0]) {
       stack.shift();
     }
@@ -45,7 +45,7 @@ export function createStringifySafeWithLimits(limits: {
       return value;
     }
 
-    let retval: mixed = value;
+    let retval: unknown = value;
     if (Array.isArray(value)) {
       if (stack.length >= maxDepth) {
         retval = `[ ... array with ${value.length} values ... ]`;
@@ -64,7 +64,7 @@ export function createStringifySafeWithLimits(limits: {
         retval = `{ ... object with ${keys.length} keys ... }`;
       } else if (keys.length > maxObjectKeysLimit) {
         // Return a sample of the keys.
-        retval = ({}: {[string]: mixed});
+        retval = ({}: {[string]: unknown});
         for (let k of keys.slice(0, maxObjectKeysLimit)) {
           retval[k] = value[k];
         }
@@ -76,7 +76,7 @@ export function createStringifySafeWithLimits(limits: {
     return retval;
   }
 
-  return function stringifySafe(arg: mixed): string {
+  return function stringifySafe(arg: unknown): string {
     if (arg === undefined) {
       return 'undefined';
     } else if (arg === null) {
@@ -111,7 +111,7 @@ export function createStringifySafeWithLimits(limits: {
   };
 }
 
-const stringifySafe: mixed => string = createStringifySafeWithLimits({
+const stringifySafe: unknown => string = createStringifySafeWithLimits({
   maxDepth: 10,
   maxStringLimit: 100,
   maxArrayLimit: 50,

package/Libraries/Utilities/useRefEffect.js

@@ -10,7 +10,7 @@
 
 import {useCallback, useRef} from 'react';
 
-type CallbackRef<T> = T => mixed;
+type CallbackRef<T> = T => unknown;
 
 /**
  * Constructs a callback ref that provides similar semantics as `useEffect`. The

package/Libraries/Vibration/RCTVibrationPlugins.mm

@@ -13,20 +13,17 @@
 
 #import "RCTVibrationPlugins.h"
 
-#import <string>
-#import <unordered_map>
-
-Class RCTVibrationClassProvider(const char *name) {
-  // 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 classFunc = p->second;
-    return classFunc();
+#import <string_view>
+
+using namespace std::literals;
+
+Class RCTVibrationClassProvider(const char *name)
+{
+
+  if (name == "Vibration"sv) {
+    return RCTVibrationCls();
   }
+
   return nil;
 }
 

package/Libraries/WebSocket/WebSocketInterceptor.js

@@ -33,10 +33,10 @@ let isInterceptorEnabled = false;
 
 /**
  * A network interceptor which monkey-patches RCTWebSocketModule methods
- * to gather all websocket network requests/responses, in order to show
- * their information in the React Native inspector development tool.
+ * to gather all websocket network events.
+ *
+ * @deprecated Since React Native 0.84
  */
-
 const WebSocketInterceptor = {
   /**
    * Invoked when RCTWebSocketModule.close(...) is called.

package/Libraries/promiseRejectionTrackingOptions.js

@@ -12,8 +12,15 @@ import typeof {enable} from 'promise/setimmediate/rejection-tracking';
 
 import ExceptionsManager from './Core/ExceptionsManager';
 
-let rejectionTrackingOptions: $NonMaybeType<Parameters<enable>[0]> = {
+const rejectionTrackingOptions: NonNullable<Parameters<enable>[0]> = {
   allRejections: true,
+  onHandled: id => {
+    const warning =
+      `Promise rejection handled (id: ${id})\n` +
+      'This means you can ignore any previous messages of the form ' +
+      `"Uncaught (in promise, id: ${id})"`;
+    console.warn(warning);
+  },
   onUnhandled: (id, rejection) => {
     let message: string;
 
@@ -46,13 +53,6 @@ let rejectionTrackingOptions: $NonMaybeType<Parameters<enable>[0]> = {
       false /* isFatal */,
     );
   },
-  onHandled: id => {
-    const warning =
-      `Promise rejection handled (id: ${id})\n` +
-      'This means you can ignore any previous messages of the form ' +
-      `"Uncaught (in promise, id: ${id})"`;
-    console.warn(warning);
-  },
 };
 
 export default rejectionTrackingOptions;

package/Libraries/vendor/core/ErrorUtils.js

@@ -9,30 +9,30 @@
  */
 
 // From @react-native/js-polyfills
-type ErrorHandler = (error: mixed, isFatal: boolean) => void;
-type Fn<Args: $ReadOnlyArray<mixed>, Return> = (...Args) => Return;
+type ErrorHandler = (error: unknown, isFatal: boolean) => void;
+type Fn<Args: $ReadOnlyArray<unknown>, Return> = (...Args) => Return;
 export type ErrorUtils = {
-  applyWithGuard<TArgs: $ReadOnlyArray<mixed>, TOut>(
+  applyWithGuard<TArgs: $ReadOnlyArray<unknown>, TOut>(
     fun: Fn<TArgs, TOut>,
-    context?: mixed,
+    context?: unknown,
     args?: ?TArgs,
     unused_onError?: null,
     unused_name?: ?string,
   ): ?TOut,
-  applyWithGuardIfNeeded<TArgs: $ReadOnlyArray<mixed>, TOut>(
+  applyWithGuardIfNeeded<TArgs: $ReadOnlyArray<unknown>, TOut>(
     fun: Fn<TArgs, TOut>,
-    context?: mixed,
+    context?: unknown,
     args?: ?TArgs,
   ): ?TOut,
   getGlobalHandler(): ErrorHandler,
-  guard<TArgs: $ReadOnlyArray<mixed>, TOut>(
+  guard<TArgs: $ReadOnlyArray<unknown>, TOut>(
     fun: Fn<TArgs, TOut>,
     name?: ?string,
-    context?: mixed,
+    context?: unknown,
   ): ?(...TArgs) => ?TOut,
   inGuard(): boolean,
-  reportError(error: mixed): void,
-  reportFatalError(error: mixed): void,
+  reportError(error: unknown): void,
+  reportFatalError(error: unknown): void,
   setGlobalHandler(fun: ErrorHandler): void,
 };
 

package/Libraries/vendor/emitter/EventEmitter.js

@@ -20,8 +20,8 @@ export interface IEventEmitter<
 > {
   addListener<TEvent: $Keys<TEventToArgsMap>>(
     eventType: TEvent,
-    listener: (...args: TEventToArgsMap[TEvent]) => mixed,
-    context?: mixed,
+    listener: (...args: TEventToArgsMap[TEvent]) => unknown,
+    context?: unknown,
   ): EventSubscription;
 
   emit<TEvent: $Keys<TEventToArgsMap>>(
@@ -35,8 +35,8 @@ export interface IEventEmitter<
 }
 
 interface Registration<TArgs> {
-  +context: mixed;
-  +listener: (...args: TArgs) => mixed;
+  +context: unknown;
+  +listener: (...args: TArgs) => unknown;
   +remove: () => void;
 }
 
@@ -85,8 +85,8 @@ export default class EventEmitter<
    */
   addListener<TEvent: $Keys<TEventToArgsMap>>(
     eventType: TEvent,
-    listener: (...args: TEventToArgsMap[TEvent]) => mixed,
-    context: mixed,
+    listener: (...args: TEventToArgsMap[TEvent]) => unknown,
+    context: unknown,
   ): EventSubscription {
     if (typeof listener !== 'function') {
       throw new TypeError(

package/README.md

@@ -1,6 +1,6 @@
 ## react-native-tvos
 
-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.
+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.81.0-0 release of this package will be derived from the 0.81.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.
 
@@ -78,7 +78,7 @@ Minimum operating system versions:
 ## Build changes
 
 - _Native layer for Apple TV_: Changes in the React Native podspecs (in 0.73 and later) require that your application `Podfile` only have one target. This repo supports either an iOS target or a tvOS target.
-- _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.
+- _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.
 
 ## TV project creation in React Native 0.75 and later
 
@@ -94,26 +94,64 @@ See the [Building Expo apps for TV](https://docs.expo.dev/guides/building-for-tv
 
 Using Expo's [continuous native generation (CNG)](https://docs.expo.dev/workflow/continuous-native-generation/) model, projects created this way can be used to build either mobile or TV apps, taking advantage of the full support for both mobile and TV platforms in this repo.
 
-### Creating a new project with the Community CLI
+### Project creation using the React Native Community CLI
 
-We maintain [template-tv](https://github.com/react-native-tvos/template-tv), a TV-specific template for developers using the React Native Community CLI. This project extends the Community CLI with `run-tvos`, `build-tvos`, and `log-tvos` commands for tvOS development.
+As of React Native 0.75.x, the template that used to reside in the `react-native` core package has been moved to a [new community repo](https://github.com/react-native-community/template) and will be maintained there. To support developers that wish to continue using the community CLI, we have created a [new TV template repository](https://github.com/react-native-tvos/template-tv) and will maintain a TV port of this template.
 
-> [!NOTE]
-> This template only supports Apple TV and Android TV. Multiple platform targets are no longer supported in React Native app Podfiles.
+> _Note:_ The new TV template will only build apps for Apple TV and Android TV. Multiple platform targets are no longer supported in React Native app Podfiles.
 
-**Quick start:**
-```sh
-# Initialize a new app called 'TVTest'
-# This command should be run outside of any existing node project
-npx @react-native-community/cli@latest init TVTest --template @react-native-tvos/template-tv
-
-cd TVTest
+To create a new project for RNTV 0.81:
 
-# Build and run on tvOS Simulator (macOS only, requires Apple TV simulator)
-npx react-native run-tvos --simulator "Apple TV"
-
-# Build and run on Android TV emulator (requires Android TV emulator)
-npx react-native run-android --device tv_api_31
+```sh
+# 
+# Init an app called 'TVTest', note that you must not be in a node module (directory with node_modules sub-directory) for this to work
+$ npx @react-native-community/cli@latest init TVTest --template @react-native-tvos/template-tv
+                                                          
+               ######                ######               
+             ###     ####        ####     ###             
+            ##          ###    ###          ##            
+            ##             ####             ##            
+            ##             ####             ##            
+            ##           ##    ##           ##            
+            ##         ###      ###         ##            
+             ##  ########################  ##             
+          ######    ###            ###    ######          
+      ###     ##    ##              ##    ##     ###      
+   ###         ## ###      ####      ### ##         ###   
+  ##           ####      ########      ####           ##  
+ ##             ###     ##########     ###             ## 
+  ##           ####      ########      ####           ##  
+   ###         ## ###      ####      ### ##         ###   
+      ###     ##    ##              ##    ##     ###      
+          ######    ###            ###    ######          
+             ##  ########################  ##             
+            ##         ###      ###         ##            
+            ##           ##    ##           ##            
+            ##             ####             ##            
+            ##             ####             ##            
+            ##          ###    ###          ##            
+             ###     ####        ####     ###             
+               ######                ######               
+                                                          
+
+              Welcome to React Native 0.81!                
+                 Learn once, write anywhere               
+
+✔ Downloading template
+✔ Copying template
+✔ Processing template
+✔ Installing dependencies
+✔ Do you want to install CocoaPods now? Only needed if you run your project in Xcode directly … yes
+✔ Installing Ruby Gems
+✔ Installing CocoaPods dependencies  (this may take a few minutes)
+.
+.
+.
+$ cd TVTest
+# Now build and start the app in the tvOS Simulator - this will only work on a macOS machine.
+npx react-native run-ios --simulator "Apple TV"
+# This command builds and starts the app in an Android TV emulator (needs to be created in advance).
+npx react-native run:android --device tv_api_31
 ```
 
 ## How to support TV specific file extensions

package/React/Base/RCTAssert.m

@@ -146,7 +146,7 @@ void RCTFatal(NSError *error)
       // userInfo: <underlying error userinfo, plus untruncated description plus JS stack trace>
       @throw [[NSException alloc] initWithName:name reason:message userInfo:userInfo];
 #if DEBUG
-    } @catch (NSException *e) {
+    } @catch (NSException *) {
     }
 #endif
   }
@@ -216,7 +216,7 @@ void RCTFatalException(NSException *exception)
 #endif
       @throw exception;
 #if DEBUG
-    } @catch (NSException *e) {
+    } @catch (NSException *) {
     }
 #endif
   }

package/React/Base/RCTBridge.h

@@ -62,10 +62,6 @@ void RCTEnableTurboModuleInteropBridgeProxy(BOOL enabled);
 BOOL RCTFabricInteropLayerEnabled(void);
 void RCTEnableFabricInteropLayer(BOOL enabled);
 
-// Turn on TurboModule sync execution of void methods
-BOOL RCTTurboModuleSyncVoidMethodsEnabled(void);
-void RCTEnableTurboModuleSyncVoidMethods(BOOL enabled);
-
 BOOL RCTUIManagerDispatchAccessibilityManagerInitOntoMain(void);
 void RCTUIManagerSetDispatchAccessibilityManagerInitOntoMain(BOOL enabled);
 

package/React/Base/RCTBridge.mm

@@ -242,17 +242,6 @@ void RCTSetTurboModuleInteropBridgeProxyLogLevel(RCTBridgeProxyLoggingLevel logL
   bridgeProxyLoggingLevel = logLevel;
 }
 
-// Turn on TurboModule sync execution of void methods
-static BOOL gTurboModuleEnableSyncVoidMethods = NO;
-BOOL RCTTurboModuleSyncVoidMethodsEnabled(void)
-{
-  return gTurboModuleEnableSyncVoidMethods;
-}
-void RCTEnableTurboModuleSyncVoidMethods(BOOL enabled)
-{
-  gTurboModuleEnableSyncVoidMethods = enabled;
-}
-
 BOOL kDispatchAccessibilityManagerInitOntoMain = NO;
 BOOL RCTUIManagerDispatchAccessibilityManagerInitOntoMain(void)
 {
@@ -380,7 +369,7 @@ static RCTBridge *RCTCurrentBridgeInstance = nil;
                   moduleProvider:(RCTBridgeModuleListProvider)block
                    launchOptions:(NSDictionary *)launchOptions
 {
-  // Only enabld this assertion in OSS
+  // Only enable this assertion in OSS
 #if COCOAPODS
   [RCTBridge throwIfOnLegacyArch];
 #endif

package/React/Base/RCTBundleManager.h

@@ -9,19 +9,71 @@
 
 @class RCTBridge;
 
-typedef NSURL * (^RCTBridgelessBundleURLGetter)(void);
-typedef void (^RCTBridgelessBundleURLSetter)(NSURL *bundleURL);
+typedef NSURL *_Nullable (^RCTBridgelessBundleURLGetter)(void);
+typedef void (^RCTBridgelessBundleURLSetter)(NSURL *_Nullable bundleURL);
+typedef NSMutableArray<NSURLQueryItem *> *_Nullable (^RCTPackagerOptionsUpdater)(
+    NSMutableArray<NSURLQueryItem *> *_Nullable options);
+
+/**
+ * Configuration class for setting up custom bundle locations
+ */
+@interface RCTBundleConfiguration : NSObject
+
++ (nonnull instancetype)defaultConfiguration;
+
+/**
+ * The URL of the bundle to load from the file system
+ */
+@property (nonatomic, readonly, nullable) NSURL *bundleFilePath;
+
+/**
+ * The server scheme (e.g. http or https) to use when loading from the packager
+ */
+@property (nonatomic, readonly, nullable) NSString *packagerServerScheme;
+
+/**
+ * The server host (e.g. localhost) to use when loading from the packager
+ */
+@property (nonatomic, readonly, nullable) NSString *packagerServerHost;
+
+/**
+ * A block that modifies the packager options when loading from the packager
+ */
+@property (nonatomic, copy, nullable) RCTPackagerOptionsUpdater packagerOptionsUpdater;
+
+/**
+ * The relative path to the bundle.
+ */
+@property (nonatomic, readonly, nullable) NSString *bundlePath;
+
+- (nonnull instancetype)initWithBundleFilePath:(nullable NSURL *)bundleFilePath;
+
+- (nonnull instancetype)initWithPackagerServerScheme:(nullable NSString *)packagerServerScheme
+                                  packagerServerHost:(nullable NSString *)packagerServerHost
+                                          bundlePath:(nullable NSString *)bundlePath;
+
+- (nullable NSURL *)getBundleURL;
+
+- (nonnull NSString *)getPackagerServerScheme;
+
+- (nonnull NSString *)getPackagerServerHost;
+
+@end
 
 /**
  * A class that allows NativeModules/TurboModules to read/write the bundleURL, with or without the bridge.
  */
 @interface RCTBundleManager : NSObject
+
+- (nullable instancetype)initWithBundleConfig:(nullable RCTBundleConfiguration *)bundleConfig;
+
 #ifndef RCT_REMOVE_LEGACY_ARCH
-- (void)setBridge:(RCTBridge *)bridge;
+- (void)setBridge:(nullable RCTBridge *)bridge;
 #endif // RCT_REMOVE_LEGACY_ARCH
-- (void)setBridgelessBundleURLGetter:(RCTBridgelessBundleURLGetter)getter
-                           andSetter:(RCTBridgelessBundleURLSetter)setter
-                    andDefaultGetter:(RCTBridgelessBundleURLGetter)defaultGetter;
+- (void)setBridgelessBundleURLGetter:(nullable RCTBridgelessBundleURLGetter)getter
+                           andSetter:(nullable RCTBridgelessBundleURLSetter)setter
+                    andDefaultGetter:(nullable RCTBridgelessBundleURLGetter)defaultGetter;
 - (void)resetBundleURL;
-@property NSURL *bundleURL;
+@property (nonatomic, nullable) NSURL *bundleURL;
+@property (nonatomic, nonnull) RCTBundleConfiguration *bundleConfig;
 @end

package/React/Base/RCTBundleManager.m

@@ -6,9 +6,100 @@
  */
 
 #import "RCTBundleManager.h"
+#import <React/RCTBundleURLProvider.h>
+#import <React/RCTDevLoadingViewSetEnabled.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;
+    };
+
+    // When the bundleFilePath is set in the RCTBundleConfiguration the Metro connection
+    // shouldn't be suggested/required.
+    if (_bundleFilePath != nil) {
+      RCTDevLoadingViewSetEnabled(false);
+    }
+  }
+
+  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 +110,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
 {
@@ -62,7 +167,13 @@
       _bridgelessBundleURLGetter != nil,
       @"RCTBundleManager: In bridgeless mode, RCTBridgelessBundleURLGetter must not be nil.");
 
-  return _bridgelessBundleURLGetter();
+  NSURL *bundleURL = [_bundleConfig getBundleURL];
+
+  if (bundleURL == nil) {
+    return _bridgelessBundleURLGetter();
+  }
+
+  return bundleURL;
 }
 
 - (void)resetBundleURL