Merge branch 'master' into release/4.0.0

Author: AntJanus

Diff for: README.md

@@ -135,7 +135,7 @@ Creates the Redux store, and allow `connect()` to access it.
 #### Arguments: 
 * `reducer` \(*Function*): A single reducer composed of all other reducers (create with redux.combineReducer)
 * [`middlewares`] \(*Function[]*): Optional, An array containing all the middleware that should be applied. Functions and strings are both valid members. String will be resolved via Angular, allowing you to use dependency injection in your middlewares.
-* [`storeEnhancers`] \(*Function[]*): Optional, this will be used to create the store, in most cases you don't need to pass anything, see [Store Enhancer official documentation.](http://rackt.github.io/redux/docs/Glossary.html#store-enhancer)
+* [`storeEnhancers`] \(*Function[]*): Optional, this will be used to create the store, in most cases you don't need to pass anything, see [Store Enhancer official documentation.](https://github.com/reactjs/redux/blob/master/docs/Glossary.md#store-enhancer)
 * [`initialState`] \(*Object*): Optional, the initial state of your Redux store.
 
 

Diff for: index.d.ts

@@ -1,3 +1,5 @@
+import { Unsubscribe } from 'redux';
+
 declare namespace ngRedux {
   export interface Reducer extends Function {
       (state: any, action: any): any;
@@ -21,7 +23,7 @@ declare namespace ngRedux {
       replaceReducer(nextReducer: Reducer): void;
       dispatch(action: any): any;
       getState(): any;
-      subscribe(listener: Function): Function;
+      subscribe(listener: Function): Unsubscribe;
       connect(
           mapStateToTarget: (state: any) => Object,
           mapDispatchToTarget?: Object | ((dispatch: Function) => Object)
@@ -35,4 +37,4 @@ declare namespace ngRedux {
 
 declare var ngRedux: string;
 export as namespace ngRedux;
-export = ngRedux;
+export default ngRedux;

Diff for: src/components/ngRedux.js

@@ -46,9 +46,9 @@ export default function ngReduxProvider() {
 
     _reducer = reducer;
     _reducerIsObject = isObject(reducer);
-    _storeEnhancers = storeEnhancers;
+    _storeEnhancers = storeEnhancers || [];
     _middlewares = middlewares || [];
-    _initialState = initialState;
+    _initialState = initialState || {};
   };
 
   this.$get = ($injector) => {
@@ -64,7 +64,7 @@ export default function ngReduxProvider() {
 
     const resolvedStoreEnhancer = map(_storeEnhancers, resolveStoreEnhancer);
 
-    if(_reducerIsObject) {
+    if (_reducerIsObject) {
       const getReducerKey = key => isString(_reducer[key])
         ? $injector.get(_reducer[key])
         : _reducer[key];
@@ -80,14 +80,14 @@ export default function ngReduxProvider() {
       _reducer = combineReducers(reducersObj);
     }
 
-    const finalCreateStore = resolvedStoreEnhancer ? compose(...resolvedStoreEnhancer)(createStore) : createStore;
-
-    //digestMiddleware needs to be the last one.
+    // digestMiddleware needs to be the last one.
     resolvedMiddleware.push(digestMiddleware($injector.get('$rootScope')));
 
-    const store = _initialState
-      ? applyMiddleware(...resolvedMiddleware)(finalCreateStore)(_reducer, _initialState)
-      : applyMiddleware(...resolvedMiddleware)(finalCreateStore)(_reducer);
+    // combine middleware into a store enhancer.
+    const middlewares = applyMiddleware(...resolvedMiddleware);
+
+    // compose enhancers with middleware and create store.
+    const store = createStore(_reducer, _initialState, compose(...resolvedStoreEnhancer, middlewares));
 
     const mergedStore = assign({}, store, { connect: Connector(store) });