summaryrefslogtreecommitdiffstats
path: root/packages/gitbook-core
diff options
context:
space:
mode:
authorSamy Pesse <samypesse@gmail.com>2016-09-21 01:05:40 +0200
committerSamy Pesse <samypesse@gmail.com>2016-09-21 01:05:40 +0200
commit2adca5deb93e9e7cc69e1cd15cb0367093670767 (patch)
treebe4294b05b29d8406f7cc85a3c77c57aee0bbc06 /packages/gitbook-core
parent3b3f43a35d5b2c795f05bb5271bd775c1b8271c6 (diff)
downloadgitbook-2adca5deb93e9e7cc69e1cd15cb0367093670767.zip
gitbook-2adca5deb93e9e7cc69e1cd15cb0367093670767.tar.gz
gitbook-2adca5deb93e9e7cc69e1cd15cb0367093670767.tar.bz2
Fix composition with plugin reducers
Diffstat (limited to 'packages/gitbook-core')
-rw-r--r--packages/gitbook-core/src/createStore.js11
-rw-r--r--packages/gitbook-core/src/reducers/components.js1
2 files changed, 7 insertions, 5 deletions
diff --git a/packages/gitbook-core/src/createStore.js b/packages/gitbook-core/src/createStore.js
index 4873190..6f90b77 100644
--- a/packages/gitbook-core/src/createStore.js
+++ b/packages/gitbook-core/src/createStore.js
@@ -1,7 +1,7 @@
const Redux = require('redux');
const ReduxThunk = require('redux-thunk').default;
-const reducers = require('./reducers');
+const coreReducers = require('./reducers');
/**
* Create a new redux store from an initial state and a list of plugins.
@@ -13,10 +13,13 @@ const reducers = require('./reducers');
*/
function createStore(plugins, initialState) {
const pluginReducers = plugins.map(plugin => plugin.onReduceState);
- console.log(pluginReducers);
- const reducer = Redux.compose(reducers, ...pluginReducers);
const store = Redux.createStore(
- reducers,
+ (state, action) => {
+ return pluginReducers.reduce(
+ (newState, reducer) => reducer(newState, action),
+ coreReducers(state, action)
+ );
+ },
initialState,
Redux.compose(Redux.applyMiddleware(ReduxThunk))
);
diff --git a/packages/gitbook-core/src/reducers/components.js b/packages/gitbook-core/src/reducers/components.js
index 8eebb34..948a3ac 100644
--- a/packages/gitbook-core/src/reducers/components.js
+++ b/packages/gitbook-core/src/reducers/components.js
@@ -3,7 +3,6 @@ const ACTION_TYPES = require('../actions/TYPES');
function reduceComponents(state, action) {
state = state || List();
-
switch (action.type) {
case ACTION_TYPES.REGISTER_COMPONENT: