Removed level of indirection for checkPropTypes

Files now import directly from prop-types/checkPropTypes
facebook · Apr 13, 2017 · e8ea754 · e8ea754
1 parent 70d5c46
commit e8ea754
Show file tree

Hide file tree

Showing 8 changed files with 49 additions and 72 deletions.
diff --git a/scripts/rollup/bundles.js b/scripts/rollup/bundles.js
@@ -91,7 +91,6 @@ const bundles = [
       'src/renderers/shared/**/*.js',
       'src/test/**/*.js', // ReactTestUtils is currently very coupled to DOM.
 
-      'src/isomorphic/classic/types/checkPropTypes.js',
       'src/ReactVersion.js',
       'src/shared/**/*.js',
     ],
@@ -120,7 +119,6 @@ const bundles = [
       'src/renderers/shared/**/*.js',
       'src/test/**/*.js', // ReactTestUtils is currently very coupled to DOM.
 
-      'src/isomorphic/classic/types/checkPropTypes.js',
       'src/ReactVersion.js',
       'src/shared/**/*.js',
     ],
@@ -148,7 +146,6 @@ const bundles = [
       'src/renderers/shared/**/*.js',
       'src/test/**/*.js', // ReactTestUtils is currently very coupled to DOM.
 
-      'src/isomorphic/classic/types/checkPropTypes.js',
       'src/ReactVersion.js',
       'src/shared/**/*.js',
     ],
@@ -179,7 +176,6 @@ const bundles = [
       'src/renderers/dom/**/*.js',
       'src/renderers/shared/**/*.js',
 
-      'src/isomorphic/classic/types/checkPropTypes.js',
       'src/ReactVersion.js',
       'src/shared/**/*.js',
     ],
@@ -218,7 +214,6 @@ const bundles = [
       'src/renderers/art/**/*.js',
       'src/renderers/shared/**/*.js',
 
-      'src/isomorphic/classic/types/checkPropTypes.js',
       'src/ReactVersion.js',
       'src/shared/**/*.js',
     ],
@@ -254,7 +249,6 @@ const bundles = [
       'src/renderers/art/**/*.js',
       'src/renderers/shared/**/*.js',
 
-      'src/isomorphic/classic/types/checkPropTypes.js',
       'src/ReactVersion.js',
       'src/shared/**/*.js',
     ],
@@ -356,7 +350,6 @@ const bundles = [
       'src/renderers/shared/**/*.js',
       'src/renderers/testing/**/*.js',
 
-      'src/isomorphic/classic/types/checkPropTypes.js',
       'src/ReactVersion.js',
       'src/shared/**/*.js',
     ],
@@ -383,7 +376,6 @@ const bundles = [
       'src/renderers/shared/**/*.js',
       'src/renderers/testing/**/*.js',
 
-      'src/isomorphic/classic/types/checkPropTypes.js',
       'src/ReactVersion.js',
       'src/shared/**/*.js',
     ],
@@ -413,7 +405,6 @@ const bundles = [
       'src/renderers/noop/**/*.js',
       'src/renderers/shared/**/*.js',
 
-      'src/isomorphic/classic/types/checkPropTypes.js',
       'src/ReactVersion.js',
       'src/shared/**/*.js',
     ],

