{"body":"Rename Devtool to Hook","parents":["2823dfcbfbf1602086a5cc64aea1c9859f67c38c","bba0d992d8f4ecf9cf6677817a1218e7f48a8a77"],"patch":"diff --git a\/src\/isomorphic\/classic\/element\/ReactElementValidator.js b\/src\/isomorphic\/classic\/element\/ReactElementValidator.js\nindex 4d4121f981..227af93995 100644\n--- a\/src\/isomorphic\/classic\/element\/ReactElementValidator.js\n+++ b\/src\/isomorphic\/classic\/element\/ReactElementValidator.js\n@@ -19,7 +19,7 @@\n 'use strict';\n \n var ReactCurrentOwner = require('ReactCurrentOwner');\n-var ReactComponentTreeDevtool = require('ReactComponentTreeDevtool');\n+var ReactComponentTreeHook = require('ReactComponentTreeHook');\n var ReactElement = require('ReactElement');\n var ReactPropTypeLocations = require('ReactPropTypeLocations');\n \n@@ -104,7 +104,7 @@ function validateExplicitKey(element, parentType) {\n '%s%s See https:\/\/fb.me\/react-warning-keys for more information.%s',\n currentComponentErrorInfo,\n childOwner,\n- ReactComponentTreeDevtool.getCurrentStackAddendum(element)\n+ ReactComponentTreeHook.getCurrentStackAddendum(element)\n );\n }\n \ndiff --git a\/src\/isomorphic\/classic\/types\/checkReactTypeSpec.js b\/src\/isomorphic\/classic\/types\/checkReactTypeSpec.js\nindex 84211727fa..3a91e8327a 100644\n--- a\/src\/isomorphic\/classic\/types\/checkReactTypeSpec.js\n+++ b\/src\/isomorphic\/classic\/types\/checkReactTypeSpec.js\n@@ -17,7 +17,7 @@ var ReactPropTypesSecret = require('ReactPropTypesSecret');\n var invariant = require('invariant');\n var warning = require('warning');\n \n-var ReactComponentTreeDevtool;\n+var ReactComponentTreeHook;\n \n if (\n typeof process !== 'undefined' &&\n@@ -29,7 +29,7 @@ if (\n \/\/ https:\/\/github.com\/facebook\/react\/issues\/7240\n \/\/ Remove the inline requires when we don't need them anymore:\n \/\/ https:\/\/github.com\/facebook\/react\/pull\/7178\n- ReactComponentTreeDevtool = require('ReactComponentTreeDevtool')\n+ ReactComponentTreeHook = require('ReactComponentTreeHook')\n }\n \n var loggedTypeFailures = {};\n@@ -88,13 +88,13 @@ function checkReactTypeSpec(typeSpecs, values, location, componentName, element,\n var componentStackInfo = '';\n \n if (__DEV__) {\n- if (!ReactComponentTreeDevtool) {\n- ReactComponentTreeDevtool = require('ReactComponentTreeDevtool');\n+ if (!ReactComponentTreeHook) {\n+ ReactComponentTreeHook = require('ReactComponentTreeHook');\n }\n if (debugID !== null) {\n- componentStackInfo = ReactComponentTreeDevtool.getStackAddendumByID(debugID);\n+ componentStackInfo = ReactComponentTreeHook.getStackAddendumByID(debugID);\n } else if (element !== null) {\n- componentStackInfo = ReactComponentTreeDevtool.getCurrentStackAddendum(element);\n+ componentStackInfo = ReactComponentTreeHook.getCurrentStackAddendum(element);\n }\n }\n \ndiff --git a\/src\/isomorphic\/hooks\/ReactComponentTreeDevtool.js b\/src\/isomorphic\/hooks\/ReactComponentTreeDevtool.js\nnew file mode 100644\nindex 0000000000..8e9898e3c1\n--- \/dev\/null\n+++ b\/src\/isomorphic\/hooks\/ReactComponentTreeDevtool.js\n@@ -0,0 +1,14 @@\n+\/**\n+ * Copyright 2016-present, Facebook, Inc.\n+ * All rights reserved.\n+ *\n+ * This source code is licensed under the BSD-style license found in the\n+ * LICENSE file in the root directory of this source tree. An additional grant\n+ * of patent rights can be found in the PATENTS file in the same directory.\n+ *\n+ * @providesModule ReactComponentTreeDevtool\n+ *\/\n+'use strict';\n+\n+\/\/ TODO remove this proxy when RN\/www gets updated\n+module.exports = require('ReactComponentTreeHook');\ndiff --git a\/src\/isomorphic\/devtools\/ReactComponentTreeDevtool.js b\/src\/isomorphic\/hooks\/ReactComponentTreeHook.js\nsimilarity index 89%\nrename from src\/isomorphic\/devtools\/ReactComponentTreeDevtool.js\nrename to src\/isomorphic\/hooks\/ReactComponentTreeHook.js\nindex 622bad9847..97aa9fa23b 100644\n--- a\/src\/isomorphic\/devtools\/ReactComponentTreeDevtool.js\n+++ b\/src\/isomorphic\/hooks\/ReactComponentTreeHook.js\n@@ -6,7 +6,7 @@\n * LICENSE file in the root directory of this source tree. An additional grant\n * of patent rights can be found in the PATENTS file in the same directory.\n *\n- * @providesModule ReactComponentTreeDevtool\n+ * @providesModule ReactComponentTreeHook\n *\/\n \n 'use strict';\n@@ -57,23 +57,23 @@ function describeComponentFrame(name, source, ownerName) {\n }\n \n function describeID(id) {\n- var name = ReactComponentTreeDevtool.getDisplayName(id);\n- var element = ReactComponentTreeDevtool.getElement(id);\n- var ownerID = ReactComponentTreeDevtool.getOwnerID(id);\n+ var name = ReactComponentTreeHook.getDisplayName(id);\n+ var element = ReactComponentTreeHook.getElement(id);\n+ var ownerID = ReactComponentTreeHook.getOwnerID(id);\n var ownerName;\n if (ownerID) {\n- ownerName = ReactComponentTreeDevtool.getDisplayName(ownerID);\n+ ownerName = ReactComponentTreeHook.getDisplayName(ownerID);\n }\n warning(\n element,\n- 'ReactComponentTreeDevtool: Missing React element for debugID %s when ' +\n+ 'ReactComponentTreeHook: Missing React element for debugID %s when ' +\n 'building stack',\n id\n );\n return describeComponentFrame(name, element && element._source, ownerName);\n }\n \n-var ReactComponentTreeDevtool = {\n+var ReactComponentTreeHook = {\n onSetDisplayName(id, displayName) {\n updateTree(id, item => item.displayName = displayName);\n },\n@@ -86,7 +86,7 @@ var ReactComponentTreeDevtool = {\n var nextChild = tree[nextChildID];\n invariant(\n nextChild,\n- 'Expected devtool events to fire for the child ' +\n+ 'Expected hook events to fire for the child ' +\n 'before its parent includes it in onSetChildren().'\n );\n invariant(\n@@ -161,7 +161,7 @@ var ReactComponentTreeDevtool = {\n },\n \n purgeUnmountedComponents() {\n- if (ReactComponentTreeDevtool._preventPurging) {\n+ if (ReactComponentTreeHook._preventPurging) {\n \/\/ Should only be used for testing.\n return;\n }\n@@ -195,7 +195,7 @@ var ReactComponentTreeDevtool = {\n var currentOwner = ReactCurrentOwner.current;\n var id = currentOwner && currentOwner._debugID;\n \n- info += ReactComponentTreeDevtool.getStackAddendumByID(id);\n+ info += ReactComponentTreeHook.getStackAddendumByID(id);\n return info;\n },\n \n@@ -203,7 +203,7 @@ var ReactComponentTreeDevtool = {\n var info = '';\n while (id) {\n info += describeID(id);\n- id = ReactComponentTreeDevtool.getParentID(id);\n+ id = ReactComponentTreeHook.getParentID(id);\n }\n return info;\n },\n@@ -259,4 +259,4 @@ var ReactComponentTreeDevtool = {\n },\n };\n \n-module.exports = ReactComponentTreeDevtool;\n+module.exports = ReactComponentTreeHook;\ndiff --git a\/src\/renderers\/dom\/client\/ReactMount.js b\/src\/renderers\/dom\/client\/ReactMount.js\nindex 9a0d15ba27..42c4a676f9 100644\n--- a\/src\/renderers\/dom\/client\/ReactMount.js\n+++ b\/src\/renderers\/dom\/client\/ReactMount.js\n@@ -302,7 +302,7 @@ var ReactMount = {\n },\n \n \/**\n- * Render a new component into the DOM. Hooked by devtools!\n+ * Render a new component into the DOM. Hooked by hooks!\n *\n * @param {ReactElement} nextElement element to render\n * @param {DOMElement} container container to render into\ndiff --git a\/src\/renderers\/dom\/shared\/ReactDOMDebugTool.js b\/src\/renderers\/dom\/shared\/ReactDOMDebugTool.js\nindex aae63af916..dbbd5a1a79 100644\n--- a\/src\/renderers\/dom\/shared\/ReactDOMDebugTool.js\n+++ b\/src\/renderers\/dom\/shared\/ReactDOMDebugTool.js\n@@ -11,8 +11,8 @@\n \n 'use strict';\n \n-var ReactDOMNullInputValuePropDevtool = require('ReactDOMNullInputValuePropDevtool');\n-var ReactDOMUnknownPropertyDevtool = require('ReactDOMUnknownPropertyDevtool');\n+var ReactDOMNullInputValuePropHook = require('ReactDOMNullInputValuePropHook');\n+var ReactDOMUnknownPropertyHook = require('ReactDOMUnknownPropertyHook');\n var ReactDebugTool = require('ReactDebugTool');\n \n var warning = require('warning');\n@@ -29,7 +29,7 @@ function emitEvent(handlerFunctionName, arg1, arg2, arg3, arg4, arg5) {\n } catch (e) {\n warning(\n handlerDoesThrowForEvent[handlerFunctionName],\n- 'exception thrown by devtool while handling %s: %s',\n+ 'exception thrown by hook while handling %s: %s',\n handlerFunctionName,\n e + '\\n' + e.stack\n );\n@@ -39,14 +39,14 @@ function emitEvent(handlerFunctionName, arg1, arg2, arg3, arg4, arg5) {\n }\n \n var ReactDOMDebugTool = {\n- addDevtool(devtool) {\n- ReactDebugTool.addDevtool(devtool);\n- eventHandlers.push(devtool);\n+ addHook(hook) {\n+ ReactDebugTool.addHook(hook);\n+ eventHandlers.push(hook);\n },\n- removeDevtool(devtool) {\n- ReactDebugTool.removeDevtool(devtool);\n+ removeHook(hook) {\n+ ReactDebugTool.removeHook(hook);\n for (var i = 0; i < eventHandlers.length; i++) {\n- if (eventHandlers[i] === devtool) {\n+ if (eventHandlers[i] === hook) {\n eventHandlers.splice(i, 1);\n i--;\n }\n@@ -66,7 +66,7 @@ var ReactDOMDebugTool = {\n },\n };\n \n-ReactDOMDebugTool.addDevtool(ReactDOMUnknownPropertyDevtool);\n-ReactDOMDebugTool.addDevtool(ReactDOMNullInputValuePropDevtool);\n+ReactDOMDebugTool.addHook(ReactDOMUnknownPropertyHook);\n+ReactDOMDebugTool.addHook(ReactDOMNullInputValuePropHook);\n \n module.exports = ReactDOMDebugTool;\ndiff --git a\/src\/renderers\/dom\/shared\/__tests__\/ReactDOMDebugTool-test.js b\/src\/renderers\/dom\/shared\/__tests__\/ReactDOMDebugTool-test.js\nindex a8fdd92175..3e60e2807d 100644\n--- a\/src\/renderers\/dom\/shared\/__tests__\/ReactDOMDebugTool-test.js\n+++ b\/src\/renderers\/dom\/shared\/__tests__\/ReactDOMDebugTool-test.js\n@@ -19,13 +19,13 @@ describe('ReactDOMDebugTool', function() {\n ReactDOMDebugTool = require('ReactDOMDebugTool');\n });\n \n- it('should add and remove devtools', () => {\n+ it('should add and remove hooks', () => {\n var handler1 = jasmine.createSpy('spy');\n var handler2 = jasmine.createSpy('spy');\n- var devtool1 = {onTestEvent: handler1};\n- var devtool2 = {onTestEvent: handler2};\n+ var hook1 = {onTestEvent: handler1};\n+ var hook2 = {onTestEvent: handler2};\n \n- ReactDOMDebugTool.addDevtool(devtool1);\n+ ReactDOMDebugTool.addHook(hook1);\n ReactDOMDebugTool.onTestEvent();\n expect(handler1.calls.count()).toBe(1);\n expect(handler2.calls.count()).toBe(0);\n@@ -34,7 +34,7 @@ describe('ReactDOMDebugTool', function() {\n expect(handler1.calls.count()).toBe(2);\n expect(handler2.calls.count()).toBe(0);\n \n- ReactDOMDebugTool.addDevtool(devtool2);\n+ ReactDOMDebugTool.addHook(hook2);\n ReactDOMDebugTool.onTestEvent();\n expect(handler1.calls.count()).toBe(3);\n expect(handler2.calls.count()).toBe(1);\n@@ -43,20 +43,20 @@ describe('ReactDOMDebugTool', function() {\n expect(handler1.calls.count()).toBe(4);\n expect(handler2.calls.count()).toBe(2);\n \n- ReactDOMDebugTool.removeDevtool(devtool1);\n+ ReactDOMDebugTool.removeHook(hook1);\n ReactDOMDebugTool.onTestEvent();\n expect(handler1.calls.count()).toBe(4);\n expect(handler2.calls.count()).toBe(3);\n \n- ReactDOMDebugTool.removeDevtool(devtool2);\n+ ReactDOMDebugTool.removeHook(hook2);\n ReactDOMDebugTool.onTestEvent();\n expect(handler1.calls.count()).toBe(4);\n expect(handler2.calls.count()).toBe(3);\n });\n \n- it('warns once when an error is thrown in devtool', () => {\n+ it('warns once when an error is thrown in hook', () => {\n spyOn(console, 'error');\n- ReactDOMDebugTool.addDevtool({\n+ ReactDOMDebugTool.addHook({\n onTestEvent() {\n throw new Error('Hi.');\n },\n@@ -65,7 +65,7 @@ describe('ReactDOMDebugTool', function() {\n ReactDOMDebugTool.onTestEvent();\n expect(console.error.calls.count()).toBe(1);\n expect(console.error.calls.argsFor(0)[0]).toContain(\n- 'exception thrown by devtool while handling ' +\n+ 'exception thrown by hook while handling ' +\n 'onTestEvent: Error: Hi.'\n );\n \ndiff --git a\/src\/renderers\/dom\/shared\/devtools\/ReactDOMNullInputValuePropDevtool.js b\/src\/renderers\/dom\/shared\/hooks\/ReactDOMNullInputValuePropHook.js\nsimilarity index 80%\nrename from src\/renderers\/dom\/shared\/devtools\/ReactDOMNullInputValuePropDevtool.js\nrename to src\/renderers\/dom\/shared\/hooks\/ReactDOMNullInputValuePropHook.js\nindex ffaa86d5de..959db6bf26 100644\n--- a\/src\/renderers\/dom\/shared\/devtools\/ReactDOMNullInputValuePropDevtool.js\n+++ b\/src\/renderers\/dom\/shared\/hooks\/ReactDOMNullInputValuePropHook.js\n@@ -6,12 +6,12 @@\n * LICENSE file in the root directory of this source tree. An additional grant\n * of patent rights can be found in the PATENTS file in the same directory.\n *\n- * @providesModule ReactDOMNullInputValuePropDevtool\n+ * @providesModule ReactDOMNullInputValuePropHook\n *\/\n \n 'use strict';\n \n-var ReactComponentTreeDevtool = require('ReactComponentTreeDevtool');\n+var ReactComponentTreeHook = require('ReactComponentTreeHook');\n \n var warning = require('warning');\n \n@@ -31,14 +31,14 @@ function handleElement(debugID, element) {\n 'Consider using the empty string to clear the component or `undefined` ' +\n 'for uncontrolled components.%s',\n element.type,\n- ReactComponentTreeDevtool.getStackAddendumByID(debugID)\n+ ReactComponentTreeHook.getStackAddendumByID(debugID)\n );\n \n didWarnValueNull = true;\n }\n }\n \n-var ReactDOMUnknownPropertyDevtool = {\n+var ReactDOMNullInputValuePropHook = {\n onBeforeMountComponent(debugID, element) {\n handleElement(debugID, element);\n },\n@@ -47,4 +47,4 @@ var ReactDOMUnknownPropertyDevtool = {\n },\n };\n \n-module.exports = ReactDOMUnknownPropertyDevtool;\n+module.exports = ReactDOMNullInputValuePropHook;\ndiff --git a\/src\/renderers\/dom\/shared\/devtools\/ReactDOMUnknownPropertyDevtool.js b\/src\/renderers\/dom\/shared\/hooks\/ReactDOMUnknownPropertyHook.js\nsimilarity index 89%\nrename from src\/renderers\/dom\/shared\/devtools\/ReactDOMUnknownPropertyDevtool.js\nrename to src\/renderers\/dom\/shared\/hooks\/ReactDOMUnknownPropertyHook.js\nindex e37be4a257..6df617e261 100644\n--- a\/src\/renderers\/dom\/shared\/devtools\/ReactDOMUnknownPropertyDevtool.js\n+++ b\/src\/renderers\/dom\/shared\/hooks\/ReactDOMUnknownPropertyHook.js\n@@ -6,14 +6,14 @@\n * LICENSE file in the root directory of this source tree. An additional grant\n * of patent rights can be found in the PATENTS file in the same directory.\n *\n- * @providesModule ReactDOMUnknownPropertyDevtool\n+ * @providesModule ReactDOMUnknownPropertyHook\n *\/\n \n 'use strict';\n \n var DOMProperty = require('DOMProperty');\n var EventPluginRegistry = require('EventPluginRegistry');\n-var ReactComponentTreeDevtool = require('ReactComponentTreeDevtool');\n+var ReactComponentTreeHook = require('ReactComponentTreeHook');\n \n var warning = require('warning');\n \n@@ -73,7 +73,7 @@ if (__DEV__) {\n 'Unknown DOM property %s. Did you mean %s?%s',\n name,\n standardName,\n- ReactComponentTreeDevtool.getStackAddendumByID(debugID)\n+ ReactComponentTreeHook.getStackAddendumByID(debugID)\n );\n return true;\n } else if (registrationName != null) {\n@@ -82,7 +82,7 @@ if (__DEV__) {\n 'Unknown event handler property %s. Did you mean `%s`?%s',\n name,\n registrationName,\n- ReactComponentTreeDevtool.getStackAddendumByID(debugID)\n+ ReactComponentTreeHook.getStackAddendumByID(debugID)\n );\n return true;\n } else {\n@@ -115,7 +115,7 @@ var warnUnknownProperties = function(debugID, element) {\n 'For details, see https:\/\/fb.me\/react-unknown-prop%s',\n unknownPropString,\n element.type,\n- ReactComponentTreeDevtool.getStackAddendumByID(debugID)\n+ ReactComponentTreeHook.getStackAddendumByID(debugID)\n );\n } else if (unknownProps.length > 1) {\n warning(\n@@ -124,7 +124,7 @@ var warnUnknownProperties = function(debugID, element) {\n 'For details, see https:\/\/fb.me\/react-unknown-prop%s',\n unknownPropString,\n element.type,\n- ReactComponentTreeDevtool.getStackAddendumByID(debugID)\n+ ReactComponentTreeHook.getStackAddendumByID(debugID)\n );\n }\n };\n@@ -139,7 +139,7 @@ function handleElement(debugID, element) {\n warnUnknownProperties(debugID, element);\n }\n \n-var ReactDOMUnknownPropertyDevtool = {\n+var ReactDOMUnknownPropertyHook = {\n onBeforeMountComponent(debugID, element) {\n handleElement(debugID, element);\n },\n@@ -148,4 +148,4 @@ var ReactDOMUnknownPropertyDevtool = {\n },\n };\n \n-module.exports = ReactDOMUnknownPropertyDevtool;\n+module.exports = ReactDOMUnknownPropertyHook;\ndiff --git a\/src\/renderers\/shared\/ReactDebugTool.js b\/src\/renderers\/shared\/ReactDebugTool.js\nindex e8c5d2f16d..4882f47a20 100644\n--- a\/src\/renderers\/shared\/ReactDebugTool.js\n+++ b\/src\/renderers\/shared\/ReactDebugTool.js\n@@ -11,10 +11,10 @@\n \n 'use strict';\n \n-var ReactInvalidSetStateWarningDevTool = require('ReactInvalidSetStateWarningDevTool');\n-var ReactHostOperationHistoryDevtool = require('ReactHostOperationHistoryDevtool');\n-var ReactComponentTreeDevtool = require('ReactComponentTreeDevtool');\n-var ReactChildrenMutationWarningDevtool = require('ReactChildrenMutationWarningDevtool');\n+var ReactInvalidSetStateWarningHook = require('ReactInvalidSetStateWarningHook');\n+var ReactHostOperationHistoryHook = require('ReactHostOperationHistoryHook');\n+var ReactComponentTreeHook = require('ReactComponentTreeHook');\n+var ReactChildrenMutationWarningHook = require('ReactChildrenMutationWarningHook');\n var ExecutionEnvironment = require('ExecutionEnvironment');\n \n var performanceNow = require('performanceNow');\n@@ -32,7 +32,7 @@ function emitEvent(handlerFunctionName, arg1, arg2, arg3, arg4, arg5) {\n } catch (e) {\n warning(\n handlerDoesThrowForEvent[handlerFunctionName],\n- 'exception thrown by devtool while handling %s: %s',\n+ 'exception thrown by hook while handling %s: %s',\n handlerFunctionName,\n e + '\\n' + e.stack\n );\n@@ -55,21 +55,21 @@ var currentTimerType = null;\n var lifeCycleTimerHasWarned = false;\n \n function clearHistory() {\n- ReactComponentTreeDevtool.purgeUnmountedComponents();\n- ReactHostOperationHistoryDevtool.clearHistory();\n+ ReactComponentTreeHook.purgeUnmountedComponents();\n+ ReactHostOperationHistoryHook.clearHistory();\n }\n \n function getTreeSnapshot(registeredIDs) {\n return registeredIDs.reduce((tree, id) => {\n- var ownerID = ReactComponentTreeDevtool.getOwnerID(id);\n- var parentID = ReactComponentTreeDevtool.getParentID(id);\n+ var ownerID = ReactComponentTreeHook.getOwnerID(id);\n+ var parentID = ReactComponentTreeHook.getParentID(id);\n tree[id] = {\n- displayName: ReactComponentTreeDevtool.getDisplayName(id),\n- text: ReactComponentTreeDevtool.getText(id),\n- updateCount: ReactComponentTreeDevtool.getUpdateCount(id),\n- childIDs: ReactComponentTreeDevtool.getChildIDs(id),\n+ displayName: ReactComponentTreeHook.getDisplayName(id),\n+ text: ReactComponentTreeHook.getText(id),\n+ updateCount: ReactComponentTreeHook.getUpdateCount(id),\n+ childIDs: ReactComponentTreeHook.getChildIDs(id),\n \/\/ Text nodes don't have owners but this is close enough.\n- ownerID: ownerID || ReactComponentTreeDevtool.getOwnerID(parentID),\n+ ownerID: ownerID || ReactComponentTreeHook.getOwnerID(parentID),\n parentID,\n };\n return tree;\n@@ -79,7 +79,7 @@ function getTreeSnapshot(registeredIDs) {\n function resetMeasurements() {\n var previousStartTime = currentFlushStartTime;\n var previousMeasurements = currentFlushMeasurements || [];\n- var previousOperations = ReactHostOperationHistoryDevtool.getHistory();\n+ var previousOperations = ReactHostOperationHistoryHook.getHistory();\n \n if (currentFlushNesting === 0) {\n currentFlushStartTime = null;\n@@ -89,7 +89,7 @@ function resetMeasurements() {\n }\n \n if (previousMeasurements.length || previousOperations.length) {\n- var registeredIDs = ReactComponentTreeDevtool.getRegisteredIDs();\n+ var registeredIDs = ReactComponentTreeHook.getRegisteredIDs();\n flushHistory.push({\n duration: performanceNow() - previousStartTime,\n measurements: previousMeasurements || [],\n@@ -182,12 +182,12 @@ function resumeCurrentLifeCycleTimer() {\n }\n \n var ReactDebugTool = {\n- addDevtool(devtool) {\n- eventHandlers.push(devtool);\n+ addHook(hook) {\n+ eventHandlers.push(hook);\n },\n- removeDevtool(devtool) {\n+ removeHook(hook) {\n for (var i = 0; i < eventHandlers.length; i++) {\n- if (eventHandlers[i] === devtool) {\n+ if (eventHandlers[i] === hook) {\n eventHandlers.splice(i, 1);\n i--;\n }\n@@ -204,7 +204,7 @@ var ReactDebugTool = {\n isProfiling = true;\n flushHistory.length = 0;\n resetMeasurements();\n- ReactDebugTool.addDevtool(ReactHostOperationHistoryDevtool);\n+ ReactDebugTool.addHook(ReactHostOperationHistoryHook);\n },\n endProfiling() {\n if (!isProfiling) {\n@@ -213,7 +213,7 @@ var ReactDebugTool = {\n \n isProfiling = false;\n resetMeasurements();\n- ReactDebugTool.removeDevtool(ReactHostOperationHistoryDevtool);\n+ ReactDebugTool.removeHook(ReactHostOperationHistoryHook);\n },\n getFlushHistory() {\n return flushHistory;\n@@ -325,9 +325,13 @@ var ReactDebugTool = {\n },\n };\n \n-ReactDebugTool.addDevtool(ReactInvalidSetStateWarningDevTool);\n-ReactDebugTool.addDevtool(ReactComponentTreeDevtool);\n-ReactDebugTool.addDevtool(ReactChildrenMutationWarningDevtool);\n+\/\/ TODO remove these when RN\/www gets updated\n+ReactDebugTool.addDevtool = ReactDebugTool.addHook;\n+ReactDebugTool.removeDevtool = ReactDebugTool.removeHook;\n+\n+ReactDebugTool.addHook(ReactInvalidSetStateWarningHook);\n+ReactDebugTool.addHook(ReactComponentTreeHook);\n+ReactDebugTool.addHook(ReactChildrenMutationWarningHook);\n var url = (ExecutionEnvironment.canUseDOM && window.location.href) || '';\n if ((\/[?&]react_perf\\b\/).test(url)) {\n ReactDebugTool.beginProfiling();\ndiff --git a\/src\/renderers\/shared\/__tests__\/ReactDebugTool-test.js b\/src\/renderers\/shared\/__tests__\/ReactDebugTool-test.js\nindex 15efcb5d1e..0eb809cdbc 100644\n--- a\/src\/renderers\/shared\/__tests__\/ReactDebugTool-test.js\n+++ b\/src\/renderers\/shared\/__tests__\/ReactDebugTool-test.js\n@@ -19,13 +19,13 @@ describe('ReactDebugTool', function() {\n ReactDebugTool = require('ReactDebugTool');\n });\n \n- it('should add and remove devtools', () => {\n+ it('should add and remove hooks', () => {\n var handler1 = jasmine.createSpy('spy');\n var handler2 = jasmine.createSpy('spy');\n- var devtool1 = {onTestEvent: handler1};\n- var devtool2 = {onTestEvent: handler2};\n+ var hook1 = {onTestEvent: handler1};\n+ var hook2 = {onTestEvent: handler2};\n \n- ReactDebugTool.addDevtool(devtool1);\n+ ReactDebugTool.addHook(hook1);\n ReactDebugTool.onTestEvent();\n expect(handler1.calls.count()).toBe(1);\n expect(handler2.calls.count()).toBe(0);\n@@ -34,7 +34,7 @@ describe('ReactDebugTool', function() {\n expect(handler1.calls.count()).toBe(2);\n expect(handler2.calls.count()).toBe(0);\n \n- ReactDebugTool.addDevtool(devtool2);\n+ ReactDebugTool.addHook(hook2);\n ReactDebugTool.onTestEvent();\n expect(handler1.calls.count()).toBe(3);\n expect(handler2.calls.count()).toBe(1);\n@@ -43,20 +43,20 @@ describe('ReactDebugTool', function() {\n expect(handler1.calls.count()).toBe(4);\n expect(handler2.calls.count()).toBe(2);\n \n- ReactDebugTool.removeDevtool(devtool1);\n+ ReactDebugTool.removeHook(hook1);\n ReactDebugTool.onTestEvent();\n expect(handler1.calls.count()).toBe(4);\n expect(handler2.calls.count()).toBe(3);\n \n- ReactDebugTool.removeDevtool(devtool2);\n+ ReactDebugTool.removeHook(hook2);\n ReactDebugTool.onTestEvent();\n expect(handler1.calls.count()).toBe(4);\n expect(handler2.calls.count()).toBe(3);\n });\n \n- it('warns once when an error is thrown in devtool', () => {\n+ it('warns once when an error is thrown in hook', () => {\n spyOn(console, 'error');\n- ReactDebugTool.addDevtool({\n+ ReactDebugTool.addHook({\n onTestEvent() {\n throw new Error('Hi.');\n },\n@@ -65,7 +65,7 @@ describe('ReactDebugTool', function() {\n ReactDebugTool.onTestEvent();\n expect(console.error.calls.count()).toBe(1);\n expect(console.error.calls.argsFor(0)[0]).toContain(\n- 'exception thrown by devtool while handling ' +\n+ 'exception thrown by hook while handling ' +\n 'onTestEvent: Error: Hi.'\n );\n \ndiff --git a\/src\/renderers\/shared\/devtools\/ReactChildrenMutationWarningDevtool.js b\/src\/renderers\/shared\/hooks\/ReactChildrenMutationWarningHook.js\nsimilarity index 84%\nrename from src\/renderers\/shared\/devtools\/ReactChildrenMutationWarningDevtool.js\nrename to src\/renderers\/shared\/hooks\/ReactChildrenMutationWarningHook.js\nindex 9cde836a27..fccc153854 100644\n--- a\/src\/renderers\/shared\/devtools\/ReactChildrenMutationWarningDevtool.js\n+++ b\/src\/renderers\/shared\/hooks\/ReactChildrenMutationWarningHook.js\n@@ -6,12 +6,12 @@\n * LICENSE file in the root directory of this source tree. An additional grant\n * of patent rights can be found in the PATENTS file in the same directory.\n *\n- * @providesModule ReactChildrenMutationWarningDevtool\n+ * @providesModule ReactChildrenMutationWarningHook\n *\/\n \n 'use strict';\n \n-var ReactComponentTreeDevtool = require('ReactComponentTreeDevtool');\n+var ReactComponentTreeHook = require('ReactComponentTreeHook');\n \n var warning = require('warning');\n \n@@ -42,11 +42,11 @@ function handleElement(debugID, element) {\n warning(\n Array.isArray(element._shadowChildren) && !isMutated,\n 'Component\\'s children should not be mutated.%s',\n- ReactComponentTreeDevtool.getStackAddendumByID(debugID),\n+ ReactComponentTreeHook.getStackAddendumByID(debugID),\n );\n }\n \n-var ReactDOMUnknownPropertyDevtool = {\n+var ReactDOMUnknownPropertyHook = {\n onBeforeMountComponent(debugID, element) {\n elements[debugID] = element;\n },\n@@ -63,4 +63,4 @@ var ReactDOMUnknownPropertyDevtool = {\n },\n };\n \n-module.exports = ReactDOMUnknownPropertyDevtool;\n+module.exports = ReactDOMUnknownPropertyHook;\ndiff --git a\/src\/renderers\/shared\/devtools\/ReactHostOperationHistoryDevtool.js b\/src\/renderers\/shared\/hooks\/ReactHostOperationHistoryHook.js\nsimilarity index 75%\nrename from src\/renderers\/shared\/devtools\/ReactHostOperationHistoryDevtool.js\nrename to src\/renderers\/shared\/hooks\/ReactHostOperationHistoryHook.js\nindex 475f1bace8..48456caea9 100644\n--- a\/src\/renderers\/shared\/devtools\/ReactHostOperationHistoryDevtool.js\n+++ b\/src\/renderers\/shared\/hooks\/ReactHostOperationHistoryHook.js\n@@ -6,14 +6,14 @@\n * LICENSE file in the root directory of this source tree. An additional grant\n * of patent rights can be found in the PATENTS file in the same directory.\n *\n- * @providesModule ReactHostOperationHistoryDevtool\n+ * @providesModule ReactHostOperationHistoryHook\n *\/\n \n 'use strict';\n \n var history = [];\n \n-var ReactHostOperationHistoryDevtool = {\n+var ReactHostOperationHistoryHook = {\n onHostOperation(debugID, type, payload) {\n history.push({\n instanceID: debugID,\n@@ -23,7 +23,7 @@ var ReactHostOperationHistoryDevtool = {\n },\n \n clearHistory() {\n- if (ReactHostOperationHistoryDevtool._preventClearing) {\n+ if (ReactHostOperationHistoryHook._preventClearing) {\n \/\/ Should only be used for tests.\n return;\n }\n@@ -36,4 +36,4 @@ var ReactHostOperationHistoryDevtool = {\n },\n };\n \n-module.exports = ReactHostOperationHistoryDevtool;\n+module.exports = ReactHostOperationHistoryHook;\ndiff --git a\/src\/renderers\/shared\/devtools\/ReactInvalidSetStateWarningDevTool.js b\/src\/renderers\/shared\/hooks\/ReactInvalidSetStateWarningHook.js\nsimilarity index 84%\nrename from src\/renderers\/shared\/devtools\/ReactInvalidSetStateWarningDevTool.js\nrename to src\/renderers\/shared\/hooks\/ReactInvalidSetStateWarningHook.js\nindex 74275187cb..4e47ced0d4 100644\n--- a\/src\/renderers\/shared\/devtools\/ReactInvalidSetStateWarningDevTool.js\n+++ b\/src\/renderers\/shared\/hooks\/ReactInvalidSetStateWarningHook.js\n@@ -6,7 +6,7 @@\n * LICENSE file in the root directory of this source tree. An additional grant\n * of patent rights can be found in the PATENTS file in the same directory.\n *\n- * @providesModule ReactInvalidSetStateWarningDevTool\n+ * @providesModule ReactInvalidSetStateWarningHook\n *\/\n \n 'use strict';\n@@ -24,7 +24,7 @@ if (__DEV__) {\n };\n }\n \n-var ReactInvalidSetStateWarningDevTool = {\n+var ReactInvalidSetStateWarningHook = {\n onBeginProcessingChildContext() {\n processingChildContext = true;\n },\n@@ -36,4 +36,4 @@ var ReactInvalidSetStateWarningDevTool = {\n },\n };\n \n-module.exports = ReactInvalidSetStateWarningDevTool;\n+module.exports = ReactInvalidSetStateWarningHook;\ndiff --git a\/src\/renderers\/shared\/devtools\/__tests__\/ReactComponentTreeDevtool-test.js b\/src\/renderers\/shared\/hooks\/__tests__\/ReactComponentTreeHook-test.js\nsimilarity index 96%\nrename from src\/renderers\/shared\/devtools\/__tests__\/ReactComponentTreeDevtool-test.js\nrename to src\/renderers\/shared\/hooks\/__tests__\/ReactComponentTreeHook-test.js\nindex 9df5410652..28f3d931a1 100644\n--- a\/src\/renderers\/shared\/devtools\/__tests__\/ReactComponentTreeDevtool-test.js\n+++ b\/src\/renderers\/shared\/hooks\/__tests__\/ReactComponentTreeHook-test.js\n@@ -11,12 +11,12 @@\n \n 'use strict';\n \n-describe('ReactComponentTreeDevtool', () => {\n+describe('ReactComponentTreeHook', () => {\n var React;\n var ReactDOM;\n var ReactDOMServer;\n var ReactInstanceMap;\n- var ReactComponentTreeDevtool;\n+ var ReactComponentTreeHook;\n var ReactComponentTreeTestUtils;\n \n beforeEach(() => {\n@@ -26,7 +26,7 @@ describe('ReactComponentTreeDevtool', () => {\n ReactDOM = require('ReactDOM');\n ReactDOMServer = require('ReactDOMServer');\n ReactInstanceMap = require('ReactInstanceMap');\n- ReactComponentTreeDevtool = require('ReactComponentTreeDevtool');\n+ ReactComponentTreeHook = require('ReactComponentTreeHook');\n ReactComponentTreeTestUtils = require('ReactComponentTreeTestUtils');\n });\n \n@@ -68,7 +68,7 @@ describe('ReactComponentTreeDevtool', () => {\n \n \/\/ Purging should have no effect\n \/\/ on the tree we expect to see.\n- ReactComponentTreeDevtool.purgeUnmountedComponents();\n+ ReactComponentTreeHook.purgeUnmountedComponents();\n expectWrapperTreeToEqual(expectedTree);\n });\n \n@@ -87,16 +87,16 @@ describe('ReactComponentTreeDevtool', () => {\n ReactDOMServer.renderToString();\n expectWrapperTreeToEqual(null);\n \n- \/\/ To test it, we tell the devtool to ignore next purge\n+ \/\/ To test it, we tell the hook to ignore next purge\n \/\/ so the cleanup request by ReactDebugTool is ignored.\n \/\/ This lets us make assertions on the actual tree.\n- ReactComponentTreeDevtool._preventPurging = true;\n+ ReactComponentTreeHook._preventPurging = true;\n ReactDOMServer.renderToString();\n- ReactComponentTreeDevtool._preventPurging = false;\n+ ReactComponentTreeHook._preventPurging = false;\n expectWrapperTreeToEqual(expectedTree);\n \n \/\/ Purge manually since we skipped the automatic purge.\n- ReactComponentTreeDevtool.purgeUnmountedComponents();\n+ ReactComponentTreeHook.purgeUnmountedComponents();\n expectWrapperTreeToEqual(null);\n });\n }\n@@ -1686,25 +1686,25 @@ describe('ReactComponentTreeDevtool', () => {\n var node = document.createElement('div');\n \n ReactDOM.render(

, node);\n- var divID = ReactComponentTreeDevtool.getRootIDs()[0];\n- expect(ReactComponentTreeDevtool.getUpdateCount(divID)).toEqual(0);\n+ var divID = ReactComponentTreeHook.getRootIDs()[0];\n+ expect(ReactComponentTreeHook.getUpdateCount(divID)).toEqual(0);\n \n ReactDOM.render(, node);\n- var spanID = ReactComponentTreeDevtool.getRootIDs()[0];\n- expect(ReactComponentTreeDevtool.getUpdateCount(divID)).toEqual(0);\n- expect(ReactComponentTreeDevtool.getUpdateCount(spanID)).toEqual(0);\n+ var spanID = ReactComponentTreeHook.getRootIDs()[0];\n+ expect(ReactComponentTreeHook.getUpdateCount(divID)).toEqual(0);\n+ expect(ReactComponentTreeHook.getUpdateCount(spanID)).toEqual(0);\n \n ReactDOM.render(, node);\n- expect(ReactComponentTreeDevtool.getUpdateCount(divID)).toEqual(0);\n- expect(ReactComponentTreeDevtool.getUpdateCount(spanID)).toEqual(1);\n+ expect(ReactComponentTreeHook.getUpdateCount(divID)).toEqual(0);\n+ expect(ReactComponentTreeHook.getUpdateCount(spanID)).toEqual(1);\n \n ReactDOM.render(, node);\n- expect(ReactComponentTreeDevtool.getUpdateCount(divID)).toEqual(0);\n- expect(ReactComponentTreeDevtool.getUpdateCount(spanID)).toEqual(2);\n+ expect(ReactComponentTreeHook.getUpdateCount(divID)).toEqual(0);\n+ expect(ReactComponentTreeHook.getUpdateCount(spanID)).toEqual(2);\n \n ReactDOM.unmountComponentAtNode(node);\n- expect(ReactComponentTreeDevtool.getUpdateCount(divID)).toEqual(0);\n- expect(ReactComponentTreeDevtool.getUpdateCount(spanID)).toEqual(0);\n+ expect(ReactComponentTreeHook.getUpdateCount(divID)).toEqual(0);\n+ expect(ReactComponentTreeHook.getUpdateCount(spanID)).toEqual(0);\n });\n \n it('does not report top-level wrapper as a root', () => {\n@@ -1724,7 +1724,7 @@ describe('ReactComponentTreeDevtool', () => {\n describe('stack addenda', () => {\n it('gets created', () => {\n function getAddendum(element) {\n- var addendum = ReactComponentTreeDevtool.getCurrentStackAddendum(element);\n+ var addendum = ReactComponentTreeHook.getCurrentStackAddendum(element);\n return addendum.replace(\/\$at .+?:\\d+\$\/g, '(at **)');\n }\n \n@@ -1798,7 +1798,7 @@ describe('ReactComponentTreeDevtool', () => {\n \n it('can be retrieved by ID', () => {\n function getAddendum(id) {\n- var addendum = ReactComponentTreeDevtool.getStackAddendumByID(id);\n+ var addendum = ReactComponentTreeHook.getStackAddendumByID(id);\n return addendum.replace(\/\$at .+?:\\d+\$\/g, '(at **)');\n }\n \n@@ -1817,7 +1817,7 @@ describe('ReactComponentTreeDevtool', () => {\n getAddendum(-17);\n expect(console.error.calls.count()).toBe(1);\n expect(console.error.calls.argsFor(0)[0]).toBe(\n- 'Warning: ReactComponentTreeDevtool: Missing React element for ' +\n+ 'Warning: ReactComponentTreeHook: Missing React element for ' +\n 'debugID -17 when building stack'\n );\n });\ndiff --git a\/src\/renderers\/shared\/devtools\/__tests__\/ReactComponentTreeDevtool-test.native.js b\/src\/renderers\/shared\/hooks\/__tests__\/ReactComponentTreeHook-test.native.js\nsimilarity index 97%\nrename from src\/renderers\/shared\/devtools\/__tests__\/ReactComponentTreeDevtool-test.native.js\nrename to src\/renderers\/shared\/hooks\/__tests__\/ReactComponentTreeHook-test.native.js\nindex 9beef3089f..bdfedebd48 100644\n--- a\/src\/renderers\/shared\/devtools\/__tests__\/ReactComponentTreeDevtool-test.native.js\n+++ b\/src\/renderers\/shared\/hooks\/__tests__\/ReactComponentTreeHook-test.native.js\n@@ -11,11 +11,11 @@\n \n 'use strict';\n \n-describe('ReactComponentTreeDevtool', () => {\n+describe('ReactComponentTreeHook', () => {\n var React;\n var ReactNative;\n var ReactInstanceMap;\n- var ReactComponentTreeDevtool;\n+ var ReactComponentTreeHook;\n var ReactComponentTreeTestUtils;\n var createReactNativeComponentClass;\n var View;\n@@ -28,7 +28,7 @@ describe('ReactComponentTreeDevtool', () => {\n React = require('React');\n ReactNative = require('ReactNative');\n ReactInstanceMap = require('ReactInstanceMap');\n- ReactComponentTreeDevtool = require('ReactComponentTreeDevtool');\n+ ReactComponentTreeHook = require('ReactComponentTreeHook');\n ReactComponentTreeTestUtils = require('ReactComponentTreeTestUtils');\n View = require('View');\n createReactNativeComponentClass = require('createReactNativeComponentClass');\n@@ -92,7 +92,7 @@ describe('ReactComponentTreeDevtool', () => {\n \n \/\/ Purging should have no effect\n \/\/ on the tree we expect to see.\n- ReactComponentTreeDevtool.purgeUnmountedComponents();\n+ ReactComponentTreeHook.purgeUnmountedComponents();\n expectWrapperTreeToEqual(expectedTree);\n });\n \n@@ -1658,25 +1658,25 @@ describe('ReactComponentTreeDevtool', () => {\n \n it('reports update counts', () => {\n ReactNative.render(, 1);\n- var viewID = ReactComponentTreeDevtool.getRootIDs()[0];\n- expect(ReactComponentTreeDevtool.getUpdateCount(viewID)).toEqual(0);\n+ var viewID = ReactComponentTreeHook.getRootIDs()[0];\n+ expect(ReactComponentTreeHook.getUpdateCount(viewID)).toEqual(0);\n \n ReactNative.render(, 1);\n- var imageID = ReactComponentTreeDevtool.getRootIDs()[0];\n- expect(ReactComponentTreeDevtool.getUpdateCount(viewID)).toEqual(0);\n- expect(ReactComponentTreeDevtool.getUpdateCount(imageID)).toEqual(0);\n+ var imageID = ReactComponentTreeHook.getRootIDs()[0];\n+ expect(ReactComponentTreeHook.getUpdateCount(viewID)).toEqual(0);\n+ expect(ReactComponentTreeHook.getUpdateCount(imageID)).toEqual(0);\n \n ReactNative.render(, 1);\n- expect(ReactComponentTreeDevtool.getUpdateCount(viewID)).toEqual(0);\n- expect(ReactComponentTreeDevtool.getUpdateCount(imageID)).toEqual(1);\n+ expect(ReactComponentTreeHook.getUpdateCount(viewID)).toEqual(0);\n+ expect(ReactComponentTreeHook.getUpdateCount(imageID)).toEqual(1);\n \n ReactNative.render(, 1);\n- expect(ReactComponentTreeDevtool.getUpdateCount(viewID)).toEqual(0);\n- expect(ReactComponentTreeDevtool.getUpdateCount(imageID)).toEqual(2);\n+ expect(ReactComponentTreeHook.getUpdateCount(viewID)).toEqual(0);\n+ expect(ReactComponentTreeHook.getUpdateCount(imageID)).toEqual(2);\n \n ReactNative.unmountComponentAtNode(1);\n- expect(ReactComponentTreeDevtool.getUpdateCount(viewID)).toEqual(0);\n- expect(ReactComponentTreeDevtool.getUpdateCount(imageID)).toEqual(0);\n+ expect(ReactComponentTreeHook.getUpdateCount(viewID)).toEqual(0);\n+ expect(ReactComponentTreeHook.getUpdateCount(imageID)).toEqual(0);\n });\n \n it('does not report top-level wrapper as a root', () => {\ndiff --git a\/src\/renderers\/shared\/devtools\/__tests__\/ReactHostOperationHistoryDevtool-test.js b\/src\/renderers\/shared\/hooks\/__tests__\/ReactHostOperationHistoryHook-test.js\nsimilarity index 89%\nrename from src\/renderers\/shared\/devtools\/__tests__\/ReactHostOperationHistoryDevtool-test.js\nrename to src\/renderers\/shared\/hooks\/__tests__\/ReactHostOperationHistoryHook-test.js\nindex 6effd763e3..c3e8d17735 100644\n--- a\/src\/renderers\/shared\/devtools\/__tests__\/ReactHostOperationHistoryDevtool-test.js\n+++ b\/src\/renderers\/shared\/hooks\/__tests__\/ReactHostOperationHistoryHook-test.js\n@@ -11,13 +11,13 @@\n \n 'use strict';\n \n-describe('ReactHostOperationHistoryDevtool', () => {\n+describe('ReactHostOperationHistoryHook', () => {\n var React;\n var ReactPerf;\n var ReactDOM;\n var ReactDOMComponentTree;\n var ReactDOMFeatureFlags;\n- var ReactHostOperationHistoryDevtool;\n+ var ReactHostOperationHistoryHook;\n \n beforeEach(() => {\n jest.resetModuleRegistry();\n@@ -27,7 +27,7 @@ describe('ReactHostOperationHistoryDevtool', () => {\n ReactDOM = require('ReactDOM');\n ReactDOMComponentTree = require('ReactDOMComponentTree');\n ReactDOMFeatureFlags = require('ReactDOMFeatureFlags');\n- ReactHostOperationHistoryDevtool = require('ReactHostOperationHistoryDevtool');\n+ ReactHostOperationHistoryHook = require('ReactHostOperationHistoryHook');\n \n ReactPerf.start();\n });\n@@ -37,14 +37,14 @@ describe('ReactHostOperationHistoryDevtool', () => {\n });\n \n function assertHistoryMatches(expectedHistory) {\n- var actualHistory = ReactHostOperationHistoryDevtool.getHistory();\n+ var actualHistory = ReactHostOperationHistoryHook.getHistory();\n expect(actualHistory).toEqual(expectedHistory);\n }\n \n describe('mount', () => {\n it('gets recorded for host roots', () => {\n var node = document.createElement('div');\n- ReactHostOperationHistoryDevtool._preventClearing = true;\n+ ReactHostOperationHistoryHook._preventClearing = true;\n ReactDOM.render(

Hi.<\/p><\/div>, node);\n \n var inst = ReactDOMComponentTree.getInstanceFromNode(node.firstChild);\n@@ -63,7 +63,7 @@ describe('ReactHostOperationHistoryDevtool', () => {\n }\n var node = document.createElement('div');\n \n- ReactHostOperationHistoryDevtool._preventClearing = true;\n+ ReactHostOperationHistoryHook._preventClearing = true;\n ReactDOM.render(, node);\n \n var inst = ReactDOMComponentTree.getInstanceFromNode(node.firstChild);\n@@ -83,10 +83,10 @@ describe('ReactHostOperationHistoryDevtool', () => {\n }\n var node = document.createElement('div');\n \n- ReactHostOperationHistoryDevtool._preventClearing = true;\n+ ReactHostOperationHistoryHook._preventClearing = true;\n ReactDOM.render(, node);\n \n- \/\/ Empty DOM components should be invisible to devtools.\n+ \/\/ Empty DOM components should be invisible to hooks.\n assertHistoryMatches([]);\n });\n \n@@ -96,7 +96,7 @@ describe('ReactHostOperationHistoryDevtool', () => {\n return element;\n }\n \n- ReactHostOperationHistoryDevtool._preventClearing = true;\n+ ReactHostOperationHistoryHook._preventClearing = true;\n \n var node = document.createElement('div');\n element = null;\n@@ -106,7 +106,7 @@ describe('ReactHostOperationHistoryDevtool', () => {\n ReactDOM.render(, node);\n var inst = ReactDOMComponentTree.getInstanceFromNode(node.firstChild);\n \n- \/\/ Since empty components should be invisible to devtools,\n+ \/\/ Since empty components should be invisible to hooks,\n \/\/ we record a \"mount\" event rather than a \"replace with\".\n assertHistoryMatches([{\n instanceID: inst._debugID,\n@@ -120,7 +120,7 @@ describe('ReactHostOperationHistoryDevtool', () => {\n it('gets recorded during mount', () => {\n var node = document.createElement('div');\n \n- ReactHostOperationHistoryDevtool._preventClearing = true;\n+ ReactHostOperationHistoryHook._preventClearing = true;\n ReactDOM.render(

{\n ReactDOM.render(

, node);\n var inst = ReactDOMComponentTree.getInstanceFromNode(node.firstChild);\n \n- ReactHostOperationHistoryDevtool._preventClearing = true;\n+ ReactHostOperationHistoryHook._preventClearing = true;\n ReactDOM.render(

, node);\n ReactDOM.render(

{\n ReactDOM.render(

{\n it('gets recorded during mount', () => {\n var node = document.createElement('div');\n \n- ReactHostOperationHistoryDevtool._preventClearing = true;\n+ ReactHostOperationHistoryHook._preventClearing = true;\n ReactDOM.render(

, node);\n \n var inst = ReactDOMComponentTree.getInstanceFromNode(node.firstChild);\n@@ -247,7 +247,7 @@ describe('ReactHostOperationHistoryDevtool', () => {\n ReactDOM.render(

, node);\n ReactDOM.render(

, node);\n@@ -282,7 +282,7 @@ describe('ReactHostOperationHistoryDevtool', () => {\n ReactDOM.render(

, node);\n ReactDOM.render(

, node);\n \n@@ -302,7 +302,7 @@ describe('ReactHostOperationHistoryDevtool', () => {\n it('gets recorded during mount', () => {\n var node = document.createElement('div');\n \n- ReactHostOperationHistoryDevtool._preventClearing = true;\n+ ReactHostOperationHistoryHook._preventClearing = true;\n ReactDOM.render(

, node);\n \n var inst = ReactDOMComponentTree.getInstanceFromNode(node.firstChild);\n@@ -335,7 +335,7 @@ describe('ReactHostOperationHistoryDevtool', () => {\n ReactDOM.render(

, node);\n ReactDOM.render(

, node);\n@@ -368,7 +368,7 @@ describe('ReactHostOperationHistoryDevtool', () => {\n it('gets recorded during mount', () => {\n var node = document.createElement('div');\n \n- ReactHostOperationHistoryDevtool._preventClearing = true;\n+ ReactHostOperationHistoryHook._preventClearing = true;\n ReactDOM.render(, node);\n \n var inst = ReactDOMComponentTree.getInstanceFromNode(node.firstChild);\n@@ -401,7 +401,7 @@ describe('ReactHostOperationHistoryDevtool', () => {\n ReactDOM.render(, node);\n var inst = ReactDOMComponentTree.getInstanceFromNode(node.firstChild);\n \n- ReactHostOperationHistoryDevtool._preventClearing = true;\n+ ReactHostOperationHistoryHook._preventClearing = true;\n ReactDOM.render(, node);\n ReactDOM.render(, node);\n ReactDOM.render(, node);\n@@ -438,7 +438,7 @@ describe('ReactHostOperationHistoryDevtool', () => {\n ReactDOM.render(

Hi.<\/div>, node);\n var inst = ReactDOMComponentTree.getInstanceFromNode(node.firstChild);\n \n- ReactHostOperationHistoryDevtool._preventClearing = true;\n+ ReactHostOperationHistoryHook._preventClearing = true;\n ReactDOM.render(

Bye.<\/div>, node);\n \n assertHistoryMatches([{\n@@ -453,7 +453,7 @@ describe('ReactHostOperationHistoryDevtool', () => {\n ReactDOM.render(

Bye.<\/div>, node);\n \n assertHistoryMatches([{\n@@ -468,7 +468,7 @@ describe('ReactHostOperationHistoryDevtool', () => {\n ReactDOM.render(

<\/div>, node);\n var inst = ReactDOMComponentTree.getInstanceFromNode(node.firstChild);\n \n- ReactHostOperationHistoryDevtool._preventClearing = true;\n+ ReactHostOperationHistoryHook._preventClearing = true;\n ReactDOM.render(

Bye.<\/div>, node);\n \n assertHistoryMatches([{\n@@ -490,7 +490,7 @@ describe('ReactHostOperationHistoryDevtool', () => {\n var node = document.createElement('div');\n ReactDOM.render(

Hi.<\/div>, node);\n \n- ReactHostOperationHistoryDevtool._preventClearing = true;\n+ ReactHostOperationHistoryHook._preventClearing = true;\n ReactDOM.render(

Hi.<\/div>, node);\n \n assertHistoryMatches([]);\n@@ -504,7 +504,7 @@ describe('ReactHostOperationHistoryDevtool', () => {\n var inst1 = ReactDOMComponentTree.getInstanceFromNode(node.firstChild.childNodes[0]);\n var inst2 = ReactDOMComponentTree.getInstanceFromNode(node.firstChild.childNodes[3]);\n \n- ReactHostOperationHistoryDevtool._preventClearing = true;\n+ ReactHostOperationHistoryHook._preventClearing = true;\n ReactDOM.render(

{'Bye.'}{43}<\/div>, node);\n \n assertHistoryMatches([{\n@@ -522,7 +522,7 @@ describe('ReactHostOperationHistoryDevtool', () => {\n var node = document.createElement('div');\n ReactDOM.render(

{'Hi.'}{42}<\/div>, node);\n \n- ReactHostOperationHistoryDevtool._preventClearing = true;\n+ ReactHostOperationHistoryHook._preventClearing = true;\n ReactDOM.render(

{'Hi.'}{42}<\/div>, node);\n \n assertHistoryMatches([]);\n@@ -544,7 +544,7 @@ describe('ReactHostOperationHistoryDevtool', () => {\n \n element = ;\n \n- ReactHostOperationHistoryDevtool._preventClearing = true;\n+ ReactHostOperationHistoryHook._preventClearing = true;\n ReactDOM.render(, node);\n \n assertHistoryMatches([{\n@@ -567,7 +567,7 @@ describe('ReactHostOperationHistoryDevtool', () => {\n var inst = ReactDOMComponentTree.getInstanceFromNode(node.firstChild);\n element = null;\n \n- ReactHostOperationHistoryDevtool._preventClearing = true;\n+ ReactHostOperationHistoryHook._preventClearing = true;\n ReactDOM.render(, node);\n \n assertHistoryMatches([{\n@@ -589,7 +589,7 @@ describe('ReactHostOperationHistoryDevtool', () => {\n \n element =

;\n \n- ReactHostOperationHistoryDevtool._preventClearing = true;\n+ ReactHostOperationHistoryHook._preventClearing = true;\n ReactDOM.render(, node);\n \n assertHistoryMatches([]);\n@@ -602,7 +602,7 @@ describe('ReactHostOperationHistoryDevtool', () => {\n ReactDOM.render(

,\n node\n@@ -623,7 +623,7 @@ describe('ReactHostOperationHistoryDevtool', () => {\n );\n var inst = ReactDOMComponentTree.getInstanceFromNode(node.firstChild);\n \n- ReactHostOperationHistoryDevtool._preventClearing = true;\n+ ReactHostOperationHistoryHook._preventClearing = true;\n ReactDOM.render(\n

,\n node\n@@ -641,7 +641,7 @@ describe('ReactHostOperationHistoryDevtool', () => {\n ReactDOM.render(

,\n node\n@@ -669,7 +669,7 @@ describe('ReactHostOperationHistoryDevtool', () => {\n node\n );\n \n- ReactHostOperationHistoryDevtool._preventClearing = true;\n+ ReactHostOperationHistoryHook._preventClearing = true;\n ReactDOM.render(\n

,\n node\n@@ -685,7 +685,7 @@ describe('ReactHostOperationHistoryDevtool', () => {\n ReactDOM.render(

<\/div>, node);\n \n assertHistoryMatches([{\n@@ -702,7 +702,7 @@ describe('ReactHostOperationHistoryDevtool', () => {\n ReactDOM.render(

<\/div>, node);\n \n assertHistoryMatches([{\n@@ -719,7 +719,7 @@ describe('ReactHostOperationHistoryDevtool', () => {\n ReactDOM.render(

<\/div>, node);\n \n assertHistoryMatches([{\ndiff --git a\/src\/renderers\/shared\/stack\/reconciler\/ReactChildReconciler.js b\/src\/renderers\/shared\/stack\/reconciler\/ReactChildReconciler.js\nindex 0d94b766d8..7fc57ac957 100644\n--- a\/src\/renderers\/shared\/stack\/reconciler\/ReactChildReconciler.js\n+++ b\/src\/renderers\/shared\/stack\/reconciler\/ReactChildReconciler.js\n@@ -19,7 +19,7 @@ var shouldUpdateReactComponent = require('shouldUpdateReactComponent');\n var traverseAllChildren = require('traverseAllChildren');\n var warning = require('warning');\n \n-var ReactComponentTreeDevtool;\n+var ReactComponentTreeHook;\n \n if (\n typeof process !== 'undefined' &&\n@@ -31,15 +31,15 @@ if (\n \/\/ https:\/\/github.com\/facebook\/react\/issues\/7240\n \/\/ Remove the inline requires when we don't need them anymore:\n \/\/ https:\/\/github.com\/facebook\/react\/pull\/7178\n- ReactComponentTreeDevtool = require('ReactComponentTreeDevtool')\n+ ReactComponentTreeHook = require('ReactComponentTreeHook')\n }\n \n function instantiateChild(childInstances, child, name, selfDebugID) {\n \/\/ We found a component instance.\n var keyUnique = (childInstances[name] === undefined);\n if (__DEV__) {\n- if (!ReactComponentTreeDevtool) {\n- ReactComponentTreeDevtool = require('ReactComponentTreeDevtool');\n+ if (!ReactComponentTreeHook) {\n+ ReactComponentTreeHook = require('ReactComponentTreeHook');\n }\n warning(\n keyUnique,\n@@ -47,7 +47,7 @@ function instantiateChild(childInstances, child, name, selfDebugID) {\n '`%s`. Child keys must be unique; when two children share a key, only ' +\n 'the first child will be used.%s',\n KeyEscapeUtils.unescape(name),\n- ReactComponentTreeDevtool.getStackAddendumByID(selfDebugID)\n+ ReactComponentTreeHook.getStackAddendumByID(selfDebugID)\n );\n }\n if (child != null && keyUnique) {\ndiff --git a\/src\/shared\/utils\/flattenChildren.js b\/src\/shared\/utils\/flattenChildren.js\nindex e0e1ed8709..861611fe9b 100644\n--- a\/src\/shared\/utils\/flattenChildren.js\n+++ b\/src\/shared\/utils\/flattenChildren.js\n@@ -16,7 +16,7 @@ var KeyEscapeUtils = require('KeyEscapeUtils');\n var traverseAllChildren = require('traverseAllChildren');\n var warning = require('warning');\n \n-var ReactComponentTreeDevtool;\n+var ReactComponentTreeHook;\n \n if (\n typeof process !== 'undefined' &&\n@@ -28,7 +28,7 @@ if (\n \/\/ https:\/\/github.com\/facebook\/react\/issues\/7240\n \/\/ Remove the inline requires when we don't need them anymore:\n \/\/ https:\/\/github.com\/facebook\/react\/pull\/7178\n- ReactComponentTreeDevtool = require('ReactComponentTreeDevtool')\n+ ReactComponentTreeHook = require('ReactComponentTreeHook')\n }\n \n \/**\n@@ -48,8 +48,8 @@ function flattenSingleChildIntoContext(\n const result = traverseContext;\n const keyUnique = (result[name] === undefined);\n if (__DEV__) {\n- if (!ReactComponentTreeDevtool) {\n- ReactComponentTreeDevtool = require('ReactComponentTreeDevtool');\n+ if (!ReactComponentTreeHook) {\n+ ReactComponentTreeHook = require('ReactComponentTreeHook');\n }\n warning(\n keyUnique,\n@@ -57,7 +57,7 @@ function flattenSingleChildIntoContext(\n '`%s`. Child keys must be unique; when two children share a key, only ' +\n 'the first child will be used.%s',\n KeyEscapeUtils.unescape(name),\n- ReactComponentTreeDevtool.getStackAddendumByID(selfDebugID)\n+ ReactComponentTreeHook.getStackAddendumByID(selfDebugID)\n );\n }\n if (keyUnique && child != null) {\ndiff --git a\/src\/test\/ReactComponentTreeTestUtils.js b\/src\/test\/ReactComponentTreeTestUtils.js\nindex 1f5967d3dd..fd7ed9b1a9 100644\n--- a\/src\/test\/ReactComponentTreeTestUtils.js\n+++ b\/src\/test\/ReactComponentTreeTestUtils.js\n@@ -11,25 +11,25 @@\n \n 'use strict';\n \n-var ReactComponentTreeDevtool = require('ReactComponentTreeDevtool');\n+var ReactComponentTreeHook = require('ReactComponentTreeHook');\n \n function getRootDisplayNames() {\n- return ReactComponentTreeDevtool.getRootIDs()\n- .map(ReactComponentTreeDevtool.getDisplayName);\n+ return ReactComponentTreeHook.getRootIDs()\n+ .map(ReactComponentTreeHook.getDisplayName);\n }\n \n function getRegisteredDisplayNames() {\n- return ReactComponentTreeDevtool.getRegisteredIDs()\n- .map(ReactComponentTreeDevtool.getDisplayName);\n+ return ReactComponentTreeHook.getRegisteredIDs()\n+ .map(ReactComponentTreeHook.getDisplayName);\n }\n \n function expectTree(rootID, expectedTree, parentPath) {\n- var displayName = ReactComponentTreeDevtool.getDisplayName(rootID);\n- var ownerID = ReactComponentTreeDevtool.getOwnerID(rootID);\n- var parentID = ReactComponentTreeDevtool.getParentID(rootID);\n- var childIDs = ReactComponentTreeDevtool.getChildIDs(rootID);\n- var text = ReactComponentTreeDevtool.getText(rootID);\n- var element = ReactComponentTreeDevtool.getElement(rootID);\n+ var displayName = ReactComponentTreeHook.getDisplayName(rootID);\n+ var ownerID = ReactComponentTreeHook.getOwnerID(rootID);\n+ var parentID = ReactComponentTreeHook.getParentID(rootID);\n+ var childIDs = ReactComponentTreeHook.getChildIDs(rootID);\n+ var text = ReactComponentTreeHook.getText(rootID);\n+ var element = ReactComponentTreeHook.getElement(rootID);\n var path = parentPath ? `${parentPath} > ${displayName}` : displayName;\n \n function expectEqual(actual, expected, name) {\n@@ -46,14 +46,14 @@ function expectTree(rootID, expectedTree, parentPath) {\n \n if (expectedTree.parentDisplayName !== undefined) {\n expectEqual(\n- ReactComponentTreeDevtool.getDisplayName(parentID),\n+ ReactComponentTreeHook.getDisplayName(parentID),\n expectedTree.parentDisplayName,\n 'parentDisplayName'\n );\n }\n if (expectedTree.ownerDisplayName !== undefined) {\n expectEqual(\n- ReactComponentTreeDevtool.getDisplayName(ownerID),\n+ ReactComponentTreeHook.getDisplayName(ownerID),\n expectedTree.ownerDisplayName,\n 'ownerDisplayName'\n );\n","files":[{"path":"src\/isomorphic\/classic\/element\/ReactElementValidator.js","status":"M"},{"path":"src\/isomorphic\/classic\/types\/checkReactTypeSpec.js","status":"M"},{"path":"src\/isomorphic\/hooks\/ReactComponentTreeDevtool.js","status":"A"},{"previousPath":"src\/isomorphic\/devtools\/ReactComponentTreeDevtool.js","path":"src\/isomorphic\/hooks\/ReactComponentTreeHook.js","status":"R089"},{"path":"src\/renderers\/dom\/client\/ReactMount.js","status":"M"},{"path":"src\/renderers\/dom\/shared\/ReactDOMDebugTool.js","status":"M"},{"path":"src\/renderers\/dom\/shared\/__tests__\/ReactDOMDebugTool-test.js","status":"M"},{"previousPath":"src\/renderers\/dom\/shared\/devtools\/ReactDOMNullInputValuePropDevtool.js","path":"src\/renderers\/dom\/shared\/hooks\/ReactDOMNullInputValuePropHook.js","status":"R080"},{"previousPath":"src\/renderers\/dom\/shared\/devtools\/ReactDOMUnknownPropertyDevtool.js","path":"src\/renderers\/dom\/shared\/hooks\/ReactDOMUnknownPropertyHook.js","status":"R089"},{"path":"src\/renderers\/shared\/ReactDebugTool.js","status":"M"},{"path":"src\/renderers\/shared\/__tests__\/ReactDebugTool-test.js","status":"M"},{"previousPath":"src\/renderers\/shared\/devtools\/ReactChildrenMutationWarningDevtool.js","path":"src\/renderers\/shared\/hooks\/ReactChildrenMutationWarningHook.js","status":"R084"},{"previousPath":"src\/renderers\/shared\/devtools\/ReactHostOperationHistoryDevtool.js","path":"src\/renderers\/shared\/hooks\/ReactHostOperationHistoryHook.js","status":"R075"},{"previousPath":"src\/renderers\/shared\/devtools\/ReactInvalidSetStateWarningDevTool.js","path":"src\/renderers\/shared\/hooks\/ReactInvalidSetStateWarningHook.js","status":"R084"},{"previousPath":"src\/renderers\/shared\/devtools\/__tests__\/ReactComponentTreeDevtool-test.js","path":"src\/renderers\/shared\/hooks\/__tests__\/ReactComponentTreeHook-test.js","status":"R096"},{"previousPath":"src\/renderers\/shared\/devtools\/__tests__\/ReactComponentTreeDevtool-test.native.js","path":"src\/renderers\/shared\/hooks\/__tests__\/ReactComponentTreeHook-test.native.js","status":"R097"},{"previousPath":"src\/renderers\/shared\/devtools\/__tests__\/ReactHostOperationHistoryDevtool-test.js","path":"src\/renderers\/shared\/hooks\/__tests__\/ReactHostOperationHistoryHook-test.js","status":"R089"},{"path":"src\/renderers\/shared\/stack\/reconciler\/ReactChildReconciler.js","status":"M"},{"path":"src\/shared\/utils\/flattenChildren.js","status":"M"},{"path":"src\/test\/ReactComponentTreeTestUtils.js","status":"M"}],"commit":{"authorEmail":"root@keyanzhang.com","revision":"328fc75bc910032ff37dc9d93429fb14b476bd0d","shortRevision":"328fc75bc9","authorName":"Keyan Zhang","authoredAt":"2016-08-01T11:42:33-07:00","subject":"Merge pull request #7381 from keyanzhang\/rename-hooks"}}

dillon1000/react

Files changed