diff --git a/src/loadOnServer.js b/src/loadOnServer.js index 00e6d1d..b98ce2a 100644 --- a/src/loadOnServer.js +++ b/src/loadOnServer.js @@ -1,14 +1,16 @@ -import { beginAsyncLoad, endAsyncLoad } from './actions'; +import { beginAsyncLoad, endAsyncLoad, skipAsyncLoad } from './actions'; import flattenComponents from './flattenComponents'; import loadAsync from './loadAsync'; export default function loadOnServer(renderProps, store) { + const { dispatch } = store; + const flattened = flattenComponents(renderProps.components); if (!flattened.length) { + dispatch(skipAsyncLoad(true)); return Promise.resolve(); } - const { dispatch } = store; dispatch(beginAsyncLoad(true)); return loadAsync(flattened, renderProps, store).then( (v) => {