Skip to content

Commit e8ea754

Browse files
author
Brian Vaughn
committed
Removed level of indirection for checkPropTypes
Files now import directly from prop-types/checkPropTypes
1 parent 70d5c46 commit e8ea754

8 files changed

Lines changed: 49 additions & 72 deletions

File tree

scripts/rollup/bundles.js

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@ const bundles = [
9191
'src/renderers/shared/**/*.js',
9292
'src/test/**/*.js', // ReactTestUtils is currently very coupled to DOM.
9393

94-
'src/isomorphic/classic/types/checkPropTypes.js',
9594
'src/ReactVersion.js',
9695
'src/shared/**/*.js',
9796
],
@@ -120,7 +119,6 @@ const bundles = [
120119
'src/renderers/shared/**/*.js',
121120
'src/test/**/*.js', // ReactTestUtils is currently very coupled to DOM.
122121

123-
'src/isomorphic/classic/types/checkPropTypes.js',
124122
'src/ReactVersion.js',
125123
'src/shared/**/*.js',
126124
],
@@ -148,7 +146,6 @@ const bundles = [
148146
'src/renderers/shared/**/*.js',
149147
'src/test/**/*.js', // ReactTestUtils is currently very coupled to DOM.
150148

151-
'src/isomorphic/classic/types/checkPropTypes.js',
152149
'src/ReactVersion.js',
153150
'src/shared/**/*.js',
154151
],
@@ -179,7 +176,6 @@ const bundles = [
179176
'src/renderers/dom/**/*.js',
180177
'src/renderers/shared/**/*.js',
181178

182-
'src/isomorphic/classic/types/checkPropTypes.js',
183179
'src/ReactVersion.js',
184180
'src/shared/**/*.js',
185181
],
@@ -218,7 +214,6 @@ const bundles = [
218214
'src/renderers/art/**/*.js',
219215
'src/renderers/shared/**/*.js',
220216

221-
'src/isomorphic/classic/types/checkPropTypes.js',
222217
'src/ReactVersion.js',
223218
'src/shared/**/*.js',
224219
],
@@ -254,7 +249,6 @@ const bundles = [
254249
'src/renderers/art/**/*.js',
255250
'src/renderers/shared/**/*.js',
256251

257-
'src/isomorphic/classic/types/checkPropTypes.js',
258252
'src/ReactVersion.js',
259253
'src/shared/**/*.js',
260254
],
@@ -356,7 +350,6 @@ const bundles = [
356350
'src/renderers/shared/**/*.js',
357351
'src/renderers/testing/**/*.js',
358352

359-
'src/isomorphic/classic/types/checkPropTypes.js',
360353
'src/ReactVersion.js',
361354
'src/shared/**/*.js',
362355
],
@@ -383,7 +376,6 @@ const bundles = [
383376
'src/renderers/shared/**/*.js',
384377
'src/renderers/testing/**/*.js',
385378

386-
'src/isomorphic/classic/types/checkPropTypes.js',
387379
'src/ReactVersion.js',
388380
'src/shared/**/*.js',
389381
],
@@ -413,7 +405,6 @@ const bundles = [
413405
'src/renderers/noop/**/*.js',
414406
'src/renderers/shared/**/*.js',
415407

416-
'src/isomorphic/classic/types/checkPropTypes.js',
417408
'src/ReactVersion.js',
418409
'src/shared/**/*.js',
419410
],

