Merge pull request #53 from lautis/babel-loose

Use Babel 6 in loose mode to build JS

Author: wbuchwalter

.babelrc

@@ -0,0 +1,3 @@
+{
+  "presets": ["es2015-loose"]
+}

dist/ng-redux.js

@@ -6,7 +6,7 @@
   "scripts": {
     "build": "rm -rf lib && `npm bin`/babel src --out-dir lib",
     "dist": "npm run build && ./node_modules/.bin/webpack --optimize-minimize lib/index.js dist/ng-redux.js",
-    "test": "mocha --compilers js:babel/register --recursive"
+    "test": "mocha --compilers js:babel-register --recursive"
   },
   "repository": {
     "type": "git",
@@ -19,13 +19,16 @@
   },
   "homepage": "https://github.com/wbuchwalter/ng-redux#readme",
   "devDependencies": {
-    "babel": "^5.8.12",
-    "babel-core": "^5.8.14",
-    "babel-loader": "^5.3.2",
+    "babel-cli": "^6.4.0",
+    "babel-core": "^6.4.0",
+    "babel-loader": "^6.2.1",
+    "babel-preset-es2015": "^6.3.13",
+    "babel-preset-es2015-loose": "^7.0.0",
+    "babel-register": "^6.3.13",
     "expect": "^1.8.0",
     "mocha": "^2.2.5",
     "sinon": "^1.16.1",
-    "webpack": "^1.10.5"
+    "webpack": "^1.12.11"
   },
   "peerDependencies": {
     "redux": "^3.0.0"

package.json

@@ -3,6 +3,7 @@ import invariant from 'invariant';
 import {createStore, applyMiddleware, compose} from 'redux';
 import digestMiddleware from './digestMiddleware';
 
+import assign from 'lodash.assign';
 import isArray from 'lodash.isarray';
 import isFunction from 'lodash.isfunction';
 
@@ -49,10 +50,7 @@ export default function ngReduxProvider() {
 
     store = applyMiddleware(...resolvedMiddleware)(finalCreateStore)(_reducer, _initialState);
 
-    return {
-      ...store,
-      connect: Connector(store)
-    };
+    return assign({}, store, { connect: Connector(store) });
   };
 
   this.$get.$inject = ['$injector'];

src/components/ngRedux.js

@@ -3,6 +3,7 @@ let sinon = require('sinon');
 import { createStore } from 'redux';
 import Connector from '../../src/components/connector';
 import isFunction from 'lodash.isfunction';
+import assign from 'lodash.assign';
 
 describe('Connector', () => {
   let store;
@@ -16,7 +17,7 @@ describe('Connector', () => {
       baz: -1
     };
     store = createStore((state = defaultState, action) => {
-      return {...state, baz: action.payload};
+      return assign({}, state, { baz: action.payload });
     });
     targetObj = {};
     connect = Connector(store);