Skip to content

Commit 488c8d2

Browse files
author
Brian Vaughn
committed
Added deprecation warning for React.checkPropTypes and updated Rollup build scripts
1 parent d34109a commit 488c8d2

File tree

8 files changed

+108
-70
lines changed

8 files changed

+108
-70
lines changed

‎scripts/fiber/tests-passing.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ src/isomorphic/__tests__/React-test.js
4646
* should log a deprecation warning once when using React.createMixin
4747
* should warn once when attempting to access React.createClass
4848
* should warn once when attempting to access React.PropTypes
49+
* should warn once when attempting to access React.checkPropTypes
4950

5051
src/isomorphic/children/__tests__/ReactChildren-test.js
5152
* should support identity for simple

‎scripts/rollup/bundles.js‎

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ const bundles = [
7979
sourceMap: false,
8080
},
8181
entry: 'src/renderers/dom/ReactDOM.js',
82-
externals: ['prop-types'],
82+
externals: ['prop-types', 'prop-types/checkPropTypes'],
8383
fbEntry: 'src/fb/ReactDOMFBEntry.js',
8484
hasteName: 'ReactDOMStack',
8585
isRenderer: true,
@@ -91,6 +91,7 @@ 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',
9495
'src/ReactVersion.js',
9596
'src/shared/**/*.js',
9697
],
@@ -107,7 +108,7 @@ const bundles = [
107108
sourceMap: false,
108109
},
109110
entry: 'src/renderers/dom/fiber/ReactDOMFiber.js',
110-
externals: ['prop-types'],
111+
externals: ['prop-types', 'prop-types/checkPropTypes'],
111112
fbEntry: 'src/fb/ReactDOMFiberFBEntry.js',
112113
hasteName: 'ReactDOMFiber',
113114
isRenderer: true,
@@ -119,6 +120,7 @@ const bundles = [
119120
'src/renderers/shared/**/*.js',
120121
'src/test/**/*.js', // ReactTestUtils is currently very coupled to DOM.
121122

123+
'src/isomorphic/classic/types/checkPropTypes.js',
122124
'src/ReactVersion.js',
123125
'src/shared/**/*.js',
124126
],
@@ -138,7 +140,7 @@ const bundles = [
138140
sourceMap: false,
139141
},
140142
entry: 'src/renderers/dom/ReactDOMServer.js',
141-
externals: ['prop-types'],
143+
externals: ['prop-types', 'prop-types/checkPropTypes'],
142144
fbEntry: 'src/renderers/dom/ReactDOMServer.js',
143145
hasteName: 'ReactDOMServerStack',
144146
isRenderer: true,
@@ -149,6 +151,7 @@ const bundles = [
149151
'src/renderers/dom/**/*.js',
150152
'src/renderers/shared/**/*.js',
151153

154+
'src/isomorphic/classic/types/checkPropTypes.js',
152155
'src/ReactVersion.js',
153156
'src/shared/**/*.js',
154157
],
@@ -174,6 +177,7 @@ const bundles = [
174177
'art/modes/current',
175178
'art/modes/fast-noSideEffects',
176179
'art/core/transform',
180+
'prop-types/checkPropTypes',
177181
'react-dom',
178182
],
179183
fbEntry: 'src/renderers/art/ReactARTStack.js',
@@ -186,6 +190,7 @@ const bundles = [
186190
'src/renderers/art/**/*.js',
187191
'src/renderers/shared/**/*.js',
188192

193+
'src/isomorphic/classic/types/checkPropTypes.js',
189194
'src/ReactVersion.js',
190195
'src/shared/**/*.js',
191196
],
@@ -208,6 +213,7 @@ const bundles = [
208213
'art/modes/current',
209214
'art/modes/fast-noSideEffects',
210215
'art/core/transform',
216+
'prop-types/checkPropTypes',
211217
'react-dom',
212218
],
213219
fbEntry: 'src/renderers/art/ReactARTFiber.js',
@@ -220,6 +226,7 @@ const bundles = [
220226
'src/renderers/art/**/*.js',
221227
'src/renderers/shared/**/*.js',
222228

229+
'src/isomorphic/classic/types/checkPropTypes.js',
223230
'src/ReactVersion.js',
224231
'src/shared/**/*.js',
225232
],
@@ -309,7 +316,7 @@ const bundles = [
309316
sourceMap: false,
310317
},
311318
entry: 'src/renderers/testing/ReactTestRendererFiber',
312-
externals: [],
319+
externals: ['prop-types/checkPropTypes'],
313320
fbEntry: 'src/renderers/testing/ReactTestRendererFiber',
314321
hasteName: 'ReactTestRendererFiber',
315322
isRenderer: true,
@@ -321,6 +328,7 @@ const bundles = [
321328
'src/renderers/shared/**/*.js',
322329
'src/renderers/testing/**/*.js',
323330

331+
'src/isomorphic/classic/types/checkPropTypes.js',
324332
'src/ReactVersion.js',
325333
'src/shared/**/*.js',
326334
],
@@ -335,7 +343,7 @@ const bundles = [
335343
sourceMap: false,
336344
},
337345
entry: 'src/renderers/testing/stack/ReactTestRendererStack',
338-
externals: [],
346+
externals: ['prop-types/checkPropTypes'],
339347
fbEntry: 'src/renderers/testing/stack/ReactTestRendererStack',
340348
hasteName: 'ReactTestRendererStack',
341349
isRenderer: true,
@@ -347,6 +355,7 @@ const bundles = [
347355
'src/renderers/shared/**/*.js',
348356
'src/renderers/testing/**/*.js',
349357

358+
'src/isomorphic/classic/types/checkPropTypes.js',
350359
'src/ReactVersion.js',
351360
'src/shared/**/*.js',
352361
],
@@ -365,7 +374,7 @@ const bundles = [
365374
sourceMap: false,
366375
},
367376
entry: 'src/renderers/noop/ReactNoop.js',
368-
externals: [],
377+
externals: ['prop-types/checkPropTypes'],
369378
isRenderer: true,
370379
label: 'noop-fiber',
371380
manglePropertiesOnProd: false,
@@ -374,6 +383,7 @@ const bundles = [
374383
'src/renderers/noop/**/*.js',
375384
'src/renderers/shared/**/*.js',
376385

386+
'src/isomorphic/classic/types/checkPropTypes.js',
377387
'src/ReactVersion.js',
378388
'src/shared/**/*.js',
379389
],

