Breaking - remove unused registration of JS modules

Summary: It's now unnecessary to declare which JS modules you want to expose on your package. To upgrade, remove all overrides of `createJSModules` and keeping calling your JS modules as before. Reviewed By: AaaChiuuu Differential Revision: D5229259 fbshipit-source-id: 1160826c951433722f1fe0421c1200883ba1a348
rastaman · Jun 14, 2017 · ce6fb33 · ce6fb33
1 parent 71ea94b
commit ce6fb33
Show file tree

Hide file tree

Showing 30 changed files with 15 additions and 203 deletions.
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/AbstractScrollViewTestCase.java b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/AbstractScrollViewTestCase.java
@@ -40,8 +40,7 @@ protected void tearDown() throws Exception {
   protected ReactInstanceSpecForTest createReactInstanceSpecForTest() {
     mScrollListenerModule = new ScrollListenerModule();
     return super.createReactInstanceSpecForTest()
-        .addNativeModule(mScrollListenerModule)
-        .addJSModule(ScrollViewTestModule.class);
+        .addNativeModule(mScrollListenerModule);
   }
 
   // See ScrollViewListenerModule.js

diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/InstanceSpecForTestPackage.java b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/InstanceSpecForTestPackage.java
@@ -36,11 +36,6 @@ public List<NativeModule> createNativeModules(
     return mSpecForTest.getExtraNativeModulesForTest();
   }
 
-  @Override
-  public List<Class<? extends JavaScriptModule>> createJSModules() {
-    return mSpecForTest.getExtraJSModulesForTest();
-  }
-
   @Override
   public List<ViewManager> createViewManagers(ReactApplicationContext reactContext) {
     return mSpecForTest.getExtraViewManagers();

diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactInstanceSpecForTest.java b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactInstanceSpecForTest.java
@@ -38,11 +38,6 @@ public ReactInstanceSpecForTest addNativeModule(NativeModule module) {
     return this;
   }
 
-  public ReactInstanceSpecForTest addJSModule(Class jsClass) {
-    mJSModuleSpecs.add(jsClass);
-    return this;
-  }
-
   public ReactInstanceSpecForTest setPackage(ReactPackage reactPackage) {
     mReactPackage = reactPackage;
     return this;
@@ -57,10 +52,6 @@ public List<NativeModule> getExtraNativeModulesForTest() {
     return mNativeModules;
   }
 
-  public List<Class<? extends JavaScriptModule>> getExtraJSModulesForTest() {
-    return mJSModuleSpecs;
-  }
-
   public ReactPackage getAlternativeReactPackageForTest() {
     return mReactPackage;
   }

diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactTestFactory.java b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactTestFactory.java
@@ -18,7 +18,6 @@ public interface ReactTestFactory {
   public static interface ReactInstanceEasyBuilder {
     ReactInstanceEasyBuilder setContext(Context context);
     ReactInstanceEasyBuilder addNativeModule(NativeModule module);
-    ReactInstanceEasyBuilder addJSModule(Class moduleInterfaceClass);
     CatalystInstance build();
   }
 

diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactTestHelper.java b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactTestHelper.java
@@ -16,6 +16,7 @@
 import android.view.View;
 import android.view.ViewGroup;
 
+import com.facebook.infer.annotation.Assertions;
 import com.facebook.react.NativeModuleRegistryBuilder;
 import com.facebook.react.R;
 import com.facebook.react.ReactInstanceManager;
@@ -39,8 +40,6 @@ public class ReactTestHelper {
   private static class DefaultReactTestFactory implements ReactTestFactory {
     private static class ReactInstanceEasyBuilderImpl implements ReactInstanceEasyBuilder {
 
-      private final JavaScriptModuleRegistry.Builder mJSModuleRegistryBuilder =
-        new JavaScriptModuleRegistry.Builder();
       private NativeModuleRegistryBuilder mNativeModuleRegistryBuilder;
 
       private @Nullable Context mContext;
@@ -59,16 +58,11 @@ public ReactInstanceEasyBuilder addNativeModule(NativeModule nativeModule) {
             null,
             false);
         }
+        Assertions.assertNotNull(nativeModule);
         mNativeModuleRegistryBuilder.addNativeModule(nativeModule);
         return this;
       }
 
-      @Override
-      public ReactInstanceEasyBuilder addJSModule(Class moduleInterfaceClass) {
-        mJSModuleRegistryBuilder.add(moduleInterfaceClass);
-        return this;
-      }
-
       @Override
       public CatalystInstance build() {
         if (mNativeModuleRegistryBuilder == null) {
@@ -87,7 +81,6 @@ public CatalystInstance build() {
           .setReactQueueConfigurationSpec(ReactQueueConfigurationSpec.createDefault())
           .setJSExecutor(executor)
           .setRegistry(mNativeModuleRegistryBuilder.build())
-          .setJSModuleRegistry(mJSModuleRegistryBuilder.build())
           .setJSBundleLoader(JSBundleLoader.createAssetLoader(
               mContext,
               "assets://AndroidTestBundle.js",
@@ -141,12 +134,6 @@ public ReactTestFactory.ReactInstanceEasyBuilder addNativeModule(NativeModule mo
           return this;
         }
 
-        @Override
-        public ReactTestFactory.ReactInstanceEasyBuilder addJSModule(Class moduleInterfaceClass) {
-          builder.addJSModule(moduleInterfaceClass);
-          return this;
-        }
-
         @Override
         public CatalystInstance build() {
           final CatalystInstance instance = builder.build();

diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/CatalystMeasureLayoutTest.java b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/CatalystMeasureLayoutTest.java
@@ -74,9 +74,8 @@ protected String getReactApplicationKeyUnderTest() {
   @Override
   protected ReactInstanceSpecForTest createReactInstanceSpecForTest() {
     mAssertModule = new AssertModule();
-    return new ReactInstanceSpecForTest()
-        .addNativeModule(mAssertModule)
-        .addJSModule(MeasureLayoutTestModule.class);
+    return super.createReactInstanceSpecForTest()
+        .addNativeModule(mAssertModule);
   }
 
   private void waitForBridgeIdleAndVerifyAsserts() {

diff --git a/...c/androidTest/java/com/facebook/react/tests/CatalystNativeJSToJavaParametersTestCase.java b/...c/androidTest/java/com/facebook/react/tests/CatalystNativeJSToJavaParametersTestCase.java
@@ -109,7 +109,6 @@ public void run() {
         .addNativeModule(new AppStateModule(getContext()))
         .addNativeModule(new FakeWebSocketModule())
         .addNativeModule(mUIManager)
-        .addJSModule(TestJSToJavaParametersModule.class)
         .build();
   }
 

diff --git a/...rc/androidTest/java/com/facebook/react/tests/CatalystNativeJavaToJSArgumentsTestCase.java b/...rc/androidTest/java/com/facebook/react/tests/CatalystNativeJavaToJSArgumentsTestCase.java
@@ -85,7 +85,6 @@ public void run() {
         .addNativeModule(new DeviceInfoModule(getContext()))
         .addNativeModule(new AppStateModule(getContext()))
         .addNativeModule(new FakeWebSocketModule())
-        .addJSModule(TestJavaToJSArgumentsModule.class)
         .addNativeModule(mUIManager)
         .build();
   }

diff --git a/...androidTest/java/com/facebook/react/tests/CatalystNativeJavaToJSReturnValuesTestCase.java b/...androidTest/java/com/facebook/react/tests/CatalystNativeJavaToJSReturnValuesTestCase.java
@@ -126,7 +126,6 @@ protected void setUp() throws Exception {
         .addNativeModule(new DeviceInfoModule(getContext()))
         .addNativeModule(new AppStateModule(getContext()))
         .addNativeModule(new FakeWebSocketModule())
-        .addJSModule(TestJavaToJSReturnValuesModule.class)
         .addNativeModule(mUIManager)
         .addNativeModule(new TestModule())
         .build();

diff --git a/...droid/src/androidTest/java/com/facebook/react/tests/CatalystSubviewsClippingTestCase.java b/...droid/src/androidTest/java/com/facebook/react/tests/CatalystSubviewsClippingTestCase.java
@@ -51,10 +51,8 @@ protected String getReactApplicationKeyUnderTest() {
 
   @Override
   protected ReactInstanceSpecForTest createReactInstanceSpecForTest() {
-    ReactInstanceSpecForTest instanceSpec = new ReactInstanceSpecForTest();
-    instanceSpec.addJSModule(SubviewsClippingTestModule.class);
-    instanceSpec.addViewManager(new ClippableViewManager(mEvents));
-    return instanceSpec;
+    return super.createReactInstanceSpecForTest()
+        .addViewManager(new ClippableViewManager(mEvents));
   }
 
   /**

diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/CatalystUIManagerTestCase.java b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/CatalystUIManagerTestCase.java
@@ -99,7 +99,6 @@ public void run() {
         .addNativeModule(new DeviceInfoModule(getContext()))
         .addNativeModule(new AppStateModule(getContext()))
         .addNativeModule(new FakeWebSocketModule())
-        .addJSModule(UIManagerTestModule.class)
         .build()
         .getJSModule(UIManagerTestModule.class);
   }

diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/DatePickerDialogTestCase.java b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/DatePickerDialogTestCase.java
@@ -80,8 +80,7 @@ public int getErrors() {
   @Override
   protected ReactInstanceSpecForTest createReactInstanceSpecForTest() {
     return super.createReactInstanceSpecForTest()
-        .addNativeModule(mRecordingModule)
-        .addJSModule(DatePickerDialogTestModule.class);
+        .addNativeModule(mRecordingModule);
   }
 
   @Override

diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/JSLocaleTest.java b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/JSLocaleTest.java
@@ -66,7 +66,6 @@ public void run() {
         .addNativeModule(new DeviceInfoModule(getContext()))
         .addNativeModule(new AppStateModule(getContext()))
         .addNativeModule(new FakeWebSocketModule())
-        .addJSModule(TestJSLocaleModule.class)
         .build();
   }
 

diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/ProgressBarTestCase.java b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/ProgressBarTestCase.java
@@ -90,7 +90,6 @@ public void run() {
         .addNativeModule(new DeviceInfoModule(getContext()))
         .addNativeModule(new AppStateModule(getContext()))
         .addNativeModule(new FakeWebSocketModule())
-        .addJSModule(ProgressBarTestModule.class)
         .build();
 
     mRootView = new ReactRootView(getContext());

diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/ReactPickerTestCase.java b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/ReactPickerTestCase.java
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree. An additional grant
  * of patent rights can be found in the PATENTS file in the same directory.
  */
- 
+
 package com.facebook.react.tests;
 
 import java.util.ArrayList;
@@ -68,7 +68,6 @@ protected String getReactApplicationKeyUnderTest() {
   protected ReactInstanceSpecForTest createReactInstanceSpecForTest() {
     mRecordingModule = new PickerAndroidRecordingModule();
     return super.createReactInstanceSpecForTest()
-      .addJSModule(PickerAndroidTestModule.class)
       .addNativeModule(mRecordingModule);
   }
 

diff --git a/...ndroid/src/androidTest/java/com/facebook/react/tests/ReactSwipeRefreshLayoutTestCase.java b/...ndroid/src/androidTest/java/com/facebook/react/tests/ReactSwipeRefreshLayoutTestCase.java
@@ -55,8 +55,7 @@ protected String getReactApplicationKeyUnderTest() {
   @Override
   protected ReactInstanceSpecForTest createReactInstanceSpecForTest() {
     return super.createReactInstanceSpecForTest()
-        .addNativeModule(mRecordingModule)
-        .addJSModule(SwipeRefreshLayoutTestModule.class);
+      .addNativeModule(mRecordingModule);
   }
 
   public void testRefreshNoScroll() {

diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/ShareTestCase.java b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/ShareTestCase.java
@@ -73,8 +73,7 @@ public int getErrors() {
   @Override
   protected ReactInstanceSpecForTest createReactInstanceSpecForTest() {
     return super.createReactInstanceSpecForTest()
-        .addNativeModule(mRecordingModule)
-        .addJSModule(ShareTestModule.class);
+        .addNativeModule(mRecordingModule);
   }
 
   @Override

diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/TextInputTestCase.java b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/TextInputTestCase.java
@@ -248,7 +248,6 @@ public void testMetionsInputColors() throws Throwable {
   @Override
   protected ReactInstanceSpecForTest createReactInstanceSpecForTest() {
     return super.createReactInstanceSpecForTest()
-        .addJSModule(TextInputTestModule.class)
         .addNativeModule(mRecordingModule);
   }
 

diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/TimePickerDialogTestCase.java b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/TimePickerDialogTestCase.java
@@ -77,8 +77,7 @@ public int getErrors() {
   @Override
   protected ReactInstanceSpecForTest createReactInstanceSpecForTest() {
     return super.createReactInstanceSpecForTest()
-        .addNativeModule(mRecordingModule)
-        .addJSModule(TimePickerDialogTestModule.class);
+        .addNativeModule(mRecordingModule);
   }
 
   @Override

diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/ViewRenderingTestCase.java b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/ViewRenderingTestCase.java
@@ -71,7 +71,6 @@ public void run() {
         .addNativeModule(new DeviceInfoModule(getContext()))
         .addNativeModule(new AppStateModule(getContext()))
         .addNativeModule(new FakeWebSocketModule())
-        .addJSModule(ViewRenderingTestModule.class)
         .build();
 
     mRootView = new ReactRootView(getContext());

diff --git a/ReactAndroid/src/main/java/com/facebook/react/CompositeReactPackage.java b/ReactAndroid/src/main/java/com/facebook/react/CompositeReactPackage.java
@@ -84,20 +84,6 @@ public List<NativeModule> createNativeModules(
     return new ArrayList(moduleMap.values());
   }
 
-  /**
-   * {@inheritDoc}
-   */
-  @Override
-  public List<Class<? extends JavaScriptModule>> createJSModules() {
-    final Set<Class<? extends JavaScriptModule>> moduleSet = new HashSet<>();
-    for (ReactPackage reactPackage: mChildReactPackages) {
-      for (Class<? extends JavaScriptModule> jsModule: reactPackage.createJSModules()) {
-        moduleSet.add(jsModule);
-      }
-    }
-    return new ArrayList(moduleSet);
-  }
-
   /**
    * {@inheritDoc}
    */

diff --git a/ReactAndroid/src/main/java/com/facebook/react/CoreModulesPackage.java b/ReactAndroid/src/main/java/com/facebook/react/CoreModulesPackage.java
@@ -12,27 +12,21 @@
 import javax.inject.Provider;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
-import com.facebook.react.bridge.JavaScriptModule;
 import com.facebook.react.bridge.ModuleSpec;
 import com.facebook.react.bridge.NativeModule;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactMarker;
 import com.facebook.react.common.build.ReactBuildConfig;
-import com.facebook.react.devsupport.HMRClient;
 import com.facebook.react.devsupport.JSCHeapCapture;
 import com.facebook.react.devsupport.JSCSamplingProfiler;
 import com.facebook.react.module.annotations.ReactModuleList;
 import com.facebook.react.module.model.ReactModuleInfoProvider;
-import com.facebook.react.modules.appregistry.AppRegistry;
 import com.facebook.react.modules.core.DefaultHardwareBackBtnHandler;
 import com.facebook.react.modules.core.DeviceEventManagerModule;
 import com.facebook.react.modules.core.ExceptionsManagerModule;
 import com.facebook.react.modules.core.HeadlessJsTaskSupportModule;
-import com.facebook.react.modules.core.JSTimersExecution;
-import com.facebook.react.modules.core.RCTNativeAppEventEmitter;
 import com.facebook.react.modules.core.Timing;
 import com.facebook.react.modules.debug.AnimationsDebugModule;
 import com.facebook.react.modules.debug.SourceCodeModule;
@@ -42,7 +36,6 @@
 import com.facebook.react.uimanager.UIManagerModule;
 import com.facebook.react.uimanager.ViewManager;
 import com.facebook.react.uimanager.debug.DebugComponentOwnershipModule;
-import com.facebook.react.uimanager.events.RCTEventEmitter;
 import com.facebook.systrace.Systrace;
 
 import static com.facebook.react.bridge.ReactMarkerConstants.CREATE_UI_MANAGER_MODULE_END;
@@ -187,26 +180,6 @@ public NativeModule get() {
     return moduleSpecList;
   }
 
-  @Override
-  public List<Class<? extends JavaScriptModule>> createJSModules() {
-    List<Class<? extends JavaScriptModule>> jsModules = new ArrayList<>(Arrays.asList(
-        DeviceEventManagerModule.RCTDeviceEventEmitter.class,
-        JSTimersExecution.class,
-        RCTEventEmitter.class,
-        RCTNativeAppEventEmitter.class,
-        AppRegistry.class,
-        com.facebook.react.bridge.Systrace.class,
-        HMRClient.class));
-
-    if (ReactBuildConfig.DEBUG) {
-      jsModules.add(DebugComponentOwnershipModule.RCTDebugComponentOwnership.class);
-      jsModules.add(JSCHeapCapture.HeapCapture.class);
-      jsModules.add(JSCSamplingProfiler.SamplingProfiler.class);
-    }
-
-    return jsModules;
-  }
-
   @Override
   public ReactModuleInfoProvider getReactModuleInfoProvider() {
     // This has to be done via reflection or we break open source.

diff --git a/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java b/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java
@@ -926,7 +926,6 @@ private ReactApplicationContext createReactContext(
       reactContext,
       this,
       mLazyNativeModulesEnabled);
-    JavaScriptModuleRegistry.Builder jsModulesBuilder = new JavaScriptModuleRegistry.Builder();
     if (mUseDeveloperSupport) {
       reactContext.setNativeModuleCallExceptionHandler(mDevSupportManager);
     }
@@ -942,7 +941,7 @@ private ReactApplicationContext createReactContext(
           mBackBtnHandler,
           mUIImplementationProvider,
           mLazyViewManagersEnabled);
-      processPackage(coreModulesPackage, nativeModuleRegistryBuilder, jsModulesBuilder);
+      processPackage(coreModulesPackage, nativeModuleRegistryBuilder);
     } finally {
       Systrace.endSection(TRACE_TAG_REACT_JAVA_BRIDGE);
     }
@@ -953,7 +952,7 @@ private ReactApplicationContext createReactContext(
           TRACE_TAG_REACT_JAVA_BRIDGE,
           "createAndProcessCustomReactPackage");
       try {
-        processPackage(reactPackage, nativeModuleRegistryBuilder, jsModulesBuilder);
+        processPackage(reactPackage, nativeModuleRegistryBuilder);
       } finally {
         Systrace.endSection(TRACE_TAG_REACT_JAVA_BRIDGE);
       }
@@ -979,7 +978,6 @@ private ReactApplicationContext createReactContext(
         ReactQueueConfigurationSpec.createDefault())
       .setJSExecutor(jsExecutor)
       .setRegistry(nativeModuleRegistry)
-      .setJSModuleRegistry(jsModulesBuilder.build())
       .setJSBundleLoader(jsBundleLoader)
       .setNativeModuleCallExceptionHandler(exceptionHandler);
 
@@ -1010,8 +1008,7 @@ private ReactApplicationContext createReactContext(
 
   private void processPackage(
     ReactPackage reactPackage,
-    NativeModuleRegistryBuilder nativeModuleRegistryBuilder,
-    JavaScriptModuleRegistry.Builder jsModulesBuilder) {
+    NativeModuleRegistryBuilder nativeModuleRegistryBuilder) {
     SystraceMessage.beginSection(TRACE_TAG_REACT_JAVA_BRIDGE, "processPackage")
       .arg("className", reactPackage.getClass().getSimpleName())
       .flush();
@@ -1020,9 +1017,6 @@ private void processPackage(
     }
     nativeModuleRegistryBuilder.processPackage(reactPackage);
 
-    for (Class<? extends JavaScriptModule> jsModuleClass : reactPackage.createJSModules()) {
-      jsModulesBuilder.add(jsModuleClass);
-    }
     if (reactPackage instanceof ReactPackageLogger) {
       ((ReactPackageLogger) reactPackage).endProcessPackage();
     }