Added module initial state.

choko-org · Aug 30, 2016 · 602fbf4 · 602fbf4
1 parent 014a636
commit 602fbf4
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 7 deletions.
diff --git a/src/bootstrap.js b/src/bootstrap.js
@@ -4,13 +4,15 @@ import configureStore from './configureStore'
 
 export const BOOT = 'redux-boot/BOOT'
 
-export default function boot(initialState = {}, modules = []) {
-  const {reducers, middlewares, enhancers} = processModules(modules)
+export default function boot(state = {}, modules = []) {
+  const {reducers, middlewares, enhancers, initialState} = processModules(modules)
 
-  let store = configureStore(initialState, reducers, middlewares, enhancers)
+  state = {...initialState, ...state}
+
+  let store = configureStore(state, reducers, middlewares, enhancers)
 
   return store
-    .dispatch(bootAction(initialState))
+    .dispatch(bootAction(state))
     .then(action => {
       return {
         action,

diff --git a/src/processModules.js b/src/processModules.js
@@ -23,10 +23,15 @@ export default function processModules(modules) {
     ))
     .map(module => module.enhancer)
 
+  const initialState = modules
+    .map(module => module.initialState || (f => f))
+    .reduce((state, initialState) => initialState(state), {})
+
   return {
     reducers,
     middlewares,
-    enhancers
+    enhancers,
+    initialState,
   }
 }
 

diff --git a/test/bootstrap.test.js b/test/bootstrap.test.js
@@ -45,15 +45,16 @@ test('Boostrap new app with an initial state', assert => {
 })
 
 test('Boostrap new app with initial state on modules', assert => {
-  const testModule = { initialState: { foo: 'bar' } }
+  const initialState = { foo: 'bar' }
+  const testModule = { initialState: (state) => initialState }
 
   const app = boot(null, [testModule])
 
   app.then(({action, store}) => {
 
     assert.deepEqual(
       store.getState(),
-      testModule.initialState,
+      initialState,
       'State is equal to module\'s initial state'
     )