Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ng-redux",
"version": "0.3.1",
"version": "1.0.0-rc",
"description": "Redux bindings for Angular.js",
"main": "./lib/index.js",
"scripts": {
Expand All @@ -25,9 +25,10 @@
"webpack": "^1.10.5"
},
"peerDependencies": {
"redux": "^1.0.0 || 1.0.0-alpha || 1.0.0-rc"
"redux": "^1.0.0"
},
"dependencies": {
"invariant": "^2.1.0"
"invariant": "^2.1.0",
"redux": "^1.0.1"
}
}
2 changes: 1 addition & 1 deletion src/components/connector.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ export default function Connector(store) {
invariant(
isFunction(callback),
'The callback parameter passed to connect must be a Function. Instead received %s.',
typeof selector
typeof callback
);

//Initial update
Expand Down
39 changes: 35 additions & 4 deletions src/components/ngRedux.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,41 @@
import Connector from './connector';
import invariant from 'invariant';
import isFunction from '../utils/isFunction';
import {createStore, applyMiddleware} from 'redux';

export default function ngReduxProvider() {
let reduxStore = undefined;
this.setReduxStore = store => reduxStore = store;
let _reducer = undefined;
let _middlewares = [];
let _storeEnhancer = undefined;

this.$get = () => {
return Connector(reduxStore);
this.createStoreWith = (reducer, middlewares, storeEnhancer) => {
invariant(
isFunction(reducer),
'The reducer parameter passed to createStoreWith must be a Function. Instead received %s.',
typeof reducer
);

invariant(
!storeEnhancer || isFunction(storeEnhancer),
'The storeEnhancer parameter passed to createStoreWith must be a Function. Instead received %s.',
typeof storeEnhancer
);

_reducer = reducer;
_storeEnhancer = storeEnhancer || createStore;
_middlewares = middlewares;
};

this.$get = ($injector) => {
let resolvedMiddleware = [];
for(let middleware of _middlewares) {
if(typeof middleware === 'string') {
resolvedMiddleware.push($injector.get(middleware));
} else {
resolvedMiddleware.push(middleware);
}
}

return Connector(applyMiddleware(...resolvedMiddleware)(_storeEnhancer)(_reducer));
}
}