diff --git a/packages/gitbook-core/src/components/InjectedComponent.js b/packages/gitbook-core/src/components/InjectedComponent.js index 39b48b2ef..df2c1c795 100644 --- a/packages/gitbook-core/src/components/InjectedComponent.js +++ b/packages/gitbook-core/src/components/InjectedComponent.js @@ -65,11 +65,11 @@ function mapStateToProps(state, props) { } module.exports = { - InjectedComponent: ReactRedux.connect(InjectedComponentSet, (state, props) => { + InjectedComponent: ReactRedux.connect((state, props) => { const result = mapStateToProps(state, props); result.components = result.components.slice(0, 1); result.withContainer = false; return result; - }), - InjectedComponentSet: ReactRedux.connect(InjectedComponentSet, mapStateToProps) + })(InjectedComponentSet), + InjectedComponentSet: ReactRedux.connect(mapStateToProps)(InjectedComponentSet) }; diff --git a/packages/gitbook-core/src/connect.js b/packages/gitbook-core/src/connect.js index 2bd9cb96f..e30eb2213 100644 --- a/packages/gitbook-core/src/connect.js +++ b/packages/gitbook-core/src/connect.js @@ -7,7 +7,7 @@ const ReactRedux = require('react-redux'); * @return {ReactComponent} */ function connect(Component, mapStateToProps) { - return ReactRedux.connect(Component, mapStateToProps); + return ReactRedux.connect(mapStateToProps)(Component); } module.exports = connect; diff --git a/packages/gitbook-core/src/createStore.js b/packages/gitbook-core/src/createStore.js index ecc351f6c..c13f21923 100644 --- a/packages/gitbook-core/src/createStore.js +++ b/packages/gitbook-core/src/createStore.js @@ -13,7 +13,7 @@ const reducers = require('./reducers'); */ function createStore(plugins, initialState) { const pluginReducers = plugins.map(plugin => plugin.onReduceState); - const reducer = Redux.combine(reducers, ...pluginReducers); + const reducer = Redux.compose(reducers, ...pluginReducers); const store = Redux.createStore( reducer, diff --git a/packages/gitbook/src/output/website/render.js b/packages/gitbook/src/output/website/render.js index dc674abef..86623054b 100644 --- a/packages/gitbook/src/output/website/render.js +++ b/packages/gitbook/src/output/website/render.js @@ -38,7 +38,8 @@ function render(initialState) { const innerHTML = ReactDOMServer.renderToString(el); const htmlEl = ; - return ReactDOMServer.renderToStaticMarkup(htmlEl); + const html = ReactDOMServer.renderToStaticMarkup(htmlEl); + return html; } module.exports = render;