scripts/rollup/results.json

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -2,112 +2,112 @@
22
"branch": "react-dom-test-utils",
33
"bundleSizes": {
44
"react.development.js (UMD_DEV)": {
5-
"size": 121454,
6-
"gzip": 30515
5+
"size": 121412,
6+
"gzip": 30500
77
},
88
"react.production.min.js (UMD_PROD)": {
9-
"size": 15685,
10-
"gzip": 5765
9+
"size": 15679,
10+
"gzip": 5761
1111
},
1212
"react-dom.development.js (UMD_DEV)": {
13-
"size": 583190,
14-
"gzip": 134534
13+
"size": 583148,
14+
"gzip": 134526
1515
},
1616
"react-dom.production.min.js (UMD_PROD)": {
1717
"size": 120740,
1818
"gzip": 38094
1919
},
2020
"react-dom-server.development.js (UMD_DEV)": {
21-
"size": 495558,
22-
"gzip": 119685
21+
"size": 495516,
22+
"gzip": 119682
2323
},
2424
"react-dom-server.production.min.js (UMD_PROD)": {
2525
"size": 107033,
2626
"gzip": 33273
2727
},
2828
"react-art.development.js (UMD_DEV)": {
29-
"size": 342608,
30-
"gzip": 76782
29+
"size": 342568,
30+
"gzip": 76773
3131
},
3232
"react-art.production.min.js (UMD_PROD)": {
3333
"size": 95013,
3434
"gzip": 28991
3535
},
3636
"react.development.js (NODE_DEV)": {
37-
"size": 70266,
38-
"gzip": 17594
37+
"size": 70222,
38+
"gzip": 17579
3939
},
4040
"react.production.min.js (NODE_PROD)": {
41-
"size": 9226,
42-
"gzip": 3628
41+
"size": 9220,
42+
"gzip": 3621
4343
},
4444
"React-dev.js (FB_DEV)": {
45-
"size": 72123,
46-
"gzip": 18231
45+
"size": 72079,
46+
"gzip": 18217
4747
},
4848
"React-prod.js (FB_PROD)": {
49-
"size": 36643,
50-
"gzip": 9256
49+
"size": 36606,
50+
"gzip": 9248
5151
},
5252
"ReactDOMStack-dev.js (FB_DEV)": {
53-
"size": 522763,
54-
"gzip": 124727
53+
"size": 522721,
54+
"gzip": 124723
5555
},
5656
"ReactDOMStack-prod.js (FB_PROD)": {
5757
"size": 352776,
5858
"gzip": 84675
5959
},
6060
"react-dom.development.js (NODE_DEV)": {
61-
"size": 542188,
62-
"gzip": 125158
61+
"size": 542144,
62+
"gzip": 125150
6363
},
6464
"react-dom.production.min.js (NODE_PROD)": {
6565
"size": 116925,
6666
"gzip": 36732
6767
},
6868
"ReactDOMFiber-dev.js (FB_DEV)": {
69-
"size": 797235,
70-
"gzip": 184122
69+
"size": 797189,
70+
"gzip": 184111
7171
},
7272
"ReactDOMFiber-prod.js (FB_PROD)": {
7373
"size": 407613,
7474
"gzip": 93586
7575
},
7676
"react-dom-server.development.js (NODE_DEV)": {
77-
"size": 445589,
78-
"gzip": 107597
77+
"size": 445547,
78+
"gzip": 107594
7979
},
8080
"react-dom-server.production.min.js (NODE_PROD)": {
8181
"size": 101411,
8282
"gzip": 31292
8383
},
8484
"ReactDOMServerStack-dev.js (FB_DEV)": {
85-
"size": 444281,
86-
"gzip": 107443
85+
"size": 444239,
86+
"gzip": 107440
8787
},
8888
"ReactDOMServerStack-prod.js (FB_PROD)": {
8989
"size": 334166,
9090
"gzip": 80444
9191
},
9292
"ReactARTStack-dev.js (FB_DEV)": {
93-
"size": 142986,
94-
"gzip": 32714
93+
"size": 142944,
94+
"gzip": 32705
9595
},
9696
"ReactARTStack-prod.js (FB_PROD)": {
9797
"size": 101143,
9898
"gzip": 22993
9999
},
100100
"react-art.development.js (NODE_DEV)": {
101-
"size": 265052,
102-
"gzip": 56927
101+
"size": 265008,
102+
"gzip": 56923
103103
},
104104
"react-art.production.min.js (NODE_PROD)": {
105105
"size": 56628,
106106
"gzip": 17152
107107
},
108108
"ReactARTFiber-dev.js (FB_DEV)": {
109-
"size": 264230,
110-
"gzip": 56736
109+
"size": 264186,
110+
"gzip": 56732
111111
},
112112
"ReactARTFiber-prod.js (FB_PROD)": {
113113
"size": 205336,
@@ -122,24 +122,24 @@
122122
"gzip": 84001
123123
},
124124
"ReactTestRendererFiber-dev.js (FB_DEV)": {
125-
"size": 262139,
126-
"gzip": 55704
125+
"size": 262095,
126+
"gzip": 55698
127127
},
128128
"ReactTestRendererStack-dev.js (FB_DEV)": {
129-
"size": 151521,
130-
"gzip": 34765
129+
"size": 151479,
130+
"gzip": 34749
131131
},
132132
"react-noop-renderer.development.js (NODE_DEV)": {
133-
"size": 254136,
134-
"gzip": 53682
133+
"size": 254092,
134+
"gzip": 53674
135135
},
136136
"react-test-renderer.development.js (NODE_DEV)": {
137-
"size": 262970,
138-
"gzip": 55891
137+
"size": 262926,
138+
"gzip": 55887
139139
},
140140
"react-test-utils.development.js (NODE_DEV)": {
141-
"size": 510282,
142-
"gzip": 122096
141+
"size": 510240,
142+
"gzip": 122093
143143
}
144144
}
145145
}

