Skip to content

Commit 90a00a6

Browse files
Yujie Liufacebook-github-bot
authored andcommitted
bundledSourceURLForBridge always return bundle path
Differential Revision: D6215467 fbshipit-source-id: 49d818cfdb776dd849a809440a1e592e5cb2231a
1 parent a75fef4 commit 90a00a6

File tree

3 files changed

+17
-5
lines changed

3 files changed

+17
-5
lines changed

React/Base/RCTBridgeDelegate.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,6 @@
4343
/**
4444
* The location of bundle path, this should be a `file://` url
4545
* pointing to a path inside the bundle resources, e.g. `file://..//main.jsbundle`.
46-
* When running from the packager this should be an absolute URL,
47-
* e.g. `http://localhost:8081/index.ios.bundle`.
4846
*/
4947
- (NSURL *)bundledSourceURLForBridge:(RCTBridge *)bridge;
5048

React/Base/RCTBundleURLProvider.h

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,14 @@ extern const NSUInteger kRCTBundleURLProviderDefaultPort;
4242
- (NSURL *)jsBundleURLForBundleRoot:(NSString *)bundleRoot
4343
fallbackResource:(NSString *)resourceName;
4444

45+
/**
46+
* Returns the jsBundleURL for a given bundle entrypoint and
47+
* the fallback offline JS bundle. If resourceName or extension
48+
* are nil, "main" and "jsbundle" will be used, respectively.
49+
*/
50+
- (NSURL *)jsBundleURLForFallbackResource:(NSString *)resourceName
51+
fallbackExtension:(NSString *)extension;
52+
4553
/**
4654
* Returns the resourceURL for a given bundle entrypoint and
4755
* the fallback offline resource file if the packager is not running.

React/Base/RCTBundleURLProvider.m

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -121,9 +121,7 @@ - (NSURL *)jsBundleURLForBundleRoot:(NSString *)bundleRoot fallbackResource:(NSS
121121
{
122122
NSString *packagerServerHost = [self packagerServerHost];
123123
if (!packagerServerHost) {
124-
resourceName = resourceName ?: @"main";
125-
extension = extension ?: @"jsbundle";
126-
return [[NSBundle mainBundle] URLForResource:resourceName withExtension:extension];
124+
return [self jsBundleURLForFallbackResource:resourceName fallbackExtension:extension];
127125
} else {
128126
return [RCTBundleURLProvider jsBundleURLForBundleRoot:bundleRoot
129127
packagerHost:packagerServerHost
@@ -137,6 +135,14 @@ - (NSURL *)jsBundleURLForBundleRoot:(NSString *)bundleRoot fallbackResource:(NSS
137135
return [self jsBundleURLForBundleRoot:bundleRoot fallbackResource:resourceName fallbackExtension:nil];
138136
}
139137

138+
- (NSURL *)jsBundleURLForFallbackResource:(NSString *)resourceName
139+
fallbackExtension:(NSString *)extension
140+
{
141+
resourceName = resourceName ?: @"main";
142+
extension = extension ?: @"jsbundle";
143+
return [[NSBundle mainBundle] URLForResource:resourceName withExtension:extension];
144+
}
145+
140146
- (NSURL *)resourceURLForResourceRoot:(NSString *)root
141147
resourceName:(NSString *)name
142148
resourceExtension:(NSString *)extension

0 commit comments

Comments
 (0)