Permalink
Browse files

Rename BundleFetcher to SegmentFetcher

Reviewed By: jeanlauliac

Differential Revision: D6271908

fbshipit-source-id: ed1259148ac5ca44789166e22d519a7a21f4cfd9
  • Loading branch information...
fromcelticpark authored and facebook-github-bot committed Nov 8, 2017
1 parent 16bbd90 commit 963c61d4d546c94b689281ca1f5105ad050e10ff
Showing with 13 additions and 12 deletions.
  1. +7 −6 Libraries/Core/InitializeCore.js
  2. +6 −6 Libraries/Utilities/BundleSegments.js
@@ -206,16 +206,17 @@ BatchedBridge.registerLazyCallableModule('RCTDeviceEventEmitter', () => require(
BatchedBridge.registerLazyCallableModule('RCTNativeAppEventEmitter', () => require('RCTNativeAppEventEmitter'));
BatchedBridge.registerLazyCallableModule('PerformanceLogger', () => require('PerformanceLogger'));
global.fetchBundle = function(
bundleId: number,
global.fetchSegment = function(
segmentId: number,
callback: (?Error) => void,
) {
const {BundleFetcher} = require('NativeModules');
if (!BundleFetcher) {
throw new Error('BundleFetcher is missing');
const {SegmentFetcher} = require('NativeModules');
if (!SegmentFetcher) {
throw new Error('SegmentFetcher is missing. Please ensure that it is ' +
'included as a NativeModule.');
}
BundleFetcher.fetchBundle(bundleId, (errorObject: ?{message: string, code: string}) => {
SegmentFetcher.fetchSegment(segmentId, (errorObject: ?{message: string, code: string}) => {
if (errorObject) {
const error = new Error(errorObject.message);
(error: any).code = errorObject.code;
@@ -17,7 +17,7 @@ let segmentLoaders = new Map();
/**
* Ensure that a bundle segment is ready for use, for example requiring some of
* its module. We cache load promises so as to avoid calling `fetchBundle` twice
* its module. We cache load promises so as to avoid calling `fetchSegment` twice
* for the same bundle. We assume that once a segment is fetched/loaded, it is
* never gettting removed during this instance of the JavaScript VM.
*/
@@ -30,16 +30,16 @@ async function loadForModule(moduleID: number): Promise<void> {
if (segmentLoader != null) {
return await segmentLoader;
}
// FIXME: `fetchBundle` should be renamed `fetchSegment`.
const {fetchBundle} = global;
if (fetchBundle == null) {
const {fetchSegment} = global;
if (fetchSegment == null) {
throw new Error(
'When bundle splitting is enabled, the `global.fetchBundle` function ' +
'When bundle splitting is enabled, the `global.fetchSegment` function ' +
'must be provided to be able to load particular bundle segments.',
);
}
segmentLoader = new Promise((resolve, reject) => {
fetchBundle(segmentId, error => {
fetchSegment(segmentId, error => {
if (error != null) {
reject(error);
return;

0 comments on commit 963c61d

Please sign in to comment.