diff --git a/React/Base/RCTBundleURLProvider.h b/React/Base/RCTBundleURLProvider.h index 268bae099df..ece801d6b4e 100644 --- a/React/Base/RCTBundleURLProvider.h +++ b/React/Base/RCTBundleURLProvider.h @@ -68,25 +68,22 @@ RCT_EXTERN void RCTBundleURLProviderAllowPackagerServerAccess(BOOL allowed); /** * Returns the jsBundleURL for a given bundle entrypoint and * the fallback offline JS bundle if the packager is not running. - * if resourceName or extension are nil, "main" and "jsbundle" will be - * used, respectively. + * if extension is nil, "jsbundle" will be used. */ -- (NSURL *)jsBundleURLForBundleRoot:(NSString *)bundleRoot - fallbackResource:(NSString *)resourceName - fallbackExtension:(NSString *)extension; +- (NSURL *)jsBundleURLForBundleRoot:(NSString *)bundleRoot fallbackExtension:(NSString *)extension; /** * Returns the jsBundleURL for a given bundle entrypoint and * the fallback offline JS bundle if the packager is not running. */ -- (NSURL *)jsBundleURLForBundleRoot:(NSString *)bundleRoot fallbackResource:(NSString *)resourceName; +- (NSURL *)jsBundleURLForBundleRoot:(NSString *)bundleRoot; /** * Returns the jsBundleURL for a given bundle entrypoint and - * the fallback offline JS bundle. If resourceName or extension - * are nil, "main" and "jsbundle" will be used, respectively. + * the fallback offline JS bundle. If extension is nil, + * "jsbundle" will be used. */ -- (NSURL *)jsBundleURLForFallbackResource:(NSString *)resourceName fallbackExtension:(NSString *)extension; +- (NSURL *)jsBundleURLForFallbackExtension:(NSString *)extension; /** * Returns the resourceURL for a given bundle entrypoint and diff --git a/React/Base/RCTBundleURLProvider.mm b/React/Base/RCTBundleURLProvider.mm index 73d7c172fd4..56dc971b9b0 100644 --- a/React/Base/RCTBundleURLProvider.mm +++ b/React/Base/RCTBundleURLProvider.mm @@ -199,26 +199,23 @@ static NSURL *serverRootWithHostPort(NSString *hostPort, NSString *scheme) runModule:NO]; } -- (NSURL *)jsBundleURLForBundleRoot:(NSString *)bundleRoot - fallbackResource:(NSString *)resourceName - fallbackExtension:(NSString *)extension +- (NSURL *)jsBundleURLForBundleRoot:(NSString *)bundleRoot fallbackExtension:(NSString *)extension { return [self jsBundleURLForBundleRoot:bundleRoot fallbackURLProvider:^NSURL * { - return [self jsBundleURLForFallbackResource:resourceName fallbackExtension:extension]; + return [self jsBundleURLForFallbackExtension:extension]; }]; } -- (NSURL *)jsBundleURLForBundleRoot:(NSString *)bundleRoot fallbackResource:(NSString *)resourceName +- (NSURL *)jsBundleURLForBundleRoot:(NSString *)bundleRoot { - return [self jsBundleURLForBundleRoot:bundleRoot fallbackResource:resourceName fallbackExtension:nil]; + return [self jsBundleURLForBundleRoot:bundleRoot fallbackExtension:nil]; } -- (NSURL *)jsBundleURLForFallbackResource:(NSString *)resourceName fallbackExtension:(NSString *)extension +- (NSURL *)jsBundleURLForFallbackExtension:(NSString *)extension { - resourceName = resourceName ?: @"main"; extension = extension ?: @"jsbundle"; - return [[NSBundle mainBundle] URLForResource:resourceName withExtension:extension]; + return [[NSBundle mainBundle] URLForResource:@"main" withExtension:extension]; } - (NSURL *)resourceURLForResourceRoot:(NSString *)root diff --git a/React/CoreModules/RCTDevMenu.mm b/React/CoreModules/RCTDevMenu.mm index d956be8926b..a10d73dcbff 100644 --- a/React/CoreModules/RCTDevMenu.mm +++ b/React/CoreModules/RCTDevMenu.mm @@ -210,8 +210,7 @@ RCT_EXPORT_MODULE() - (void)setDefaultJSBundle { [[RCTBundleURLProvider sharedSettings] resetToDefaults]; - self->_bundleManager.bundleURL = [[RCTBundleURLProvider sharedSettings] jsBundleURLForFallbackResource:nil - fallbackExtension:nil]; + self->_bundleManager.bundleURL = [[RCTBundleURLProvider sharedSettings] jsBundleURLForFallbackExtension:nil]; RCTTriggerReloadCommandListeners(@"Dev menu - reset to default"); } @@ -363,8 +362,7 @@ RCT_EXPORT_MODULE() [bundleManager resetBundleURL]; } else { bundleManager.bundleURL = [[RCTBundleURLProvider sharedSettings] - jsBundleURLForBundleRoot:bundleRoot - fallbackResource:nil]; + jsBundleURLForBundleRoot:bundleRoot]; } RCTTriggerReloadCommandListeners(@"Dev menu - apply changes"); diff --git a/packages/rn-tester/RNTester/AppDelegate.mm b/packages/rn-tester/RNTester/AppDelegate.mm index c34703b5570..1917cabb127 100644 --- a/packages/rn-tester/RNTester/AppDelegate.mm +++ b/packages/rn-tester/RNTester/AppDelegate.mm @@ -121,8 +121,7 @@ - (NSURL *)sourceURLForBridge:(__unused RCTBridge *)bridge { - return [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@"packages/rn-tester/js/RNTesterApp.ios" - fallbackResource:nil]; + return [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@"packages/rn-tester/js/RNTesterApp.ios"]; } - (void)initializeFlipper:(UIApplication *)application diff --git a/packages/rn-tester/RNTesterUnitTests/RCTBundleURLProviderTests.m b/packages/rn-tester/RNTesterUnitTests/RCTBundleURLProviderTests.m index 9a72c65def9..1c923fe48d7 100644 --- a/packages/rn-tester/RNTesterUnitTests/RCTBundleURLProviderTests.m +++ b/packages/rn-tester/RNTesterUnitTests/RCTBundleURLProviderTests.m @@ -98,7 +98,7 @@ static NSURL *ipBundleURL() { RCTBundleURLProvider *settings = [RCTBundleURLProvider sharedSettings]; settings.jsLocation = nil; - NSURL *URL = [settings jsBundleURLForBundleRoot:testFile fallbackResource:nil]; + NSURL *URL = [settings jsBundleURLForBundleRoot:testFile]; if (!getenv("CI_USE_PACKAGER")) { XCTAssertEqualObjects(URL, mainBundleURL()); } else { @@ -112,7 +112,7 @@ static NSURL *ipBundleURL() [[[classMock stub] andReturnValue:@YES] isPackagerRunning:[OCMArg any] scheme:[OCMArg any]]; RCTBundleURLProvider *settings = [RCTBundleURLProvider sharedSettings]; settings.jsLocation = @"localhost"; - NSURL *URL = [settings jsBundleURLForBundleRoot:testFile fallbackResource:nil]; + NSURL *URL = [settings jsBundleURLForBundleRoot:testFile]; XCTAssertEqualObjects(URL, localhostBundleURL()); } @@ -122,7 +122,7 @@ static NSURL *ipBundleURL() [[[classMock stub] andReturnValue:@YES] isPackagerRunning:[OCMArg any] scheme:[OCMArg any]]; RCTBundleURLProvider *settings = [RCTBundleURLProvider sharedSettings]; settings.jsLocation = @"192.168.1.1"; - NSURL *URL = [settings jsBundleURLForBundleRoot:testFile fallbackResource:nil]; + NSURL *URL = [settings jsBundleURLForBundleRoot:testFile]; XCTAssertEqualObjects(URL, ipBundleURL()); }