{"commit":{"shortRevision":"828efb798a","subject":"Merge pull request #2350 from sebmarkbage\/assign","authorName":"Sebastian Markbåge","authorEmail":"sebastian@calyptus.eu","revision":"828efb798a94a631007efe966828fbc5b01613ea","authoredAt":"2014-10-16T09:29:01-07:00"},"body":"Hide Object.assign polyfill behind a module","parents":["5263f61c8784a23a8bdffbc652a2cc09c6333ca6","8210beeef4219d11b0a997f5a5abe7c348c01448"],"files":[{"status":"M","path":"jest\/environment.js"},{"status":"M","path":"src\/addons\/transitions\/ReactCSSTransitionGroup.js"},{"status":"M","path":"src\/addons\/transitions\/ReactTransitionGroup.js"},{"status":"M","path":"src\/addons\/update.js"},{"status":"M","path":"src\/browser\/ReactBrowserEventEmitter.js"},{"status":"M","path":"src\/browser\/ReactPutListenerQueue.js"},{"status":"M","path":"src\/browser\/ReactReconcileTransaction.js"},{"status":"M","path":"src\/browser\/ReactTextComponent.js"},{"status":"M","path":"src\/browser\/server\/ReactServerRenderingTransaction.js"},{"status":"M","path":"src\/browser\/syntheticEvents\/SyntheticEvent.js"},{"status":"M","path":"src\/browser\/ui\/React.js"},{"status":"M","path":"src\/browser\/ui\/ReactDOMComponent.js"},{"status":"M","path":"src\/browser\/ui\/ReactEventListener.js"},{"status":"M","path":"src\/browser\/ui\/__tests__\/ReactDOMComponent-test.js"},{"status":"M","path":"src\/browser\/ui\/dom\/components\/ReactDOMInput.js"},{"status":"M","path":"src\/browser\/ui\/dom\/components\/ReactDOMSelect.js"},{"status":"M","path":"src\/browser\/ui\/dom\/components\/ReactDOMTextarea.js"},{"status":"M","path":"src\/core\/ReactComponent.js"},{"status":"M","path":"src\/core\/ReactCompositeComponent.js"},{"status":"M","path":"src\/core\/ReactContext.js"},{"status":"M","path":"src\/core\/ReactDefaultBatchingStrategy.js"},{"status":"M","path":"src\/core\/ReactNativeComponent.js"},{"status":"M","path":"src\/core\/ReactPropTransferer.js"},{"status":"M","path":"src\/core\/ReactUpdates.js"},{"status":"M","path":"src\/event\/__tests__\/EventPluginRegistry-test.js"},{"status":"M","path":"src\/test\/ReactDefaultPerfAnalysis.js"},{"status":"M","path":"src\/test\/ReactTestUtils.js"},{"status":"M","path":"src\/test\/reactComponentExpect.js"},{"status":"M","path":"src\/utils\/CallbackQueue.js"},{"status":"M","path":"src\/utils\/LegacyImmutableObject.js"},{"status":"M","path":"src\/utils\/OrderedMap.js"},{"status":"M","path":"src\/utils\/__tests__\/Transaction-test.js"},{"status":"M","path":"src\/utils\/deprecated.js"},{"status":"M","path":"src\/vendor\/core\/emptyFunction.js"},{"status":"M","path":"src\/vendor\/immutable\/Immutable.js"},{"status":"D","path":"src\/vendor\/polyfill\/Object.es6.js"},{"status":"A","path":"src\/vendor\/stubs\/Object.assign.js"},{"status":"M","path":"src\/vendor_deprecated\/core\/merge.js"},{"status":"M","path":"src\/vendor_deprecated\/core\/mergeInto.js"},{"status":"M","path":"vendor\/fbtransform\/transforms\/__tests__\/react-test.js"},{"status":"M","path":"vendor\/fbtransform\/transforms\/react.js"}],"patch":"diff --git a\/jest\/environment.js b\/jest\/environment.js\nindex a24f9f9ac4..a5ca53b7a9 100644\n--- a\/jest\/environment.js\n+++ b\/jest\/environment.js\n@@ -1,3 +1 @@\n __DEV__ = true;\n-\n-require.requireActual('..\/src\/vendor\/polyfill\/Object.es6.js');\ndiff --git a\/src\/addons\/transitions\/ReactCSSTransitionGroup.js b\/src\/addons\/transitions\/ReactCSSTransitionGroup.js\nindex 6db897c88c..2e4190c729 100644\n--- a\/src\/addons\/transitions\/ReactCSSTransitionGroup.js\n+++ b\/src\/addons\/transitions\/ReactCSSTransitionGroup.js\n@@ -14,6 +14,8 @@\n \n var React = require('React');\n \n+var assign = require('Object.assign');\n+\n var ReactTransitionGroup = React.createFactory(\n require('ReactTransitionGroup')\n );\n@@ -54,7 +56,7 @@ var ReactCSSTransitionGroup = React.createClass({\n render: function() {\n return (\n ReactTransitionGroup(\n- Object.assign({}, this.props, {childFactory: this._wrapChild})\n+ assign({}, this.props, {childFactory: this._wrapChild})\n )\n );\n }\ndiff --git a\/src\/addons\/transitions\/ReactTransitionGroup.js b\/src\/addons\/transitions\/ReactTransitionGroup.js\nindex 3cfec96318..ce967cff4c 100644\n--- a\/src\/addons\/transitions\/ReactTransitionGroup.js\n+++ b\/src\/addons\/transitions\/ReactTransitionGroup.js\n@@ -14,6 +14,7 @@\n var React = require('React');\n var ReactTransitionChildMapping = require('ReactTransitionChildMapping');\n \n+var assign = require('Object.assign');\n var cloneWithProps = require('cloneWithProps');\n var emptyFunction = require('emptyFunction');\n \n@@ -151,7 +152,7 @@ var ReactTransitionGroup = React.createClass({\n \/\/ This entered again before it fully left. Add it again.\n this.performEnter(key);\n } else {\n- var newChildren = Object.assign({}, this.state.children);\n+ var newChildren = assign({}, this.state.children);\n delete newChildren[key];\n this.setState({children: newChildren});\n }\ndiff --git a\/src\/addons\/update.js b\/src\/addons\/update.js\nindex dded114ea4..34e078b20e 100644\n--- a\/src\/addons\/update.js\n+++ b\/src\/addons\/update.js\n@@ -11,6 +11,7 @@\n \n \"use strict\";\n \n+var assign = require('Object.assign');\n var keyOf = require('keyOf');\n var invariant = require('invariant');\n \n@@ -18,7 +19,7 @@ function shallowCopy(x) {\n if (Array.isArray(x)) {\n return x.concat();\n } else if (x && typeof x === 'object') {\n- return Object.assign(new x.constructor(), x);\n+ return assign(new x.constructor(), x);\n } else {\n return x;\n }\n@@ -98,7 +99,7 @@ function update(value, spec) {\n COMMAND_MERGE,\n nextValue\n );\n- Object.assign(nextValue, spec[COMMAND_MERGE]);\n+ assign(nextValue, spec[COMMAND_MERGE]);\n }\n \n if (spec.hasOwnProperty(COMMAND_PUSH)) {\ndiff --git a\/src\/browser\/ReactBrowserEventEmitter.js b\/src\/browser\/ReactBrowserEventEmitter.js\nindex 7b957efca2..f2c4a5dd78 100644\n--- a\/src\/browser\/ReactBrowserEventEmitter.js\n+++ b\/src\/browser\/ReactBrowserEventEmitter.js\n@@ -18,6 +18,7 @@ var EventPluginRegistry = require('EventPluginRegistry');\n var ReactEventEmitterMixin = require('ReactEventEmitterMixin');\n var ViewportMetrics = require('ViewportMetrics');\n \n+var assign = require('Object.assign');\n var isEventSupported = require('isEventSupported');\n \n \/**\n@@ -147,7 +148,7 @@ function getListeningForDocument(mountAt) {\n *\n * @internal\n *\/\n-var ReactBrowserEventEmitter = Object.assign({}, ReactEventEmitterMixin, {\n+var ReactBrowserEventEmitter = assign({}, ReactEventEmitterMixin, {\n \n \/**\n * Injectable event backend\ndiff --git a\/src\/browser\/ReactPutListenerQueue.js b\/src\/browser\/ReactPutListenerQueue.js\nindex 2c8b2f6085..e47b6edcfe 100644\n--- a\/src\/browser\/ReactPutListenerQueue.js\n+++ b\/src\/browser\/ReactPutListenerQueue.js\n@@ -14,11 +14,13 @@\n var PooledClass = require('PooledClass');\n var ReactBrowserEventEmitter = require('ReactBrowserEventEmitter');\n \n+var assign = require('Object.assign');\n+\n function ReactPutListenerQueue() {\n this.listenersToPut = [];\n }\n \n-Object.assign(ReactPutListenerQueue.prototype, {\n+assign(ReactPutListenerQueue.prototype, {\n enqueuePutListener: function(rootNodeID, propKey, propValue) {\n this.listenersToPut.push({\n rootNodeID: rootNodeID,\ndiff --git a\/src\/browser\/ReactReconcileTransaction.js b\/src\/browser\/ReactReconcileTransaction.js\nindex f777e4d12c..008890a256 100644\n--- a\/src\/browser\/ReactReconcileTransaction.js\n+++ b\/src\/browser\/ReactReconcileTransaction.js\n@@ -19,6 +19,8 @@ var ReactInputSelection = require('ReactInputSelection');\n var ReactPutListenerQueue = require('ReactPutListenerQueue');\n var Transaction = require('Transaction');\n \n+var assign = require('Object.assign');\n+\n \/**\n * Ensures that, when possible, the selection range (currently selected text\n * input) is not disturbed by performing the transaction.\n@@ -165,7 +167,7 @@ var Mixin = {\n };\n \n \n-Object.assign(ReactReconcileTransaction.prototype, Transaction.Mixin, Mixin);\n+assign(ReactReconcileTransaction.prototype, Transaction.Mixin, Mixin);\n \n PooledClass.addPoolingTo(ReactReconcileTransaction);\n \ndiff --git a\/src\/browser\/ReactTextComponent.js b\/src\/browser\/ReactTextComponent.js\nindex 4f0f20ff47..f87930f3f7 100644\n--- a\/src\/browser\/ReactTextComponent.js\n+++ b\/src\/browser\/ReactTextComponent.js\n@@ -16,6 +16,7 @@ var DOMPropertyOperations = require('DOMPropertyOperations');\n var ReactComponent = require('ReactComponent');\n var ReactElement = require('ReactElement');\n \n+var assign = require('Object.assign');\n var escapeTextForBrowser = require('escapeTextForBrowser');\n \n \/**\n@@ -37,7 +38,7 @@ var ReactTextComponent = function(props) {\n \/\/ This constructor and it's argument is currently used by mocks.\n };\n \n-Object.assign(ReactTextComponent.prototype, ReactComponent.Mixin, {\n+assign(ReactTextComponent.prototype, ReactComponent.Mixin, {\n \n \/**\n * Creates the markup for this text node. This node is not intended to have\ndiff --git a\/src\/browser\/server\/ReactServerRenderingTransaction.js b\/src\/browser\/server\/ReactServerRenderingTransaction.js\nindex 529ebec5e6..7833b58831 100644\n--- a\/src\/browser\/server\/ReactServerRenderingTransaction.js\n+++ b\/src\/browser\/server\/ReactServerRenderingTransaction.js\n@@ -17,6 +17,7 @@ var CallbackQueue = require('CallbackQueue');\n var ReactPutListenerQueue = require('ReactPutListenerQueue');\n var Transaction = require('Transaction');\n \n+var assign = require('Object.assign');\n var emptyFunction = require('emptyFunction');\n \n \/**\n@@ -99,7 +100,7 @@ var Mixin = {\n };\n \n \n-Object.assign(\n+assign(\n ReactServerRenderingTransaction.prototype,\n Transaction.Mixin,\n Mixin\ndiff --git a\/src\/browser\/syntheticEvents\/SyntheticEvent.js b\/src\/browser\/syntheticEvents\/SyntheticEvent.js\nindex d603427743..2d17e6cf9d 100644\n--- a\/src\/browser\/syntheticEvents\/SyntheticEvent.js\n+++ b\/src\/browser\/syntheticEvents\/SyntheticEvent.js\n@@ -14,6 +14,7 @@\n \n var PooledClass = require('PooledClass');\n \n+var assign = require('Object.assign');\n var emptyFunction = require('emptyFunction');\n var getEventTarget = require('getEventTarget');\n \n@@ -82,7 +83,7 @@ function SyntheticEvent(dispatchConfig, dispatchMarker, nativeEvent) {\n this.isPropagationStopped = emptyFunction.thatReturnsFalse;\n }\n \n-Object.assign(SyntheticEvent.prototype, {\n+assign(SyntheticEvent.prototype, {\n \n preventDefault: function() {\n this.defaultPrevented = true;\n@@ -140,11 +141,11 @@ SyntheticEvent.augmentClass = function(Class, Interface) {\n var Super = this;\n \n var prototype = Object.create(Super.prototype);\n- Object.assign(prototype, Class.prototype);\n+ assign(prototype, Class.prototype);\n Class.prototype = prototype;\n Class.prototype.constructor = Class;\n \n- Class.Interface = Object.assign({}, Super.Interface, Interface);\n+ Class.Interface = assign({}, Super.Interface, Interface);\n Class.augmentClass = Super.augmentClass;\n \n PooledClass.addPoolingTo(Class, PooledClass.threeArgumentPooler);\ndiff --git a\/src\/browser\/ui\/React.js b\/src\/browser\/ui\/React.js\nindex 382cc89f1d..7031035d81 100644\n--- a\/src\/browser\/ui\/React.js\n+++ b\/src\/browser\/ui\/React.js\n@@ -11,10 +11,6 @@\n \n \"use strict\";\n \n-\/\/ TODO: Move this elsewhere - it only exists in open source until a better\n-\/\/ solution is found.\n-require('Object.es6');\n-\n var DOMPropertyOperations = require('DOMPropertyOperations');\n var EventPluginUtils = require('EventPluginUtils');\n var ReactChildren = require('ReactChildren');\n@@ -36,6 +32,7 @@ var ReactPropTypes = require('ReactPropTypes');\n var ReactServerRendering = require('ReactServerRendering');\n var ReactTextComponent = require('ReactTextComponent');\n \n+var assign = require('Object.assign');\n var deprecated = require('deprecated');\n var onlyChild = require('onlyChild');\n \n@@ -84,6 +81,9 @@ var React = {\n isValidElement: ReactElement.isValidElement,\n withContext: ReactContext.withContext,\n \n+ \/\/ Hook for JSX spread, don't use this for anything else.\n+ __spread: assign,\n+\n \/\/ Deprecations (remove for 0.13)\n renderComponent: deprecated(\n 'React',\ndiff --git a\/src\/browser\/ui\/ReactDOMComponent.js b\/src\/browser\/ui\/ReactDOMComponent.js\nindex ba47058f3a..62fe8f0be9 100644\n--- a\/src\/browser\/ui\/ReactDOMComponent.js\n+++ b\/src\/browser\/ui\/ReactDOMComponent.js\n@@ -22,6 +22,7 @@ var ReactMount = require('ReactMount');\n var ReactMultiChild = require('ReactMultiChild');\n var ReactPerf = require('ReactPerf');\n \n+var assign = require('Object.assign');\n var escapeTextForBrowser = require('escapeTextForBrowser');\n var invariant = require('invariant');\n var isEventSupported = require('isEventSupported');\n@@ -213,7 +214,7 @@ ReactDOMComponent.Mixin = {\n } else {\n if (propKey === STYLE) {\n if (propValue) {\n- propValue = props.style = Object.assign({}, props.style);\n+ propValue = props.style = assign({}, props.style);\n }\n propValue = CSSPropertyOperations.createMarkupForStyles(propValue);\n }\n@@ -362,7 +363,7 @@ ReactDOMComponent.Mixin = {\n }\n if (propKey === STYLE) {\n if (nextProp) {\n- nextProp = nextProps.style = Object.assign({}, nextProp);\n+ nextProp = nextProps.style = assign({}, nextProp);\n }\n if (lastProp) {\n \/\/ Unset styles on `lastProp` but not on `nextProp`.\n@@ -471,7 +472,7 @@ ReactDOMComponent.Mixin = {\n \n };\n \n-Object.assign(\n+assign(\n ReactDOMComponent.prototype,\n ReactComponent.Mixin,\n ReactDOMComponent.Mixin,\ndiff --git a\/src\/browser\/ui\/ReactEventListener.js b\/src\/browser\/ui\/ReactEventListener.js\nindex 9ea621d7d2..e51fcd9c62 100644\n--- a\/src\/browser\/ui\/ReactEventListener.js\n+++ b\/src\/browser\/ui\/ReactEventListener.js\n@@ -19,6 +19,7 @@ var ReactInstanceHandles = require('ReactInstanceHandles');\n var ReactMount = require('ReactMount');\n var ReactUpdates = require('ReactUpdates');\n \n+var assign = require('Object.assign');\n var getEventTarget = require('getEventTarget');\n var getUnboundedScrollPosition = require('getUnboundedScrollPosition');\n \n@@ -46,7 +47,7 @@ function TopLevelCallbackBookKeeping(topLevelType, nativeEvent) {\n this.nativeEvent = nativeEvent;\n this.ancestors = [];\n }\n-Object.assign(TopLevelCallbackBookKeeping.prototype, {\n+assign(TopLevelCallbackBookKeeping.prototype, {\n destructor: function() {\n this.topLevelType = null;\n this.nativeEvent = null;\ndiff --git a\/src\/browser\/ui\/__tests__\/ReactDOMComponent-test.js b\/src\/browser\/ui\/__tests__\/ReactDOMComponent-test.js\nindex 92c4b1f373..2d54865dc3 100644\n--- a\/src\/browser\/ui\/__tests__\/ReactDOMComponent-test.js\n+++ b\/src\/browser\/ui\/__tests__\/ReactDOMComponent-test.js\n@@ -13,6 +13,7 @@\n \n \"use strict\";\n \n+var assign = require('Object.assign');\n var mocks = require('mocks');\n \n describe('ReactDOMComponent', function() {\n@@ -223,7 +224,7 @@ describe('ReactDOMComponent', function() {\n this.props = initialProps || {};\n this._rootNodeID = 'test';\n };\n- Object.assign(NodeStub.prototype, ReactDOMComponent.Mixin);\n+ assign(NodeStub.prototype, ReactDOMComponent.Mixin);\n \n genMarkup = function(props) {\n var transaction = new ReactReconcileTransaction();\n@@ -273,7 +274,7 @@ describe('ReactDOMComponent', function() {\n this.props = initialProps || {};\n this._rootNodeID = 'test';\n };\n- Object.assign(NodeStub.prototype, ReactDOMComponent.Mixin);\n+ assign(NodeStub.prototype, ReactDOMComponent.Mixin);\n \n genMarkup = function(props) {\n var transaction = new ReactReconcileTransaction();\n@@ -310,9 +311,9 @@ describe('ReactDOMComponent', function() {\n var StubNativeComponent = function(element) {\n ReactComponent.Mixin.construct.call(this, element);\n };\n- Object.assign(StubNativeComponent.prototype, ReactComponent.Mixin);\n- Object.assign(StubNativeComponent.prototype, ReactDOMComponent.Mixin);\n- Object.assign(StubNativeComponent.prototype, ReactMultiChild.Mixin);\n+ assign(StubNativeComponent.prototype, ReactComponent.Mixin);\n+ assign(StubNativeComponent.prototype, ReactDOMComponent.Mixin);\n+ assign(StubNativeComponent.prototype, ReactMultiChild.Mixin);\n \n mountComponent = function(props) {\n var transaction = new ReactReconcileTransaction();\ndiff --git a\/src\/browser\/ui\/dom\/components\/ReactDOMInput.js b\/src\/browser\/ui\/dom\/components\/ReactDOMInput.js\nindex 670e5de8af..54ad741d98 100644\n--- a\/src\/browser\/ui\/dom\/components\/ReactDOMInput.js\n+++ b\/src\/browser\/ui\/dom\/components\/ReactDOMInput.js\n@@ -21,6 +21,7 @@ var ReactDOM = require('ReactDOM');\n var ReactMount = require('ReactMount');\n var ReactUpdates = require('ReactUpdates');\n \n+var assign = require('Object.assign');\n var invariant = require('invariant');\n \n \/\/ Store a reference to the `ReactDOMComponent`. TODO: use string\n@@ -66,7 +67,7 @@ var ReactDOMInput = ReactCompositeComponent.createClass({\n \n render: function() {\n \/\/ Clone `this.props` so we don't mutate the input.\n- var props = Object.assign({}, this.props);\n+ var props = assign({}, this.props);\n \n props.defaultChecked = null;\n props.defaultValue = null;\ndiff --git a\/src\/browser\/ui\/dom\/components\/ReactDOMSelect.js b\/src\/browser\/ui\/dom\/components\/ReactDOMSelect.js\nindex 1b663b8284..5aba6d6f47 100644\n--- a\/src\/browser\/ui\/dom\/components\/ReactDOMSelect.js\n+++ b\/src\/browser\/ui\/dom\/components\/ReactDOMSelect.js\n@@ -19,6 +19,8 @@ var ReactElement = require('ReactElement');\n var ReactDOM = require('ReactDOM');\n var ReactUpdates = require('ReactUpdates');\n \n+var assign = require('Object.assign');\n+\n \/\/ Store a reference to the

dillon1000/react

Files changed