Adopt new split segments registration approach on iOS

Differential Revision: D6284479 fbshipit-source-id: d0d7e8c6a6ce4ecab63739149be69f25df7fbe6f
facebook · Nov 9, 2017 · 6812789 · 6812789
1 parent cff0d8e
commit 6812789
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 13 deletions.
diff --git a/React/Base/RCTBridge.h b/React/Base/RCTBridge.h
@@ -138,6 +138,13 @@ RCT_EXTERN NSString *RCTBridgeModuleNameForClass(Class bridgeModuleClass);
                         arguments:(NSArray *)arguments
                             error:(NSError **)error;
 
+/**
+ * This method registers the file path of an additional JS segment by its ID.
+ *
+ * @experimental
+ */
+- (void)registerSegmentWithId:(NSUInteger)segmentId path:(NSString *)path;
+
 /**
  * Retrieve a bridge module instance by name or class. Note that modules are
  * lazily instantiated, so calling these methods for the first time with a given

diff --git a/React/Base/RCTBridge.m b/React/Base/RCTBridge.m
@@ -398,6 +398,11 @@ - (JSValue *)callFunctionOnModule:(NSString *)module
   return [self.batchedBridge callFunctionOnModule:module method:method arguments:arguments error:error];
 }
 
+- (void)registerSegmentWithId:(NSUInteger)segmentId path:(NSString *)path
+{
+  [self.batchedBridge registerSegmentWithId:segmentId path:path];
+}
+
 @end
 
 @implementation RCTBridge (JavaScriptCore)

diff --git a/React/Base/RCTBridgeDelegate.h b/React/Base/RCTBridgeDelegate.h
@@ -94,11 +94,4 @@
 - (void)loadSourceForBridge:(RCTBridge *)bridge
                   withBlock:(RCTSourceLoadBlock)loadCallback;
 
-/**
- * Specifies the path to folder where additional bundles are located
- *
- * @experimental
- */
-- (NSURL *)jsSegmentsDirectory;
-
 @end
diff --git a/React/CxxBridge/RCTCxxBridge.mm b/React/CxxBridge/RCTCxxBridge.mm
@@ -1148,12 +1148,7 @@ - (void)executeApplicationScript:(NSData *)script
       [self->_performanceLogger markStopForTag:RCTPLRAMBundleLoad];
       [self->_performanceLogger setValue:scriptStr->size() forTag:RCTPLRAMStartupCodeSize];
       if (self->_reactInstance) {
-        NSString *jsSegmentsDirectory = [self.delegate respondsToSelector:@selector(jsSegmentsDirectory)]
-          ? [[self.delegate jsSegmentsDirectory].path stringByAppendingString:@"/"]
-          : nil;
-        auto registry = jsSegmentsDirectory != nil
-          ? RAMBundleRegistry::multipleBundlesRegistry(std::move(ramBundle), JSIndexedRAMBundle::buildFactory())
-          : RAMBundleRegistry::singleBundleRegistry(std::move(ramBundle));
+        auto registry = RAMBundleRegistry::multipleBundlesRegistry(std::move(ramBundle), JSIndexedRAMBundle::buildFactory());
         self->_reactInstance->loadRAMBundle(std::move(registry), std::move(scriptStr),
                                             sourceUrlStr.UTF8String, !async);
       }
@@ -1214,6 +1209,13 @@ - (JSValue *)callFunctionOnModule:(NSString *)module
   return ret;
 }
 
+- (void)registerSegmentWithId:(NSUInteger)segmentId path:(NSString *)path
+{
+  if (_reactInstance) {
+    _reactInstance->registerBundle(static_cast<uint32_t>(segmentId), path.UTF8String);
+  }
+}
+
 #pragma mark - Payload Processing
 
 - (void)partialBatchDidFlush