‎scripts/rollup/modules.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ function replaceLegacyModuleAliases(bundleType) {
247247
case UMD_DEV:
248248
case UMD_PROD:
249249
const modulesAlias = {};
250-
for (var legacyModule in legacyModules) {
250+
for (let legacyModule in legacyModules) {
251251
modulesAlias[legacyModule] = resolve(
252252
`./node_modules/${legacyModules[legacyModule]}`
253253
);

‎scripts/rollup/results.json‎

Lines changed: 57 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -2,116 +2,116 @@
22
"branch": "prop-types",
33
"bundleSizes": {
44
"react.development.js (UMD_DEV)": {
5-
"size": 120916,
6-
"gzip": 30481
5+
"size": 121272,
6+
"gzip": 30505
77
},
88
"react.production.min.js (UMD_PROD)": {
99
"size": 15685,
10-
"gzip": 5764
10+
"gzip": 5765
1111
},
1212
"react-dom.development.js (UMD_DEV)": {
13-
"size": 583318,
14-
"gzip": 134555
13+
"size": 583352,
14+
"gzip": 134572
1515
},
1616
"react-dom.production.min.js (UMD_PROD)": {
1717
"size": 120740,
1818
"gzip": 38092
1919
},
2020
"react-dom-server.development.js (UMD_DEV)": {
21-
"size": 495519,
22-
"gzip": 119683
21+
"size": 495558,
22+
"gzip": 119685
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": 339929,
30-
"gzip": 76018
29+
"size": 342770,
30+
"gzip": 76828
3131
},
3232
"react-art.production.min.js (UMD_PROD)": {
3333
"size": 95013,
34-
"gzip": 28991
34+
"gzip": 28990
3535
},
3636
"react.development.js (NODE_DEV)": {
37-
"size": 69612,
38-
"gzip": 17522
37+
"size": 69913,
38+
"gzip": 17542
3939
},
4040
"react.production.min.js (NODE_PROD)": {
4141
"size": 9226,
42-
"gzip": 3623
42+
"gzip": 3626
4343
},
4444
"React-dev.js (FB_DEV)": {
45-
"size": 71469,
46-
"gzip": 18157
45+
"size": 71770,
46+
"gzip": 18179
4747
},
4848
"React-prod.js (FB_PROD)": {
49-
"size": 36701,
50-
"gzip": 9254
49+
"size": 36643,
50+
"gzip": 9256
5151
},
5252
"ReactDOMStack-dev.js (FB_DEV)": {
53-
"size": 522667,
54-
"gzip": 124718
53+
"size": 522763,
54+
"gzip": 124727
5555
},
5656
"ReactDOMStack-prod.js (FB_PROD)": {
57-
"size": 352737,
58-
"gzip": 84668
57+
"size": 352776,
58+
"gzip": 84675
5959
},
6060
"react-dom.development.js (NODE_DEV)": {
61-
"size": 542259,
62-
"gzip": 125174
61+
"size": 542350,
62+
"gzip": 125199
6363
},
6464
"react-dom.production.min.js (NODE_PROD)": {
65-
"size": 116884,
66-
"gzip": 36722
65+
"size": 116925,
66+
"gzip": 36732
6767
},
6868
"ReactDOMFiber-dev.js (FB_DEV)": {
69-
"size": 797309,
70-
"gzip": 184144
69+
"size": 797397,
70+
"gzip": 184161
7171
},
7272
"ReactDOMFiber-prod.js (FB_PROD)": {
73-
"size": 407569,
74-
"gzip": 93574
73+
"size": 407613,
74+
"gzip": 93586
7575
},
7676
"react-dom-server.development.js (NODE_DEV)": {
77-
"size": 445493,
78-
"gzip": 107585
77+
"size": 445589,
78+
"gzip": 107597
7979
},
8080
"react-dom-server.production.min.js (NODE_PROD)": {
81-
"size": 101370,
82-
"gzip": 31284
81+
"size": 101411,
82+
"gzip": 31292
8383
},
8484
"ReactDOMServerStack-dev.js (FB_DEV)": {
85-
"size": 444185,
86-
"gzip": 107436
85+
"size": 444281,
86+
"gzip": 107443
8787
},
8888
"ReactDOMServerStack-prod.js (FB_PROD)": {
89-
"size": 333773,
90-
"gzip": 80431
89+
"size": 334166,
90+
"gzip": 80444
9191
},
9292
"ReactARTStack-dev.js (FB_DEV)": {
93-
"size": 142890,
94-
"gzip": 32689
93+
"size": 142986,
94+
"gzip": 32714
9595
},
9696
"ReactARTStack-prod.js (FB_PROD)": {
97-
"size": 101099,
98-
"gzip": 22973
97+
"size": 101143,
98+
"gzip": 22993
9999
},
100100
"react-art.development.js (NODE_DEV)": {
101-
"size": 265123,
102-
"gzip": 56951
101+
"size": 265214,
102+
"gzip": 56974
103103
},
104104
"react-art.production.min.js (NODE_PROD)": {
105-
"size": 56591,
106-
"gzip": 17132
105+
"size": 56628,
106+
"gzip": 17152
107107
},
108108
"ReactARTFiber-dev.js (FB_DEV)": {
109-
"size": 264301,
110-
"gzip": 56758
109+
"size": 264392,
110+
"gzip": 56780
111111
},
112112
"ReactARTFiber-prod.js (FB_PROD)": {
113-
"size": 205292,
114-
"gzip": 43132
113+
"size": 205336,
114+
"gzip": 43154
115115
},
116116
"ReactNativeStack.js (RN)": {
117117
"size": 233993,
@@ -122,20 +122,20 @@
122122
"gzip": 84001
123123
},
124124
"ReactTestRendererFiber-dev.js (FB_DEV)": {
125-
"size": 262210,
126-
"gzip": 55722
125+
"size": 262301,
126+
"gzip": 55747
127127
},
128128
"ReactTestRendererStack-dev.js (FB_DEV)": {
129-
"size": 151425,
130-
"gzip": 34728
129+
"size": 151521,
130+
"gzip": 34765
131131
},
132132
"react-noop-renderer.development.js (NODE_DEV)": {
133-
"size": 254207,
134-
"gzip": 53701
133+
"size": 254298,
134+
"gzip": 53728
135135
},
136136
"react-test-renderer.development.js (NODE_DEV)": {
137-
"size": 263041,
138-
"gzip": 55919
137+
"size": 263132,
138+
"gzip": 55938
139139
}
140140
}
141141
}

‎src/isomorphic/React.js‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,12 +57,13 @@ var React = {
5757
cloneElement: cloneElement,
5858
isValidElement: ReactElement.isValidElement,
5959

60+
// TODO (bvaughn) Remove these getters in 16.0.0-alpha.10
61+
PropTypes: ReactPropTypes,
6062
checkPropTypes: checkPropTypes,
63+
createClass: createReactClass,
6164

6265
// Classic
6366

64-
PropTypes: ReactPropTypes, // TODO (bvaughn) Remove this getter in 16.0.0-alpha.10
65-
createClass: createReactClass, // TODO (bvaughn) Remove this getter in 16.0.0-alpha.10
6667
createFactory: createFactory,
6768
createMixin: createMixin,
6869

@@ -84,6 +85,7 @@ if (__DEV__) {
8485
ReactDebugCurrentFrame: require('ReactDebugCurrentFrame'),
8586
});
8687

88+
let warnedForCheckPropTypes = false;
8789
let warnedForCreateMixin = false;
8890
let warnedForCreateClass = false;
8991
let warnedForPropTypes = false;
@@ -100,6 +102,18 @@ if (__DEV__) {
100102

101103
// TODO (bvaughn) Remove both of these deprecation warnings in 16.0.0-alpha.10
102104
if (canDefineProperty) {
105+
Object.defineProperty(React, 'checkPropTypes', {
106+
get() {
107+
warning(
108+
warnedForCheckPropTypes,
109+
'checkPropTypes has moved out of the react package. ' +
110+
'Use the prop-types package from npm instead.',
111+
);
112+
warnedForCheckPropTypes = true;
113+
return ReactPropTypes;
114+
},
115+
});
116+
103117
Object.defineProperty(React, 'createClass', {
104118
get: function() {
105119
warning(

0 commit comments

Comments
 (0)