Inline dev-only requires (#7188)

* Inline dev-only requires This reduces the production bundled build size. * Use new references after resetting module registry in tests This fixes the tests which were broken due to inlining some requires. (cherry picked from commit 8fe6b5f)
facebook · Jul 8, 2016 · 7547d0d · 7547d0d
1 parent d7a6c95
commit 7547d0d
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 12 deletions.
diff --git a/src/isomorphic/classic/types/checkReactTypeSpec.js b/src/isomorphic/classic/types/checkReactTypeSpec.js
@@ -11,7 +11,6 @@
 
 'use strict';
 
-var ReactComponentTreeDevtool = require('ReactComponentTreeDevtool');
 var ReactPropTypeLocationNames = require('ReactPropTypeLocationNames');
 
 var invariant = require('invariant');
@@ -72,10 +71,13 @@ function checkReactTypeSpec(typeSpecs, values, location, componentName, element,
 
         var componentStackInfo = '';
 
-        if (debugID !== null) {
-          componentStackInfo = ReactComponentTreeDevtool.getStackAddendumByID(debugID);
-        } else if (element !== null) {
-          componentStackInfo = ReactComponentTreeDevtool.getCurrentStackAddendum(element);
+        if (__DEV__) {
+          var ReactComponentTreeDevtool = require('ReactComponentTreeDevtool');
+          if (debugID !== null) {
+            componentStackInfo = ReactComponentTreeDevtool.getStackAddendumByID(debugID);
+          } else if (element !== null) {
+            componentStackInfo = ReactComponentTreeDevtool.getCurrentStackAddendum(element);
+          }
         }
 
         warning(

diff --git a/src/renderers/dom/shared/ReactDOMDebugTool.js b/src/renderers/dom/shared/ReactDOMDebugTool.js
@@ -11,8 +11,6 @@
 
 'use strict';
 
-var ReactDOMNullInputValuePropDevtool = require('ReactDOMNullInputValuePropDevtool');
-var ReactDOMUnknownPropertyDevtool = require('ReactDOMUnknownPropertyDevtool');
 var ReactDebugTool = require('ReactDebugTool');
 
 var warning = require('warning');
@@ -68,7 +66,11 @@ var ReactDOMDebugTool = {
   },
 };
 
-ReactDOMDebugTool.addDevtool(ReactDOMUnknownPropertyDevtool);
-ReactDOMDebugTool.addDevtool(ReactDOMNullInputValuePropDevtool);
+if (__DEV__) {
+  var ReactDOMNullInputValuePropDevtool = require('ReactDOMNullInputValuePropDevtool');
+  var ReactDOMUnknownPropertyDevtool = require('ReactDOMUnknownPropertyDevtool');
+  ReactDOMDebugTool.addDevtool(ReactDOMUnknownPropertyDevtool);
+  ReactDOMDebugTool.addDevtool(ReactDOMNullInputValuePropDevtool);
+}
 
 module.exports = ReactDOMDebugTool;
diff --git a/src/renderers/shared/stack/reconciler/ReactChildReconciler.js b/src/renderers/shared/stack/reconciler/ReactChildReconciler.js
@@ -13,7 +13,6 @@
 
 var ReactReconciler = require('ReactReconciler');
 
-var ReactComponentTreeDevtool = require('ReactComponentTreeDevtool');
 var instantiateReactComponent = require('instantiateReactComponent');
 var KeyEscapeUtils = require('KeyEscapeUtils');
 var shouldUpdateReactComponent = require('shouldUpdateReactComponent');
@@ -24,6 +23,7 @@ function instantiateChild(childInstances, child, name, selfDebugID) {
   // We found a component instance.
   var keyUnique = (childInstances[name] === undefined);
   if (__DEV__) {
+    var ReactComponentTreeDevtool = require('ReactComponentTreeDevtool');
     warning(
       keyUnique,
       'flattenChildren(...): Encountered two children with the same key, ' +

diff --git a/src/renderers/shared/stack/reconciler/__tests__/ReactMultiChildReconcile-test.js b/src/renderers/shared/stack/reconciler/__tests__/ReactMultiChildReconcile-test.js
@@ -239,6 +239,12 @@ function testPropsSequence(sequence) {
 describe('ReactMultiChildReconcile', function() {
   beforeEach(function() {
     jest.resetModuleRegistry();
+
+    React = require('React');
+    ReactDOM = require('ReactDOM');
+    ReactDOMComponentTree = require('ReactDOMComponentTree');
+    ReactInstanceMap = require('ReactInstanceMap');
+    mapObject = require('mapObject');
   });
 
   it('should reset internal state if removed then readded', function() {

diff --git a/src/renderers/shared/stack/reconciler/__tests__/refs-test.js b/src/renderers/shared/stack/reconciler/__tests__/refs-test.js
@@ -116,6 +116,10 @@ var expectClickLogsLengthToBe = function(instance, length) {
 describe('reactiverefs', function() {
   beforeEach(function() {
     jest.resetModuleRegistry();
+
+    React = require('React');
+    ReactTestUtils = require('ReactTestUtils');
+    reactComponentExpect = require('reactComponentExpect');
   });
 
   /**
@@ -159,6 +163,10 @@ describe('reactiverefs', function() {
 describe('ref swapping', function() {
   beforeEach(function() {
     jest.resetModuleRegistry();
+
+    React = require('React');
+    ReactTestUtils = require('ReactTestUtils');
+    reactComponentExpect = require('reactComponentExpect');
   });
 
   var RefHopsAround = React.createClass({
@@ -241,4 +249,3 @@ describe('ref swapping', function() {
     expect(!!instance.refs).toBe(true);
   });
 });
-
diff --git a/src/shared/utils/flattenChildren.js b/src/shared/utils/flattenChildren.js
@@ -12,7 +12,6 @@
 
 'use strict';
 
-var ReactComponentTreeDevtool = require('ReactComponentTreeDevtool');
 var KeyEscapeUtils = require('KeyEscapeUtils');
 var traverseAllChildren = require('traverseAllChildren');
 var warning = require('warning');
@@ -34,6 +33,7 @@ function flattenSingleChildIntoContext(
     const result = traverseContext;
     const keyUnique = (result[name] === undefined);
     if (__DEV__) {
+      var ReactComponentTreeDevtool = require('ReactComponentTreeDevtool');
       warning(
         keyUnique,
         'flattenChildren(...): Encountered two children with the same key, ' +