diff --git a/React/Base/RCTBridge.h b/React/Base/RCTBridge.h index 9a5fa5cd1f749d..450a0d0e38a104 100644 --- a/React/Base/RCTBridge.h +++ b/React/Base/RCTBridge.h @@ -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 diff --git a/React/Base/RCTBridge.m b/React/Base/RCTBridge.m index b69ea1d9fd5ae3..a8cef88c7bf4d9 100644 --- a/React/Base/RCTBridge.m +++ b/React/Base/RCTBridge.m @@ -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]; diff --git a/React/Base/RCTBridgeDelegate.h b/React/Base/RCTBridgeDelegate.h index fb048769ead2c9..f70a024188bad1 100644 --- a/React/Base/RCTBridgeDelegate.h +++ b/React/Base/RCTBridgeDelegate.h @@ -41,10 +41,10 @@ - (NSArray> *)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 diff --git a/React/CxxBridge/RCTCxxBridge.mm b/React/CxxBridge/RCTCxxBridge.mm index 88eb814aceb334..871bc46071c255 100644 --- a/React/CxxBridge/RCTCxxBridge.mm +++ b/React/CxxBridge/RCTCxxBridge.mm @@ -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); diff --git a/React/Modules/RCTSourceCode.m b/React/Modules/RCTSourceCode.m index aab1692010f96b..a7c274a006fd86 100644 --- a/React/Modules/RCTSourceCode.m +++ b/React/Modules/RCTSourceCode.m @@ -26,7 +26,7 @@ + (BOOL)requiresMainQueueSetup { return @{ @"scriptURL": self.bridge.bundleURL.absoluteString ?: @"", - @"bundledScriptURL": self.bridge.bundledSourceURL.absoluteString ?: @"" + @"embeddedBundleURL": self.bridge.embeddedBundleURL.absoluteString ?: @"" }; }