Separate exported config from TestBundle.js, remove js_glob override (#…

…34161) Summary: Pull Request resolved: #34161 This is a follow up to D37648363 (64fe676) which breaks up `TestBundle.js` into two modules. This enables `TestApps.js` (which defines and exports the set of integration test apps) to be required in the Meta-specific dependency graph without violating our internal naming pattern for JS entry points. `force_include_bundles` is removed from the `js_glob` macro signature. Changelog: [Internal] Reviewed By: motiz88 Differential Revision: D37686883 fbshipit-source-id: 492c13dfcdd76ea8347d4d11c85818e31777c663
facebook · Jul 12, 2022 · 86b4acb · 86b4acb
1 parent 13a0556
commit 86b4acb
Show file tree

Hide file tree

Showing 4 changed files with 113 additions and 102 deletions.
diff --git a/ReactAndroid/src/androidTest/js/BUCK b/ReactAndroid/src/androidTest/js/BUCK
@@ -15,7 +15,6 @@ rn_library(
             "**/*.command",
             "**/*.md",
         ],
-        force_include_bundles = True,
     ),
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",

diff --git a/ReactAndroid/src/androidTest/js/TestApps.js b/ReactAndroid/src/androidTest/js/TestApps.js
@@ -0,0 +1,110 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @format
+ */
+
+'use strict';
+
+// Disable LogBox so we do not have to mock its dependencies.
+require('react-native').LogBox.ignoreAllLogs(true);
+
+// Include callable JS modules first, in case one of the other ones below throws
+require('./ProgressBarTestModule');
+require('./ViewRenderingTestModule');
+require('./TestJavaToJSArgumentsModule');
+require('./TestJSLocaleModule');
+require('./TestJSToJavaParametersModule');
+require('./TestJavaToJSReturnValuesModule');
+require('./UIManagerTestModule');
+require('./CatalystRootViewTestModule');
+require('./MeasureLayoutTestModule');
+require('./ScrollViewTestModule');
+require('./ShareTestModule');
+require('./SwipeRefreshLayoutTestModule');
+require('./TextInputTestModule');
+
+// Define catalyst test apps used in integration tests
+const apps = [
+  {
+    appKey: 'AnimatedTransformTestApp',
+    component: () =>
+      require('./AnimatedTransformTestModule').AnimatedTransformTestApp,
+  },
+  {
+    appKey: 'CatalystRootViewTestApp',
+    component: () =>
+      require('./CatalystRootViewTestModule').CatalystRootViewTestApp,
+  },
+  {
+    appKey: 'JSResponderTestApp',
+    component: () => require('./JSResponderTestApp'),
+  },
+  {
+    appKey: 'HorizontalScrollViewTestApp',
+    component: () =>
+      require('./ScrollViewTestModule').HorizontalScrollViewTestApp,
+  },
+  {
+    appKey: 'ImageOverlayColorTestApp',
+    component: () => require('./ImageOverlayColorTestApp'),
+  },
+  {
+    appKey: 'ImageErrorTestApp',
+    component: () => require('./ImageErrorTestApp'),
+  },
+  {
+    appKey: 'InitialPropsTestApp',
+    component: () => require('./InitialPropsTestApp'),
+  },
+  {
+    appKey: 'LayoutEventsTestApp',
+    component: () => require('./LayoutEventsTestApp'),
+  },
+  {
+    appKey: 'MeasureLayoutTestApp',
+    component: () => require('./MeasureLayoutTestModule').MeasureLayoutTestApp,
+  },
+  {
+    appKey: 'MultitouchHandlingTestAppModule',
+    component: () => require('./MultitouchHandlingTestAppModule'),
+  },
+  {
+    appKey: 'NativeIdTestApp',
+    component: () => require('./NativeIdTestModule').NativeIdTestApp,
+  },
+  {
+    appKey: 'ScrollViewTestApp',
+    component: () => require('./ScrollViewTestModule').ScrollViewTestApp,
+  },
+  {
+    appKey: 'ShareTestApp',
+    component: () => require('./ShareTestModule').ShareTestApp,
+  },
+  {
+    appKey: 'SubviewsClippingTestApp',
+    component: () => require('./SubviewsClippingTestModule').App,
+  },
+  {
+    appKey: 'SwipeRefreshLayoutTestApp',
+    component: () =>
+      require('./SwipeRefreshLayoutTestModule').SwipeRefreshLayoutTestApp,
+  },
+  {
+    appKey: 'TextInputTestApp',
+    component: () => require('./TextInputTestModule').TextInputTestApp,
+  },
+  {
+    appKey: 'TestIdTestApp',
+    component: () => require('./TestIdTestModule').TestIdTestApp,
+  },
+  {
+    appKey: 'TouchBubblingTestAppModule',
+    component: () => require('./TouchBubblingTestAppModule'),
+  },
+];
+
+module.exports = apps;
diff --git a/ReactAndroid/src/androidTest/js/TestBundle.js b/ReactAndroid/src/androidTest/js/TestBundle.js
@@ -9,105 +9,7 @@
 
 'use strict';
 
