Facebook/react-native
1
0
Fork 0
mirror of https://github.com/facebook/react-native.git synced 2025-11-01 09:14:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move loadSplitBundleFromServer from DevSupportManagerBase to BridgeDevSupportManager

Browse Source 
Summary:
## Rationale
DevSupportManagerBase.loadSplitBundleFromServer() uses the bridge. So, it's best to move it to DevSupportManagerBase.

Changelog: [Internal]

Reviewed By: JoshuaGross

Differential Revision: D29004064

fbshipit-source-id: 9acfb769d57a44ee4871e1997ff0950c3d66b757
This commit is contained in:
Ramanpreet Nara
2021-06-10 16:47:19 -07:00
committed by Facebook GitHub Bot
parent 3feaecd473
commit 30340890dc
2 changed files with 30 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ReactAndroid/src/main/java/com/facebook/react/devsupport/BridgeDevSupportManager.java
+24
View File
@@ -10,7 +10,9 @@ package com.facebook.react.devsupport;
import android.content.Context;
import androidx.annotation.Nullable;
import com.facebook.react.bridge.CatalystInstance;
import com.facebook.react.bridge.JSBundleLoader;
import com.facebook.react.devsupport.interfaces.DevBundleDownloadListener;
import com.facebook.react.devsupport.interfaces.DevSplitBundleCallback;
import com.facebook.react.packagerconnection.RequestHandler;
import java.util.Map;
@@ -79,4 +81,26 @@ public final class BridgeDevSupportManager extends DevSupportManagerBase {
minNumShakes,
customPackagerCommandHandlers);
}
@Override
public void loadSplitBundleFromServer(
final String bundlePath, final DevSplitBundleCallback callback) {
fetchSplitBundleAndCreateBundleLoader(
bundlePath,
new CallbackWithBundleLoader() {
@Override
public void onSuccess(JSBundleLoader bundleLoader) {
bundleLoader.loadScript(getCurrentContext().getCatalystInstance());
getCurrentContext()
.getJSModule(HMRClient.class)
.registerBundle(getDevServerHelper().getDevServerSplitBundleURL(bundlePath));
callback.onSuccess();
}
@Override
public void onError(String url, Throwable cause) {
callback.onError(url, cause);
}
});
}
}
ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerBase.java
+6 -21
View File
@@ -46,7 +46,6 @@ import com.facebook.react.devsupport.DevServerHelper.PackagerCommandListener;
import com.facebook.react.devsupport.interfaces.BundleLoadCallback;
import com.facebook.react.devsupport.interfaces.DevBundleDownloadListener;
import com.facebook.react.devsupport.interfaces.DevOptionHandler;
import com.facebook.react.devsupport.interfaces.DevSplitBundleCallback;
import com.facebook.react.devsupport.interfaces.DevSupportManager;
import com.facebook.react.devsupport.interfaces.ErrorCustomizer;
import com.facebook.react.devsupport.interfaces.ErrorType;
@@ -98,7 +97,7 @@ public abstract class DevSupportManagerBase
private final Context mApplicationContext;
private final ShakeDetector mShakeDetector;
private final BroadcastReceiver mReloadAppBroadcastReceiver;
protected final DevServerHelper mDevServerHelper;
private final DevServerHelper mDevServerHelper;
private final LinkedHashMap<String, DevOptionHandler> mCustomDevOptions = new LinkedHashMap<>();
private final ReactInstanceDevHelper mReactInstanceDevHelper;
private final @Nullable String mJSAppBundleName;
@@ -869,26 +868,12 @@ public abstract class DevSupportManagerBase
}
}
@Override
public void loadSplitBundleFromServer(
final String bundlePath, final DevSplitBundleCallback callback) {
fetchSplitBundleAndCreateBundleLoader(
bundlePath,
new CallbackWithBundleLoader() {
@Override
public void onSuccess(JSBundleLoader bundleLoader) {
bundleLoader.loadScript(mCurrentContext.getCatalystInstance());
mCurrentContext
.getJSModule(HMRClient.class)
.registerBundle(mDevServerHelper.getDevServerSplitBundleURL(bundlePath));
callback.onSuccess();
}
protected @Nullable ReactContext getCurrentContext() {
return mCurrentContext;
}
@Override
public void onError(String url, Throwable cause) {
callback.onError(url, cause);
}
});
protected DevServerHelper getDevServerHelper() {
return mDevServerHelper;
}
public void fetchSplitBundleAndCreateBundleLoader(