Move instrumentation to renderers/shared. Closes #6797
Dustan Kasten committed
May 18, 2016 at 22:05 UTC
d51981eeead4386445a9d8570910346509ed8cf0
13 files changed
+10
-9
src/isomorphic/modern/class/ReactComponent.js
-9
@@ -12,7 +12,6 @@
12
'use strict';
13
14
var ReactNoopUpdateQueue = require('ReactNoopUpdateQueue');
15
-var ReactInstrumentation = require('ReactInstrumentation');
15
16
var canDefineProperty = require('canDefineProperty');
17
var emptyObject = require('emptyObject');
@@ -66,14 +65,6 @@ ReactComponent.prototype.setState = function(partialState, callback) {
65
'setState(...): takes an object of state variables to update or a ' +
66
'function which returns an object of state variables.'
67
);
69
- if (__DEV__) {
70
- ReactInstrumentation.debugTool.onSetState();
71
- warning(
72
- partialState != null,
73
- 'setState(...): You passed an undefined or null state object; ' +
74
- 'instead, use forceUpdate().'
75
- );
76
- }
68
this.updater.enqueueSetState(this, partialState);
69
if (callback) {
70
this.updater.enqueueCallback(this, callback, 'setState');
src/renderers/shared/ReactDebugTool.js
renamed
src/renderers/shared/ReactInstrumentation.js
renamed
src/renderers/shared/ReactPerf.js
renamed
src/renderers/shared/__tests__/ReactDebugTool-test.js
renamed
src/renderers/shared/__tests__/ReactPerf-test.js
renamed
src/renderers/shared/devtools/ReactComponentTreeDevtool.js
renamed
src/renderers/shared/devtools/ReactHostOperationHistoryDevtool.js
renamed
src/renderers/shared/devtools/ReactInvalidSetStateWarningDevTool.js
renamed
src/renderers/shared/devtools/__tests__/ReactComponentTreeDevtool-test.js
renamed
src/renderers/shared/devtools/__tests__/ReactComponentTreeDevtool-test.native.js
renamed
src/renderers/shared/devtools/__tests__/ReactHostOperationHistoryDevtool-test.js
renamed
src/renderers/shared/stack/reconciler/ReactUpdateQueue.js
+10
@@ -13,6 +13,7 @@
13
14
var ReactCurrentOwner = require('ReactCurrentOwner');
15
var ReactInstanceMap = require('ReactInstanceMap');
16
+var ReactInstrumentation = require('ReactInstrumentation');
17
var ReactUpdates = require('ReactUpdates');
18
19
var invariant = require('invariant');
@@ -219,6 +220,15 @@ var ReactUpdateQueue = {
220
* @internal
221
*/
222
enqueueSetState: function(publicInstance, partialState) {
223
+ if (__DEV__) {
224
+ ReactInstrumentation.debugTool.onSetState();
225
+ warning(
226
+ partialState != null,
227
+ 'setState(...): You passed an undefined or null state object; ' +
228
+ 'instead, use forceUpdate().'
229
+ );
230
+ }
231
+
232
var internalInstance = getInternalInstanceReadyForUpdate(
233
publicInstance,
234
'setState'