Use native Object.assign

Closes Flipboard#144

Author: tuxracer

lib/Canvas.js

@@ -1,7 +1,5 @@
 'use strict';
 
-var assign = require('react/lib/Object.assign');
-
 // Note that this class intentionally does not use PooledClass.
 // DrawingUtils manages <canvas> pooling for more fine-grained control.
 
@@ -20,7 +18,7 @@ function Canvas (width, height, scale) {
  this._canvas.getContext('2d').scale(this.scale, this.scale);
 }
 
-assign(Canvas.prototype, {
+Object.assign(Canvas.prototype, {
 
  getRawCanvas: function () {
  return this._canvas;

lib/ContainerMixin.js

@@ -5,10 +5,9 @@
 
 var React = require('react');
 var ReactMultiChild = require('react/lib/ReactMultiChild');
-var assign = require('object-assign');
 var emptyObject = require('fbjs/lib/emptyObject');
 
-var ContainerMixin = assign({}, ReactMultiChild.Mixin, {
+var ContainerMixin = Object.assign({}, ReactMultiChild.Mixin, {
 
  /**
  * Moves a child component to the supplied index.

lib/Image.js

@@ -1,7 +1,6 @@
 'use strict';
 
 var React = require('react');
-var assign = require('react/lib/Object.assign');
 var createComponent = require('./createComponent');
 var LayerMixin = require('./LayerMixin');
 var Layer = require('./Layer');
@@ -86,9 +85,9 @@ var Image = React.createClass({
 
  render: function () {
  var rawImage;
- var imageStyle = assign({}, this.props.style);
- var style = assign({}, this.props.style);
- var backgroundStyle = assign({}, this.props.style);
+ var imageStyle = Object.assign({}, this.props.style);
+ var style = Object.assign({}, this.props.style);
+ var backgroundStyle = Object.assign({}, this.props.style);
  var useBackingStore = this.state.loaded ? this.props.useBackingStore : false;
 
  // Hide the image until loaded.

lib/ImageCache.js

@@ -1,7 +1,6 @@
 'use strict';
 
 var EventEmitter = require('events');
-var assign = require('react/lib/Object.assign');
 
 var NOOP = function () {};
 
@@ -22,7 +21,7 @@ function Img (src) {
  this.setMaxListeners(100);
 }
 
-assign(Img.prototype, EventEmitter.prototype, {
+Object.assign(Img.prototype, EventEmitter.prototype, {
 
  /**
  * Pooling owner looks for this

lib/ListView.js

@@ -1,7 +1,6 @@
 'use strict';
 
 var React = require('react');
-var assign = require('react/lib/Object.assign');
 var Scroller = require('scroller');
 var Group = require('./Group');
 var clamp = require('./clamp');

lib/createComponent.js

@@ -3,7 +3,6 @@
 // Adapted from ReactART:
 // https://github.com/reactjs/react-art
 
-var assign = require('react/lib/Object.assign');
 var RenderLayer = require('./RenderLayer');
 
 function createComponent (name) {
@@ -18,7 +17,7 @@ function createComponent (name) {
  };
  ReactCanvasComponent.displayName = name;
  for (var i = 1, l = arguments.length; i < l; i++) {
- assign(ReactCanvasComponent.prototype, arguments[i]);
+ Object.assign(ReactCanvasComponent.prototype, arguments[i]);
  }
 
  return ReactCanvasComponent;

package.json

@@ -41,7 +41,6 @@
  "dependencies": {
  "fbjs": "^0.4.0",
  "linebreak": "^0.3.0",
- "object-assign": "^4.0.1",
  "scroller": "git://github.com/mjohnston/scroller"
  }
 }