{"parents":["3cc733add482fd0f855d15ae8cbd75cc077bd674"],"patch":"diff --git a\/src\/isomorphic\/ReactDebugTool.js b\/src\/isomorphic\/ReactDebugTool.js\nindex d81ab6ee16..b6e6f98e31 100644\n--- a\/src\/isomorphic\/ReactDebugTool.js\n+++ b\/src\/isomorphic\/ReactDebugTool.js\n@@ -236,6 +236,10 @@ var ReactDebugTool = {\n checkDebugID(debugID);\n emitEvent('onSetOwner', debugID, ownerDebugID);\n },\n+ onSetParent(debugID, parentDebugID) {\n+ checkDebugID(debugID);\n+ emitEvent('onSetParent', debugID, parentDebugID);\n+ },\n onSetText(debugID, text) {\n checkDebugID(debugID);\n emitEvent('onSetText', debugID, text);\ndiff --git a\/src\/isomorphic\/classic\/element\/ReactElementValidator.js b\/src\/isomorphic\/classic\/element\/ReactElementValidator.js\nindex 2051a212e3..9467160708 100644\n--- a\/src\/isomorphic\/classic\/element\/ReactElementValidator.js\n+++ b\/src\/isomorphic\/classic\/element\/ReactElementValidator.js\n@@ -18,10 +18,11 @@\n \n 'use strict';\n \n+var ReactCurrentOwner = require('ReactCurrentOwner');\n+var ReactComponentTreeDevtool = require('ReactComponentTreeDevtool');\n var ReactElement = require('ReactElement');\n-var ReactPropTypeLocations = require('ReactPropTypeLocations');\n var ReactPropTypeLocationNames = require('ReactPropTypeLocationNames');\n-var ReactCurrentOwner = require('ReactCurrentOwner');\n+var ReactPropTypeLocations = require('ReactPropTypeLocations');\n \n var canDefineProperty = require('canDefineProperty');\n var getIteratorFn = require('getIteratorFn');\n@@ -171,13 +172,14 @@ function validateChildKeys(node, parentType) {\n \/**\n * Assert that the props are valid\n *\n+ * @param {object} element\n * @param {string} componentName Name of the component for error messages.\n * @param {object} propTypes Map of prop name to a ReactPropType\n- * @param {object} props\n * @param {string} location e.g. \"prop\", \"context\", \"child context\"\n * @private\n *\/\n-function checkPropTypes(componentName, propTypes, props, location) {\n+function checkPropTypes(element, componentName, propTypes, location) {\n+ var props = element.props;\n for (var propName in propTypes) {\n if (propTypes.hasOwnProperty(propName)) {\n var error;\n@@ -216,8 +218,12 @@ function checkPropTypes(componentName, propTypes, props, location) {\n \/\/ same error.\n loggedTypeFailures[error.message] = true;\n \n- var addendum = getDeclarationErrorAddendum();\n- warning(false, 'Failed propType: %s%s', error.message, addendum);\n+ warning(\n+ false,\n+ 'Failed propType: %s%s',\n+ error.message,\n+ ReactComponentTreeDevtool.getCurrentStackAddendum(element)\n+ );\n }\n }\n }\n@@ -237,9 +243,9 @@ function validatePropTypes(element) {\n var name = componentClass.displayName || componentClass.name;\n if (componentClass.propTypes) {\n checkPropTypes(\n+ element,\n name,\n componentClass.propTypes,\n- element.props,\n ReactPropTypeLocations.prop\n );\n }\ndiff --git a\/src\/isomorphic\/classic\/element\/__tests__\/ReactElementClone-test.js b\/src\/isomorphic\/classic\/element\/__tests__\/ReactElementClone-test.js\nindex 20b4089726..b062870d17 100644\n--- a\/src\/isomorphic\/classic\/element\/__tests__\/ReactElementClone-test.js\n+++ b\/src\/isomorphic\/classic\/element\/__tests__\/ReactElementClone-test.js\n@@ -271,7 +271,10 @@ describe('ReactElementClone', function() {\n expect(console.error.argsForCall[0][0]).toBe(\n 'Warning: Failed propType: ' +\n 'Invalid prop `color` of type `number` supplied to `Component`, ' +\n- 'expected `string`. Check the render method of `Parent`.'\n+ 'expected `string`.\\n' +\n+ ' in Component (created by GrandParent)\\n' +\n+ ' in Parent (created by GrandParent)\\n' +\n+ ' in GrandParent'\n );\n });\n \ndiff --git a\/src\/isomorphic\/classic\/element\/__tests__\/ReactElementValidator-test.js b\/src\/isomorphic\/classic\/element\/__tests__\/ReactElementValidator-test.js\nindex 3cdcd48e5b..64c7a4fc1e 100644\n--- a\/src\/isomorphic\/classic\/element\/__tests__\/ReactElementValidator-test.js\n+++ b\/src\/isomorphic\/classic\/element\/__tests__\/ReactElementValidator-test.js\n@@ -242,7 +242,9 @@ describe('ReactElementValidator', function() {\n expect(console.error.argsForCall[0][0]).toBe(\n 'Warning: Failed propType: ' +\n 'Invalid prop `color` of type `number` supplied to `MyComp`, ' +\n- 'expected `string`. Check the render method of `ParentComp`.'\n+ 'expected `string`.\\n' +\n+ ' in MyComp (created by ParentComp)\\n' +\n+ ' in ParentComp'\n );\n });\n \n@@ -318,7 +320,8 @@ describe('ReactElementValidator', function() {\n expect(console.error.calls.length).toBe(1);\n expect(console.error.argsForCall[0][0]).toBe(\n 'Warning: Failed propType: ' +\n- 'Required prop `prop` was not specified in `Component`.'\n+ 'Required prop `prop` was not specified in `Component`.\\n' +\n+ ' in Component'\n );\n });\n \n@@ -342,7 +345,8 @@ describe('ReactElementValidator', function() {\n expect(console.error.calls.length).toBe(1);\n expect(console.error.argsForCall[0][0]).toBe(\n 'Warning: Failed propType: ' +\n- 'Required prop `prop` was not specified in `Component`.'\n+ 'Required prop `prop` was not specified in `Component`.\\n' +\n+ ' in Component'\n );\n });\n \n@@ -368,13 +372,15 @@ describe('ReactElementValidator', function() {\n expect(console.error.calls.length).toBe(2);\n expect(console.error.argsForCall[0][0]).toBe(\n 'Warning: Failed propType: ' +\n- 'Required prop `prop` was not specified in `Component`.'\n+ 'Required prop `prop` was not specified in `Component`.\\n' +\n+ ' in Component'\n );\n \n expect(console.error.argsForCall[1][0]).toBe(\n 'Warning: Failed propType: ' +\n 'Invalid prop `prop` of type `number` supplied to ' +\n- '`Component`, expected `string`.'\n+ '`Component`, expected `string`.\\n' +\n+ ' in Component'\n );\n \n ReactTestUtils.renderIntoDocument(\ndiff --git a\/src\/isomorphic\/classic\/types\/__tests__\/ReactPropTypes-test.js b\/src\/isomorphic\/classic\/types\/__tests__\/ReactPropTypes-test.js\nindex ea8d54035a..1c01aeee84 100644\n--- a\/src\/isomorphic\/classic\/types\/__tests__\/ReactPropTypes-test.js\n+++ b\/src\/isomorphic\/classic\/types\/__tests__\/ReactPropTypes-test.js\n@@ -891,8 +891,11 @@ describe('ReactPropTypes', function() {\n var instance = ;\n instance = ReactTestUtils.renderIntoDocument(instance);\n expect(console.error.argsForCall.length).toBe(1);\n- expect(console.error.argsForCall[0][0]).toBe(\n- 'Warning: Failed propType: num must be 5!'\n+ expect(\n+ console.error.argsForCall[0][0].replace(\/\\(at .+?:\\d+\\)\/g, '(at **)')\n+ ).toBe(\n+ 'Warning: Failed propType: num must be 5!\\n' +\n+ ' in Component (at **)'\n );\n });\n \ndiff --git a\/src\/isomorphic\/devtools\/ReactComponentTreeDevtool.js b\/src\/isomorphic\/devtools\/ReactComponentTreeDevtool.js\nindex c0347a3246..25d537e2e8 100644\n--- a\/src\/isomorphic\/devtools\/ReactComponentTreeDevtool.js\n+++ b\/src\/isomorphic\/devtools\/ReactComponentTreeDevtool.js\n@@ -11,6 +11,8 @@\n \n 'use strict';\n \n+var ReactCurrentOwner = require('ReactCurrentOwner');\n+\n var invariant = require('invariant');\n \n var tree = {};\n@@ -53,7 +55,6 @@ var ReactComponentTreeDevtool = {\n \n onSetChildren(id, nextChildIDs) {\n updateTree(id, item => {\n- var prevChildIDs = item.childIDs;\n item.childIDs = nextChildIDs;\n \n nextChildIDs.forEach(nextChildID => {\n@@ -78,10 +79,20 @@ var ReactComponentTreeDevtool = {\n 'Expected onMountComponent() to fire for the child ' +\n 'before its parent includes it in onSetChildren().'\n );\n-\n- if (prevChildIDs.indexOf(nextChildID) === -1) {\n+ if (nextChild.parentID == null) {\n nextChild.parentID = id;\n+ \/\/ TODO: This shouldn't be necessary but mounting a new root during in\n+ \/\/ componentWillMount currently causes not-yet-mounted components to\n+ \/\/ be purged from our tree data so their parent ID is missing.\n }\n+ invariant(\n+ nextChild.parentID === id,\n+ 'Expected onSetParent() and onSetChildren() to be consistent (%s ' +\n+ 'has parents %s and %s).',\n+ nextChildID,\n+ nextChild.parentID,\n+ id\n+ );\n });\n });\n },\n@@ -90,6 +101,10 @@ var ReactComponentTreeDevtool = {\n updateTree(id, item => item.ownerID = ownerID);\n },\n \n+ onSetParent(id, parentID) {\n+ updateTree(id, item => item.parentID = parentID);\n+ },\n+\n onSetText(id, text) {\n updateTree(id, item => item.text = text);\n },\n@@ -138,6 +153,53 @@ var ReactComponentTreeDevtool = {\n return item ? item.isMounted : false;\n },\n \n+ getCurrentStackAddendum(topElement) {\n+ function describeComponentFrame(name, source, ownerName) {\n+ return '\\n in ' + name + (\n+ source ?\n+ ' (at ' + source.fileName.replace(\/^.*[\\\\\\\/]\/, '') + ':' +\n+ source.lineNumber + ')' :\n+ ownerName ?\n+ ' (created by ' + ownerName + ')' :\n+ ''\n+ );\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 ownerName;\n+ if (ownerID) {\n+ ownerName = ReactComponentTreeDevtool.getDisplayName(ownerID);\n+ }\n+ return describeComponentFrame(name, element._source, ownerName);\n+ }\n+\n+ var info = '';\n+ if (topElement) {\n+ var type = topElement.type;\n+ var name = typeof type === 'function' ?\n+ type.displayName || type.name :\n+ type;\n+ var owner = topElement._owner;\n+ info += describeComponentFrame(\n+ name || 'Unknown',\n+ topElement._source,\n+ owner && owner.getName()\n+ );\n+ }\n+\n+ var currentOwner = ReactCurrentOwner.current;\n+ var id = currentOwner && currentOwner._debugID;\n+ while (id) {\n+ info += describeID(id);\n+ id = ReactComponentTreeDevtool.getParentID(id);\n+ }\n+\n+ return info;\n+ },\n+\n getChildIDs(id) {\n var item = tree[id];\n return item ? item.childIDs : [];\n@@ -148,6 +210,11 @@ var ReactComponentTreeDevtool = {\n return item ? item.displayName : 'Unknown';\n },\n \n+ getElement(id) {\n+ var item = tree[id];\n+ return item ? item.element : null;\n+ },\n+\n getOwnerID(id) {\n var item = tree[id];\n return item ? item.ownerID : null;\ndiff --git a\/src\/isomorphic\/devtools\/__tests__\/ReactComponentTreeDevtool-test.js b\/src\/isomorphic\/devtools\/__tests__\/ReactComponentTreeDevtool-test.js\nindex a600c79e59..ed685741e6 100644\n--- a\/src\/isomorphic\/devtools\/__tests__\/ReactComponentTreeDevtool-test.js\n+++ b\/src\/isomorphic\/devtools\/__tests__\/ReactComponentTreeDevtool-test.js\n@@ -1741,4 +1741,78 @@ describe('ReactComponentTreeDevtool', () => {\n expect(getRootDisplayNames()).toEqual([]);\n expect(getRegisteredDisplayNames()).toEqual([]);\n });\n+\n+ it('creates stack addenda', () => {\n+ function getAddendum(element) {\n+ var addendum = ReactComponentTreeDevtool.getCurrentStackAddendum(element);\n+ return addendum.replace(\/\\(at .+?:\\d+\\)\/g, '(at **)');\n+ }\n+\n+ var Anon = React.createClass({displayName: null, render: () => null});\n+ var Orange = React.createClass({render: () => null});\n+\n+ expect(getAddendum()).toBe(\n+ ''\n+ );\n+ expect(getAddendum(

)).toBe(\n+ '\\n in div (at **)'\n+ );\n+ expect(getAddendum()).toBe(\n+ '\\n in Unknown (at **)'\n+ );\n+ expect(getAddendum()).toBe(\n+ '\\n in Orange (at **)'\n+ );\n+ expect(getAddendum(React.createElement(Orange))).toBe(\n+ '\\n in Orange'\n+ );\n+\n+ var renders = 0;\n+ var rOwnedByQ;\n+\n+ function Q() {\n+ return (rOwnedByQ = React.createElement(R));\n+ }\n+ function R() {\n+ return

<\/div>;\n+ }\n+ class S extends React.Component {\n+ componentDidMount() {\n+ \/\/ Check that the parent path is still fetched when only S itself is on\n+ \/\/ the stack.\n+ this.forceUpdate();\n+ }\n+ render() {\n+ expect(getAddendum()).toBe(\n+ '\\n in S (at **)' +\n+ '\\n in div (at **)' +\n+ '\\n in R (created by Q)' +\n+ '\\n in Q (at **)'\n+ );\n+ expect(getAddendum()).toBe(\n+ '\\n in span (at **)' +\n+ '\\n in S (at **)' +\n+ '\\n in div (at **)' +\n+ '\\n in R (created by Q)' +\n+ '\\n in Q (at **)'\n+ );\n+ expect(getAddendum(React.createElement('span'))).toBe(\n+ '\\n in span (created by S)' +\n+ '\\n in S (at **)' +\n+ '\\n in div (at **)' +\n+ '\\n in R (created by Q)' +\n+ '\\n in Q (at **)'\n+ );\n+ renders++;\n+ return null;\n+ }\n+ }\n+ ReactDOM.render(, document.createElement('div'));\n+ expect(renders).toBe(2);\n+\n+ \/\/ Make sure owner is fetched for the top element too.\n+ expect(getAddendum(rOwnedByQ)).toBe(\n+ '\\n in R (created by Q)'\n+ );\n+ });\n });\ndiff --git a\/src\/isomorphic\/modern\/element\/__tests__\/ReactJSXElementValidator-test.js b\/src\/isomorphic\/modern\/element\/__tests__\/ReactJSXElementValidator-test.js\nindex 1e2890e9f0..427d2340bb 100644\n--- a\/src\/isomorphic\/modern\/element\/__tests__\/ReactJSXElementValidator-test.js\n+++ b\/src\/isomorphic\/modern\/element\/__tests__\/ReactJSXElementValidator-test.js\n@@ -195,10 +195,14 @@ describe('ReactJSXElementValidator', function() {\n }\n }\n ReactTestUtils.renderIntoDocument();\n- expect(console.error.argsForCall[0][0]).toBe(\n+ expect(\n+ console.error.argsForCall[0][0].replace(\/\\(at .+?:\\d+\\)\/g, '(at **)')\n+ ).toBe(\n 'Warning: Failed propType: ' +\n 'Invalid prop `color` of type `number` supplied to `MyComp`, ' +\n- 'expected `string`. Check the render method of `ParentComp`.'\n+ 'expected `string`.\\n' +\n+ ' in MyComp (at **)\\n' +\n+ ' in ParentComp (at **)'\n );\n });\n \n@@ -242,9 +246,12 @@ describe('ReactJSXElementValidator', function() {\n ReactTestUtils.renderIntoDocument();\n \n expect(console.error.calls.length).toBe(1);\n- expect(console.error.argsForCall[0][0]).toBe(\n+ expect(\n+ console.error.argsForCall[0][0].replace(\/\\(at .+?:\\d+\\)\/g, '(at **)')\n+ ).toBe(\n 'Warning: Failed propType: ' +\n- 'Required prop `prop` was not specified in `RequiredPropComponent`.'\n+ 'Required prop `prop` was not specified in `RequiredPropComponent`.\\n' +\n+ ' in RequiredPropComponent (at **)'\n );\n });\n \n@@ -254,9 +261,12 @@ describe('ReactJSXElementValidator', function() {\n ReactTestUtils.renderIntoDocument();\n \n expect(console.error.calls.length).toBe(1);\n- expect(console.error.argsForCall[0][0]).toBe(\n+ expect(\n+ console.error.argsForCall[0][0].replace(\/\\(at .+?:\\d+\\)\/g, '(at **)')\n+ ).toBe(\n 'Warning: Failed propType: ' +\n- 'Required prop `prop` was not specified in `RequiredPropComponent`.'\n+ 'Required prop `prop` was not specified in `RequiredPropComponent`.\\n' +\n+ ' in RequiredPropComponent (at **)'\n );\n });\n \n@@ -267,15 +277,21 @@ describe('ReactJSXElementValidator', function() {\n ReactTestUtils.renderIntoDocument();\n \n expect(console.error.calls.length).toBe(2);\n- expect(console.error.argsForCall[0][0]).toBe(\n+ expect(\n+ console.error.argsForCall[0][0].replace(\/\\(at .+?:\\d+\\)\/g, '(at **)')\n+ ).toBe(\n 'Warning: Failed propType: ' +\n- 'Required prop `prop` was not specified in `RequiredPropComponent`.'\n+ 'Required prop `prop` was not specified in `RequiredPropComponent`.\\n' +\n+ ' in RequiredPropComponent (at **)'\n );\n \n- expect(console.error.argsForCall[1][0]).toBe(\n+ expect(\n+ console.error.argsForCall[1][0].replace(\/\\(at .+?:\\d+\\)\/g, '(at **)')\n+ ).toBe(\n 'Warning: Failed propType: ' +\n 'Invalid prop `prop` of type `number` supplied to ' +\n- '`RequiredPropComponent`, expected `string`.'\n+ '`RequiredPropComponent`, expected `string`.\\n' +\n+ ' in RequiredPropComponent (at **)'\n );\n \n ReactTestUtils.renderIntoDocument();\ndiff --git a\/src\/renderers\/dom\/shared\/ReactDOMComponent.js b\/src\/renderers\/dom\/shared\/ReactDOMComponent.js\nindex f30fb5796b..61dc9f87ad 100644\n--- a\/src\/renderers\/dom\/shared\/ReactDOMComponent.js\n+++ b\/src\/renderers\/dom\/shared\/ReactDOMComponent.js\n@@ -253,6 +253,8 @@ if (__DEV__) {\n var contentDebugID = debugID + '#text';\n this._contentDebugID = contentDebugID;\n ReactInstrumentation.debugTool.onSetDisplayName(contentDebugID, '#text');\n+ ReactInstrumentation.debugTool.onSetParent(contentDebugID, debugID);\n+ ReactInstrumentation.debugTool.onBeforeMountComponent(contentDebugID);\n ReactInstrumentation.debugTool.onSetText(contentDebugID, '' + contentToUse);\n ReactInstrumentation.debugTool.onMountComponent(contentDebugID);\n ReactInstrumentation.debugTool.onSetChildren(debugID, [contentDebugID]);\ndiff --git a\/src\/renderers\/shared\/stack\/reconciler\/ReactCompositeComponent.js b\/src\/renderers\/shared\/stack\/reconciler\/ReactCompositeComponent.js\nindex badd3e7b45..8fc797064a 100644\n--- a\/src\/renderers\/shared\/stack\/reconciler\/ReactCompositeComponent.js\n+++ b\/src\/renderers\/shared\/stack\/reconciler\/ReactCompositeComponent.js\n@@ -471,12 +471,21 @@ var ReactCompositeComponentMixin = {\n }\n \n this._renderedNodeType = ReactNodeTypes.getType(renderedElement);\n- this._renderedComponent = this._instantiateReactComponent(\n+ var child = this._instantiateReactComponent(\n renderedElement\n );\n+ this._renderedComponent = child;\n+ if (__DEV__) {\n+ if (child._debugID !== 0 && this._debugID !== 0) {\n+ ReactInstrumentation.debugTool.onSetParent(\n+ child._debugID,\n+ this._debugID\n+ );\n+ }\n+ }\n \n var markup = ReactReconciler.mountComponent(\n- this._renderedComponent,\n+ child,\n transaction,\n hostParent,\n hostContainerInfo,\n@@ -487,9 +496,7 @@ var ReactCompositeComponentMixin = {\n if (this._debugID !== 0) {\n ReactInstrumentation.debugTool.onSetChildren(\n this._debugID,\n- this._renderedComponent._debugID !== 0 ?\n- [this._renderedComponent._debugID] :\n- []\n+ child._debugID !== 0 ? [child._debugID] : []\n );\n }\n }\n@@ -1031,12 +1038,21 @@ var ReactCompositeComponentMixin = {\n ReactReconciler.unmountComponent(prevComponentInstance, false);\n \n this._renderedNodeType = ReactNodeTypes.getType(nextRenderedElement);\n- this._renderedComponent = this._instantiateReactComponent(\n+ var child = this._instantiateReactComponent(\n nextRenderedElement\n );\n+ this._renderedComponent = child;\n+ if (__DEV__) {\n+ if (child._debugID !== 0 && this._debugID !== 0) {\n+ ReactInstrumentation.debugTool.onSetParent(\n+ child._debugID,\n+ this._debugID\n+ );\n+ }\n+ }\n \n var nextMarkup = ReactReconciler.mountComponent(\n- this._renderedComponent,\n+ child,\n transaction,\n this._hostParent,\n this._hostContainerInfo,\n@@ -1047,9 +1063,7 @@ var ReactCompositeComponentMixin = {\n if (this._debugID !== 0) {\n ReactInstrumentation.debugTool.onSetChildren(\n this._debugID,\n- this._renderedComponent._debugID !== 0 ?\n- [this._renderedComponent._debugID] :\n- []\n+ child._debugID !== 0 ? [child._debugID] : []\n );\n }\n }\ndiff --git a\/src\/renderers\/shared\/stack\/reconciler\/ReactMultiChild.js b\/src\/renderers\/shared\/stack\/reconciler\/ReactMultiChild.js\nindex 9c10bc9a88..8b4c95f0c2 100644\n--- a\/src\/renderers\/shared\/stack\/reconciler\/ReactMultiChild.js\n+++ b\/src\/renderers\/shared\/stack\/reconciler\/ReactMultiChild.js\n@@ -139,8 +139,14 @@ function processQueue(inst, updateQueue) {\n );\n }\n \n+var setParentForInstrumentation = emptyFunction;\n var setChildrenForInstrumentation = emptyFunction;\n if (__DEV__) {\n+ setParentForInstrumentation = function(child) {\n+ if (child._debugID !== 0) {\n+ ReactInstrumentation.debugTool.onSetParent(child._debugID, this._debugID);\n+ }\n+ };\n setChildrenForInstrumentation = function(children) {\n ReactInstrumentation.debugTool.onSetChildren(\n this._debugID,\n@@ -232,6 +238,9 @@ var ReactMultiChild = {\n for (var name in children) {\n if (children.hasOwnProperty(name)) {\n var child = children[name];\n+ if (__DEV__) {\n+ setParentForInstrumentation.call(this, child);\n+ }\n var mountImage = ReactReconciler.mountComponent(\n child,\n transaction,\ndiff --git a\/src\/renderers\/shared\/stack\/reconciler\/ReactReconciler.js b\/src\/renderers\/shared\/stack\/reconciler\/ReactReconciler.js\nindex 9c74c9f8f1..149bbedd80 100644\n--- a\/src\/renderers\/shared\/stack\/reconciler\/ReactReconciler.js\n+++ b\/src\/renderers\/shared\/stack\/reconciler\/ReactReconciler.js\n@@ -222,6 +222,10 @@ var ReactReconciler = {\n internalInstance._debugID,\n 'performUpdateIfNecessary'\n );\n+ ReactInstrumentation.debugTool.onBeforeUpdateComponent(\n+ internalInstance._debugID,\n+ internalInstance._currentElement\n+ );\n }\n }\n internalInstance.performUpdateIfNecessary(transaction);\ndiff --git a\/src\/renderers\/shared\/stack\/reconciler\/__tests__\/ReactStatelessComponent-test.js b\/src\/renderers\/shared\/stack\/reconciler\/__tests__\/ReactStatelessComponent-test.js\nindex 8e0c8ac492..c5b2744ceb 100644\n--- a\/src\/renderers\/shared\/stack\/reconciler\/__tests__\/ReactStatelessComponent-test.js\n+++ b\/src\/renderers\/shared\/stack\/reconciler\/__tests__\/ReactStatelessComponent-test.js\n@@ -175,9 +175,12 @@ describe('ReactStatelessComponent', function() {\n spyOn(console, 'error');\n ReactTestUtils.renderIntoDocument();\n expect(console.error.argsForCall.length).toBe(1);\n- expect(console.error.argsForCall[0][0]).toBe(\n+ expect(\n+ console.error.argsForCall[0][0].replace(\/\\(at .+?:\\d+\\)\/g, '(at **)')\n+ ).toBe(\n 'Warning: Failed propType: Invalid prop `test` of type `number` ' +\n- 'supplied to `Child`, expected `string`.'\n+ 'supplied to `Child`, expected `string`.\\n' +\n+ ' in Child (at **)'\n );\n });\n \n","commit":{"revision":"378c879a6a65afe18acacb8e2a6fe6ea323974df","authorName":"Ben Alpert","authorEmail":"ben@benalpert.com","shortRevision":"378c879a6a","authoredAt":"2016-05-14T17:40:39-07:00","subject":"Show component stack in PropTypes warnings (#6771)"},"body":"","files":[{"status":"M","path":"src\/isomorphic\/ReactDebugTool.js"},{"status":"M","path":"src\/isomorphic\/classic\/element\/ReactElementValidator.js"},{"status":"M","path":"src\/isomorphic\/classic\/element\/__tests__\/ReactElementClone-test.js"},{"status":"M","path":"src\/isomorphic\/classic\/element\/__tests__\/ReactElementValidator-test.js"},{"status":"M","path":"src\/isomorphic\/classic\/types\/__tests__\/ReactPropTypes-test.js"},{"status":"M","path":"src\/isomorphic\/devtools\/ReactComponentTreeDevtool.js"},{"status":"M","path":"src\/isomorphic\/devtools\/__tests__\/ReactComponentTreeDevtool-test.js"},{"status":"M","path":"src\/isomorphic\/modern\/element\/__tests__\/ReactJSXElementValidator-test.js"},{"status":"M","path":"src\/renderers\/dom\/shared\/ReactDOMComponent.js"},{"status":"M","path":"src\/renderers\/shared\/stack\/reconciler\/ReactCompositeComponent.js"},{"status":"M","path":"src\/renderers\/shared\/stack\/reconciler\/ReactMultiChild.js"},{"status":"M","path":"src\/renderers\/shared\/stack\/reconciler\/ReactReconciler.js"},{"status":"M","path":"src\/renderers\/shared\/stack\/reconciler\/__tests__\/ReactStatelessComponent-test.js"}]}

dillon1000/react

Files changed