Skip to content

Commit

Permalink
Upgrade to "redux-devtools": "^3.0.0-beta-2",
Browse files Browse the repository at this point in the history
    "redux-devtools-dock-monitor": "^1.0.0-beta-2",
    "redux-devtools-log-monitor": "^1.0.0-beta-2",
  • Loading branch information
PeterKow committed Oct 17, 2015
1 parent 7bcb1d1 commit eff5418
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 13 deletions.
4 changes: 3 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@
"react": "^0.14.0",
"react-addons-test-utils": "^0.14.0",
"react-hot-loader": "^1.3.0",
"redux-devtools": "^2.1.5",
"redux-devtools": "^3.0.0-beta-2",
"redux-devtools-dock-monitor": "^1.0.0-beta-2",
"redux-devtools-log-monitor": "^1.0.0-beta-2",
"sinon": "^1.17.1",
"url-loader": "^0.5.6",
"webpack": "^1.12.2"
Expand Down
8 changes: 2 additions & 6 deletions src/app/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ import React, { PropTypes } from 'react';
import ReactDOM from 'react-dom';

import { createStore, combineReducers, compose} from 'redux';
import { DevTools, DebugPanel, LogMonitor } from 'redux-devtools/lib/react';
import { Provider, connect } from 'react-redux';
import createHashHistory from 'history/lib/createBrowserHistory';
import createBrowserHistory from 'history/lib/createHashHistory';
import configureStore from './utils/configure-store.js';
import HeaderMenu from './containers/headerMenu/containers/headerMenu.container.jsx';
import * as storage from './persistance/storage.js'
import { IntlProvider } from 'react-intl'
import DevTools from './utils/devTools.js'

import { twitterResultsSimple } from './containers/articles/mockTwitterResults.js'
const initialState = {
Expand Down Expand Up @@ -54,12 +54,8 @@ function getRootChildren (props) {
]
const __DEVTOOLS__ = process.env.DEVTOOLS;
if (__DEVTOOLS__) {
const { DevTools, DebugPanel, LogMonitor } =
require('redux-devtools/lib/react')
rootChildren.push(
<DebugPanel key="debug-panel" top right bottom>
<DevTools store={store} monitor={LogMonitor} />
</DebugPanel>
<DevTools key='dev-tools'/>
)
}
return rootChildren
Expand Down
10 changes: 4 additions & 6 deletions src/app/utils/configure-store.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,17 @@
import { createStore, combineReducers, compose, applyMiddleware } from 'redux'
import thunk from 'redux-thunk'
import logger from '../middleware/logger'

import { devTools, persistState } from 'redux-devtools';
import persistenceStore from '../persistance/store.js'
import { persistState } from 'redux-devtools';
import combinedReducer from '../app.reducers.js'
import DevTools from './devTools.js'

let combinedCreateStore
const storeEnhancers = [persistenceStore]
const storeEnhancers = []

//todo: add it to webpack global config
const __DEVTOOLS__ = process.env.DEVTOOLS;
if (__DEVTOOLS__) {
const { devTools } = require('redux-devtools')
storeEnhancers.push(devTools())
storeEnhancers.push(DevTools.instrument())
storeEnhancers.push(persistState(window.location.href.match(/[?&]debug_session=([^&]+)\b/)))
}
combinedCreateStore = compose(...storeEnhancers)(createStore)
Expand Down
14 changes: 14 additions & 0 deletions src/app/utils/devTools.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
/**
* Created by Peter on 17/10/15.
*/
import React from 'react';
import { createDevTools } from 'redux-devtools';
import LogMonitor from 'redux-devtools-log-monitor';
import DockMonitor from 'redux-devtools-dock-monitor';

export default createDevTools(
<DockMonitor toggleVisibilityKey='H'
changePositionKey='Q'>
<LogMonitor />
</DockMonitor>
);

0 comments on commit eff5418

Please sign in to comment.