diff --git a/scripts/rollup/results.json b/scripts/rollup/results.json
@@ -2,112 +2,112 @@
   "branch": "react-dom-test-utils",
   "bundleSizes": {
     "react.development.js (UMD_DEV)": {
-      "size": 121454,
-      "gzip": 30515
+      "size": 121412,
+      "gzip": 30500
     },
     "react.production.min.js (UMD_PROD)": {
-      "size": 15685,
-      "gzip": 5765
+      "size": 15679,
+      "gzip": 5761
     },
     "react-dom.development.js (UMD_DEV)": {
-      "size": 583190,
-      "gzip": 134534
+      "size": 583148,
+      "gzip": 134526
     },
     "react-dom.production.min.js (UMD_PROD)": {
       "size": 120740,
       "gzip": 38094
     },
     "react-dom-server.development.js (UMD_DEV)": {
-      "size": 495558,
-      "gzip": 119685
+      "size": 495516,
+      "gzip": 119682
     },
     "react-dom-server.production.min.js (UMD_PROD)": {
       "size": 107033,
       "gzip": 33273
     },
     "react-art.development.js (UMD_DEV)": {
-      "size": 342608,
-      "gzip": 76782
+      "size": 342568,
+      "gzip": 76773
     },
     "react-art.production.min.js (UMD_PROD)": {
       "size": 95013,
       "gzip": 28991
     },
     "react.development.js (NODE_DEV)": {
-      "size": 70266,
-      "gzip": 17594
+      "size": 70222,
+      "gzip": 17579
     },
     "react.production.min.js (NODE_PROD)": {
-      "size": 9226,
-      "gzip": 3628
+      "size": 9220,
+      "gzip": 3621
     },
     "React-dev.js (FB_DEV)": {
-      "size": 72123,
-      "gzip": 18231
+      "size": 72079,
+      "gzip": 18217
     },
     "React-prod.js (FB_PROD)": {
-      "size": 36643,
-      "gzip": 9256
+      "size": 36606,
+      "gzip": 9248
     },
     "ReactDOMStack-dev.js (FB_DEV)": {
-      "size": 522763,
-      "gzip": 124727
+      "size": 522721,
+      "gzip": 124723
     },
     "ReactDOMStack-prod.js (FB_PROD)": {
       "size": 352776,
       "gzip": 84675
     },
     "react-dom.development.js (NODE_DEV)": {
-      "size": 542188,
-      "gzip": 125158
+      "size": 542144,
+      "gzip": 125150
     },
     "react-dom.production.min.js (NODE_PROD)": {
       "size": 116925,
       "gzip": 36732
     },
     "ReactDOMFiber-dev.js (FB_DEV)": {
-      "size": 797235,
-      "gzip": 184122
+      "size": 797189,
+      "gzip": 184111
     },
     "ReactDOMFiber-prod.js (FB_PROD)": {
       "size": 407613,
       "gzip": 93586
     },
     "react-dom-server.development.js (NODE_DEV)": {
-      "size": 445589,
-      "gzip": 107597
+      "size": 445547,
+      "gzip": 107594
     },
     "react-dom-server.production.min.js (NODE_PROD)": {
       "size": 101411,
       "gzip": 31292
     },
     "ReactDOMServerStack-dev.js (FB_DEV)": {
-      "size": 444281,
-      "gzip": 107443
+      "size": 444239,
+      "gzip": 107440
     },
     "ReactDOMServerStack-prod.js (FB_PROD)": {
       "size": 334166,
       "gzip": 80444
     },
     "ReactARTStack-dev.js (FB_DEV)": {
-      "size": 142986,
-      "gzip": 32714
+      "size": 142944,
+      "gzip": 32705
     },
     "ReactARTStack-prod.js (FB_PROD)": {
       "size": 101143,
       "gzip": 22993
     },
     "react-art.development.js (NODE_DEV)": {
-      "size": 265052,
-      "gzip": 56927
+      "size": 265008,
+      "gzip": 56923
     },
     "react-art.production.min.js (NODE_PROD)": {
       "size": 56628,
       "gzip": 17152
     },
     "ReactARTFiber-dev.js (FB_DEV)": {
-      "size": 264230,
-      "gzip": 56736
+      "size": 264186,
+      "gzip": 56732
     },
     "ReactARTFiber-prod.js (FB_PROD)": {
       "size": 205336,
@@ -122,24 +122,24 @@
       "gzip": 84001
     },
     "ReactTestRendererFiber-dev.js (FB_DEV)": {
-      "size": 262139,
-      "gzip": 55704
+      "size": 262095,
+      "gzip": 55698
     },
     "ReactTestRendererStack-dev.js (FB_DEV)": {
-      "size": 151521,
-      "gzip": 34765
+      "size": 151479,
+      "gzip": 34749
     },
     "react-noop-renderer.development.js (NODE_DEV)": {
-      "size": 254136,
-      "gzip": 53682
+      "size": 254092,
+      "gzip": 53674
     },
     "react-test-renderer.development.js (NODE_DEV)": {
-      "size": 262970,
-      "gzip": 55891
+      "size": 262926,
+      "gzip": 55887
     },
     "react-test-utils.development.js (NODE_DEV)": {
-      "size": 510282,
-      "gzip": 122096
+      "size": 510240,
+      "gzip": 122093
     }
   }
 }
diff --git a/src/isomorphic/React.js b/src/isomorphic/React.js
@@ -19,7 +19,7 @@ var ReactPropTypes = require('ReactPropTypes');
 var ReactVersion = require('ReactVersion');
 
 var onlyChild = require('onlyChild');
-var checkPropTypes = require('checkPropTypes');
+var checkPropTypes = require('prop-types/checkPropTypes');
 var createReactClass = require('createClass');
 
 var createElement = ReactElement.createElement;

diff --git a/src/isomorphic/classic/element/ReactElementValidator.js b/src/isomorphic/classic/element/ReactElementValidator.js
@@ -26,7 +26,7 @@ var getComponentName = require('getComponentName');
 var getIteratorFn = require('getIteratorFn');
 
 if (__DEV__) {
-  var checkPropTypes = require('checkPropTypes');
+  var checkPropTypes = require('prop-types/checkPropTypes');
   var warning = require('fbjs/lib/warning');
   var ReactDebugCurrentFrame = require('ReactDebugCurrentFrame');
   var {

diff --git a/src/isomorphic/classic/types/__tests__/ReactPropTypes-test.js b/src/isomorphic/classic/types/__tests__/ReactPropTypes-test.js
@@ -21,7 +21,7 @@ var MyComponent;
 
 function resetWarningCache() {
   jest.resetModules();
-  checkPropTypes = require('checkPropTypes');
+  checkPropTypes = require('prop-types/checkPropTypes');
 }
 
 function getPropTypeWarningMessage(propTypes, object, componentName) {

diff --git a/src/isomorphic/classic/types/checkPropTypes.js b/src/isomorphic/classic/types/checkPropTypes.js
diff --git a/src/renderers/shared/fiber/ReactFiberContext.js b/src/renderers/shared/fiber/ReactFiberContext.js
@@ -15,7 +15,7 @@
 import type {Fiber} from 'ReactFiber';
 import type {StackCursor} from 'ReactFiberStack';
 
-var checkPropTypes = require('checkPropTypes');
+var checkPropTypes = require('prop-types/checkPropTypes');
 var emptyObject = require('fbjs/lib/emptyObject');
 var getComponentName = require('getComponentName');
 var invariant = require('fbjs/lib/invariant');

diff --git a/src/renderers/shared/stack/reconciler/ReactCompositeComponent.js b/src/renderers/shared/stack/reconciler/ReactCompositeComponent.js
@@ -27,7 +27,7 @@ if (__DEV__) {
   var warningAboutMissingGetChildContext = {};
 }
 
-var checkPropTypes = require('checkPropTypes');
+var checkPropTypes = require('prop-types/checkPropTypes');
 var emptyObject = require('fbjs/lib/emptyObject');
 var invariant = require('fbjs/lib/invariant');
 var shallowEqual = require('fbjs/lib/shallowEqual');