Move instrumentation to renderers/shared. Closes facebook#6797

iamdustan · May 19, 2016 · 69ca6d3 · 69ca6d3
1 parent 8ea1cf4
commit 69ca6d3
Show file tree

Hide file tree

Showing 13 changed files with 10 additions and 9 deletions.
diff --git a/src/isomorphic/modern/class/ReactComponent.js b/src/isomorphic/modern/class/ReactComponent.js
@@ -12,7 +12,6 @@
 'use strict';
 
 var ReactNoopUpdateQueue = require('ReactNoopUpdateQueue');
-var ReactInstrumentation = require('ReactInstrumentation');
 
 var canDefineProperty = require('canDefineProperty');
 var emptyObject = require('emptyObject');
@@ -66,14 +65,6 @@ ReactComponent.prototype.setState = function(partialState, callback) {
     'setState(...): takes an object of state variables to update or a ' +
     'function which returns an object of state variables.'
   );
-  if (__DEV__) {
-    ReactInstrumentation.debugTool.onSetState();
-    warning(
-      partialState != null,
-      'setState(...): You passed an undefined or null state object; ' +
-      'instead, use forceUpdate().'
-    );
-  }
   this.updater.enqueueSetState(this, partialState);
   if (callback) {
     this.updater.enqueueCallback(this, callback, 'setState');

diff --git a/src/renderers/shared/stack/reconciler/ReactUpdateQueue.js b/src/renderers/shared/stack/reconciler/ReactUpdateQueue.js
@@ -13,6 +13,7 @@
 
 var ReactCurrentOwner = require('ReactCurrentOwner');
 var ReactInstanceMap = require('ReactInstanceMap');
+var ReactInstrumentation = require('ReactInstrumentation');
 var ReactUpdates = require('ReactUpdates');
 
 var invariant = require('invariant');
@@ -219,6 +220,15 @@ var ReactUpdateQueue = {
    * @internal
    */
   enqueueSetState: function(publicInstance, partialState) {
+    if (__DEV__) {
+      ReactInstrumentation.debugTool.onSetState();
+      warning(
+        partialState != null,
+        'setState(...): You passed an undefined or null state object; ' +
+        'instead, use forceUpdate().'
+      );
+    }
+
     var internalInstance = getInternalInstanceReadyForUpdate(
       publicInstance,
       'setState'

diff --git a/src/isomorphic/ReactPerf.js → src/shared/ReactPerf.js b/src/isomorphic/ReactPerf.js → src/shared/ReactPerf.js
diff --git a/src/isomorphic/__tests__/ReactPerf-test.js → src/shared/__tests__/ReactPerf-test.js b/src/isomorphic/__tests__/ReactPerf-test.js → src/shared/__tests__/ReactPerf-test.js
diff --git a/...hic/devtools/ReactComponentTreeDevtool.js → ...red/devtools/ReactComponentTreeDevtool.js b/...hic/devtools/ReactComponentTreeDevtool.js → ...red/devtools/ReactComponentTreeDevtool.js
diff --git a/...tools/ReactHostOperationHistoryDevtool.js → ...tools/ReactHostOperationHistoryDevtool.js b/...tools/ReactHostOperationHistoryDevtool.js → ...tools/ReactHostOperationHistoryDevtool.js
diff --git a/...ols/ReactInvalidSetStateWarningDevTool.js → ...ols/ReactInvalidSetStateWarningDevTool.js b/...ols/ReactInvalidSetStateWarningDevTool.js → ...ols/ReactInvalidSetStateWarningDevTool.js
diff --git a/...tests__/ReactComponentTreeDevtool-test.js → ...tests__/ReactComponentTreeDevtool-test.js b/...tests__/ReactComponentTreeDevtool-test.js → ...tests__/ReactComponentTreeDevtool-test.js
diff --git a/.../ReactComponentTreeDevtool-test.native.js → .../ReactComponentTreeDevtool-test.native.js b/.../ReactComponentTreeDevtool-test.native.js → .../ReactComponentTreeDevtool-test.native.js
diff --git a/.../ReactHostOperationHistoryDevtool-test.js → .../ReactHostOperationHistoryDevtool-test.js b/.../ReactHostOperationHistoryDevtool-test.js → .../ReactHostOperationHistoryDevtool-test.js
diff --git a/src/isomorphic/ReactDebugTool.js → src/shared/utils/ReactDebugTool.js b/src/isomorphic/ReactDebugTool.js → src/shared/utils/ReactDebugTool.js
diff --git a/src/isomorphic/ReactInstrumentation.js → src/shared/utils/ReactInstrumentation.js b/src/isomorphic/ReactInstrumentation.js → src/shared/utils/ReactInstrumentation.js
diff --git a/...omorphic/__tests__/ReactDebugTool-test.js → ...ed/utils/__tests__/ReactDebugTool-test.js b/...omorphic/__tests__/ReactDebugTool-test.js → ...ed/utils/__tests__/ReactDebugTool-test.js