summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--packages/gitbook-core/src/components/InjectedComponent.js6
-rw-r--r--packages/gitbook-core/src/connect.js2
-rw-r--r--packages/gitbook-core/src/createStore.js2
-rw-r--r--packages/gitbook/src/output/website/render.js3
4 files changed, 7 insertions, 6 deletions
diff --git a/packages/gitbook-core/src/components/InjectedComponent.js b/packages/gitbook-core/src/components/InjectedComponent.js
index 39b48b2..df2c1c7 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 2bd9cb9..e30eb22 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 ecc351f..c13f219 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 dc674ab..8662305 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 = <HTML head={head} innerHTML={innerHTML} />;
- return ReactDOMServer.renderToStaticMarkup(htmlEl);
+ const html = ReactDOMServer.renderToStaticMarkup(htmlEl);
+ return html;
}
module.exports = render;