Permalink
Browse files

Rename bundleSource to embeddedBundle

Reviewed By: fromcelticpark

Differential Revision: D6274101

fbshipit-source-id: f62da158d165cb3ce4a510ebc4eed24a8a719381
  • Loading branch information...
Yujie Liu authored and facebook-github-bot committed Nov 9, 2017
1 parent e9393f6 commit ae5ef653cbc4c03fe5edb5d4b0002e38cbb6f458
@@ -172,9 +172,9 @@ RCT_EXTERN NSString *RCTBridgeModuleNameForClass(Class bridgeModuleClass);
@property (nonatomic, strong, readonly) NSURL *bundleURL;
/**
* URL of the original script (not necessarily loaded) of the bridge.
* URL of the embedded bundle of the bridge.
*/
@property (nonatomic, strong, readonly) NSURL *bundledSourceURL;
@property (nonatomic, strong, readonly) NSURL *embeddedBundleURL;
/**
* The class of the executor currently being used. Changes to this value will
@@ -329,9 +329,9 @@ - (void)setUp
// Sanitize the bundle URL
_bundleURL = [RCTConvert NSURL:_bundleURL.absoluteString];
if ([self.delegate respondsToSelector:@selector(bundledSourceURLForBridge:)]) {
_bundledSourceURL = [self.delegate bundledSourceURLForBridge:self];
_bundledSourceURL = [RCTConvert NSURL:_bundledSourceURL.absoluteString];
if ([self.delegate respondsToSelector:@selector(embeddedBundleURLForBridge:)]) {
_embeddedBundleURL = [self.delegate embeddedBundleURLForBridge:self];
_embeddedBundleURL = [RCTConvert NSURL:_embeddedBundleURL.absoluteString];
}
self.batchedBridge = [[bridgeClass alloc] initWithParentBridge:self];
@@ -41,10 +41,10 @@
- (NSArray<id<RCTBridgeModule>> *)extraModulesForBridge:(RCTBridge *)bridge;
/**
* The location of bundle path, this should be a `file://` url
* The location of embedded bundle path, this should be a `file://` url
* pointing to a path inside the bundle resources, e.g. `file://..//main.jsbundle`.
*/
- (NSURL *)bundledSourceURLForBridge:(RCTBridge *)bridge;
- (NSURL *)embeddedBundleURLForBridge:(RCTBridge *)bridge;
/**
* Configure whether the JSCExecutor created should use the system JSC API or
@@ -176,8 +176,8 @@ @implementation RCTCxxBridge
}
@synthesize bridgeDescription = _bridgeDescription;
@synthesize embeddedBundleURL = _embeddedBundleURL;
@synthesize loading = _loading;
@synthesize bundledSourceURL = _bundledSourceURL;
@synthesize performanceLogger = _performanceLogger;
@synthesize valid = _valid;
@@ -208,8 +208,8 @@ - (instancetype)initWithParentBridge:(RCTBridge *)bridge
launchOptions:bridge.launchOptions])) {
_parentBridge = bridge;
_performanceLogger = [bridge performanceLogger];
if ([bridge.delegate respondsToSelector:@selector(bundledSourceURLForBridge:)]) {
_bundledSourceURL = [bridge.delegate bundledSourceURLForBridge:bridge];
if ([bridge.delegate respondsToSelector:@selector(embeddedBundleURLForBridge:)]) {
_embeddedBundleURL = [bridge.delegate embeddedBundleURLForBridge:bridge];
}
registerPerformanceLoggerHooks(_performanceLogger);
@@ -26,7 +26,7 @@ + (BOOL)requiresMainQueueSetup
{
return @{
@"scriptURL": self.bridge.bundleURL.absoluteString ?: @"",
@"bundledScriptURL": self.bridge.bundledSourceURL.absoluteString ?: @""
@"embeddedBundleURL": self.bridge.embeddedBundleURL.absoluteString ?: @""
};
}

0 comments on commit ae5ef65

Please sign in to comment.