Skip to content

Commit 03d9bee

Browse files
committed
Merge pull request #53 from lautis/babel-loose
Use Babel 6 in loose mode to build JS
2 parents 1441b6a + e394450 commit 03d9bee

File tree

5 files changed

+16
-11
lines changed

5 files changed

+16
-11
lines changed

.babelrc

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"presets": ["es2015-loose"]
3+
}

dist/ng-redux.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+8-5
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"scripts": {
77
"build": "rm -rf lib && `npm bin`/babel src --out-dir lib",
88
"dist": "npm run build && ./node_modules/.bin/webpack --optimize-minimize lib/index.js dist/ng-redux.js",
9-
"test": "mocha --compilers js:babel/register --recursive"
9+
"test": "mocha --compilers js:babel-register --recursive"
1010
},
1111
"repository": {
1212
"type": "git",
@@ -19,13 +19,16 @@
1919
},
2020
"homepage": "https://github.com/wbuchwalter/ng-redux#readme",
2121
"devDependencies": {
22-
"babel": "^5.8.12",
23-
"babel-core": "^5.8.14",
24-
"babel-loader": "^5.3.2",
22+
"babel-cli": "^6.4.0",
23+
"babel-core": "^6.4.0",
24+
"babel-loader": "^6.2.1",
25+
"babel-preset-es2015": "^6.3.13",
26+
"babel-preset-es2015-loose": "^7.0.0",
27+
"babel-register": "^6.3.13",
2528
"expect": "^1.8.0",
2629
"mocha": "^2.2.5",
2730
"sinon": "^1.16.1",
28-
"webpack": "^1.10.5"
31+
"webpack": "^1.12.11"
2932
},
3033
"peerDependencies": {
3134
"redux": "^3.0.0"

src/components/ngRedux.js

+2-4
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import invariant from 'invariant';
33
import {createStore, applyMiddleware, compose} from 'redux';
44
import digestMiddleware from './digestMiddleware';
55

6+
import assign from 'lodash.assign';
67
import isArray from 'lodash.isarray';
78
import isFunction from 'lodash.isfunction';
89

@@ -49,10 +50,7 @@ export default function ngReduxProvider() {
4950

5051
store = applyMiddleware(...resolvedMiddleware)(finalCreateStore)(_reducer, _initialState);
5152

52-
return {
53-
...store,
54-
connect: Connector(store)
55-
};
53+
return assign({}, store, { connect: Connector(store) });
5654
};
5755

5856
this.$get.$inject = ['$injector'];

test/components/connector.spec.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ let sinon = require('sinon');
33
import { createStore } from 'redux';
44
import Connector from '../../src/components/connector';
55
import isFunction from 'lodash.isfunction';
6+
import assign from 'lodash.assign';
67

78
describe('Connector', () => {
89
let store;
@@ -16,7 +17,7 @@ describe('Connector', () => {
1617
baz: -1
1718
};
1819
store = createStore((state = defaultState, action) => {
19-
return {...state, baz: action.payload};
20+
return assign({}, state, { baz: action.payload });
2021
});
2122
targetObj = {};
2223
connect = Connector(store);

0 commit comments

Comments
 (0)