Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev

This commit is contained in:
zwjamnsss 2017-08-11 11:36:50 +08:00
commit b637fc6412

View File

@ -2,7 +2,6 @@ import { createStore as _createStore, applyMiddleware, compose } from 'redux';
import thunkMiddleware from 'redux-thunk'; import thunkMiddleware from 'redux-thunk';
import promiseMiddleware from 'redux-promise'; import promiseMiddleware from 'redux-promise';
import messageMiddleware from './middleware/messageMiddleware'; import messageMiddleware from './middleware/messageMiddleware';
import reducer from './modules/reducer'; import reducer from './modules/reducer';
export default function createStore(initialState = {}) { export default function createStore(initialState = {}) {
@ -12,6 +11,7 @@ export default function createStore(initialState = {}) {
if (ENV_PARAMS.development) { if (ENV_PARAMS.development) {
finalCreateStore = compose( finalCreateStore = compose(
applyMiddleware(...middleware), applyMiddleware(...middleware),
window.devToolsExtension ? window.devToolsExtension() : require('../containers/DevTools/DevTools').default.instrument() window.devToolsExtension ? window.devToolsExtension() : require('../containers/DevTools/DevTools').default.instrument()
)(_createStore); )(_createStore);