.type === div.type\n- ConvenienceConstructor.type = Constructor;\n- Constructor.prototype.type = Constructor;\n+ var ConvenienceConstructor = ReactDescriptor.createFactory(Constructor);\n \n- Constructor.ConvenienceConstructor = ConvenienceConstructor;\n- ConvenienceConstructor.componentConstructor = Constructor;\n return ConvenienceConstructor;\n }\n \ndiff --git a\/src\/browser\/ReactTextComponent.js b\/src\/browser\/ReactTextComponent.js\nindex f1e71151af..e23c720232 100644\n--- a\/src\/browser\/ReactTextComponent.js\n+++ b\/src\/browser\/ReactTextComponent.js\n@@ -22,6 +22,7 @@\n var DOMPropertyOperations = require('DOMPropertyOperations');\n var ReactBrowserComponentMixin = require('ReactBrowserComponentMixin');\n var ReactComponent = require('ReactComponent');\n+var ReactDescriptor = require('ReactDescriptor');\n \n var escapeTextForBrowser = require('escapeTextForBrowser');\n var mixInto = require('mixInto');\n@@ -41,18 +42,8 @@ var mixInto = require('mixInto');\n * @extends ReactComponent\n * @internal\n *\/\n-var ReactTextComponent = function(initialText) {\n- this.construct({text: initialText});\n-};\n-\n-\/**\n- * Used to clone the text descriptor object before it's mounted.\n- *\n- * @param {object} props\n- * @return {object} A new ReactTextComponent instance\n- *\/\n-ReactTextComponent.ConvenienceConstructor = function(props) {\n- return new ReactTextComponent(props.text);\n+var ReactTextComponent = function(descriptor) {\n+ this.construct(descriptor);\n };\n \n mixInto(ReactTextComponent, ReactComponent.Mixin);\n@@ -77,7 +68,7 @@ mixInto(ReactTextComponent, {\n mountDepth\n );\n \n- var escapedText = escapeTextForBrowser(this.props.text);\n+ var escapedText = escapeTextForBrowser(this.props);\n \n if (transaction.renderToStaticMarkup) {\n \/\/ Normally we'd wrap this in a `span` for the reasons stated above, but\n@@ -102,20 +93,15 @@ mixInto(ReactTextComponent, {\n *\/\n receiveComponent: function(nextComponent, transaction) {\n var nextProps = nextComponent.props;\n- if (nextProps.text !== this.props.text) {\n- this.props.text = nextProps.text;\n+ if (nextProps !== this.props) {\n+ this.props = nextProps;\n ReactComponent.BackendIDOperations.updateTextContentByID(\n this._rootNodeID,\n- nextProps.text\n+ nextProps\n );\n }\n }\n \n });\n \n-\/\/ Expose the constructor on itself and the prototype for consistency with other\n-\/\/ descriptors.\n-ReactTextComponent.type = ReactTextComponent;\n-ReactTextComponent.prototype.type = ReactTextComponent;\n-\n-module.exports = ReactTextComponent;\n+module.exports = ReactDescriptor.createFactory(ReactTextComponent);\ndiff --git a\/src\/browser\/eventPlugins\/BeforeInputEventPlugin.js b\/src\/browser\/eventPlugins\/BeforeInputEventPlugin.js\nindex c7ef71b988..d4248158ac 100644\n--- a\/src\/browser\/eventPlugins\/BeforeInputEventPlugin.js\n+++ b\/src\/browser\/eventPlugins\/BeforeInputEventPlugin.js\n@@ -29,9 +29,22 @@ var keyOf = require('keyOf');\n var canUseTextInputEvent = (\n ExecutionEnvironment.canUseDOM &&\n 'TextEvent' in window &&\n- !('documentMode' in document)\n+ !('documentMode' in document || isPresto())\n );\n \n+\/**\n+ * Opera <= 12 includes TextEvent in window, but does not fire\n+ * text input events. Rely on keypress instead.\n+ *\/\n+function isPresto() {\n+ var opera = window.opera;\n+ return (\n+ typeof opera === 'object' &&\n+ typeof opera.version === 'function' &&\n+ parseInt(opera.version(), 10) <= 12\n+ );\n+}\n+\n var SPACEBAR_CODE = 32;\n var SPACEBAR_CHAR = String.fromCharCode(SPACEBAR_CODE);\n \ndiff --git a\/src\/browser\/server\/ReactServerRendering.js b\/src\/browser\/server\/ReactServerRendering.js\nindex 43f7786d1f..cf61cc4aaa 100644\n--- a\/src\/browser\/server\/ReactServerRendering.js\n+++ b\/src\/browser\/server\/ReactServerRendering.js\n@@ -18,7 +18,7 @@\n *\/\n \"use strict\";\n \n-var ReactComponent = require('ReactComponent');\n+var ReactDescriptor = require('ReactDescriptor');\n var ReactInstanceHandles = require('ReactInstanceHandles');\n var ReactMarkupChecksum = require('ReactMarkupChecksum');\n var ReactServerRenderingTransaction =\n@@ -33,7 +33,7 @@ var invariant = require('invariant');\n *\/\n function renderComponentToString(component) {\n invariant(\n- ReactComponent.isValidComponent(component),\n+ ReactDescriptor.isValidDescriptor(component),\n 'renderComponentToString(): You must pass a valid ReactComponent.'\n );\n \n@@ -65,7 +65,7 @@ function renderComponentToString(component) {\n *\/\n function renderComponentToStaticMarkup(component) {\n invariant(\n- ReactComponent.isValidComponent(component),\n+ ReactDescriptor.isValidDescriptor(component),\n 'renderComponentToStaticMarkup(): You must pass a valid ReactComponent.'\n );\n \ndiff --git a\/src\/browser\/ui\/React.js b\/src\/browser\/ui\/React.js\nindex e5833d237e..29b7ed0098 100644\n--- a\/src\/browser\/ui\/React.js\n+++ b\/src\/browser\/ui\/React.js\n@@ -25,6 +25,7 @@ var ReactComponent = require('ReactComponent');\n var ReactCompositeComponent = require('ReactCompositeComponent');\n var ReactContext = require('ReactContext');\n var ReactCurrentOwner = require('ReactCurrentOwner');\n+var ReactDescriptor = require('ReactDescriptor');\n var ReactDOM = require('ReactDOM');\n var ReactDOMComponent = require('ReactDOMComponent');\n var ReactDefaultInjection = require('ReactDefaultInjection');\n@@ -63,8 +64,8 @@ var React = {\n renderComponentToStaticMarkup:\n ReactServerRendering.renderComponentToStaticMarkup,\n unmountComponentAtNode: ReactMount.unmountComponentAtNode,\n- isValidClass: ReactCompositeComponent.isValidClass,\n- isValidComponent: ReactComponent.isValidComponent,\n+ isValidClass: ReactDescriptor.isValidFactory,\n+ isValidComponent: ReactDescriptor.isValidDescriptor,\n withContext: ReactContext.withContext,\n __internals: {\n Component: ReactComponent,\ndiff --git a\/src\/browser\/ui\/ReactDOMComponent.js b\/src\/browser\/ui\/ReactDOMComponent.js\nindex b29226b739..6b65664e86 100644\n--- a\/src\/browser\/ui\/ReactDOMComponent.js\n+++ b\/src\/browser\/ui\/ReactDOMComponent.js\n@@ -205,19 +205,22 @@ ReactDOMComponent.Mixin = {\n return '';\n },\n \n- receiveComponent: function(nextComponent, transaction) {\n- if (nextComponent === this) {\n- \/\/ Since props and context are immutable after the component is\n- \/\/ mounted, we can do a cheap identity compare here to determine\n- \/\/ if this is a superfluous reconcile.\n-\n- \/\/ TODO: compare the descriptor\n+ receiveComponent: function(nextDescriptor, transaction) {\n+ if (nextDescriptor === this._descriptor &&\n+ nextDescriptor._owner != null) {\n+ \/\/ Since descriptors are immutable after the owner is rendered,\n+ \/\/ we can do a cheap identity compare here to determine if this is a\n+ \/\/ superfluous reconcile. It's possible for state to be mutable but such\n+ \/\/ change should trigger an update of the owner which would recreate\n+ \/\/ the descriptor. We explicitly check for the existence of an owner since\n+ \/\/ it's possible for a descriptor created outside a composite to be\n+ \/\/ deeply mutated and reused.\n return;\n }\n \n ReactComponent.Mixin.receiveComponent.call(\n this,\n- nextComponent,\n+ nextDescriptor,\n transaction\n );\n },\n@@ -227,23 +230,22 @@ ReactDOMComponent.Mixin = {\n * attached to the DOM. Reconciles the root DOM node, then recurses.\n *\n * @param {ReactReconcileTransaction} transaction\n- * @param {object} prevProps\n+ * @param {ReactDescriptor} prevDescriptor\n * @internal\n * @overridable\n *\/\n updateComponent: ReactPerf.measure(\n 'ReactDOMComponent',\n 'updateComponent',\n- function(transaction, prevProps, prevOwner) {\n- assertValidProps(this.props);\n+ function(transaction, prevDescriptor) {\n+ assertValidProps(this._descriptor.props);\n ReactComponent.Mixin.updateComponent.call(\n this,\n transaction,\n- prevProps,\n- prevOwner\n+ prevDescriptor\n );\n- this._updateDOMProperties(prevProps, transaction);\n- this._updateDOMChildren(prevProps, transaction);\n+ this._updateDOMProperties(prevDescriptor.props, transaction);\n+ this._updateDOMChildren(prevDescriptor.props, transaction);\n }\n ),\n \ndiff --git a\/src\/browser\/ui\/ReactMount.js b\/src\/browser\/ui\/ReactMount.js\nindex 90899383ad..9131c15db7 100644\n--- a\/src\/browser\/ui\/ReactMount.js\n+++ b\/src\/browser\/ui\/ReactMount.js\n@@ -326,19 +326,20 @@ var ReactMount = {\n * perform an update on it and only mutate the DOM as necessary to reflect the\n * latest React component.\n *\n- * @param {ReactComponent} nextComponent Component instance to render.\n+ * @param {ReactDescriptor} nextDescriptor Component descriptor to render.\n * @param {DOMElement} container DOM element to render into.\n * @param {?function} callback function triggered on completion\n * @return {ReactComponent} Component instance rendered in `container`.\n *\/\n- renderComponent: function(nextComponent, container, callback) {\n+ renderComponent: function(nextDescriptor, container, callback) {\n var prevComponent = instancesByReactRootID[getReactRootID(container)];\n \n if (prevComponent) {\n- if (shouldUpdateReactComponent(prevComponent, nextComponent)) {\n+ var prevDescriptor = prevComponent._descriptor;\n+ if (shouldUpdateReactComponent(prevDescriptor, nextDescriptor)) {\n return ReactMount._updateRootComponent(\n prevComponent,\n- nextComponent,\n+ nextDescriptor,\n container,\n callback\n );\n@@ -354,7 +355,7 @@ var ReactMount = {\n var shouldReuseMarkup = containerHasReactMarkup && !prevComponent;\n \n var component = ReactMount._renderNewRootComponent(\n- nextComponent,\n+ nextDescriptor,\n container,\n shouldReuseMarkup\n );\ndiff --git a\/src\/browser\/ui\/__tests__\/ReactDOMComponent-test.js b\/src\/browser\/ui\/__tests__\/ReactDOMComponent-test.js\nindex 082c629a01..ccc279f2e2 100644\n--- a\/src\/browser\/ui\/__tests__\/ReactDOMComponent-test.js\n+++ b\/src\/browser\/ui\/__tests__\/ReactDOMComponent-test.js\n@@ -307,8 +307,8 @@ describe('ReactDOMComponent', function() {\n var ReactDOMComponent = require('ReactDOMComponent');\n var ReactReconcileTransaction = require('ReactReconcileTransaction');\n \n- var StubNativeComponent = function(initialProps) {\n- ReactComponent.Mixin.construct.call(this, initialProps);\n+ var StubNativeComponent = function(descriptor) {\n+ ReactComponent.Mixin.construct.call(this, descriptor);\n };\n mixInto(StubNativeComponent, ReactComponent.Mixin);\n mixInto(StubNativeComponent, ReactDOMComponent.Mixin);\n@@ -316,7 +316,12 @@ describe('ReactDOMComponent', function() {\n \n mountComponent = function(props) {\n var transaction = new ReactReconcileTransaction();\n- var stubComponent = new StubNativeComponent(props);\n+ var stubComponent = new StubNativeComponent({\n+ type: StubNativeComponent,\n+ props: props,\n+ _owner: null,\n+ _context: null\n+ });\n return stubComponent.mountComponent('test', transaction, 0);\n };\n });\ndiff --git a\/src\/browser\/ui\/__tests__\/ReactEventTopLevelCallback-test.js b\/src\/browser\/ui\/__tests__\/ReactEventTopLevelCallback-test.js\nindex 03230cc357..51e7149f55 100644\n--- a\/src\/browser\/ui\/__tests__\/ReactEventTopLevelCallback-test.js\n+++ b\/src\/browser\/ui\/__tests__\/ReactEventTopLevelCallback-test.js\n@@ -121,17 +121,28 @@ describe('ReactEventTopLevelCallback', function() {\n \n it('should not fire duplicate events for a React DOM tree', function() {\n var container = document.createElement('div');\n- var inner =

Inner<\/div>;\n- var control =

{inner}<\/div><\/div>;\n- ReactMount.renderComponent(control, container);\n+ var Wrapper = React.createClass({\n+\n+ getInner: function() {\n+ return this.refs.inner;\n+ },\n+\n+ render: function() {\n+ var inner =

Inner<\/div>;\n+ return

{inner}<\/div><\/div>;\n+ }\n+\n+ });\n+\n+ var instance = ReactMount.renderComponent(, container);\n \n var callback = ReactEventTopLevelCallback.createTopLevelCallback('test');\n callback({\n- target: inner.getDOMNode()\n+ target: instance.getInner().getDOMNode()\n });\n \n var calls = ReactEventEmitter.handleTopLevel.mock.calls;\n expect(calls.length).toBe(1);\n- expect(calls[0][EVENT_TARGET_PARAM]).toBe(inner.getDOMNode());\n+ expect(calls[0][EVENT_TARGET_PARAM]).toBe(instance.getInner().getDOMNode());\n });\n });\ndiff --git a\/src\/browser\/ui\/dom\/__tests__\/Danger-test.js b\/src\/browser\/ui\/dom\/__tests__\/Danger-test.js\nindex 48e2e54789..698eeb6dc8 100644\n--- a\/src\/browser\/ui\/dom\/__tests__\/Danger-test.js\n+++ b\/src\/browser\/ui\/dom\/__tests__\/Danger-test.js\n@@ -21,6 +21,7 @@\n \"use strict\";\n \n var React = require('React');\n+var instantiateReactComponent = require('instantiateReactComponent');\n \n describe('Danger', function() {\n \n@@ -37,14 +38,18 @@ describe('Danger', function() {\n });\n \n it('should render markup', function() {\n- var markup = (

).mountComponent('.rX', transaction, 0);\n+ var markup = instantiateReactComponent(\n+

\n+ ).mountComponent('.rX', transaction, 0);\n var output = Danger.dangerouslyRenderMarkup([markup])[0];\n \n expect(output.nodeName).toBe('DIV');\n });\n \n it('should render markup with props', function() {\n- var markup = (

).mountComponent(\n+ var markup = instantiateReactComponent(\n+

\n+ ).mountComponent(\n '.rX',\n transaction,\n 0\n@@ -56,7 +61,9 @@ describe('Danger', function() {\n });\n \n it('should render wrapped markup', function() {\n- var markup = ().mountComponent('.rX', transaction, 0);\n+ var markup = instantiateReactComponent(\n+ \n+ ).mountComponent('.rX', transaction, 0);\n var output = Danger.dangerouslyRenderMarkup([markup])[0];\n \n expect(output.nodeName).toBe('TH');\ndiff --git a\/src\/browser\/ui\/dom\/components\/createFullPageComponent.js b\/src\/browser\/ui\/dom\/components\/createFullPageComponent.js\nindex bfb0fcc929..e4053aaffc 100644\n--- a\/src\/browser\/ui\/dom\/components\/createFullPageComponent.js\n+++ b\/src\/browser\/ui\/dom\/components\/createFullPageComponent.js\n@@ -38,7 +38,7 @@ var invariant = require('invariant');\n function createFullPageComponent(componentClass) {\n var FullPageComponent = ReactCompositeComponent.createClass({\n displayName: 'ReactFullPageComponent' + (\n- componentClass.componentConstructor.displayName || ''\n+ componentClass.type.displayName || ''\n ),\n \n componentWillUnmount: function() {\ndiff --git a\/src\/core\/ReactComponent.js b\/src\/core\/ReactComponent.js\nindex 7792001b64..2d6acf1974 100644\n--- a\/src\/core\/ReactComponent.js\n+++ b\/src\/core\/ReactComponent.js\n@@ -18,14 +18,13 @@\n \n \"use strict\";\n \n-var ReactCurrentOwner = require('ReactCurrentOwner');\n+var ReactDescriptor = require('ReactDescriptor');\n var ReactOwner = require('ReactOwner');\n var ReactUpdates = require('ReactUpdates');\n \n var invariant = require('invariant');\n var keyMirror = require('keyMirror');\n var merge = require('merge');\n-var monitorCodeUse = require('monitorCodeUse');\n \n \/**\n * Every React component is in one of these life cycles.\n@@ -42,18 +41,6 @@ var ComponentLifeCycle = keyMirror({\n UNMOUNTED: null\n });\n \n-\/**\n- * Warn if there's no key explicitly set on dynamic arrays of children or\n- * object keys are not valid. This allows us to keep track of children between\n- * updates.\n- *\/\n-\n-var ownerHasExplicitKeyWarning = {};\n-var ownerHasPropertyWarning = {};\n-var ownerHasMonitoredObjectMap = {};\n-\n-var NUMERIC_PROPERTY_REGEX = \/^\\d+$\/;\n-\n var injected = false;\n \n \/**\n@@ -76,130 +63,6 @@ var unmountIDFromEnvironment = null;\n *\/\n var mountImageIntoNode = null;\n \n-\/**\n- * Warn if the component doesn't have an explicit key assigned to it.\n- * This component is in an array. The array could grow and shrink or be\n- * reordered. All children that haven't already been validated are required to\n- * have a \"key\" property assigned to it.\n- *\n- * @internal\n- * @param {ReactComponent} component Component that requires a key.\n- *\/\n-function validateExplicitKey(component) {\n- if (component.__keyValidated__ || component.props.key != null) {\n- return;\n- }\n- component.__keyValidated__ = true;\n-\n- \/\/ We can't provide friendly warnings for top level components.\n- if (!ReactCurrentOwner.current) {\n- return;\n- }\n-\n- \/\/ Name of the component whose render method tried to pass children.\n- var currentName = ReactCurrentOwner.current.constructor.displayName;\n- if (ownerHasExplicitKeyWarning.hasOwnProperty(currentName)) {\n- return;\n- }\n- ownerHasExplicitKeyWarning[currentName] = true;\n-\n- var message = 'Each child in an array should have a unique \"key\" prop. ' +\n- 'Check the render method of ' + currentName + '.';\n-\n- var childOwnerName = null;\n- if (!component.isOwnedBy(ReactCurrentOwner.current)) {\n- \/\/ Name of the component that originally created this child.\n- childOwnerName =\n- component._owner &&\n- component._owner.constructor.displayName;\n-\n- \/\/ Usually the current owner is the offender, but if it accepts\n- \/\/ children as a property, it may be the creator of the child that's\n- \/\/ responsible for assigning it a key.\n- message += ' It was passed a child from ' + childOwnerName + '.';\n- }\n-\n- message += ' See http:\/\/fb.me\/react-warning-keys for more information.';\n- monitorCodeUse('react_key_warning', {\n- component: currentName,\n- componentOwner: childOwnerName\n- });\n- console.warn(message);\n-}\n-\n-\/**\n- * Warn if the key is being defined as an object property but has an incorrect\n- * value.\n- *\n- * @internal\n- * @param {string} name Property name of the key.\n- * @param {ReactComponent} component Component that requires a key.\n- *\/\n-function validatePropertyKey(name) {\n- if (NUMERIC_PROPERTY_REGEX.test(name)) {\n- \/\/ Name of the component whose render method tried to pass children.\n- var currentName = ReactCurrentOwner.current.constructor.displayName;\n- if (ownerHasPropertyWarning.hasOwnProperty(currentName)) {\n- return;\n- }\n- ownerHasPropertyWarning[currentName] = true;\n-\n- monitorCodeUse('react_numeric_key_warning');\n- console.warn(\n- 'Child objects should have non-numeric keys so ordering is preserved. ' +\n- 'Check the render method of ' + currentName + '. ' +\n- 'See http:\/\/fb.me\/react-warning-keys for more information.'\n- );\n- }\n-}\n-\n-\/**\n- * Log that we're using an object map. We're considering deprecating this\n- * feature and replace it with proper Map and ImmutableMap data structures.\n- *\n- * @internal\n- *\/\n-function monitorUseOfObjectMap() {\n- \/\/ Name of the component whose render method tried to pass children.\n- \/\/ We only use this to avoid spewing the logs. We lose additional\n- \/\/ owner stacks but hopefully one level is enough to trace the source.\n- var currentName = (ReactCurrentOwner.current &&\n- ReactCurrentOwner.current.constructor.displayName) || '';\n- if (ownerHasMonitoredObjectMap.hasOwnProperty(currentName)) {\n- return;\n- }\n- ownerHasMonitoredObjectMap[currentName] = true;\n- monitorCodeUse('react_object_map_children');\n-}\n-\n-\/**\n- * Ensure that every component either is passed in a static location, in an\n- * array with an explicit keys property defined, or in an object literal\n- * with valid key property.\n- *\n- * @internal\n- * @param {*} component Statically passed child of any type.\n- * @return {boolean}\n- *\/\n-function validateChildKeys(component) {\n- if (Array.isArray(component)) {\n- for (var i = 0; i < component.length; i++) {\n- var child = component[i];\n- if (ReactComponent.isValidComponent(child)) {\n- validateExplicitKey(child);\n- }\n- }\n- } else if (ReactComponent.isValidComponent(component)) {\n- \/\/ This component was passed in a valid location.\n- component.__keyValidated__ = true;\n- } else if (component && typeof component === 'object') {\n- monitorUseOfObjectMap();\n- for (var name in component) {\n- validatePropertyKey(name, component);\n- }\n- }\n-}\n-\n \/**\n * Components are the basic units of composition in React.\n *\n@@ -244,26 +107,6 @@ var ReactComponent = {\n }\n },\n \n- \/**\n- * @param {?object} object\n- * @return {boolean} True if `object` is a valid component.\n- * @final\n- *\/\n- isValidComponent: function(object) {\n- if (!object || !object.type || !object.type.prototype) {\n- return false;\n- }\n- \/\/ This is the safer way of duck checking the type of instance this is.\n- \/\/ The object can be a generic descriptor but the type property refers to\n- \/\/ the constructor and it's prototype can be used to inspect the type that\n- \/\/ will actually get mounted.\n- var prototype = object.type.prototype;\n- return (\n- typeof prototype.mountComponentIntoNode === 'function' &&\n- typeof prototype.receiveComponent === 'function'\n- );\n- },\n-\n \/**\n * @internal\n *\/\n@@ -314,9 +157,11 @@ var ReactComponent = {\n * @public\n *\/\n setProps: function(partialProps, callback) {\n- \/\/ Merge with `_pendingProps` if it exists, otherwise with existing props.\n+ \/\/ Merge with the pending descriptor if it exists, otherwise with existing\n+ \/\/ descriptor props.\n+ var descriptor = this._pendingDescriptor || this._descriptor;\n this.replaceProps(\n- merge(this._pendingProps || this.props, partialProps),\n+ merge(descriptor.props, partialProps),\n callback\n );\n },\n@@ -342,7 +187,31 @@ var ReactComponent = {\n '`render` method to pass the correct value as props to the component ' +\n 'where it is created.'\n );\n- this._pendingProps = props;\n+ \/\/ This is a deoptimized path. We optimize for always having a descriptor.\n+ \/\/ This creates an extra internal descriptor.\n+ this._pendingDescriptor = ReactDescriptor.cloneAndReplaceProps(\n+ this._pendingDescriptor || this._descriptor,\n+ props\n+ );\n+ ReactUpdates.enqueueUpdate(this, callback);\n+ },\n+\n+ \/**\n+ * Schedule a partial update to the props. Only used for internal testing.\n+ *\n+ * @param {object} partialProps Subset of the next props.\n+ * @param {?function} callback Called after props are updated.\n+ * @final\n+ * @internal\n+ *\/\n+ _setPropsInternal: function(partialProps, callback) {\n+ \/\/ This is a deoptimized path. We optimize for always having a descriptor.\n+ \/\/ This creates an extra internal descriptor.\n+ var descriptor = this._pendingDescriptor || this._descriptor;\n+ this._pendingDescriptor = ReactDescriptor.cloneAndReplaceProps(\n+ descriptor,\n+ merge(descriptor.props, partialProps)\n+ );\n ReactUpdates.enqueueUpdate(this, callback);\n },\n \n@@ -352,43 +221,30 @@ var ReactComponent = {\n * Subclasses that override this method should make sure to invoke\n * `ReactComponent.Mixin.construct.call(this, ...)`.\n *\n- * @param {?object} initialProps\n- * @param {*} children\n+ * @param {ReactDescriptor} descriptor\n * @internal\n *\/\n- construct: function(initialProps, children) {\n- this.props = initialProps || {};\n+ construct: function(descriptor) {\n+ \/\/ This is the public exposed props object after it has been processed\n+ \/\/ with default props. The descriptor's props represents the true internal\n+ \/\/ state of the props.\n+ this.props = descriptor.props;\n \/\/ Record the component responsible for creating this component.\n- this._owner = ReactCurrentOwner.current;\n+ \/\/ This is accessible through the descriptor but we maintain an extra\n+ \/\/ field for compatibility with devtools and as a way to make an\n+ \/\/ incremental update. TODO: Consider deprecating this field.\n+ this._owner = descriptor._owner;\n+\n \/\/ All components start unmounted.\n this._lifeCycleState = ComponentLifeCycle.UNMOUNTED;\n \n- this._pendingProps = null;\n+ \/\/ See ReactUpdates.\n this._pendingCallbacks = null;\n \n- \/\/ Unlike _pendingProps and _pendingCallbacks, we won't use null to\n- \/\/ indicate that nothing is pending because it's possible for a component\n- \/\/ to have a null owner. Instead, an owner change is pending when\n- \/\/ this._owner !== this._pendingOwner.\n- this._pendingOwner = this._owner;\n-\n- \/\/ Children can be more than one argument\n- var childrenLength = arguments.length - 1;\n- if (childrenLength === 1) {\n- if (__DEV__) {\n- validateChildKeys(children);\n- }\n- this.props.children = children;\n- } else if (childrenLength > 1) {\n- var childArray = Array(childrenLength);\n- for (var i = 0; i < childrenLength; i++) {\n- if (__DEV__) {\n- validateChildKeys(arguments[i + 1]);\n- }\n- childArray[i] = arguments[i + 1];\n- }\n- this.props.children = childArray;\n- }\n+ \/\/ We keep the old descriptor and a reference to the pending descriptor\n+ \/\/ to track updates.\n+ this._descriptor = descriptor;\n+ this._pendingDescriptor = null;\n },\n \n \/**\n@@ -413,9 +269,10 @@ var ReactComponent = {\n 'single component instance in multiple places.',\n rootID\n );\n- var props = this.props;\n+ var props = this._descriptor.props;\n if (props.ref != null) {\n- ReactOwner.addComponentAsRefTo(this, props.ref, this._owner);\n+ var owner = this._descriptor._owner;\n+ ReactOwner.addComponentAsRefTo(this, props.ref, owner);\n }\n this._rootNodeID = rootID;\n this._lifeCycleState = ComponentLifeCycle.MOUNTED;\n@@ -458,13 +315,12 @@ var ReactComponent = {\n * @param {ReactReconcileTransaction} transaction\n * @internal\n *\/\n- receiveComponent: function(nextComponent, transaction) {\n+ receiveComponent: function(nextDescriptor, transaction) {\n invariant(\n this.isMounted(),\n 'receiveComponent(...): Can only update a mounted component.'\n );\n- this._pendingOwner = nextComponent._owner;\n- this._pendingProps = nextComponent.props;\n+ this._pendingDescriptor = nextDescriptor;\n this._performUpdateIfNecessary(transaction);\n },\n \n@@ -480,44 +336,60 @@ var ReactComponent = {\n },\n \n \/**\n- * If `_pendingProps` is set, update the component.\n+ * If `_pendingDescriptor` is set, update the component.\n *\n * @param {ReactReconcileTransaction} transaction\n * @internal\n *\/\n _performUpdateIfNecessary: function(transaction) {\n- if (this._pendingProps == null) {\n+ if (this._pendingDescriptor == null) {\n return;\n }\n- var prevProps = this.props;\n- var prevOwner = this._owner;\n- this.props = this._pendingProps;\n- this._owner = this._pendingOwner;\n- this._pendingProps = null;\n- this.updateComponent(transaction, prevProps, prevOwner);\n+ var prevDescriptor = this._descriptor;\n+ var nextDescriptor = this._pendingDescriptor;\n+ this._descriptor = nextDescriptor;\n+ this.props = nextDescriptor.props;\n+ this._owner = nextDescriptor._owner;\n+ this._pendingDescriptor = null;\n+ this.updateComponent(transaction, prevDescriptor);\n },\n \n \/**\n * Updates the component's currently mounted representation.\n *\n * @param {ReactReconcileTransaction} transaction\n- * @param {object} prevProps\n+ * @param {object} prevDescriptor\n * @internal\n *\/\n- updateComponent: function(transaction, prevProps, prevOwner) {\n- var props = this.props;\n+ updateComponent: function(transaction, prevDescriptor) {\n+ var nextDescriptor = this._descriptor;\n+\n \/\/ If either the owner or a `ref` has changed, make sure the newest owner\n \/\/ has stored a reference to `this`, and the previous owner (if different)\n- \/\/ has forgotten the reference to `this`.\n- if (this._owner !== prevOwner || props.ref !== prevProps.ref) {\n- if (prevProps.ref != null) {\n+ \/\/ has forgotten the reference to `this`. We use the descriptor instead\n+ \/\/ of the public this.props because the post processing cannot determine\n+ \/\/ a ref. The ref conceptually lives on the descriptor.\n+\n+ \/\/ TODO: Should this even be possible? The owner cannot change because\n+ \/\/ it's forbidden by shouldUpdateReactComponent. The ref can change\n+ \/\/ if you swap the keys of but not the refs. Reconsider where this check\n+ \/\/ is made. It probably belongs where the key checking and\n+ \/\/ instantiateReactComponent is done.\n+\n+ if (nextDescriptor._owner !== prevDescriptor._owner ||\n+ nextDescriptor.props.ref !== prevDescriptor.props.ref) {\n+ if (prevDescriptor.props.ref != null) {\n ReactOwner.removeComponentAsRefFrom(\n- this, prevProps.ref, prevOwner\n+ this, prevDescriptor.props.ref, prevDescriptor._owner\n );\n }\n \/\/ Correct, even if the owner is the same, and only the ref has changed.\n- if (props.ref != null) {\n- ReactOwner.addComponentAsRefTo(this, props.ref, this._owner);\n+ if (nextDescriptor.props.ref != null) {\n+ ReactOwner.addComponentAsRefTo(\n+ this,\n+ nextDescriptor.props.ref,\n+ nextDescriptor._owner\n+ );\n }\n }\n },\ndiff --git a\/src\/core\/ReactCompositeComponent.js b\/src\/core\/ReactCompositeComponent.js\nindex 9a3436401c..6f07a4b366 100644\n--- a\/src\/core\/ReactCompositeComponent.js\n+++ b\/src\/core\/ReactCompositeComponent.js\n@@ -21,6 +21,7 @@\n var ReactComponent = require('ReactComponent');\n var ReactContext = require('ReactContext');\n var ReactCurrentOwner = require('ReactCurrentOwner');\n+var ReactDescriptor = require('ReactDescriptor');\n var ReactErrorUtils = require('ReactErrorUtils');\n var ReactOwner = require('ReactOwner');\n var ReactPerf = require('ReactPerf');\n@@ -327,7 +328,7 @@ var ReactCompositeComponentInterface = {\n *\/\n var RESERVED_SPEC_KEYS = {\n displayName: function(ConvenienceConstructor, displayName) {\n- ConvenienceConstructor.componentConstructor.displayName = displayName;\n+ ConvenienceConstructor.type.displayName = displayName;\n },\n mixins: function(ConvenienceConstructor, mixins) {\n if (mixins) {\n@@ -337,7 +338,7 @@ var RESERVED_SPEC_KEYS = {\n }\n },\n childContextTypes: function(ConvenienceConstructor, childContextTypes) {\n- var Constructor = ConvenienceConstructor.componentConstructor;\n+ var Constructor = ConvenienceConstructor.type;\n validateTypeDef(\n Constructor,\n childContextTypes,\n@@ -349,7 +350,7 @@ var RESERVED_SPEC_KEYS = {\n );\n },\n contextTypes: function(ConvenienceConstructor, contextTypes) {\n- var Constructor = ConvenienceConstructor.componentConstructor;\n+ var Constructor = ConvenienceConstructor.type;\n validateTypeDef(\n Constructor,\n contextTypes,\n@@ -358,7 +359,7 @@ var RESERVED_SPEC_KEYS = {\n Constructor.contextTypes = merge(Constructor.contextTypes, contextTypes);\n },\n propTypes: function(ConvenienceConstructor, propTypes) {\n- var Constructor = ConvenienceConstructor.componentConstructor;\n+ var Constructor = ConvenienceConstructor.type;\n validateTypeDef(\n Constructor,\n propTypes,\n@@ -437,17 +438,17 @@ function validateLifeCycleOnReplaceState(instance) {\n *\/\n function mixSpecIntoComponent(ConvenienceConstructor, spec) {\n invariant(\n- !isValidClass(spec),\n+ !ReactDescriptor.isValidFactory(spec),\n 'ReactCompositeComponent: You\\'re attempting to ' +\n 'use a component class as a mixin. Instead, just use a regular object.'\n );\n invariant(\n- !ReactComponent.isValidComponent(spec),\n+ !ReactDescriptor.isValidDescriptor(spec),\n 'ReactCompositeComponent: You\\'re attempting to ' +\n 'use a component as a mixin. Instead, just use a regular object.'\n );\n \n- var Constructor = ConvenienceConstructor.componentConstructor;\n+ var Constructor = ConvenienceConstructor.type;\n var proto = Constructor.prototype;\n for (var name in spec) {\n var property = spec[name];\n@@ -505,7 +506,7 @@ function mixStaticSpecIntoComponent(ConvenienceConstructor, statics) {\n for (var name in statics) {\n var property = statics[name];\n if (!statics.hasOwnProperty(name)) {\n- return;\n+ continue;\n }\n \n var isInherited = name in ConvenienceConstructor;\n@@ -525,7 +526,7 @@ function mixStaticSpecIntoComponent(ConvenienceConstructor, statics) {\n result = createChainedFunction(existingProperty, property);\n }\n ConvenienceConstructor[name] = result;\n- ConvenienceConstructor.componentConstructor[name] = result;\n+ ConvenienceConstructor.type[name] = result;\n }\n }\n \n@@ -590,203 +591,6 @@ function createChainedFunction(one, two) {\n };\n }\n \n-if (__DEV__) {\n-\n- var unmountedPropertyWhitelist = {\n- constructor: true,\n- construct: true,\n- isOwnedBy: true, \/\/ should be deprecated but can have code mod (internal)\n- type: true,\n- props: true,\n- \/\/ currently private but belong on the descriptor and are valid for use\n- \/\/ inside the framework:\n- __keyValidated__: true,\n- _owner: true,\n- _currentContext: true\n- };\n-\n- var componentInstanceProperties = {\n- __keyValidated__: true,\n- __keySetters: true,\n- _compositeLifeCycleState: true,\n- _currentContext: true,\n- _defaultProps: true,\n- _instance: true,\n- _lifeCycleState: true,\n- _mountDepth: true,\n- _owner: true,\n- _pendingCallbacks: true,\n- _pendingContext: true,\n- _pendingForceUpdate: true,\n- _pendingOwner: true,\n- _pendingProps: true,\n- _pendingState: true,\n- _renderedComponent: true,\n- _rootNodeID: true,\n- context: true,\n- props: true,\n- refs: true,\n- state: true,\n-\n- \/\/ These are known instance properties coming from other sources\n- _pendingQueries: true,\n- _queryPropListeners: true,\n- queryParams: true\n-\n- };\n-\n- var hasWarnedOnComponentType = {};\n-\n- var warningStackCounter = 0;\n-\n- var issueMembraneWarning = function(instance, key) {\n- var isWhitelisted = unmountedPropertyWhitelist.hasOwnProperty(key);\n- if (warningStackCounter > 0 || isWhitelisted) {\n- return;\n- }\n- var name = instance.constructor.displayName || 'Unknown';\n- var owner = ReactCurrentOwner.current;\n- var ownerName = (owner && owner.constructor.displayName) || 'Unknown';\n- var warningKey = key + '|' + name + '|' + ownerName;\n- if (hasWarnedOnComponentType.hasOwnProperty(warningKey)) {\n- \/\/ We have already warned for this combination. Skip it this time.\n- return;\n- }\n- hasWarnedOnComponentType[warningKey] = true;\n-\n- var context = owner ? ' in ' + ownerName + '.' : ' at the top level.';\n- var staticMethodExample = '<' + name + ' \/>.type.' + key + '(...)';\n-\n- monitorCodeUse('react_descriptor_property_access', { component: name });\n- console.warn(\n- 'Invalid access to component property \"' + key + '\" on ' + name +\n- context + ' See http:\/\/fb.me\/react-warning-descriptors .' +\n- ' Use a static method instead: ' + staticMethodExample\n- );\n- };\n-\n- var wrapInMembraneFunction = function(fn, thisBinding) {\n- if (fn.__reactMembraneFunction && fn.__reactMembraneSelf === thisBinding) {\n- return fn.__reactMembraneFunction;\n- }\n- return fn.__reactMembraneFunction = function() {\n- \/**\n- * By getting this function, you've already received a warning. The\n- * internals of this function will likely cause more warnings. To avoid\n- * Spamming too much we disable any warning triggered inside of this\n- * stack.\n- *\/\n- warningStackCounter++;\n- try {\n- \/\/ If the this binding is unchanged, we defer to the real component.\n- \/\/ This is important to keep some referential integrity in the\n- \/\/ internals. E.g. owner equality check.\n- var self = this === thisBinding ? this.__realComponentInstance : this;\n- return fn.apply(self, arguments);\n- } finally {\n- warningStackCounter--;\n- }\n- };\n- };\n-\n- var defineMembraneProperty = function(membrane, prototype, key) {\n- Object.defineProperty(membrane, key, {\n-\n- configurable: false,\n- enumerable: true,\n-\n- get: function() {\n- if (this === membrane) {\n- \/\/ We're allowed to access the prototype directly.\n- return prototype[key];\n- }\n- issueMembraneWarning(this, key);\n-\n- var realValue = this.__realComponentInstance[key];\n- \/\/ If the real value is a function, we need to provide a wrapper that\n- \/\/ disables nested warnings. The properties type and constructors are\n- \/\/ expected to the be constructors and therefore is often use with an\n- \/\/ equality check and we shouldn't try to rebind those.\n- if (typeof realValue === 'function' &&\n- key !== 'type' &&\n- key !== 'constructor') {\n- return wrapInMembraneFunction(realValue, this);\n- }\n- return realValue;\n- },\n-\n- set: function(value) {\n- if (this === membrane) {\n- \/\/ We're allowed to set a value on the prototype directly.\n- prototype[key] = value;\n- return;\n- }\n- issueMembraneWarning(this, key);\n- this.__realComponentInstance[key] = value;\n- }\n-\n- });\n- };\n-\n- \/**\n- * Creates a membrane prototype which wraps the original prototype. If any\n- * property is accessed in an unmounted state, a warning is issued.\n- *\n- * @param {object} prototype Original prototype.\n- * @return {object} The membrane prototype.\n- * @private\n- *\/\n- var createMountWarningMembrane = function(prototype) {\n- var membrane = {};\n- var key;\n- for (key in prototype) {\n- defineMembraneProperty(membrane, prototype, key);\n- }\n- \/\/ These are properties that goes into the instance but not the prototype.\n- \/\/ We can create the membrane on the prototype even though this will\n- \/\/ result in a faulty hasOwnProperty check it's better perf.\n- for (key in componentInstanceProperties) {\n- if (componentInstanceProperties.hasOwnProperty(key) &&\n- !(key in prototype)) {\n- defineMembraneProperty(membrane, prototype, key);\n- }\n- }\n- return membrane;\n- };\n-\n- \/**\n- * Creates a membrane constructor which wraps the component that gets mounted.\n- *\n- * @param {function} constructor Original constructor.\n- * @return {function} The membrane constructor.\n- * @private\n- *\/\n- var createDescriptorProxy = function(constructor) {\n- try {\n- var ProxyConstructor = function() {\n- this.__realComponentInstance = new constructor();\n-\n- \/\/ We can only safely pass through known instance variables. Unknown\n- \/\/ expandos are not safe. Use the real mounted instance to avoid this\n- \/\/ problem if it blows something up.\n- Object.freeze(this);\n- };\n-\n- ProxyConstructor.prototype = createMountWarningMembrane(\n- constructor.prototype\n- );\n-\n- return ProxyConstructor;\n- } catch(x) {\n- \/\/ In IE8 define property will fail on non-DOM objects. If anything in\n- \/\/ the membrane creation fails, we'll bail out and just use the plain\n- \/\/ constructor without warnings.\n- return constructor;\n- }\n- };\n-\n-}\n-\n \/**\n * `ReactCompositeComponent` maintains an auxiliary life cycle state in\n * `this._compositeLifeCycleState` (which can be null).\n@@ -844,12 +648,11 @@ var ReactCompositeComponentMixin = {\n \/**\n * Base constructor for all composite component.\n *\n- * @param {?object} initialProps\n- * @param {*} children\n+ * @param {ReactDescriptor} descriptor\n * @final\n * @internal\n *\/\n- construct: function(initialProps, children) {\n+ construct: function(descriptor) {\n \/\/ Children can be either an array or more than one argument\n ReactComponent.Mixin.construct.apply(this, arguments);\n ReactOwner.Mixin.construct.apply(this, arguments);\n@@ -857,14 +660,9 @@ var ReactCompositeComponentMixin = {\n this.state = null;\n this._pendingState = null;\n \n+ \/\/ This is the public post-processed context. The real context and pending\n+ \/\/ context lives on the descriptor.\n this.context = null;\n- this._currentContext = ReactContext.current;\n- this._pendingContext = null;\n-\n- \/\/ The descriptor that was used to instantiate this component. Will be\n- \/\/ set by the instantiator instead of the constructor since this\n- \/\/ constructor is currently used by both instances and descriptors.\n- this._descriptor = null;\n \n this._compositeLifeCycleState = null;\n },\n@@ -913,7 +711,7 @@ var ReactCompositeComponentMixin = {\n );\n this._compositeLifeCycleState = CompositeLifeCycle.MOUNTING;\n \n- this.context = this._processContext(this._currentContext);\n+ this.context = this._processContext(this._descriptor._context);\n this._defaultProps = this.getDefaultProps ? this.getDefaultProps() : null;\n this.props = this._processProps(this.props);\n \n@@ -1156,28 +954,27 @@ var ReactCompositeComponentMixin = {\n },\n \n \/**\n- * If any of `_pendingProps`, `_pendingState`, or `_pendingForceUpdate` is\n- * set, update the component.\n+ * If any of `_pendingDescriptor`, `_pendingState`, or `_pendingForceUpdate`\n+ * is set, update the component.\n *\n * @param {ReactReconcileTransaction} transaction\n * @internal\n *\/\n _performUpdateIfNecessary: function(transaction) {\n- if (this._pendingProps == null &&\n+ if (this._pendingDescriptor == null &&\n this._pendingState == null &&\n- this._pendingContext == null &&\n !this._pendingForceUpdate) {\n return;\n }\n \n- var nextFullContext = this._pendingContext || this._currentContext;\n- var nextContext = this._processContext(nextFullContext);\n- this._pendingContext = null;\n-\n+ var nextContext = this.context;\n var nextProps = this.props;\n- if (this._pendingProps != null) {\n- nextProps = this._processProps(this._pendingProps);\n- this._pendingProps = null;\n+ var nextDescriptor = this._descriptor;\n+ if (this._pendingDescriptor != null) {\n+ nextDescriptor = this._pendingDescriptor;\n+ nextContext = this._processContext(nextDescriptor._context);\n+ nextProps = this._processProps(nextDescriptor.props);\n+ this._pendingDescriptor = null;\n \n this._compositeLifeCycleState = CompositeLifeCycle.RECEIVING_PROPS;\n if (this.componentWillReceiveProps) {\n@@ -1187,12 +984,6 @@ var ReactCompositeComponentMixin = {\n \n this._compositeLifeCycleState = CompositeLifeCycle.RECEIVING_STATE;\n \n- \/\/ Unlike props, state, and context, we specifically don't want to set\n- \/\/ _pendingOwner to null here because it's possible for a component to have\n- \/\/ a null owner, so we instead make `this._owner === this._pendingOwner`\n- \/\/ mean that there's no owner change pending.\n- var nextOwner = this._pendingOwner;\n-\n var nextState = this._pendingState || this.state;\n this._pendingState = null;\n \n@@ -1203,21 +994,23 @@ var ReactCompositeComponentMixin = {\n this._pendingForceUpdate = false;\n \/\/ Will set `this.props`, `this.state` and `this.context`.\n this._performComponentUpdate(\n+ nextDescriptor,\n nextProps,\n- nextOwner,\n nextState,\n- nextFullContext,\n nextContext,\n transaction\n );\n } else {\n \/\/ If it's determined that a component should not update, we still want\n \/\/ to set props and state.\n+ this._descriptor = nextDescriptor;\n this.props = nextProps;\n- this._owner = nextOwner;\n this.state = nextState;\n- this._currentContext = nextFullContext;\n this.context = nextContext;\n+\n+ \/\/ Owner cannot change because shouldUpdateReactComponent doesn't allow\n+ \/\/ it. TODO: Remove this._owner completely.\n+ this._owner = nextDescriptor._owner;\n }\n } finally {\n this._compositeLifeCycleState = null;\n@@ -1228,24 +1021,22 @@ var ReactCompositeComponentMixin = {\n * Merges new props and state, notifies delegate methods of update and\n * performs update.\n *\n- * @param {object} nextProps Next object to set as properties.\n- * @param {?ReactComponent} nextOwner Next component to set as owner\n+ * @param {ReactDescriptor} nextDescriptor Next descriptor\n+ * @param {object} nextProps Next public object to set as properties.\n * @param {?object} nextState Next object to set as state.\n- * @param {?object} nextFullContext Next object to set as _currentContext.\n- * @param {?object} nextContext Next object to set as context.\n+ * @param {?object} nextContext Next public object to set as context.\n * @param {ReactReconcileTransaction} transaction\n * @private\n *\/\n _performComponentUpdate: function(\n+ nextDescriptor,\n nextProps,\n- nextOwner,\n nextState,\n- nextFullContext,\n nextContext,\n transaction\n ) {\n+ var prevDescriptor = this._descriptor;\n var prevProps = this.props;\n- var prevOwner = this._owner;\n var prevState = this.state;\n var prevContext = this.context;\n \n@@ -1253,18 +1044,18 @@ var ReactCompositeComponentMixin = {\n this.componentWillUpdate(nextProps, nextState, nextContext);\n }\n \n+ this._descriptor = nextDescriptor;\n this.props = nextProps;\n- this._owner = nextOwner;\n this.state = nextState;\n- this._currentContext = nextFullContext;\n this.context = nextContext;\n \n+ \/\/ Owner cannot change because shouldUpdateReactComponent doesn't allow\n+ \/\/ it. TODO: Remove this._owner completely.\n+ this._owner = nextDescriptor._owner;\n+\n this.updateComponent(\n transaction,\n- prevProps,\n- prevOwner,\n- prevState,\n- prevContext\n+ prevDescriptor\n );\n \n if (this.componentDidUpdate) {\n@@ -1275,21 +1066,22 @@ var ReactCompositeComponentMixin = {\n }\n },\n \n- receiveComponent: function(nextComponent, transaction) {\n- if (nextComponent === this._descriptor) {\n- \/\/ Since props and context are immutable after the component is\n- \/\/ mounted, we can do a cheap identity compare here to determine\n- \/\/ if this is a superfluous reconcile.\n+ receiveComponent: function(nextDescriptor, transaction) {\n+ if (nextDescriptor === this._descriptor &&\n+ nextDescriptor._owner != null) {\n+ \/\/ Since descriptors are immutable after the owner is rendered,\n+ \/\/ we can do a cheap identity compare here to determine if this is a\n+ \/\/ superfluous reconcile. It's possible for state to be mutable but such\n+ \/\/ change should trigger an update of the owner which would recreate\n+ \/\/ the descriptor. We explicitly check for the existence of an owner since\n+ \/\/ it's possible for a descriptor created outside a composite to be\n+ \/\/ deeply mutated and reused.\n return;\n }\n \n- \/\/ Update the descriptor that was last used by this component instance\n- this._descriptor = nextComponent;\n-\n- this._pendingContext = nextComponent._currentContext;\n ReactComponent.Mixin.receiveComponent.call(\n this,\n- nextComponent,\n+ nextDescriptor,\n transaction\n );\n },\n@@ -1301,35 +1093,31 @@ var ReactCompositeComponentMixin = {\n * Sophisticated clients may wish to override this.\n *\n * @param {ReactReconcileTransaction} transaction\n- * @param {object} prevProps\n- * @param {?ReactComponent} prevOwner\n- * @param {?object} prevState\n- * @param {?object} prevContext\n+ * @param {ReactDescriptor} prevDescriptor\n * @internal\n * @overridable\n *\/\n updateComponent: ReactPerf.measure(\n 'ReactCompositeComponent',\n 'updateComponent',\n- function(transaction, prevProps, prevOwner, prevState, prevContext) {\n+ function(transaction, prevParentDescriptor) {\n ReactComponent.Mixin.updateComponent.call(\n this,\n transaction,\n- prevProps,\n- prevOwner\n+ prevParentDescriptor\n );\n \n-\n var prevComponentInstance = this._renderedComponent;\n- var nextComponent = this._renderValidatedComponent();\n- if (shouldUpdateReactComponent(prevComponentInstance, nextComponent)) {\n- prevComponentInstance.receiveComponent(nextComponent, transaction);\n+ var prevDescriptor = prevComponentInstance._descriptor;\n+ var nextDescriptor = this._renderValidatedComponent();\n+ if (shouldUpdateReactComponent(prevDescriptor, nextDescriptor)) {\n+ prevComponentInstance.receiveComponent(nextDescriptor, transaction);\n } else {\n \/\/ These two IDs are actually the same! But nothing should rely on that.\n var thisID = this._rootNodeID;\n var prevComponentID = prevComponentInstance._rootNodeID;\n prevComponentInstance.unmountComponent();\n- this._renderedComponent = instantiateReactComponent(nextComponent);\n+ this._renderedComponent = instantiateReactComponent(nextDescriptor);\n var nextMarkup = this._renderedComponent.mountComponent(\n thisID,\n transaction,\n@@ -1384,7 +1172,9 @@ var ReactCompositeComponentMixin = {\n function() {\n var renderedComponent;\n var previousContext = ReactContext.current;\n- ReactContext.current = this._processChildContext(this._currentContext);\n+ ReactContext.current = this._processChildContext(\n+ this._descriptor._context\n+ );\n ReactCurrentOwner.current = this;\n try {\n renderedComponent = this.render();\n@@ -1393,7 +1183,7 @@ var ReactCompositeComponentMixin = {\n ReactCurrentOwner.current = null;\n }\n invariant(\n- ReactComponent.isValidComponent(renderedComponent),\n+ ReactDescriptor.isValidDescriptor(renderedComponent),\n '%s.render(): A valid ReactComponent must be returned. You may have ' +\n 'returned null, undefined, an array, or some other invalid object.',\n this.constructor.displayName || 'ReactCompositeComponent'\n@@ -1471,18 +1261,6 @@ mixInto(ReactCompositeComponentBase, ReactOwner.Mixin);\n mixInto(ReactCompositeComponentBase, ReactPropTransferer.Mixin);\n mixInto(ReactCompositeComponentBase, ReactCompositeComponentMixin);\n \n-\/**\n- * Checks if a value is a valid component constructor.\n- *\n- * @param {*}\n- * @return {boolean}\n- * @public\n- *\/\n-function isValidClass(componentClass) {\n- return componentClass instanceof Function &&\n- 'componentConstructor' in componentClass &&\n- componentClass.componentConstructor instanceof Function;\n-}\n \/**\n * Module for creating composite components.\n *\n@@ -1505,20 +1283,16 @@ var ReactCompositeComponent = {\n * @public\n *\/\n createClass: function(spec) {\n- var Constructor = function() {};\n+ var Constructor = function(props, owner) {\n+ this.construct(props, owner);\n+ };\n Constructor.prototype = new ReactCompositeComponentBase();\n Constructor.prototype.constructor = Constructor;\n \n- var DescriptorConstructor = Constructor;\n+ var ConvenienceConstructor = ReactDescriptor.createFactory(Constructor);\n \n- var ConvenienceConstructor = function(props, children) {\n- var descriptor = new DescriptorConstructor();\n- descriptor.construct.apply(descriptor, arguments);\n- return descriptor;\n- };\n- ConvenienceConstructor.componentConstructor = Constructor;\n- Constructor.ConvenienceConstructor = ConvenienceConstructor;\n- ConvenienceConstructor.originalSpec = spec;\n+ \/\/ TODO: Move statics off of the convenience constructor. That way the\n+ \/\/ factory can be created independently from the main class.\n \n injectedMixins.forEach(\n mixSpecIntoComponent.bind(null, ConvenienceConstructor)\n@@ -1546,14 +1320,6 @@ var ReactCompositeComponent = {\n }\n }\n \n- \/\/ Expose the convience constructor on the prototype so that it can be\n- \/\/ easily accessed on descriptors. E.g. .type === Foo.type and for\n- \/\/ static methods like .type.staticMethod();\n- \/\/ This should not be named constructor since this may not be the function\n- \/\/ that created the descriptor, and it may not even be a constructor.\n- ConvenienceConstructor.type = Constructor;\n- Constructor.prototype.type = Constructor;\n-\n \/\/ Reduce time spent doing lookups by setting these on the prototype.\n for (var methodName in ReactCompositeComponentInterface) {\n if (!Constructor.prototype[methodName]) {\n@@ -1561,18 +1327,9 @@ var ReactCompositeComponent = {\n }\n }\n \n- if (__DEV__) {\n- \/\/ In DEV the convenience constructor generates a proxy to another\n- \/\/ instance around it to warn about access to properties on the\n- \/\/ descriptor.\n- DescriptorConstructor = createDescriptorProxy(Constructor);\n- }\n-\n return ConvenienceConstructor;\n },\n \n- isValidClass: isValidClass,\n-\n injection: {\n injectMixin: function(mixin) {\n injectedMixins.push(mixin);\ndiff --git a\/src\/core\/ReactDescriptor.js b\/src\/core\/ReactDescriptor.js\nnew file mode 100644\nindex 0000000000..ddbbebe726\n--- \/dev\/null\n+++ b\/src\/core\/ReactDescriptor.js\n@@ -0,0 +1,350 @@\n+\/**\n+ * Copyright 2014 Facebook, Inc.\n+ *\n+ * Licensed under the Apache License, Version 2.0 (the \"License\");\n+ * you may not use this file except in compliance with the License.\n+ * You may obtain a copy of the License at\n+ *\n+ * http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ *\n+ * @providesModule ReactDescriptor\n+ *\/\n+\n+\"use strict\";\n+\n+var ReactContext = require('ReactContext');\n+var ReactCurrentOwner = require('ReactCurrentOwner');\n+\n+var monitorCodeUse = require('monitorCodeUse');\n+var warning = require('warning');\n+\n+\/**\n+ * Warn if there's no key explicitly set on dynamic arrays of children or\n+ * object keys are not valid. This allows us to keep track of children between\n+ * updates.\n+ *\/\n+var ownerHasExplicitKeyWarning = {};\n+var ownerHasPropertyWarning = {};\n+var ownerHasMonitoredObjectMap = {};\n+\n+var NUMERIC_PROPERTY_REGEX = \/^\\d+$\/;\n+\n+\/**\n+ * Warn if the component doesn't have an explicit key assigned to it.\n+ * This component is in an array. The array could grow and shrink or be\n+ * reordered. All children that haven't already been validated are required to\n+ * have a \"key\" property assigned to it.\n+ *\n+ * @internal\n+ * @param {ReactComponent} component Component that requires a key.\n+ *\/\n+function validateExplicitKey(component) {\n+ if (component._store.validated || component.props.key != null) {\n+ return;\n+ }\n+ component._store.validated = true;\n+\n+ \/\/ We can't provide friendly warnings for top level components.\n+ if (!ReactCurrentOwner.current) {\n+ return;\n+ }\n+\n+ \/\/ Name of the component whose render method tried to pass children.\n+ var currentName = ReactCurrentOwner.current.constructor.displayName;\n+ if (ownerHasExplicitKeyWarning.hasOwnProperty(currentName)) {\n+ return;\n+ }\n+ ownerHasExplicitKeyWarning[currentName] = true;\n+\n+ var message = 'Each child in an array should have a unique \"key\" prop. ' +\n+ 'Check the render method of ' + currentName + '.';\n+\n+ var childOwnerName = null;\n+ if (component._owner !== ReactCurrentOwner.current) {\n+ \/\/ Name of the component that originally created this child.\n+ childOwnerName =\n+ component._owner &&\n+ component._owner.constructor.displayName;\n+\n+ \/\/ Usually the current owner is the offender, but if it accepts\n+ \/\/ children as a property, it may be the creator of the child that's\n+ \/\/ responsible for assigning it a key.\n+ message += ' It was passed a child from ' + childOwnerName + '.';\n+ }\n+\n+ message += ' See http:\/\/fb.me\/react-warning-keys for more information.';\n+ monitorCodeUse('react_key_warning', {\n+ component: currentName,\n+ componentOwner: childOwnerName\n+ });\n+ console.warn(message);\n+}\n+\n+\/**\n+ * Warn if the key is being defined as an object property but has an incorrect\n+ * value.\n+ *\n+ * @internal\n+ * @param {string} name Property name of the key.\n+ * @param {ReactComponent} component Component that requires a key.\n+ *\/\n+function validatePropertyKey(name) {\n+ if (NUMERIC_PROPERTY_REGEX.test(name)) {\n+ \/\/ Name of the component whose render method tried to pass children.\n+ var currentName = ReactCurrentOwner.current.constructor.displayName;\n+ if (ownerHasPropertyWarning.hasOwnProperty(currentName)) {\n+ return;\n+ }\n+ ownerHasPropertyWarning[currentName] = true;\n+\n+ monitorCodeUse('react_numeric_key_warning');\n+ console.warn(\n+ 'Child objects should have non-numeric keys so ordering is preserved. ' +\n+ 'Check the render method of ' + currentName + '. ' +\n+ 'See http:\/\/fb.me\/react-warning-keys for more information.'\n+ );\n+ }\n+}\n+\n+\/**\n+ * Log that we're using an object map. We're considering deprecating this\n+ * feature and replace it with proper Map and ImmutableMap data structures.\n+ *\n+ * @internal\n+ *\/\n+function monitorUseOfObjectMap() {\n+ \/\/ Name of the component whose render method tried to pass children.\n+ \/\/ We only use this to avoid spewing the logs. We lose additional\n+ \/\/ owner stacks but hopefully one level is enough to trace the source.\n+ var currentName = (ReactCurrentOwner.current &&\n+ ReactCurrentOwner.current.constructor.displayName) || '';\n+ if (ownerHasMonitoredObjectMap.hasOwnProperty(currentName)) {\n+ return;\n+ }\n+ ownerHasMonitoredObjectMap[currentName] = true;\n+ monitorCodeUse('react_object_map_children');\n+}\n+\n+\/**\n+ * Ensure that every component either is passed in a static location, in an\n+ * array with an explicit keys property defined, or in an object literal\n+ * with valid key property.\n+ *\n+ * @internal\n+ * @param {*} component Statically passed child of any type.\n+ * @return {boolean}\n+ *\/\n+function validateChildKeys(component) {\n+ if (Array.isArray(component)) {\n+ for (var i = 0; i < component.length; i++) {\n+ var child = component[i];\n+ if (ReactDescriptor.isValidDescriptor(child)) {\n+ validateExplicitKey(child);\n+ }\n+ }\n+ } else if (ReactDescriptor.isValidDescriptor(component)) {\n+ \/\/ This component was passed in a valid location.\n+ component._store.validated = true;\n+ } else if (component && typeof component === 'object') {\n+ monitorUseOfObjectMap();\n+ for (var name in component) {\n+ validatePropertyKey(name, component);\n+ }\n+ }\n+}\n+\n+\/**\n+ * Warn for mutations.\n+ *\n+ * @internal\n+ * @param {object} object\n+ * @param {string} key\n+ *\/\n+function defineWarningProperty(object, key) {\n+ Object.defineProperty(object, key, {\n+\n+ configurable: false,\n+ enumerable: true,\n+\n+ get: function() {\n+ if (!this._store) {\n+ return null;\n+ }\n+ return this._store[key];\n+ },\n+\n+ set: function(value) {\n+ warning(\n+ false,\n+ 'Don\\'t set the ' + key + ' property of the component. ' +\n+ 'Mutate the existing props object instead.'\n+ );\n+ this._store[key] = value;\n+ }\n+\n+ });\n+}\n+\n+\/**\n+ * This is updated to true if the membrane is successfully created.\n+ *\/\n+var useMutationMembrane = false;\n+\n+\/**\n+ * Warn for mutations.\n+ *\n+ * @internal\n+ * @param {object} descriptor\n+ *\/\n+function defineMutationMembrane(prototype) {\n+ try {\n+ var pseudoFrozenProperties = {\n+ props: true\n+ };\n+ for (var key in pseudoFrozenProperties) {\n+ defineWarningProperty(prototype, key);\n+ }\n+ useMutationMembrane = true;\n+ } catch (x) {\n+ \/\/ IE will fail on defineProperty\n+ }\n+}\n+\n+\/**\n+ * Base constructor for all React descriptors. This is only used to make this\n+ * work with a dynamic instanceof check. Nothing should live on this prototype.\n+ *\n+ * @param {*} type\n+ * @internal\n+ *\/\n+var ReactDescriptor = function() {};\n+\n+if (__DEV__) {\n+ defineMutationMembrane(ReactDescriptor.prototype);\n+}\n+\n+ReactDescriptor.createFactory = function(type) {\n+\n+ var descriptorPrototype = Object.create(ReactDescriptor.prototype);\n+\n+ var factory = function(props, children) {\n+ if (props == null) {\n+ props = {};\n+ }\n+\n+ \/\/ Children can be more than one argument\n+ var childrenLength = arguments.length - 1;\n+ if (childrenLength === 1) {\n+ if (__DEV__) {\n+ validateChildKeys(children);\n+ }\n+ props.children = children;\n+ } else if (childrenLength > 1) {\n+ var childArray = Array(childrenLength);\n+ for (var i = 0; i < childrenLength; i++) {\n+ if (__DEV__) {\n+ validateChildKeys(arguments[i + 1]);\n+ }\n+ childArray[i] = arguments[i + 1];\n+ }\n+ props.children = childArray;\n+ }\n+\n+ var descriptor = Object.create(descriptorPrototype);\n+\n+ \/\/ Record the component responsible for creating this descriptor.\n+ descriptor._owner = ReactCurrentOwner.current;\n+\n+ \/\/ TODO: Deprecate withContext, and then the context becomes accessible\n+ \/\/ through the owner.\n+ descriptor._context = ReactContext.current;\n+\n+ if (__DEV__) {\n+ \/\/ The validation flag and props are currently mutative. We put them on\n+ \/\/ an external backing store so that we can freeze the whole object.\n+ descriptor._store = { validated: false, props: props };\n+\n+ \/\/ We're not allowed to set props directly on the object so we early\n+ \/\/ return and rely on the prototype membrane toward to the backing store.\n+ if (useMutationMembrane) {\n+ Object.freeze(descriptor);\n+ return descriptor;\n+ }\n+ }\n+\n+ descriptor.props = props;\n+ return descriptor;\n+\n+ };\n+\n+ \/\/ Currently we expose the prototype of the descriptor so that\n+ \/\/ instanceof Foo works. This is controversial pattern.\n+ factory.prototype = descriptorPrototype;\n+\n+ \/\/ Expose the type on the factory and the prototype so that it can be\n+ \/\/ easily accessed on descriptors. E.g. .type === Foo.type and for\n+ \/\/ static methods like .type.staticMethod();\n+ \/\/ This should not be named constructor since this may not be the function\n+ \/\/ that created the descriptor, and it may not even be a constructor.\n+ factory.type = type;\n+ descriptorPrototype.type = type;\n+\n+ \/\/ Expose a unique constructor on the prototype is that this works with type\n+ \/\/ systems that compare constructor properties: .constructor === Foo\n+ \/\/ This may be controversial since it requires a known factory function.\n+ descriptorPrototype.constructor = factory;\n+\n+ return factory;\n+\n+};\n+\n+ReactDescriptor.cloneAndReplaceProps = function(oldDescriptor, newProps) {\n+ var newDescriptor = Object.create(oldDescriptor.constructor.prototype);\n+ \/\/ It's important that this property order matches the hidden class of the\n+ \/\/ original descriptor to maintain perf.\n+ newDescriptor._owner = oldDescriptor._owner;\n+ newDescriptor._context = oldDescriptor._context;\n+\n+ if (__DEV__) {\n+ newDescriptor._store = {\n+ validated: oldDescriptor._store.validated,\n+ props: newProps\n+ };\n+ if (useMutationMembrane) {\n+ Object.freeze(newDescriptor);\n+ return newDescriptor;\n+ }\n+ }\n+\n+ newDescriptor.props = newProps;\n+ return newDescriptor;\n+};\n+\n+\/**\n+ * Checks if a value is a valid descriptor constructor.\n+ *\n+ * @param {*}\n+ * @return {boolean}\n+ * @public\n+ *\/\n+ReactDescriptor.isValidFactory = function(factory) {\n+ return typeof factory === 'function' &&\n+ factory.prototype instanceof ReactDescriptor;\n+};\n+\n+\/**\n+ * @param {?object} object\n+ * @return {boolean} True if `object` is a valid component.\n+ * @final\n+ *\/\n+ReactDescriptor.isValidDescriptor = function(object) {\n+ return object instanceof ReactDescriptor;\n+};\n+\n+module.exports = ReactDescriptor;\ndiff --git a\/src\/core\/ReactMultiChild.js b\/src\/core\/ReactMultiChild.js\nindex 8cc6c10106..608fe62d84 100644\n--- a\/src\/core\/ReactMultiChild.js\n+++ b\/src\/core\/ReactMultiChild.js\n@@ -286,11 +286,12 @@ var ReactMultiChild = {\n continue;\n }\n var prevChild = prevChildren && prevChildren[name];\n- var nextChild = nextChildren[name];\n- if (shouldUpdateReactComponent(prevChild, nextChild)) {\n+ var prevDescriptor = prevChild && prevChild._descriptor;\n+ var nextDescriptor = nextChildren[name];\n+ if (shouldUpdateReactComponent(prevDescriptor, nextDescriptor)) {\n this.moveChild(prevChild, nextIndex, lastIndex);\n lastIndex = Math.max(prevChild._mountIndex, lastIndex);\n- prevChild.receiveComponent(nextChild, transaction);\n+ prevChild.receiveComponent(nextDescriptor, transaction);\n prevChild._mountIndex = nextIndex;\n } else {\n if (prevChild) {\n@@ -299,7 +300,7 @@ var ReactMultiChild = {\n this._unmountChildByName(prevChild, name);\n }\n \/\/ The child must be instantiated before it's mounted.\n- var nextChildInstance = instantiateReactComponent(nextChild);\n+ var nextChildInstance = instantiateReactComponent(nextDescriptor);\n this._mountChildByNameAtIndex(\n nextChildInstance, name, nextIndex, transaction\n );\n@@ -416,13 +417,10 @@ var ReactMultiChild = {\n * @private\n *\/\n _unmountChildByName: function(child, name) {\n- \/\/ TODO: When is this not true?\n- if (ReactComponent.isValidComponent(child)) {\n- this.removeChild(child);\n- child._mountIndex = null;\n- child.unmountComponent();\n- delete this._renderedChildren[name];\n- }\n+ this.removeChild(child);\n+ child._mountIndex = null;\n+ child.unmountComponent();\n+ delete this._renderedChildren[name];\n }\n \n }\ndiff --git a\/src\/core\/ReactPropTransferer.js b\/src\/core\/ReactPropTransferer.js\nindex 2915c76f23..c64df1201a 100644\n--- a\/src\/core\/ReactPropTransferer.js\n+++ b\/src\/core\/ReactPropTransferer.js\n@@ -68,6 +68,31 @@ var TransferStrategies = {\n style: createTransferStrategy(merge)\n };\n \n+\/**\n+ * Mutates the first argument by transferring the properties from the second\n+ * argument.\n+ *\n+ * @param {object} props\n+ * @param {object} newProps\n+ * @return {object}\n+ *\/\n+function transferInto(props, newProps) {\n+ for (var thisKey in newProps) {\n+ if (!newProps.hasOwnProperty(thisKey)) {\n+ continue;\n+ }\n+\n+ var transferStrategy = TransferStrategies[thisKey];\n+\n+ if (transferStrategy && TransferStrategies.hasOwnProperty(thisKey)) {\n+ transferStrategy(props, thisKey, newProps[thisKey]);\n+ } else if (!props.hasOwnProperty(thisKey)) {\n+ props[thisKey] = newProps[thisKey];\n+ }\n+ }\n+ return props;\n+}\n+\n \/**\n * ReactPropTransferer are capable of transferring props to another component\n * using a `transferPropsTo` method.\n@@ -86,23 +111,7 @@ var ReactPropTransferer = {\n * @return {object} a new object containing both sets of props merged.\n *\/\n mergeProps: function(oldProps, newProps) {\n- var props = merge(oldProps);\n-\n- for (var thisKey in newProps) {\n- if (!newProps.hasOwnProperty(thisKey)) {\n- continue;\n- }\n-\n- var transferStrategy = TransferStrategies[thisKey];\n-\n- if (transferStrategy && TransferStrategies.hasOwnProperty(thisKey)) {\n- transferStrategy(props, thisKey, newProps[thisKey]);\n- } else if (!props.hasOwnProperty(thisKey)) {\n- props[thisKey] = newProps[thisKey];\n- }\n- }\n-\n- return props;\n+ return transferInto(merge(oldProps), newProps);\n },\n \n \/**\n@@ -118,27 +127,26 @@ var ReactPropTransferer = {\n *\n * This is usually used to pass down props to a returned root component.\n *\n- * @param {ReactComponent} component Component receiving the properties.\n- * @return {ReactComponent} The supplied `component`.\n+ * @param {ReactDescriptor} descriptor Component receiving the properties.\n+ * @return {ReactDescriptor} The supplied `component`.\n * @final\n * @protected\n *\/\n- transferPropsTo: function(component) {\n+ transferPropsTo: function(descriptor) {\n invariant(\n- component._owner === this,\n+ descriptor._owner === this,\n '%s: You can\\'t call transferPropsTo() on a component that you ' +\n 'don\\'t own, %s. This usually means you are calling ' +\n 'transferPropsTo() on a component passed in as props or children.',\n this.constructor.displayName,\n- component.constructor.displayName\n+ descriptor.type.displayName\n );\n \n- component.props = ReactPropTransferer.mergeProps(\n- component.props,\n- this.props\n- );\n+ \/\/ Because descriptors are immutable we have to merge into the existing\n+ \/\/ props object rather than clone it.\n+ transferInto(descriptor.props, this.props);\n \n- return component;\n+ return descriptor;\n }\n \n }\ndiff --git a\/src\/core\/ReactPropTypes.js b\/src\/core\/ReactPropTypes.js\nindex f29ccd10d5..3168427ca0 100644\n--- a\/src\/core\/ReactPropTypes.js\n+++ b\/src\/core\/ReactPropTypes.js\n@@ -18,7 +18,7 @@\n \n \"use strict\";\n \n-var ReactComponent = require('ReactComponent');\n+var ReactDescriptor = require('ReactDescriptor');\n var ReactPropTypeLocationNames = require('ReactPropTypeLocationNames');\n \n var warning = require('warning');\n@@ -106,7 +106,7 @@ function isRenderable(propValue) {\n if (Array.isArray(propValue)) {\n return propValue.every(isRenderable);\n }\n- if (ReactComponent.isValidComponent(propValue)) {\n+ if (ReactDescriptor.isValidDescriptor(propValue)) {\n return true;\n }\n for (var k in propValue) {\n@@ -279,7 +279,7 @@ function createComponentTypeChecker() {\n function validateComponentType(\n shouldWarn, propValue, propName, componentName, location\n ) {\n- var isValid = ReactComponent.isValidComponent(propValue);\n+ var isValid = ReactDescriptor.isValidDescriptor(propValue);\n if (shouldWarn) {\n warning(\n isValid,\ndiff --git a\/src\/core\/__tests__\/ReactComponent-test.js b\/src\/core\/__tests__\/ReactComponent-test.js\nindex f0fdf7f634..71067e15eb 100644\n--- a\/src\/core\/__tests__\/ReactComponent-test.js\n+++ b\/src\/core\/__tests__\/ReactComponent-test.js\n@@ -65,7 +65,8 @@ describe('ReactComponent', function() {\n }\n });\n \n- var instance = } \/>;\n+ var childInstance = ReactTestUtils.renderIntoDocument();\n+ var instance = ;\n \n expect(function() {\n instance = ReactTestUtils.renderIntoDocument(instance);\n@@ -76,21 +77,33 @@ describe('ReactComponent', function() {\n });\n \n it('should support refs on owned components', function() {\n- var inner, outer;\n+ var innerObj = {}, outerObj = {};\n+\n+ var Wrapper = React.createClass({\n+\n+ getObject: function() {\n+ return this.props.object;\n+ },\n+\n+ render: function() {\n+ return

{this.props.children}<\/div>;\n+ }\n+\n+ });\n \n var Component = React.createClass({\n render: function() {\n- inner =

;\n- outer =

{inner}<\/div>;\n+ var inner = ;\n+ var outer = {inner}<\/Wrapper>;\n return outer;\n },\n componentDidMount: function() {\n- expect(this.refs.inner).toEqual(inner);\n- expect(this.refs.outer).toEqual(outer);\n+ expect(this.refs.inner.getObject()).toEqual(innerObj);\n+ expect(this.refs.outer.getObject()).toEqual(outerObj);\n }\n });\n \n- var instance = } \/>;\n+ var instance = ;\n instance = ReactTestUtils.renderIntoDocument(instance);\n });\n \ndiff --git a\/src\/core\/__tests__\/ReactComponentLifeCycle-test.js b\/src\/core\/__tests__\/ReactComponentLifeCycle-test.js\nindex 3f4d2d1524..30135cd0c4 100644\n--- a\/src\/core\/__tests__\/ReactComponentLifeCycle-test.js\n+++ b\/src\/core\/__tests__\/ReactComponentLifeCycle-test.js\n@@ -91,29 +91,23 @@ describe('ReactComponentLifeCycle', function() {\n CompositeComponentLifeCycle = ReactCompositeComponent.LifeCycle;\n });\n \n- it('should scrub state when reinitialized using getInitialState', function() {\n+ it('should not reuse an instance when it has been unmounted', function() {\n+ var container = document.createElement('div');\n var StatefulComponent = React.createClass({\n getInitialState: function() {\n return { };\n },\n- addAnotherField: function() {\n- this.setState({\n- aField: 'asdf'\n- });\n- },\n render: function() {\n return (\n

<\/div>\n );\n }\n });\n- var instance = ;\n- instance = ReactTestUtils.renderIntoDocument(instance);\n- instance.addAnotherField();\n- expect(instance.state.aField).toBe('asdf');\n- instance.unmountComponent();\n- instance = ReactTestUtils.renderIntoDocument(instance);\n- expect(typeof instance.state.aField).toBe('undefined');\n+ var descriptor = ;\n+ var firstInstance = React.renderComponent(descriptor, container);\n+ React.unmountComponentAtNode(container);\n+ var secondInstance = React.renderComponent(descriptor, container);\n+ expect(firstInstance).not.toBe(secondInstance);\n });\n \n \/**\n@@ -165,29 +159,6 @@ describe('ReactComponentLifeCycle', function() {\n ]);\n });\n \n-\n- it('should scrub state when re-initialized', function() {\n- var StatefulComponent = React.createClass({\n- addAnotherField: function() {\n- this.setState({\n- aField: 'asdf'\n- });\n- },\n- render: function() {\n- return (\n-

<\/div>\n- );\n- }\n- });\n- var instance = ;\n- instance = ReactTestUtils.renderIntoDocument(instance);\n- instance.addAnotherField();\n- expect(instance.state.aField).toBe('asdf');\n- instance.unmountComponent();\n- instance = ReactTestUtils.renderIntoDocument(instance);\n- expect(instance.state).toBe(null);\n- });\n-\n \/\/ You could assign state here, but not access members of it, unless you\n \/\/ had provided a getInitialState method.\n it('throws when accessing state in componentWillMount', function() {\n@@ -454,7 +425,7 @@ describe('ReactComponentLifeCycle', function() {\n instance.setProps({text: \"dos\", tooltipText: \"two\"});\n });\n \n- it('should throw when calling setProps() on an unmounted component',\n+ it('should not allow setProps() called on an unmounted descriptor',\n function() {\n var PropsToUpdate = React.createClass({\n render: function() {\n@@ -467,12 +438,7 @@ describe('ReactComponentLifeCycle', function() {\n }\n });\n var instance = ;\n- expect(function() {\n- instance.setProps({value: \"goodbye\"});\n- }).toThrow(\n- 'Invariant Violation: replaceProps(...): Can only update a ' +\n- 'mounted component.'\n- );\n+ expect(instance.setProps).not.toBeDefined();\n });\n \n it('should allow state updates in componentDidMount', function() {\ndiff --git a\/src\/core\/__tests__\/ReactCompositeComponent-test.js b\/src\/core\/__tests__\/ReactCompositeComponent-test.js\nindex c5de4a340e..2c6b4294b6 100644\n--- a\/src\/core\/__tests__\/ReactCompositeComponent-test.js\n+++ b\/src\/core\/__tests__\/ReactCompositeComponent-test.js\n@@ -402,12 +402,7 @@ describe('ReactCompositeComponent', function() {\n });\n \n var instance = ;\n- expect(function() {\n- instance.forceUpdate();\n- }).toThrow(\n- 'Invariant Violation: forceUpdate(...): Can only force an update on ' +\n- 'mounted or mounting components.'\n- );\n+ expect(instance.forceUpdate).not.toBeDefined();\n \n instance = React.renderComponent(instance, container);\n expect(function() {\n@@ -1154,39 +1149,6 @@ describe('ReactCompositeComponent', function() {\n instance = ReactTestUtils.renderIntoDocument(instance);\n });\n \n- it('should warn if an umounted component is touched', function() {\n- spyOn(console, 'warn');\n-\n- var ComponentClass = React.createClass({\n- getInitialState: function() {\n- return {valueToReturn: 'hi'};\n- },\n- someMethod: function() {\n- return this;\n- },\n- someOtherMethod: function() {\n- return this;\n- },\n- render: function() {\n- return

<\/div>;\n- }\n- });\n-\n- var descriptor = ;\n- var instance = ReactTestUtils.renderIntoDocument(descriptor);\n- instance.someMethod();\n- expect(console.warn.argsForCall.length).toBe(0);\n-\n- var unmountedInstance = ;\n- unmountedInstance.someMethod();\n- expect(console.warn.argsForCall.length).toBe(1);\n-\n- var unmountedInstance2 = ;\n- unmountedInstance2.someOtherMethod = 'override';\n- expect(console.warn.argsForCall.length).toBe(2);\n- expect(unmountedInstance2.someOtherMethod).toBe('override');\n- });\n-\n it('should allow static methods called using type property', function() {\n spyOn(console, 'warn');\n \ndiff --git a\/src\/core\/__tests__\/ReactCompositeComponentMixin-test.js b\/src\/core\/__tests__\/ReactCompositeComponentMixin-test.js\nindex 482019ab57..d77055f4ca 100644\n--- a\/src\/core\/__tests__\/ReactCompositeComponentMixin-test.js\n+++ b\/src\/core\/__tests__\/ReactCompositeComponentMixin-test.js\n@@ -129,8 +129,8 @@ describe('ReactCompositeComponent-mixin', function() {\n });\n \n it('should validate prop types via mixins', function() {\n- expect(TestComponent.componentConstructor.propTypes).toBeDefined();\n- expect(TestComponent.componentConstructor.propTypes.value)\n+ expect(TestComponent.type.propTypes).toBeDefined();\n+ expect(TestComponent.type.propTypes.value)\n .toBe(mixinPropValidator);\n });\n \n@@ -138,11 +138,11 @@ describe('ReactCompositeComponent-mixin', function() {\n \/\/ Sanity check...\n expect(componentPropValidator).toNotBe(mixinPropValidator);\n \/\/ Actually check...\n- expect(TestComponentWithPropTypes.componentConstructor.propTypes)\n+ expect(TestComponentWithPropTypes.type.propTypes)\n .toBeDefined();\n- expect(TestComponentWithPropTypes.componentConstructor.propTypes.value)\n+ expect(TestComponentWithPropTypes.type.propTypes.value)\n .toNotBe(mixinPropValidator);\n- expect(TestComponentWithPropTypes.componentConstructor.propTypes.value)\n+ expect(TestComponentWithPropTypes.type.propTypes.value)\n .toBe(componentPropValidator);\n });\n });\ndiff --git a\/src\/core\/__tests__\/ReactCompositeComponentSpec-test.js b\/src\/core\/__tests__\/ReactCompositeComponentSpec-test.js\nindex fd8ed430c9..2559027573 100644\n--- a\/src\/core\/__tests__\/ReactCompositeComponentSpec-test.js\n+++ b\/src\/core\/__tests__\/ReactCompositeComponentSpec-test.js\n@@ -49,7 +49,7 @@ describe('ReactCompositeComponent-spec', function() {\n }\n });\n \n- expect(TestComponent.componentConstructor.displayName)\n+ expect(TestComponent.type.displayName)\n .toBe('TestComponent');\n });\n \n@@ -64,8 +64,8 @@ describe('ReactCompositeComponent-spec', function() {\n }\n });\n \n- expect(TestComponent.componentConstructor.propTypes).toBeDefined();\n- expect(TestComponent.componentConstructor.propTypes.value)\n+ expect(TestComponent.type.propTypes).toBeDefined();\n+ expect(TestComponent.type.propTypes.value)\n .toBe(propValidator);\n });\n });\ndiff --git a\/src\/core\/__tests__\/ReactIdentity-test.js b\/src\/core\/__tests__\/ReactIdentity-test.js\nindex 1f7ba7be36..b07b2adcac 100644\n--- a\/src\/core\/__tests__\/ReactIdentity-test.js\n+++ b\/src\/core\/__tests__\/ReactIdentity-test.js\n@@ -105,13 +105,23 @@ describe('ReactIdentity', function() {\n });\n \n function renderAComponentWithKeyIntoContainer(key, container) {\n- var span1 = ;\n- var span2 = ;\n \n- var map = {};\n- map[key] = span2;\n+ var Wrapper = React.createClass({\n+\n+ render: function() {\n+ var span1 = ;\n+ var span2 = ;\n+\n+ var map = {};\n+ map[key] = span2;\n+ return

{[span1, map]}<\/div>;\n+ }\n+\n+ });\n \n- React.renderComponent(

{[span1, map]}<\/div>, container);\n+ var instance = React.renderComponent(, container);\n+ var span1 = instance.refs.span1;\n+ var span2 = instance.refs.span2;\n \n expect(span1.getDOMNode()).not.toBe(null);\n expect(span2.getDOMNode()).not.toBe(null);\ndiff --git a\/src\/core\/instantiateReactComponent.js b\/src\/core\/instantiateReactComponent.js\nindex 750b13fda8..6af796258c 100644\n--- a\/src\/core\/instantiateReactComponent.js\n+++ b\/src\/core\/instantiateReactComponent.js\n@@ -19,7 +19,7 @@\n \n \"use strict\";\n \n-var warning = require('warning');\n+var invariant = require('invariant');\n \n \/**\n * Validate a `componentDescriptor`. This should be exposed publicly in a follow\n@@ -30,10 +30,10 @@ var warning = require('warning');\n *\/\n function isValidComponentDescriptor(descriptor) {\n return (\n- typeof descriptor.constructor === 'function' &&\n- typeof descriptor.constructor.prototype.construct === 'function' &&\n- typeof descriptor.constructor.prototype.mountComponent === 'function' &&\n- typeof descriptor.constructor.prototype.receiveComponent === 'function'\n+ descriptor &&\n+ typeof descriptor.type === 'function' &&\n+ typeof descriptor.type.prototype.mountComponent === 'function' &&\n+ typeof descriptor.type.prototype.receiveComponent === 'function'\n );\n }\n \n@@ -47,24 +47,16 @@ function isValidComponentDescriptor(descriptor) {\n * @protected\n *\/\n function instantiateReactComponent(descriptor) {\n- if (__DEV__) {\n- warning(\n+\n+ \/\/ TODO: Make warning\n+ \/\/ if (__DEV__) {\n+ invariant(\n isValidComponentDescriptor(descriptor),\n 'Only React Components are valid for mounting.'\n );\n- \/\/ We use the clone of a composite component instead of the original\n- \/\/ instance. This allows us to warn you if you're are accessing the wrong\n- \/\/ instance.\n- var instance = descriptor.__realComponentInstance || descriptor;\n- instance._descriptor = descriptor;\n- return instance;\n- }\n- \/\/ In prod we don't clone, we simply use the same instance for unaffected\n- \/\/ behavior. We have to keep the descriptor around for comparison later on.\n- \/\/ This should ideally be accepted in the constructor of the instance but\n- \/\/ since that is currently overloaded, we just manually attach it here.\n- descriptor._descriptor = descriptor;\n- return descriptor;\n+ \/\/ }\n+\n+ return new descriptor.type(descriptor);\n }\n \n module.exports = instantiateReactComponent;\ndiff --git a\/src\/core\/shouldUpdateReactComponent.js b\/src\/core\/shouldUpdateReactComponent.js\nindex c2ee9a4030..d571b9b236 100644\n--- a\/src\/core\/shouldUpdateReactComponent.js\n+++ b\/src\/core\/shouldUpdateReactComponent.js\n@@ -20,40 +20,23 @@\n \"use strict\";\n \n \/**\n- * Given a `prevComponentInstance` and `nextComponent`, determines if\n- * `prevComponentInstance` should be updated as opposed to being destroyed or\n- * replaced by a new instance. The second argument is a descriptor. Future\n- * versions of the reconciler should only compare descriptors to other\n- * descriptors.\n+ * Given a `prevDescriptor` and `nextDescriptor`, determines if the existing\n+ * instance should be updated as opposed to being destroyed or replaced by a new\n+ * instance. Both arguments are descriptors. This ensures that this logic can\n+ * operate on stateless trees without any backing instance.\n *\n- * @param {?object} prevComponentInstance\n+ * @param {?object} prevDescriptor\n * @param {?object} nextDescriptor\n- * @return {boolean} True if `prevComponentInstance` should be updated.\n+ * @return {boolean} True if the existing instance should be updated.\n * @protected\n *\/\n-function shouldUpdateReactComponent(prevComponentInstance, nextDescriptor) {\n- \/\/ TODO: Remove warning after a release.\n- if (prevComponentInstance && nextDescriptor &&\n- prevComponentInstance.constructor === nextDescriptor.constructor && (\n- (prevComponentInstance.props && prevComponentInstance.props.key) ===\n+function shouldUpdateReactComponent(prevDescriptor, nextDescriptor) {\n+ if (prevDescriptor && nextDescriptor &&\n+ prevDescriptor.type === nextDescriptor.type && (\n+ (prevDescriptor.props && prevDescriptor.props.key) ===\n (nextDescriptor.props && nextDescriptor.props.key)\n- )) {\n- if (prevComponentInstance._owner === nextDescriptor._owner) {\n- return true;\n- } else {\n- if (__DEV__) {\n- if (prevComponentInstance.state) {\n- console.warn(\n- 'A recent change to React has been found to impact your code. ' +\n- 'A mounted component will now be unmounted and replaced by a ' +\n- 'component (of the same class) if their owners are different. ' +\n- 'Previously, ownership was not considered when updating.',\n- prevComponentInstance,\n- nextDescriptor\n- );\n- }\n- }\n- }\n+ ) && prevDescriptor._owner === nextDescriptor._owner) {\n+ return true;\n }\n return false;\n }\ndiff --git a\/src\/event\/EventPluginHub.js b\/src\/event\/EventPluginHub.js\nindex 92c72618cc..4d36756496 100644\n--- a\/src\/event\/EventPluginHub.js\n+++ b\/src\/event\/EventPluginHub.js\n@@ -154,10 +154,6 @@ var EventPluginHub = {\n * @param {?function} listener The callback to store.\n *\/\n putListener: function(id, registrationName, listener) {\n- invariant(\n- ExecutionEnvironment.canUseDOM,\n- 'Cannot call putListener() in a non-DOM environment.'\n- );\n invariant(\n !listener || typeof listener === 'function',\n 'Expected %s listener to be a function, instead got type %s',\ndiff --git a\/src\/test\/ReactTestUtils.js b\/src\/test\/ReactTestUtils.js\nindex 8d34272703..cac11e9bba 100644\n--- a\/src\/test\/ReactTestUtils.js\n+++ b\/src\/test\/ReactTestUtils.js\n@@ -22,7 +22,7 @@ var EventConstants = require('EventConstants');\n var EventPluginHub = require('EventPluginHub');\n var EventPropagators = require('EventPropagators');\n var React = require('React');\n-var ReactComponent = require('ReactComponent');\n+var ReactDescriptor = require('ReactDescriptor');\n var ReactDOM = require('ReactDOM');\n var ReactEventEmitter = require('ReactEventEmitter');\n var ReactMount = require('ReactMount');\n@@ -57,21 +57,39 @@ var ReactTestUtils = {\n return React.renderComponent(instance, div);\n },\n \n- isComponentOfType: function(inst, convenienceConstructor) {\n+ isDescriptor: function(descriptor) {\n+ return ReactDescriptor.isValidDescriptor(descriptor);\n+ },\n+\n+ isDescriptorOfType: function(inst, convenienceConstructor) {\n return (\n- ReactComponent.isValidComponent(inst) &&\n+ ReactDescriptor.isValidDescriptor(inst) &&\n inst.type === convenienceConstructor.type\n );\n },\n \n isDOMComponent: function(inst) {\n+ return !!(inst && inst.mountComponent && inst.tagName);\n+ },\n+\n+ isDOMComponentDescriptor: function(inst) {\n return !!(inst &&\n- ReactComponent.isValidComponent(inst) &&\n+ ReactDescriptor.isValidDescriptor(inst) &&\n !!inst.tagName);\n },\n \n isCompositeComponent: function(inst) {\n- if (!ReactComponent.isValidComponent(inst)) {\n+ return typeof inst.render === 'function' &&\n+ typeof inst.setState === 'function';\n+ },\n+\n+ isCompositeComponentWithType: function(inst, type) {\n+ return !!(ReactTestUtils.isCompositeComponent(inst) &&\n+ (inst.constructor === type.type));\n+ },\n+\n+ isCompositeComponentDescriptor: function(inst) {\n+ if (!ReactDescriptor.isValidDescriptor(inst)) {\n return false;\n }\n \/\/ We check the prototype of the type that will get mounted, not the\n@@ -79,19 +97,17 @@ var ReactTestUtils = {\n var prototype = inst.type.prototype;\n return (\n typeof prototype.render === 'function' &&\n- typeof prototype.setState === 'function' &&\n- typeof prototype.updateComponent === 'function'\n+ typeof prototype.setState === 'function'\n );\n },\n \n- isCompositeComponentWithType: function(inst, type) {\n- return !!(ReactTestUtils.isCompositeComponent(inst) &&\n- (inst.constructor === type.componentConstructor ||\n- inst.constructor === type));\n+ isCompositeComponentDescriptorWithType: function(inst, type) {\n+ return !!(ReactTestUtils.isCompositeComponentDescriptor(inst) &&\n+ (inst.constructor === type));\n },\n \n isTextComponent: function(inst) {\n- return inst instanceof ReactTextComponent;\n+ return inst instanceof ReactTextComponent.type;\n },\n \n findAllInRenderedTree: function(inst, test) {\n@@ -182,7 +198,10 @@ var ReactTestUtils = {\n *\/\n scryRenderedComponentsWithType: function(root, componentType) {\n return ReactTestUtils.findAllInRenderedTree(root, function(inst) {\n- return ReactTestUtils.isCompositeComponentWithType(inst, componentType);\n+ return ReactTestUtils.isCompositeComponentWithType(\n+ inst,\n+ componentType\n+ );\n });\n },\n \ndiff --git a\/src\/test\/reactComponentExpect.js b\/src\/test\/reactComponentExpect.js\nindex 76c351f48e..7c42694799 100644\n--- a\/src\/test\/reactComponentExpect.js\n+++ b\/src\/test\/reactComponentExpect.js\n@@ -17,7 +17,6 @@\n * @nolint\n *\/\n \n-var ReactComponent = require('ReactComponent');\n var ReactTestUtils = require('ReactTestUtils');\n \n var mergeInto = require('mergeInto');\n@@ -32,7 +31,9 @@ function reactComponentExpect(instance) {\n }\n \n this._instance = instance;\n- this.toBeValidReactComponent();\n+ expect(typeof instance).toBe('object');\n+ expect(typeof instance.constructor).toBe('function');\n+ expect(ReactTestUtils.isDescriptor(instance)).toBe(false);\n }\n \n mergeInto(reactComponentExpect.prototype, {\n@@ -105,10 +106,9 @@ mergeInto(reactComponentExpect.prototype, {\n \/\/ Matchers ------------------------------------------------------------------\n \n toBeComponentOfType: function(convenienceConstructor) {\n- expect(ReactTestUtils.isComponentOfType(\n- this.instance(),\n- convenienceConstructor\n- )).toBe(true);\n+ expect(\n+ this.instance().constructor === convenienceConstructor.type\n+ ).toBe(true);\n return this;\n },\n \n@@ -117,16 +117,18 @@ mergeInto(reactComponentExpect.prototype, {\n * here.\n *\/\n toBeCompositeComponent: function() {\n- this.toBeValidReactComponent();\n- expect(ReactTestUtils.isCompositeComponent(this.instance())).toBe(true);\n+ expect(\n+ typeof this.instance().render === 'function' &&\n+ typeof this.instance().setState === 'function'\n+ ).toBe(true);\n return this;\n },\n \n toBeCompositeComponentWithType: function(convenienceConstructor) {\n- expect(ReactTestUtils.isCompositeComponentWithType(\n- this.instance(),\n- convenienceConstructor\n- )).toBe(true);\n+ this.toBeCompositeComponent();\n+ expect(\n+ this.instance().constructor === convenienceConstructor.type\n+ ).toBe(true);\n return this;\n },\n \n@@ -135,14 +137,6 @@ mergeInto(reactComponentExpect.prototype, {\n return this;\n },\n \n- \/**\n- * Falsy values are valid components - the vanished component that is.\n- *\/\n- toBeValidReactComponent: function() {\n- expect(ReactComponent.isValidComponent(this.instance())).toBe(true);\n- return this;\n- },\n-\n toBePresent: function() {\n expect(this.instance()).toBeTruthy();\n return this;\ndiff --git a\/src\/utils\/cloneWithProps.js b\/src\/utils\/cloneWithProps.js\nindex 8a8483e744..e347f54e51 100644\n--- a\/src\/utils\/cloneWithProps.js\n+++ b\/src\/utils\/cloneWithProps.js\n@@ -53,7 +53,9 @@ function cloneWithProps(child, props) {\n newProps.children = child.props.children;\n }\n \n- return child.constructor.ConvenienceConstructor(newProps);\n+ \/\/ The current API doesn't retain _owner and _context, which is why this\n+ \/\/ doesn't use ReactDescriptor.cloneAndReplaceProps.\n+ return child.constructor(newProps);\n }\n \n module.exports = cloneWithProps;\ndiff --git a\/src\/utils\/onlyChild.js b\/src\/utils\/onlyChild.js\nindex af64a9c213..5c15af4cb1 100644\n--- a\/src\/utils\/onlyChild.js\n+++ b\/src\/utils\/onlyChild.js\n@@ -17,7 +17,7 @@\n *\/\n \"use strict\";\n \n-var ReactComponent = require('ReactComponent');\n+var ReactDescriptor = require('ReactDescriptor');\n \n var invariant = require('invariant');\n \n@@ -34,7 +34,7 @@ var invariant = require('invariant');\n *\/\n function onlyChild(children) {\n invariant(\n- ReactComponent.isValidComponent(children),\n+ ReactDescriptor.isValidDescriptor(children),\n 'onlyChild must be passed a children with exactly one child.'\n );\n return children;\ndiff --git a\/src\/utils\/traverseAllChildren.js b\/src\/utils\/traverseAllChildren.js\nindex 379d6e98f1..d89d4402bc 100644\n--- a\/src\/utils\/traverseAllChildren.js\n+++ b\/src\/utils\/traverseAllChildren.js\n@@ -153,11 +153,11 @@ var traverseAllChildrenImpl =\n }\n }\n } else if (type === 'string') {\n- var normalizedText = new ReactTextComponent(children);\n+ var normalizedText = ReactTextComponent(children);\n callback(traverseContext, normalizedText, storageName, indexSoFar);\n subtreeCount += 1;\n } else if (type === 'number') {\n- var normalizedNumber = new ReactTextComponent('' + children);\n+ var normalizedNumber = ReactTextComponent('' + children);\n callback(traverseContext, normalizedNumber, storageName, indexSoFar);\n subtreeCount += 1;\n }\ndiff --git a\/vendor\/browser-transforms.js b\/vendor\/browser-transforms.js\nindex 26c48a7f9b..00401537d1 100644\n--- a\/vendor\/browser-transforms.js\n+++ b\/vendor\/browser-transforms.js\n@@ -22,7 +22,7 @@ var headEl;\n \n var buffer = require('buffer');\n var transform = require('jstransform').transform;\n-var visitors = require('.\/fbtransform\/visitors').transformVisitors;\n+var visitors = require('.\/fbtransform\/visitors');\n var docblock = require('jstransform\/src\/docblock');\n \n \/\/ The source-map library relies on Object.defineProperty, but IE8 doesn't\n@@ -31,16 +31,23 @@ var docblock = require('jstransform\/src\/docblock');\n \/\/ the source map in that case.\n var supportsAccessors = Object.prototype.hasOwnProperty('__defineGetter__');\n \n-function transformReact(source) {\n- return transform(visitors.react, source, {\n+function transformReact(source, options) {\n+ var visitorList;\n+ if (options && options.harmony) {\n+ visitorList = visitors.getAllVisitors();\n+ } else {\n+ visitorList = visitors.transformVisitors.react;\n+ }\n+\n+ return transform(visitorList, source, {\n sourceMap: supportsAccessors\n });\n }\n \n exports.transform = transformReact;\n \n-exports.exec = function(code) {\n- return eval(transformReact(code).code);\n+exports.exec = function(code, options) {\n+ return eval(transformReact(code, options).code);\n };\n \n var inlineScriptCount = 0;\n"}

dillon1000/react

Files changed