OSSForks/react
1
0
Fork 0
mirror of https://github.com/zebrajr/react.git synced 2025-12-07 00:20:28 +01:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Make ReactDebugCurrentFrame shared state between core and renderers (#9365)

Browse Source
This commit is contained in:
Dan Abramov 2017-04-07 17:03:22 +01:00 committed by GitHub
parent e303e00d06
commit d9fd08df26
5 changed files with 67 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
scripts/rollup/modules.js
View File

@ -46,7 +46,9 @@ const fbjsModules = [
]; ];
const devOnlyFilesToStubOut = [ const devOnlyFilesToStubOut = [
"'ReactDebugCurrentFrame'",
"'ReactComponentTreeHook'", "'ReactComponentTreeHook'",
"'react/lib/ReactDebugCurrentFrame'",
"'react/lib/ReactComponentTreeHook'", "'react/lib/ReactComponentTreeHook'",
"'react-dom/lib/ReactPerf'", "'react-dom/lib/ReactPerf'",
"'react-dom/lib/ReactTestUtils'", "'react-dom/lib/ReactTestUtils'",
@ -169,9 +171,6 @@ function getInternalModules() {
// it doesn't pick them up and assumes they're external // it doesn't pick them up and assumes they're external
return { return {
reactProdInvariant: resolve('./src/shared/utils/reactProdInvariant.js'), reactProdInvariant: resolve('./src/shared/utils/reactProdInvariant.js'),
'react/lib/ReactDebugCurrentFrame': resolve(
'./src/isomorphic/classic/element/ReactDebugCurrentFrame.js'
),
}; };
} }
@ -277,6 +276,28 @@ function getReactComponentTreeHookModuleAlias(bundleType, isRenderer) {
} }
} }
// this works almost identically to the ReactCurrentOwner shim above
const shimReactDebugCurrentFrame = resolve(
'./scripts/rollup/shims/rollup/ReactDebugCurrentFrameRollupShim.js'
);
const realReactDebugCurrentFrame = resolve(
'./src/isomorphic/classic/element/ReactDebugCurrentFrame.js'
);
function getReactDebugCurrentFrameModuleAlias(bundleType, isRenderer) {
if (isRenderer) {
return {
ReactDebugCurrentFrame: shimReactDebugCurrentFrame,
'react/lib/ReactDebugCurrentFrame': shimReactDebugCurrentFrame,
};
} else {
return {
ReactDebugCurrentFrame: realReactDebugCurrentFrame,
'react/lib/ReactDebugCurrentFrame': realReactDebugCurrentFrame,
};
}
}
const devOnlyModuleStub = `'${resolve('./scripts/rollup/shims/rollup/DevOnlyStubShim.js')}'`; const devOnlyModuleStub = `'${resolve('./scripts/rollup/shims/rollup/DevOnlyStubShim.js')}'`;
function replaceDevOnlyStubbedModules(bundleType) { function replaceDevOnlyStubbedModules(bundleType) {
@ -302,6 +323,7 @@ function getAliases(paths, bundleType, isRenderer, extractErrors) {
return Object.assign( return Object.assign(
getReactCurrentOwnerModuleAlias(bundleType, isRenderer), getReactCurrentOwnerModuleAlias(bundleType, isRenderer),
getReactComponentTreeHookModuleAlias(bundleType, isRenderer), getReactComponentTreeHookModuleAlias(bundleType, isRenderer),
getReactDebugCurrentFrameModuleAlias(bundleType, isRenderer),
createModuleMap( createModuleMap(
paths, paths,
extractErrors && extractErrorCodes(errorCodeOpts), extractErrors && extractErrorCodes(errorCodeOpts),

70
scripts/rollup/results.json
View File

@ -1,41 +1,41 @@
{ {
"branch": "master", "branch": "debug-frame",
"bundleSizes": { "bundleSizes": {
"react.development.js (UMD_DEV)": { "react.development.js (UMD_DEV)": {
"size": 116208, "size": 116245,
"gzip": 29564 "gzip": 29572
}, },
"react.production.min.js (UMD_PROD)": { "react.production.min.js (UMD_PROD)": {
"size": 13719, "size": 13719,
"gzip": 5080 "gzip": 5080
}, },
"react-dom.development.js (UMD_DEV)": { "react-dom.development.js (UMD_DEV)": {
"size": 564771, "size": 563524,
"gzip": 130439 "gzip": 130148
}, },
"react-dom.production.min.js (UMD_PROD)": { "react-dom.production.min.js (UMD_PROD)": {
"size": 120123, "size": 120123,
"gzip": 37844 "gzip": 37844
}, },
"react-dom-server.development.js (UMD_DEV)": { "react-dom-server.development.js (UMD_DEV)": {
"size": 477021, "size": 475780,
"gzip": 115494 "gzip": 115177
}, },
"react-dom-server.production.min.js (UMD_PROD)": { "react-dom-server.production.min.js (UMD_PROD)": {
"size": 106349, "size": 106349,
"gzip": 32998 "gzip": 32998
}, },
"react-art.development.js (UMD_DEV)": { "react-art.development.js (UMD_DEV)": {
"size": 341151, "size": 339599,
"gzip": 76261 "gzip": 75952
}, },
"react-art.production.min.js (UMD_PROD)": { "react-art.production.min.js (UMD_PROD)": {
"size": 94939, "size": 94939,
"gzip": 28976 "gzip": 28976
}, },
"react.development.js (NODE_DEV)": { "react.development.js (NODE_DEV)": {
"size": 109222, "size": 109259,
"gzip": 27519 "gzip": 27527
}, },
"react.production.min.js (NODE_PROD)": { "react.production.min.js (NODE_PROD)": {
"size": 12615, "size": 12615,
@ -50,64 +50,64 @@
"gzip": 14329 "gzip": 14329
}, },
"ReactDOMStack-dev.js (FB_DEV)": { "ReactDOMStack-dev.js (FB_DEV)": {
"size": 523202, "size": 521957,
"gzip": 124830 "gzip": 124586
}, },
"ReactDOMStack-prod.js (FB_PROD)": { "ReactDOMStack-prod.js (FB_PROD)": {
"size": 351707, "size": 351707,
"gzip": 84367 "gzip": 84367
}, },
"react-dom.development.js (NODE_DEV)": { "react-dom.development.js (NODE_DEV)": {
"size": 543145, "size": 541898,
"gzip": 125402 "gzip": 125114
}, },
"react-dom.production.min.js (NODE_PROD)": { "react-dom.production.min.js (NODE_PROD)": {
"size": 116802, "size": 116802,
"gzip": 36707 "gzip": 36707
}, },
"ReactDOMFiber-dev.js (FB_DEV)": { "ReactDOMFiber-dev.js (FB_DEV)": {
"size": 797617, "size": 796380,
"gzip": 184146 "gzip": 183920
}, },
"ReactDOMFiber-prod.js (FB_PROD)": { "ReactDOMFiber-prod.js (FB_PROD)": {
"size": 407360, "size": 407360,
"gzip": 93460 "gzip": 93460
}, },
"react-dom-server.development.js (NODE_DEV)": { "react-dom-server.development.js (NODE_DEV)": {
"size": 446422, "size": 445181,
"gzip": 107796 "gzip": 107467
}, },
"react-dom-server.production.min.js (NODE_PROD)": { "react-dom-server.production.min.js (NODE_PROD)": {
"size": 101204, "size": 101204,
"gzip": 31227 "gzip": 31227
}, },
"ReactDOMServerStack-dev.js (FB_DEV)": { "ReactDOMServerStack-dev.js (FB_DEV)": {
"size": 445173, "size": 443932,
"gzip": 107652 "gzip": 107406
}, },
"ReactDOMServerStack-prod.js (FB_PROD)": { "ReactDOMServerStack-prod.js (FB_PROD)": {
"size": 332974, "size": 332974,
"gzip": 80219 "gzip": 80219
}, },
"ReactARTStack-dev.js (FB_DEV)": { "ReactARTStack-dev.js (FB_DEV)": {
"size": 494340, "size": 492711,
"gzip": 118840 "gzip": 118489
}, },
"ReactARTStack-prod.js (FB_PROD)": { "ReactARTStack-prod.js (FB_PROD)": {
"size": 365115, "size": 365115,
"gzip": 87595 "gzip": 87595
}, },
"react-art.development.js (NODE_DEV)": { "react-art.development.js (NODE_DEV)": {
"size": 266386, "size": 264816,
"gzip": 57183 "gzip": 56881
}, },
"react-art.production.min.js (NODE_PROD)": { "react-art.production.min.js (NODE_PROD)": {
"size": 56517, "size": 56517,
"gzip": 17109 "gzip": 17109
}, },
"ReactARTFiber-dev.js (FB_DEV)": { "ReactARTFiber-dev.js (FB_DEV)": {
"size": 265561, "size": 263991,
"gzip": 57011 "gzip": 56709
}, },
"ReactARTFiber-prod.js (FB_PROD)": { "ReactARTFiber-prod.js (FB_PROD)": {
"size": 205194, "size": 205194,
@ -122,20 +122,20 @@
"gzip": 84001 "gzip": 84001
}, },
"ReactTestRendererFiber-dev.js (FB_DEV)": { "ReactTestRendererFiber-dev.js (FB_DEV)": {
"size": 263452, "size": 261900,
"gzip": 55974 "gzip": 55671
}, },
"ReactTestRendererStack-dev.js (FB_DEV)": { "ReactTestRendererStack-dev.js (FB_DEV)": {
"size": 155222, "size": 151142,
"gzip": 35662 "gzip": 34709
}, },
"react-noop-renderer.development.js (NODE_DEV)": { "react-noop-renderer.development.js (NODE_DEV)": {
"size": 255447, "size": 253895,
"gzip": 53933 "gzip": 53629
}, },
"react-test-renderer.development.js (NODE_DEV)": { "react-test-renderer.development.js (NODE_DEV)": {
"size": 264286, "size": 262734,
"gzip": 56152 "gzip": 55847
} }
} }
} }

3
scripts/rollup/shims/rollup/ReactDebugCurrentFrameRollupShim.js Normal file
View File

@ -0,0 +1,3 @@
var ReactInternals = require('react').__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED;
module.exports = ReactInternals.ReactDebugCurrentFrame;

3
src/fb/ReactFBEntry.js
View File

@ -27,8 +27,9 @@ if (__DEV__) {
Object.assign( Object.assign(
ReactFBEntry.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED, ReactFBEntry.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,
{ {
// ReactComponentTreeHook should not be included in production. // These should not be included in production.
ReactComponentTreeHook: require('react/lib/ReactComponentTreeHook'), ReactComponentTreeHook: require('react/lib/ReactComponentTreeHook'),
ReactDebugCurrentFrame: require('react/lib/ReactDebugCurrentFrame'),
}, },
); );
} }

3
src/umd/ReactUMDEntry.js
View File

@ -27,8 +27,9 @@ if (__DEV__) {
Object.assign( Object.assign(
ReactUMDEntry.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED, ReactUMDEntry.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,
{ {
// ReactComponentTreeHook should not be included in production. // These should not be included in production.
ReactComponentTreeHook: require('react/lib/ReactComponentTreeHook'), ReactComponentTreeHook: require('react/lib/ReactComponentTreeHook'),
ReactDebugCurrentFrame: require('react/lib/ReactDebugCurrentFrame'),
}, },
); );
} }