src/isomorphic/React.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ var ReactPropTypes = require('ReactPropTypes');
1919
var ReactVersion = require('ReactVersion');
2020

2121
var onlyChild = require('onlyChild');
22-
var checkPropTypes = require('checkPropTypes');
22+
var checkPropTypes = require('prop-types/checkPropTypes');
2323
var createReactClass = require('createClass');
2424

2525
var createElement = ReactElement.createElement;

src/isomorphic/classic/element/ReactElementValidator.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ var getComponentName = require('getComponentName');
2626
var getIteratorFn = require('getIteratorFn');
2727

2828
if (__DEV__) {
29-
var checkPropTypes = require('checkPropTypes');
29+
var checkPropTypes = require('prop-types/checkPropTypes');
3030
var warning = require('fbjs/lib/warning');
3131
var ReactDebugCurrentFrame = require('ReactDebugCurrentFrame');
3232
var {

src/isomorphic/classic/types/__tests__/ReactPropTypes-test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ var MyComponent;
2121

2222
function resetWarningCache() {
2323
jest.resetModules();
24-
checkPropTypes = require('checkPropTypes');
24+
checkPropTypes = require('prop-types/checkPropTypes');
2525
}
2626

2727
function getPropTypeWarningMessage(propTypes, object, componentName) {

src/isomorphic/classic/types/checkPropTypes.js

Lines changed: 0 additions & 14 deletions
This file was deleted.

src/renderers/shared/fiber/ReactFiberContext.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
import type {Fiber} from 'ReactFiber';
1616
import type {StackCursor} from 'ReactFiberStack';
1717

18-
var checkPropTypes = require('checkPropTypes');
18+
var checkPropTypes = require('prop-types/checkPropTypes');
1919
var emptyObject = require('fbjs/lib/emptyObject');
2020
var getComponentName = require('getComponentName');
2121
var invariant = require('fbjs/lib/invariant');

src/renderers/shared/stack/reconciler/ReactCompositeComponent.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ if (__DEV__) {
2727
var warningAboutMissingGetChildContext = {};
2828
}
2929

30-
var checkPropTypes = require('checkPropTypes');
30+
var checkPropTypes = require('prop-types/checkPropTypes');
3131
var emptyObject = require('fbjs/lib/emptyObject');
3232
var invariant = require('fbjs/lib/invariant');
3333
var shallowEqual = require('fbjs/lib/shallowEqual');

0 commit comments

Comments
 (0)