Merge branch 'rollup' of github.com:trueadm/react into rollup

This commit is contained in:
Dominic Gannaway
2017-03-27 15:26:00 +01:00
2 changed files with 34 additions and 4 deletions
@@ -13,6 +13,15 @@
const {
__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,
} = require('ReactDOMFiber-build'); // It doesn't exist in Stack
} = require('ReactDOM-fb');
module.exports = __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactFiberErrorLogger;
// TODO: remove this when we delete Stack
const ReactFiberErrorLoggerStackShim = {
injection: {
injectDialog() {},
},
};
module.exports =
__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactFiberErrorLogger ||
ReactFiberErrorLoggerStackShim;
+23 -2
View File
@@ -11,8 +11,29 @@
'use strict';
const emptyFunction = require('fbjs/lib/emptyFunction');
const {
__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,
} = require('ReactDOMStack-build'); // It doesn't exist in Fiber
} = require('ReactDOM-fb');
module.exports = __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactPerf;
// TODO: remove this whole module when we delete Stack
const ReactPerfFiberShim = {
getLastMeasurements: emptyFunction,
getExclusive: emptyFunction,
getInclusive: emptyFunction,
getWasted: emptyFunction,
getOperations: emptyFunction,
printExclusive: emptyFunction,
printInclusive: emptyFunction,
printWasted: emptyFunction,
printOperations: emptyFunction,
start: emptyFunction,
stop: emptyFunction,
isRunning: emptyFunction,
printDOM: emptyFunction,
getMeasurementsSummaryMap: emptyFunction,
};
module.exports =
__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactPerf ||
ReactPerfFiberShim;