Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/react-dom/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
"README.md",
"index.js",
"server.js",
"test-utils.js",
"cjs/",
"umd/"
],
Expand Down
5 changes: 5 additions & 0 deletions packages/react-dom/test-utils.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
'use strict';

if (process.env.NODE_ENV !== 'production') {
module.exports = require('./cjs/test-utils.development.js');
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does it make sense to always export it? Or at least throw in production.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I considered throwing, but I thought it would be immediately obvious when you tried to use it. I guess I can throw a more meaningful error message at least, sure!

}
43 changes: 35 additions & 8 deletions scripts/rollup/bundles.js
Original file line number Diff line number Diff line change
Expand Up @@ -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',
],
Expand Down Expand Up @@ -120,7 +119,39 @@ 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',
],
},
{
babelOpts: babelOptsReact,
bundleTypes: [FB_DEV, NODE_DEV],
config: {
destDir: 'build/',
globals: {
react: 'React',
},
moduleName: 'ReactTestUtils',
sourceMap: false,
},
entry: 'src/test/ReactTestUtils.js',
externals: [
'prop-types',
'prop-types/checkPropTypes',
'react',
'react-dom',
'react-dom/test-utils',
],
fbEntry: 'src/fb/ReactTestUtilsFBEntry.js',
hasteName: 'ReactTestUtils',
isRenderer: false,
label: 'test-utils',
manglePropertiesOnProd: false,
name: 'react-dom/test-utils',
paths: [
'src/renderers/shared/**/*.js',
'src/test/**/*.js', // ReactTestUtils is currently very coupled to DOM.

'src/ReactVersion.js',
'src/shared/**/*.js',
],
Expand Down Expand Up @@ -151,7 +182,6 @@ const bundles = [
'src/renderers/dom/**/*.js',
'src/renderers/shared/**/*.js',

'src/isomorphic/classic/types/checkPropTypes.js',
'src/ReactVersion.js',
'src/shared/**/*.js',
],
Expand Down Expand Up @@ -190,7 +220,6 @@ const bundles = [
'src/renderers/art/**/*.js',
'src/renderers/shared/**/*.js',

'src/isomorphic/classic/types/checkPropTypes.js',
'src/ReactVersion.js',
'src/shared/**/*.js',
],
Expand Down Expand Up @@ -226,7 +255,6 @@ const bundles = [
'src/renderers/art/**/*.js',
'src/renderers/shared/**/*.js',

'src/isomorphic/classic/types/checkPropTypes.js',
'src/ReactVersion.js',
'src/shared/**/*.js',
],
Expand Down Expand Up @@ -328,7 +356,6 @@ const bundles = [
'src/renderers/shared/**/*.js',
'src/renderers/testing/**/*.js',

'src/isomorphic/classic/types/checkPropTypes.js',
'src/ReactVersion.js',
'src/shared/**/*.js',
],
Expand All @@ -355,12 +382,13 @@ const bundles = [
'src/renderers/shared/**/*.js',
'src/renderers/testing/**/*.js',

'src/isomorphic/classic/types/checkPropTypes.js',
'src/ReactVersion.js',
'src/shared/**/*.js',
],
},

// TODO (bvaughn) Add shallow renderer target

/******* React Noop Renderer (used only for fixtures/fiber-debugger) *******/
{
babelOpts: babelOptsReact,
Expand All @@ -383,7 +411,6 @@ const bundles = [
'src/renderers/noop/**/*.js',
'src/renderers/shared/**/*.js',

'src/isomorphic/classic/types/checkPropTypes.js',
'src/ReactVersion.js',
'src/shared/**/*.js',
],
Expand Down
114 changes: 63 additions & 51 deletions scripts/rollup/results.json
Original file line number Diff line number Diff line change
@@ -1,113 +1,113 @@
{
"branch": "master",
"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": 583284,
"gzip": 134555
},
"react-dom.production.min.js (UMD_PROD)": {
"size": 120740,
"gzip": 38094
"size": 120793,
"gzip": 38119
},
"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": 492312,
"gzip": 117399
},
"ReactDOMStack-prod.js (FB_PROD)": {
"size": 352776,
"gzip": 84675
"size": 352924,
"gzip": 84697
},
"react-dom.development.js (NODE_DEV)": {
"size": 542188,
"gzip": 125158
"size": 542280,
"gzip": 125179
},
"react-dom.production.min.js (NODE_PROD)": {
"size": 116925,
"gzip": 36732
"size": 116978,
"gzip": 36758
},
"ReactDOMFiber-dev.js (FB_DEV)": {
"size": 797235,
"gzip": 184122
"size": 543121,
"gzip": 125573
},
"ReactDOMFiber-prod.js (FB_PROD)": {
"size": 407613,
"gzip": 93586
"size": 407761,
"gzip": 93608
},
"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,
Expand All @@ -122,20 +122,32 @@
"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": 510240,
"gzip": 122093
},
"react-dom-test-utils.development.js (NODE_DEV)": {
"size": 78532,
"gzip": 19766
},
"ReactTestUtils-dev.js (FB_DEV)": {
"size": 528,
"gzip": 328
}
}
}
18 changes: 0 additions & 18 deletions scripts/rollup/shims/facebook-www/ReactTestUtils.js

This file was deleted.

5 changes: 2 additions & 3 deletions src/fb/ReactDOMFBEntry.js
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,9 @@ Object.assign(ReactDOM.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED, {

if (__DEV__) {
Object.assign(ReactDOM.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED, {
// ReactPerf and ReactTestUtils currently only work with the DOM renderer
// so we expose them from here, but only in DEV mode.
// ReactPerf currently only works with the DOM renderer
// so we expose it here, but only in DEV mode.
ReactPerf: require('ReactPerf'),
ReactTestUtils: require('ReactTestUtils'),
});
}

Expand Down
11 changes: 0 additions & 11 deletions src/fb/ReactDOMFiberFBEntry.js
Original file line number Diff line number Diff line change
Expand Up @@ -45,15 +45,4 @@ Object.assign(
},
);

if (__DEV__) {
Object.assign(
ReactDOMFiber.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,
{
// ReactPerf and ReactTestUtils currently only work with the DOM renderer
// so we expose them from here, but only in DEV mode.
ReactTestUtils: require('ReactTestUtils'),
},
);
}

module.exports = ReactDOMFiber;
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,8 @@
* This source code is licensed under the BSD-style license found in the
* LICENSE file in the root directory of this source tree. An additional grant
* of patent rights can be found in the PATENTS file in the same directory.
*
* @providesModule checkPropTypes
*/

'use strict';

module.exports = require('prop-types/checkPropTypes');
module.exports = require('react-dom/test-utils');
2 changes: 1 addition & 1 deletion src/isomorphic/React.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/isomorphic/classic/element/ReactElementValidator.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Loading