From f3fab5184ea5e2a366e016e7b34479779f59a9b1 Mon Sep 17 00:00:00 2001 From: Alex Kotliarskyi Date: Tue, 7 Jun 2016 11:07:53 -0700 Subject: [PATCH] Remove SourceCode.getScriptText Summary: After cleaning up JS SourceMap code, these native methods are not needed anymore. On iOS it saves another 30+ Mb during development. Reviewed By: javache, astreet Differential Revision: D3348975 fbshipit-source-id: a68ae9b00b4dbaa374b421029ae676fc69ae5a75 --- React/Base/RCTBatchedBridge.m | 1 - React/Modules/RCTSourceCode.h | 1 - React/Modules/RCTSourceCode.m | 17 ----------------- .../com/facebook/react/CoreModulesPackage.java | 4 +--- .../react/modules/debug/SourceCodeModule.java | 11 +---------- 5 files changed, 2 insertions(+), 32 deletions(-) diff --git a/React/Base/RCTBatchedBridge.m b/React/Base/RCTBatchedBridge.m index 3314a2d07..98d0615db 100644 --- a/React/Base/RCTBatchedBridge.m +++ b/React/Base/RCTBatchedBridge.m @@ -455,7 +455,6 @@ RCT_EXTERN NSArray *RCTGetModuleClasses(void); RCTSourceCode *sourceCodeModule = [self moduleForClass:[RCTSourceCode class]]; sourceCodeModule.scriptURL = self.bundleURL; - sourceCodeModule.scriptData = sourceCode; [self enqueueApplicationScript:sourceCode url:self.bundleURL onComplete:^(NSError *loadError) { if (!_valid) { diff --git a/React/Modules/RCTSourceCode.h b/React/Modules/RCTSourceCode.h index 1acf6f1e0..4e2ef845c 100644 --- a/React/Modules/RCTSourceCode.h +++ b/React/Modules/RCTSourceCode.h @@ -13,7 +13,6 @@ @interface RCTSourceCode : NSObject -@property (nonatomic, copy) NSData *scriptData; @property (nonatomic, copy) NSURL *scriptURL; @end diff --git a/React/Modules/RCTSourceCode.m b/React/Modules/RCTSourceCode.m index 1608aca70..df81bb89a 100644 --- a/React/Modules/RCTSourceCode.m +++ b/React/Modules/RCTSourceCode.m @@ -20,23 +20,6 @@ RCT_EXPORT_MODULE() @synthesize bridge = _bridge; -#if !RCT_DEV -- (void)setScriptText:(NSString *)scriptText {} -#endif - -NSString *const RCTErrorUnavailable = @"E_SOURCE_CODE_UNAVAILABLE"; - -RCT_EXPORT_METHOD(getScriptText:(RCTPromiseResolveBlock)resolve - reject:(RCTPromiseRejectBlock)reject) -{ - if (RCT_DEV && self.scriptData && self.scriptURL) { - NSString *scriptText = [[NSString alloc] initWithData:self.scriptData encoding:NSUTF8StringEncoding]; - resolve(@{@"text": RCTNullIfNil(scriptText), @"url": self.scriptURL.absoluteString}); - } else { - reject(RCTErrorUnavailable, nil, RCTErrorWithMessage(@"Source code is not available")); - } -} - - (NSDictionary *)constantsToExport { NSString *URL = self.bridge.bundleURL.absoluteString ?: @""; diff --git a/ReactAndroid/src/main/java/com/facebook/react/CoreModulesPackage.java b/ReactAndroid/src/main/java/com/facebook/react/CoreModulesPackage.java index 9b975bf55..8be15fb6d 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/CoreModulesPackage.java +++ b/ReactAndroid/src/main/java/com/facebook/react/CoreModulesPackage.java @@ -81,9 +81,7 @@ import com.facebook.systrace.Systrace; new DeviceEventManagerModule(catalystApplicationContext, mHardwareBackBtnHandler), new ExceptionsManagerModule(mReactInstanceManager.getDevSupportManager()), new Timing(catalystApplicationContext), - new SourceCodeModule( - mReactInstanceManager.getSourceUrl(), - mReactInstanceManager.getDevSupportManager().getSourceMapUrl()), + new SourceCodeModule(mReactInstanceManager.getSourceUrl()), uiManagerModule, new JSCHeapCapture(catalystApplicationContext), new DebugComponentOwnershipModule(catalystApplicationContext)); diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/debug/SourceCodeModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/debug/SourceCodeModule.java index 3417c8194..71aba3511 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/debug/SourceCodeModule.java +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/debug/SourceCodeModule.java @@ -25,11 +25,9 @@ import com.facebook.react.bridge.WritableNativeMap; */ public class SourceCodeModule extends BaseJavaModule { - private final String mSourceMapUrl; private final String mSourceUrl; - public SourceCodeModule(String sourceUrl, String sourceMapUrl) { - mSourceMapUrl = sourceMapUrl; + public SourceCodeModule(String sourceUrl) { mSourceUrl = sourceUrl; } @@ -38,13 +36,6 @@ public class SourceCodeModule extends BaseJavaModule { return "RCTSourceCode"; } - @ReactMethod - public void getScriptText(final Promise promise) { - WritableMap map = new WritableNativeMap(); - map.putString("fullSourceMappingURL", mSourceMapUrl); - promise.resolve(map); - } - @Override public @Nullable Map getConstants() { HashMap constants = new HashMap();