-// Disable LogBox so we do not have to mock its dependencies.
-require('react-native').LogBox.ignoreAllLogs(true);
-
-// Include callable JS modules first, in case one of the other ones below throws
-require('./ProgressBarTestModule');
-require('./ViewRenderingTestModule');
-require('./TestJavaToJSArgumentsModule');
-require('./TestJSLocaleModule');
-require('./TestJSToJavaParametersModule');
-require('./TestJavaToJSReturnValuesModule');
-require('./UIManagerTestModule');
-require('./CatalystRootViewTestModule');
-require('./MeasureLayoutTestModule');
-require('./ScrollViewTestModule');
-require('./ShareTestModule');
-require('./SwipeRefreshLayoutTestModule');
-require('./TextInputTestModule');
-
-// Define catalyst test apps used in integration tests
 const {AppRegistry} = require('react-native');
+const TestApps = require('./TestApps');
 
-const apps = [
-  {
-    appKey: 'AnimatedTransformTestApp',
-    component: () =>
-      require('./AnimatedTransformTestModule').AnimatedTransformTestApp,
-  },
-  {
-    appKey: 'CatalystRootViewTestApp',
-    component: () =>
-      require('./CatalystRootViewTestModule').CatalystRootViewTestApp,
-  },
-  {
-    appKey: 'JSResponderTestApp',
-    component: () => require('./JSResponderTestApp'),
-  },
-  {
-    appKey: 'HorizontalScrollViewTestApp',
-    component: () =>
-      require('./ScrollViewTestModule').HorizontalScrollViewTestApp,
-  },
-  {
-    appKey: 'ImageOverlayColorTestApp',
-    component: () => require('./ImageOverlayColorTestApp'),
-  },
-  {
-    appKey: 'ImageErrorTestApp',
-    component: () => require('./ImageErrorTestApp'),
-  },
-  {
-    appKey: 'InitialPropsTestApp',
-    component: () => require('./InitialPropsTestApp'),
-  },
-  {
-    appKey: 'LayoutEventsTestApp',
-    component: () => require('./LayoutEventsTestApp'),
-  },
-  {
-    appKey: 'MeasureLayoutTestApp',
-    component: () => require('./MeasureLayoutTestModule').MeasureLayoutTestApp,
-  },
-  {
-    appKey: 'MultitouchHandlingTestAppModule',
-    component: () => require('./MultitouchHandlingTestAppModule'),
-  },
-  {
-    appKey: 'NativeIdTestApp',
-    component: () => require('./NativeIdTestModule').NativeIdTestApp,
-  },
-  {
-    appKey: 'ScrollViewTestApp',
-    component: () => require('./ScrollViewTestModule').ScrollViewTestApp,
-  },
-  {
-    appKey: 'ShareTestApp',
-    component: () => require('./ShareTestModule').ShareTestApp,
-  },
-  {
-    appKey: 'SubviewsClippingTestApp',
-    component: () => require('./SubviewsClippingTestModule').App,
-  },
-  {
-    appKey: 'SwipeRefreshLayoutTestApp',
-    component: () =>
-      require('./SwipeRefreshLayoutTestModule').SwipeRefreshLayoutTestApp,
-  },
-  {
-    appKey: 'TextInputTestApp',
-    component: () => require('./TextInputTestModule').TextInputTestApp,
-  },
-  {
-    appKey: 'TestIdTestApp',
-    component: () => require('./TestIdTestModule').TestIdTestApp,
-  },
-  {
-    appKey: 'TouchBubblingTestAppModule',
-    component: () => require('./TouchBubblingTestAppModule'),
-  },
-];
-
-module.exports = apps;
-AppRegistry.registerConfig(apps);
+AppRegistry.registerConfig(TestApps);
diff --git a/tools/build_defs/js_glob.bzl b/tools/build_defs/js_glob.bzl
@@ -17,7 +17,7 @@ js_glob_exts = (
     "png",
 )
 
-def js_glob(dirs, excludes = [], force_include_bundles = False):
+def js_glob(dirs, excludes = []):
     globs = []
     for glob_dir in dirs:
         if glob_dir == ".":