Skip to content

Commit ae5ef65

Browse files
Yujie Liufacebook-github-bot
Yujie Liu
authored andcommitted
Rename bundleSource to embeddedBundle
Reviewed By: fromcelticpark Differential Revision: D6274101 fbshipit-source-id: f62da158d165cb3ce4a510ebc4eed24a8a719381
1 parent e9393f6 commit ae5ef65

File tree

5 files changed

+11
-11
lines changed

5 files changed

+11
-11
lines changed

React/Base/RCTBridge.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -172,9 +172,9 @@ RCT_EXTERN NSString *RCTBridgeModuleNameForClass(Class bridgeModuleClass);
172172
@property (nonatomic, strong, readonly) NSURL *bundleURL;
173173

174174
/**
175-
* URL of the original script (not necessarily loaded) of the bridge.
175+
* URL of the embedded bundle of the bridge.
176176
*/
177-
@property (nonatomic, strong, readonly) NSURL *bundledSourceURL;
177+
@property (nonatomic, strong, readonly) NSURL *embeddedBundleURL;
178178

179179
/**
180180
* The class of the executor currently being used. Changes to this value will

React/Base/RCTBridge.m

+3-3
Original file line numberDiff line numberDiff line change
@@ -329,9 +329,9 @@ - (void)setUp
329329
// Sanitize the bundle URL
330330
_bundleURL = [RCTConvert NSURL:_bundleURL.absoluteString];
331331

332-
if ([self.delegate respondsToSelector:@selector(bundledSourceURLForBridge:)]) {
333-
_bundledSourceURL = [self.delegate bundledSourceURLForBridge:self];
334-
_bundledSourceURL = [RCTConvert NSURL:_bundledSourceURL.absoluteString];
332+
if ([self.delegate respondsToSelector:@selector(embeddedBundleURLForBridge:)]) {
333+
_embeddedBundleURL = [self.delegate embeddedBundleURLForBridge:self];
334+
_embeddedBundleURL = [RCTConvert NSURL:_embeddedBundleURL.absoluteString];
335335
}
336336

337337
self.batchedBridge = [[bridgeClass alloc] initWithParentBridge:self];

React/Base/RCTBridgeDelegate.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,10 @@
4141
- (NSArray<id<RCTBridgeModule>> *)extraModulesForBridge:(RCTBridge *)bridge;
4242

4343
/**
44-
* The location of bundle path, this should be a `file://` url
44+
* The location of embedded bundle path, this should be a `file://` url
4545
* pointing to a path inside the bundle resources, e.g. `file://..//main.jsbundle`.
4646
*/
47-
- (NSURL *)bundledSourceURLForBridge:(RCTBridge *)bridge;
47+
- (NSURL *)embeddedBundleURLForBridge:(RCTBridge *)bridge;
4848

4949
/**
5050
* Configure whether the JSCExecutor created should use the system JSC API or

React/CxxBridge/RCTCxxBridge.mm

+3-3
Original file line numberDiff line numberDiff line change
@@ -176,8 +176,8 @@ @implementation RCTCxxBridge
176176
}
177177

178178
@synthesize bridgeDescription = _bridgeDescription;
179+
@synthesize embeddedBundleURL = _embeddedBundleURL;
179180
@synthesize loading = _loading;
180-
@synthesize bundledSourceURL = _bundledSourceURL;
181181
@synthesize performanceLogger = _performanceLogger;
182182
@synthesize valid = _valid;
183183

@@ -208,8 +208,8 @@ - (instancetype)initWithParentBridge:(RCTBridge *)bridge
208208
launchOptions:bridge.launchOptions])) {
209209
_parentBridge = bridge;
210210
_performanceLogger = [bridge performanceLogger];
211-
if ([bridge.delegate respondsToSelector:@selector(bundledSourceURLForBridge:)]) {
212-
_bundledSourceURL = [bridge.delegate bundledSourceURLForBridge:bridge];
211+
if ([bridge.delegate respondsToSelector:@selector(embeddedBundleURLForBridge:)]) {
212+
_embeddedBundleURL = [bridge.delegate embeddedBundleURLForBridge:bridge];
213213
}
214214

215215
registerPerformanceLoggerHooks(_performanceLogger);

React/Modules/RCTSourceCode.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ + (BOOL)requiresMainQueueSetup
2626
{
2727
return @{
2828
@"scriptURL": self.bridge.bundleURL.absoluteString ?: @"",
29-
@"bundledScriptURL": self.bridge.bundledSourceURL.absoluteString ?: @""
29+
@"embeddedBundleURL": self.bridge.embeddedBundleURL.absoluteString ?: @""
3030
};
3131
}
3232

0 commit comments

Comments
 (0)