diff options
| author | Samy Pessé <samypesse@gmail.com> | 2016-09-05 14:41:21 +0200 |
|---|---|---|
| committer | Samy Pessé <samypesse@gmail.com> | 2016-09-05 14:41:21 +0200 |
| commit | fe298f2a3f2a3b5d22d246ebfdb41c3d086b6da3 (patch) | |
| tree | 72b2f0235a32668f9ddba7912cd627df7227dec4 /packages | |
| parent | ab3d94a55dc1fdf8082b70376212961f0ef28d1b (diff) | |
| download | gitbook-fe298f2a3f2a3b5d22d246ebfdb41c3d086b6da3.zip gitbook-fe298f2a3f2a3b5d22d246ebfdb41c3d086b6da3.tar.gz gitbook-fe298f2a3f2a3b5d22d246ebfdb41c3d086b6da3.tar.bz2 | |
Fix error during fake rendering
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/gitbook-core/src/components/InjectedComponent.js | 6 | ||||
| -rw-r--r-- | packages/gitbook-core/src/connect.js | 2 | ||||
| -rw-r--r-- | packages/gitbook-core/src/createStore.js | 2 | ||||
| -rw-r--r-- | packages/gitbook/src/output/website/render.js | 3 |
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; |