Skip to content

Make creating persistor its own function #130

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 23, 2018
Merged

Make creating persistor its own function #130

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions src/createStore.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { History } from 'history'
import { routerMiddleware, routerReducer } from 'react-router-redux'
import { applyMiddleware, compose, createStore as _createStore, Store, StoreEnhancer } from 'redux'
import { persistCombineReducers, PersistConfig, Persistor, persistStore } from 'redux-persist'
import { persistCombineReducers, PersistConfig, persistStore } from 'redux-persist'
import { createFilter } from 'redux-persist-transform-filter'
import storage from 'redux-persist/lib/storage' // defaults to localStorage
import createSagaMiddleware from 'redux-saga'
Expand All @@ -19,7 +19,7 @@ type IPersistState = Pick<IApplicationState, 'environment'> &
Pick<ISessionState, 'token'> &
Pick<ISessionState, 'username'>

function createStore(history: History): { store: Store<IState>; persistor: Persistor } {
function createStore(history: History) {
let composeEnhancers: any = compose
const sagaMiddleware = createSagaMiddleware()
const middleware = [sagaMiddleware, routerMiddleware(history)]
Expand Down Expand Up @@ -47,11 +47,13 @@ function createStore(history: History): { store: Store<IState>; persistor: Persi

const enchancers = composeEnhancers(applyMiddleware(...middleware))
const createdStore = _createStore(persistedReducer, enchancers) as Store<IState>
const createdPersistor = persistStore(createdStore)
sagaMiddleware.run(mainSaga)
return { store: createdStore, persistor: createdPersistor }
return createdStore
}

const storeAndPersistor = createStore(appHistory)
export const persistor = storeAndPersistor.persistor
export const store = storeAndPersistor.store
function createPersistor(createdStore: Store<IState>) {
return persistStore(createdStore)
}

export const store = createStore(appHistory)
export const persistor = createPersistor(store)