Fix use Object.assign instead of pollyfill

closes #86
ThunderCatsJS · Oct 5, 2015 · aa56717 · aa56717
1 parent 5e624f4
commit aa56717
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 5 deletions.
diff --git a/circle.yml b/circle.yml
@@ -4,4 +4,4 @@ general:
       - gh-pages
 machine:
   node:
-    version: iojs-v1.6.4
+    version: 4.1.1
diff --git a/package.json b/package.json
@@ -47,7 +47,6 @@
     "debug": "^2.1.3",
     "invariant": "^2.0.0",
     "node-uuid": "^1.4.1",
-    "object.assign": "^3.0.0",
     "stampit": "^2.1.0",
     "supermixer": "^1.0.2",
     "warning": "^2.0.0"

diff --git a/src/Actions.js b/src/Actions.js
@@ -1,11 +1,11 @@
 import Rx from 'rx';
 import warning from 'warning';
-import assign from 'object.assign';
 import stampit from 'stampit';
 import debugFactory from 'debug';
 
 import waitFor from './waitFor';
 
+const assign = Object.assign;
 const debug = debugFactory('thundercats:actions');
 const currentStampSpec = [
   'methods',

diff --git a/src/Store.js b/src/Store.js
@@ -1,5 +1,4 @@
 import uuid from 'node-uuid';
-import assign from 'object.assign';
 import stampit from 'stampit';
 import { Observable, Disposable } from 'rx';
 import invariant from 'invariant';
@@ -18,6 +17,7 @@ import {
   isPromise
 } from './utils';
 
+const assign = Object.assign;
 const debug = debugFactory('thundercats:store');
 const __DEV__ = process.env.NODE_ENV !== 'production';
 

diff --git a/src/Translate.js b/src/Translate.js
@@ -1,6 +1,5 @@
 import { Observable } from 'rx';
 import invariant from 'invariant';
-import assign from 'object.assign';
 import debugFactory from 'debug';
 import {
   createObjectValidator,
@@ -9,6 +8,7 @@ import {
   isKitten
 } from './utils';
 
+const assign = Object.assign;
 const __DEV__ = process.env.NODE_ENV === 'development';
 const debug = debugFactory('thundercats:translate');