diff --git a/packages/redux-devtools-chart-monitor/README.md b/packages/redux-devtools-chart-monitor/README.md index bbdd5608..16e4a7d4 100644 --- a/packages/redux-devtools-chart-monitor/README.md +++ b/packages/redux-devtools-chart-monitor/README.md @@ -15,7 +15,7 @@ It shows a real-time view of the store aka the current state of the app. ### Installation ``` -yarn add --dev redux-devtools-chart-monitor +yarn add redux-devtools-chart-monitor ``` ### Usage @@ -26,7 +26,7 @@ You can use `ChartMonitor` as the only monitor in your app: ```js import React from 'react'; -import { createDevTools } from 'redux-devtools'; +import { createDevTools } from '@redux-devtools/core'; import ChartMonitor from 'redux-devtools-chart-monitor'; export default createDevTools(); diff --git a/packages/redux-devtools-chart-monitor/package.json b/packages/redux-devtools-chart-monitor/package.json index 291d3a0f..1dbfe32a 100644 --- a/packages/redux-devtools-chart-monitor/package.json +++ b/packages/redux-devtools-chart-monitor/package.json @@ -46,15 +46,15 @@ "redux-devtools-themes": "^1.0.0" }, "devDependencies": { + "@redux-devtools/core": "^3.7.0", "@types/react": "^16.9.46", "react": "^16.13.1", - "redux": "^4.0.5", - "redux-devtools": "^3.7.0" + "redux": "^4.0.5" }, "peerDependencies": { + "@redux-devtools/core": "^3.4.0", "@types/react": "^16.3.18", "react": "^16.3.0", - "redux": "^3.4.0 || ^4.0.0", - "redux-devtools": "^3.0.0" + "redux": "^3.4.0 || ^4.0.0" } } diff --git a/packages/redux-devtools-chart-monitor/src/Chart.tsx b/packages/redux-devtools-chart-monitor/src/Chart.tsx index 8947741b..ee169e44 100644 --- a/packages/redux-devtools-chart-monitor/src/Chart.tsx +++ b/packages/redux-devtools-chart-monitor/src/Chart.tsx @@ -2,7 +2,7 @@ import React, { Component, createRef } from 'react'; import PropTypes from 'prop-types'; import { tree } from 'd3-state-visualizer'; import { Action, Dispatch } from 'redux'; -import { LiftedAction, LiftedState } from 'redux-devtools'; +import { LiftedAction, LiftedState } from '@redux-devtools/core'; import * as themes from 'redux-devtools-themes'; import { Base16Theme } from 'react-base16-styling'; import { ChartMonitorState } from './reducers'; diff --git a/packages/redux-devtools-chart-monitor/src/ChartMonitor.tsx b/packages/redux-devtools-chart-monitor/src/ChartMonitor.tsx index df609820..3cd32732 100644 --- a/packages/redux-devtools-chart-monitor/src/ChartMonitor.tsx +++ b/packages/redux-devtools-chart-monitor/src/ChartMonitor.tsx @@ -1,7 +1,11 @@ import React, { CSSProperties, PureComponent } from 'react'; import PropTypes from 'prop-types'; import * as themes from 'redux-devtools-themes'; -import { ActionCreators, LiftedAction, LiftedState } from 'redux-devtools'; +import { + ActionCreators, + LiftedAction, + LiftedState, +} from '@redux-devtools/core'; import deepmerge from 'deepmerge'; import { Action, Dispatch } from 'redux'; import { Base16Theme } from 'react-base16-styling'; diff --git a/packages/redux-devtools-core/package.json b/packages/redux-devtools-core/package.json index 30aacab4..d154ef30 100644 --- a/packages/redux-devtools-core/package.json +++ b/packages/redux-devtools-core/package.json @@ -37,6 +37,7 @@ "prepublishOnly": "npm run clean && npm run build" }, "dependencies": { + "@redux-devtools/core": "^3.7.0", "d3-state-visualizer": "^1.3.4", "devui": "^1.0.0-6", "get-params": "^0.1.2", @@ -52,7 +53,6 @@ "react-is": "^16.13.1", "react-redux": "^7.2.1", "redux": "^4.0.5", - "redux-devtools": "^3.7.0", "redux-devtools-chart-monitor": "^1.7.2", "redux-devtools-inspector-monitor": "^0.14.0", "redux-devtools-inspector-monitor-test-tab": "^0.6.2", diff --git a/packages/redux-devtools-core/src/app/actions/index.ts b/packages/redux-devtools-core/src/app/actions/index.ts index 3c585024..3eda8bb8 100644 --- a/packages/redux-devtools-core/src/app/actions/index.ts +++ b/packages/redux-devtools-core/src/app/actions/index.ts @@ -43,7 +43,7 @@ import { import { Action } from 'redux'; import { Features, State } from '../reducers/instances'; import { MonitorStateMonitorState } from '../reducers/monitor'; -import { LiftedAction } from 'redux-devtools'; +import { LiftedAction } from '@redux-devtools/core'; import { Data } from '../reducers/reports'; let monitorReducer: ( diff --git a/packages/redux-devtools-core/src/app/components/TopButtons.tsx b/packages/redux-devtools-core/src/app/components/TopButtons.tsx index 040fa8d0..2f5c7543 100644 --- a/packages/redux-devtools-core/src/app/components/TopButtons.tsx +++ b/packages/redux-devtools-core/src/app/components/TopButtons.tsx @@ -1,6 +1,6 @@ import React, { Component } from 'react'; import PropTypes from 'prop-types'; -import { ActionCreators, LiftedAction } from 'redux-devtools'; +import { ActionCreators, LiftedAction } from '@redux-devtools/core'; import { Button, Toolbar, Divider } from 'devui'; import { Action } from 'redux'; import RecordButton from './buttons/RecordButton'; diff --git a/packages/redux-devtools-core/src/app/containers/DevTools.tsx b/packages/redux-devtools-core/src/app/containers/DevTools.tsx index 2d359af2..4d676ffa 100644 --- a/packages/redux-devtools-core/src/app/containers/DevTools.tsx +++ b/packages/redux-devtools-core/src/app/containers/DevTools.tsx @@ -1,6 +1,6 @@ import React, { Component } from 'react'; import { withTheme } from 'styled-components'; -import { LiftedAction, LiftedState } from 'redux-devtools'; +import { LiftedAction, LiftedState } from '@redux-devtools/core'; import { Action } from 'redux'; import getMonitor from '../utils/getMonitor'; import { InitMonitorAction } from '../actions'; diff --git a/packages/redux-devtools-core/src/app/containers/monitors/Slider.tsx b/packages/redux-devtools-core/src/app/containers/monitors/Slider.tsx index 0ee8184d..d9394eb5 100644 --- a/packages/redux-devtools-core/src/app/containers/monitors/Slider.tsx +++ b/packages/redux-devtools-core/src/app/containers/monitors/Slider.tsx @@ -1,7 +1,7 @@ import React, { Component } from 'react'; import styled, { withTheme } from 'styled-components'; import SliderMonitor from 'redux-devtools-slider-monitor'; -import { LiftedAction } from 'redux-devtools'; +import { LiftedAction } from '@redux-devtools/core'; import { Action } from 'redux'; import { ThemeFromProvider } from 'devui'; import { State } from '../../reducers/instances'; diff --git a/packages/redux-devtools-core/src/app/reducers/instances.ts b/packages/redux-devtools-core/src/app/reducers/instances.ts index 5652dadb..daa53764 100644 --- a/packages/redux-devtools-core/src/app/reducers/instances.ts +++ b/packages/redux-devtools-core/src/app/reducers/instances.ts @@ -1,4 +1,4 @@ -import { PerformAction } from 'redux-devtools'; +import { PerformAction } from '@redux-devtools/core'; import { Action } from 'redux'; import { UPDATE_STATE, diff --git a/packages/redux-devtools-core/src/app/utils/updateState.ts b/packages/redux-devtools-core/src/app/utils/updateState.ts index c0eccdbe..ab08bfc0 100644 --- a/packages/redux-devtools-core/src/app/utils/updateState.ts +++ b/packages/redux-devtools-core/src/app/utils/updateState.ts @@ -1,7 +1,7 @@ import commitExcessActions from './commitExcessActions'; import { State } from '../reducers/instances'; import { Action } from 'redux'; -import { PerformAction } from 'redux-devtools'; +import { PerformAction } from '@redux-devtools/core'; export function recompute( previousLiftedState: State, diff --git a/packages/redux-devtools-core/src/utils/filters.ts b/packages/redux-devtools-core/src/utils/filters.ts index 65c57753..bbfe53d6 100644 --- a/packages/redux-devtools-core/src/utils/filters.ts +++ b/packages/redux-devtools-core/src/utils/filters.ts @@ -1,5 +1,5 @@ import mapValues from 'lodash/mapValues'; -import { PerformAction } from 'redux-devtools'; +import { PerformAction } from '@redux-devtools/core'; import { Action } from 'redux'; import { State } from '../app/reducers/instances'; diff --git a/packages/redux-devtools-dock-monitor/README.md b/packages/redux-devtools-dock-monitor/README.md index 16aff434..94189ad1 100644 --- a/packages/redux-devtools-dock-monitor/README.md +++ b/packages/redux-devtools-dock-monitor/README.md @@ -20,7 +20,7 @@ For example, you can use it together with [`LogMonitor`](https://github.com/redu ```js import React from 'react'; -import { createDevTools } from 'redux-devtools'; +import { createDevTools } from '@redux-devtools/core'; import LogMonitor from 'redux-devtools-log-monitor'; import SliderMonitor from 'redux-devtools-slider-monitor'; import DockMonitor from 'redux-devtools-dock-monitor'; diff --git a/packages/redux-devtools-dock-monitor/package.json b/packages/redux-devtools-dock-monitor/package.json index 85d1e03a..2d53607a 100644 --- a/packages/redux-devtools-dock-monitor/package.json +++ b/packages/redux-devtools-dock-monitor/package.json @@ -46,16 +46,16 @@ "react-dock": "^0.3.0" }, "devDependencies": { + "@redux-devtools/core": "^3.7.0", "@types/parse-key": "^0.2.0", "@types/react": "^16.9.46", "react": "^16.13.1", - "redux": "^4.0.5", - "redux-devtools": "^3.7.0" + "redux": "^4.0.5" }, "peerDependencies": { + "@redux-devtools/core": "^3.4.0", "@types/react": "^16.3.18", "react": "^16.3.0", - "redux": "^3.4.0 || ^4.0.0", - "redux-devtools": "^3.4.0" + "redux": "^3.4.0 || ^4.0.0" } } diff --git a/packages/redux-devtools-dock-monitor/src/DockMonitor.tsx b/packages/redux-devtools-dock-monitor/src/DockMonitor.tsx index 0e9824eb..99f0e94c 100644 --- a/packages/redux-devtools-dock-monitor/src/DockMonitor.tsx +++ b/packages/redux-devtools-dock-monitor/src/DockMonitor.tsx @@ -2,7 +2,7 @@ import React, { cloneElement, Children, Component } from 'react'; import PropTypes from 'prop-types'; import Dock from 'react-dock'; import { Action, Dispatch } from 'redux'; -import { LiftedState, Monitor } from 'redux-devtools'; +import { LiftedState, Monitor } from '@redux-devtools/core'; import { POSITIONS } from './constants'; import { toggleVisibility, diff --git a/packages/redux-devtools-inspector-monitor-test-tab/README.md b/packages/redux-devtools-inspector-monitor-test-tab/README.md index 979fb899..0cbedbd6 100644 --- a/packages/redux-devtools-inspector-monitor-test-tab/README.md +++ b/packages/redux-devtools-inspector-monitor-test-tab/README.md @@ -3,7 +3,7 @@ ### Installation ``` -yarn add --dev redux-devtools-inspector-monitor-test-tab +yarn add redux-devtools-inspector-monitor-test-tab ``` ### Usage @@ -16,7 +16,7 @@ With [`redux-devtools`](https://github.com/reduxjs/redux-devtools) and [`redux-d ```js import React from 'react'; -import { createDevTools } from 'redux-devtools'; +import { createDevTools } from '@redux-devtools/core'; import InspectorMonitor from 'redux-devtools-inspector-monitor'; import TestGenerator from 'redux-devtools-inspector-monitor-test-tab'; import mochaTemplate from 'redux-devtools-inspector-monitor-test-tab/lib/redux/mocha'; // If using default tests. diff --git a/packages/redux-devtools-inspector-monitor-test-tab/demo/src/js/DevTools.tsx b/packages/redux-devtools-inspector-monitor-test-tab/demo/src/js/DevTools.tsx index d34e7b35..15adef22 100644 --- a/packages/redux-devtools-inspector-monitor-test-tab/demo/src/js/DevTools.tsx +++ b/packages/redux-devtools-inspector-monitor-test-tab/demo/src/js/DevTools.tsx @@ -1,6 +1,6 @@ import React from 'react'; import { connect } from 'react-redux'; -import { createDevTools } from 'redux-devtools'; +import { createDevTools } from '@redux-devtools/core'; import InspectorMonitor, { base16Themes, Tab, diff --git a/packages/redux-devtools-inspector-monitor-test-tab/demo/src/js/index.tsx b/packages/redux-devtools-inspector-monitor-test-tab/demo/src/js/index.tsx index 755be5c6..a3d39ad4 100644 --- a/packages/redux-devtools-inspector-monitor-test-tab/demo/src/js/index.tsx +++ b/packages/redux-devtools-inspector-monitor-test-tab/demo/src/js/index.tsx @@ -14,7 +14,7 @@ import logger from 'redux-logger'; import { Route } from 'react-router'; import { createBrowserHistory } from 'history'; import { ConnectedRouter, routerMiddleware } from 'connected-react-router'; -import { persistState } from 'redux-devtools'; +import { persistState } from '@redux-devtools/core'; import DemoApp from './DemoApp'; import createRootReducer from './reducers'; import getOptions from './getOptions'; diff --git a/packages/redux-devtools-inspector-monitor-test-tab/package.json b/packages/redux-devtools-inspector-monitor-test-tab/package.json index 5113016d..9d2b4690 100644 --- a/packages/redux-devtools-inspector-monitor-test-tab/package.json +++ b/packages/redux-devtools-inspector-monitor-test-tab/package.json @@ -54,6 +54,7 @@ "simple-diff": "^1.6.0" }, "devDependencies": { + "@redux-devtools/core": "^3.7.0", "@types/es6template": "^1.0.0", "@types/history": "^4.7.7", "@types/jsan": "^3.1.0", @@ -76,7 +77,6 @@ "react-redux": "^7.2.1", "react-router": "^5.2.0", "redux": "^4.0.5", - "redux-devtools": "^3.7.0", "redux-devtools-dock-monitor": "^1.2.0", "redux-devtools-inspector-monitor": "^0.14.0", "redux-logger": "^3.0.6", diff --git a/packages/redux-devtools-inspector-monitor-test-tab/test/TestGenerator.spec.tsx b/packages/redux-devtools-inspector-monitor-test-tab/test/TestGenerator.spec.tsx index 1304727a..2b50f9b7 100644 --- a/packages/redux-devtools-inspector-monitor-test-tab/test/TestGenerator.spec.tsx +++ b/packages/redux-devtools-inspector-monitor-test-tab/test/TestGenerator.spec.tsx @@ -1,7 +1,7 @@ import React from 'react'; import { render } from 'enzyme'; import { renderToJson } from 'enzyme-to-json'; -import { PerformAction } from 'redux-devtools'; +import { PerformAction } from '@redux-devtools/core'; import { Action } from 'redux'; import TestGenerator from '../src/TestGenerator'; import fnTemplate from '../src/redux/mocha'; diff --git a/packages/redux-devtools-inspector-monitor-trace-tab/README.md b/packages/redux-devtools-inspector-monitor-trace-tab/README.md index b2b3b8c7..7d7d8fb4 100644 --- a/packages/redux-devtools-inspector-monitor-trace-tab/README.md +++ b/packages/redux-devtools-inspector-monitor-trace-tab/README.md @@ -8,7 +8,7 @@ It's integrated in Redux DevTools browser extension. To use it separately with [ ```js import React from 'react'; -import { createDevTools } from 'redux-devtools'; +import { createDevTools } from '@redux-devtools/core'; import InspectorMonitor from 'redux-devtools-inspector-monitor'; import TraceTab from 'redux-devtools-inspector-monitor-trace-tab'; diff --git a/packages/redux-devtools-inspector-monitor-trace-tab/package.json b/packages/redux-devtools-inspector-monitor-trace-tab/package.json index a928bb30..dfddd199 100644 --- a/packages/redux-devtools-inspector-monitor-trace-tab/package.json +++ b/packages/redux-devtools-inspector-monitor-trace-tab/package.json @@ -36,6 +36,7 @@ "settle-promise": "^1.0.0" }, "devDependencies": { + "@redux-devtools/core": "^3.7.0", "@types/babel__code-frame": "^7.0.2", "@types/enzyme": "^3.10.5", "@types/enzyme-adapter-react-16": "^1.0.6", @@ -49,14 +50,12 @@ "react-dom": "^16.13.1", "react-test-renderer": "^16.13.1", "redux": "^4.0.5", - "redux-devtools": "^3.7.0", "redux-devtools-inspector-monitor": "^0.14.0" }, "peerDependencies": { "@types/react": "^16.3.18", "react": "^16.3.0", "redux": "^3.4.0 || ^4.0.0", - "redux-devtools": "^3.4.0", "redux-devtools-inspector-monitor": "^0.14.0" } } diff --git a/packages/redux-devtools-inspector-monitor/README.md b/packages/redux-devtools-inspector-monitor/README.md index 4ef8cc97..5125f59b 100644 --- a/packages/redux-devtools-inspector-monitor/README.md +++ b/packages/redux-devtools-inspector-monitor/README.md @@ -9,7 +9,7 @@ A state monitor for [Redux DevTools](https://github.com/reduxjs/redux-devtools) ### Installation ``` -yarn add --dev redux-devtools-inspector-monitor +yarn add redux-devtools-inspector-monitor ``` ### Usage @@ -20,7 +20,7 @@ You can use `Inspector` as the only monitor in your app: ```js import React from 'react'; -import { createDevTools } from 'redux-devtools'; +import { createDevTools } from '@redux-devtools/core'; import Inspector from 'redux-devtools-inspector-monitor'; export default createDevTools(); diff --git a/packages/redux-devtools-inspector-monitor/demo/src/js/DevTools.tsx b/packages/redux-devtools-inspector-monitor/demo/src/js/DevTools.tsx index bae66bd0..6f3262cd 100644 --- a/packages/redux-devtools-inspector-monitor/demo/src/js/DevTools.tsx +++ b/packages/redux-devtools-inspector-monitor/demo/src/js/DevTools.tsx @@ -1,6 +1,6 @@ import React from 'react'; import { connect } from 'react-redux'; -import { createDevTools } from 'redux-devtools'; +import { createDevTools } from '@redux-devtools/core'; import DockMonitor from 'redux-devtools-dock-monitor'; import { Location } from 'history'; import DevtoolsInspector from '../../../src/DevtoolsInspector'; diff --git a/packages/redux-devtools-inspector-monitor/demo/src/js/index.tsx b/packages/redux-devtools-inspector-monitor/demo/src/js/index.tsx index c5bf7093..0ed32248 100644 --- a/packages/redux-devtools-inspector-monitor/demo/src/js/index.tsx +++ b/packages/redux-devtools-inspector-monitor/demo/src/js/index.tsx @@ -12,7 +12,7 @@ import logger from 'redux-logger'; import { Route } from 'react-router'; import { createBrowserHistory } from 'history'; import { ConnectedRouter, routerMiddleware } from 'connected-react-router'; -import { persistState } from 'redux-devtools'; +import { persistState } from '@redux-devtools/core'; import DemoApp from './DemoApp'; import createRootReducer from './reducers'; import getOptions from './getOptions'; diff --git a/packages/redux-devtools-inspector-monitor/package.json b/packages/redux-devtools-inspector-monitor/package.json index 1d828391..ed189731 100644 --- a/packages/redux-devtools-inspector-monitor/package.json +++ b/packages/redux-devtools-inspector-monitor/package.json @@ -53,6 +53,7 @@ "redux-devtools-themes": "^1.0.0" }, "devDependencies": { + "@redux-devtools/core": "^3.7.0", "@types/dateformat": "^3.0.1", "@types/hex-rgba": "^1.0.0", "@types/history": "^4.7.7", @@ -72,12 +73,12 @@ "react-redux": "^7.2.1", "react-router": "^5.2.0", "redux": "^4.0.5", - "redux-devtools": "^3.7.0", "redux-devtools-dock-monitor": "^1.2.0", "redux-logger": "^3.0.6", "seamless-immutable": "^7.1.4" }, "peerDependencies": { + "@redux-devtools/core": "^3.4.0", "@types/react": "^16.3.18", "react": "^16.3.0", "redux": "^3.4.0 || ^4.0.0" diff --git a/packages/redux-devtools-inspector-monitor/src/ActionList.tsx b/packages/redux-devtools-inspector-monitor/src/ActionList.tsx index 8d1c5cd1..22085b0e 100644 --- a/packages/redux-devtools-inspector-monitor/src/ActionList.tsx +++ b/packages/redux-devtools-inspector-monitor/src/ActionList.tsx @@ -2,7 +2,7 @@ import React, { PureComponent, RefCallback } from 'react'; import { Drake } from 'dragula'; import dragula from 'react-dragula'; import { Action } from 'redux'; -import { PerformAction } from 'redux-devtools'; +import { PerformAction } from '@redux-devtools/core'; import { StylingFunction } from 'react-base16-styling'; import ActionListRow from './ActionListRow'; import ActionListHeader from './ActionListHeader'; diff --git a/packages/redux-devtools-inspector-monitor/src/ActionPreview.tsx b/packages/redux-devtools-inspector-monitor/src/ActionPreview.tsx index 71b3f0c2..2a3364f3 100644 --- a/packages/redux-devtools-inspector-monitor/src/ActionPreview.tsx +++ b/packages/redux-devtools-inspector-monitor/src/ActionPreview.tsx @@ -2,7 +2,7 @@ import React, { Component } from 'react'; import { Base16Theme } from 'redux-devtools-themes'; import { Action } from 'redux'; import { StylingFunction } from 'react-base16-styling'; -import { PerformAction } from 'redux-devtools'; +import { PerformAction } from '@redux-devtools/core'; import { Delta } from 'jsondiffpatch'; import { DEFAULT_STATE, DevtoolsInspectorState } from './redux'; import ActionPreviewHeader from './ActionPreviewHeader'; diff --git a/packages/redux-devtools-inspector-monitor/src/DevtoolsInspector.tsx b/packages/redux-devtools-inspector-monitor/src/DevtoolsInspector.tsx index a5714b20..eb4b894b 100644 --- a/packages/redux-devtools-inspector-monitor/src/DevtoolsInspector.tsx +++ b/packages/redux-devtools-inspector-monitor/src/DevtoolsInspector.tsx @@ -6,7 +6,11 @@ import { invertTheme, StylingFunction, } from 'react-base16-styling'; -import { ActionCreators, LiftedAction, LiftedState } from 'redux-devtools'; +import { + ActionCreators, + LiftedAction, + LiftedState, +} from '@redux-devtools/core'; import { Action, Dispatch } from 'redux'; import { Delta, DiffContext } from 'jsondiffpatch'; import { diff --git a/packages/redux-devtools-log-monitor/README.md b/packages/redux-devtools-log-monitor/README.md index ce979ee1..0b48d814 100644 --- a/packages/redux-devtools-log-monitor/README.md +++ b/packages/redux-devtools-log-monitor/README.md @@ -19,7 +19,7 @@ You can use `LogMonitor` as the only monitor in your app: ```js import React from 'react'; -import { createDevTools } from 'redux-devtools'; +import { createDevTools } from '@redux-devtools/core'; import LogMonitor from 'redux-devtools-log-monitor'; export default createDevTools(); diff --git a/packages/redux-devtools-log-monitor/package.json b/packages/redux-devtools-log-monitor/package.json index 58d85770..31b5d0c6 100644 --- a/packages/redux-devtools-log-monitor/package.json +++ b/packages/redux-devtools-log-monitor/package.json @@ -49,15 +49,15 @@ "redux-devtools-themes": "^1.0.0" }, "devDependencies": { + "@redux-devtools/core": "^3.7.0", "@types/react": "^16.9.46", "react": "^16.13.1", - "redux": "^4.0.5", - "redux-devtools": "^3.7.0" + "redux": "^4.0.5" }, "peerDependencies": { + "@redux-devtools/core": "^3.4.0", "@types/react": "^16.3.18", "react": "^16.3.0", - "redux": "^3.4.0 || ^4.0.0", - "redux-devtools": "^3.4.0" + "redux": "^3.4.0 || ^4.0.0" } } diff --git a/packages/redux-devtools-log-monitor/src/LogMonitor.tsx b/packages/redux-devtools-log-monitor/src/LogMonitor.tsx index b0d1f538..fe2c60ae 100644 --- a/packages/redux-devtools-log-monitor/src/LogMonitor.tsx +++ b/packages/redux-devtools-log-monitor/src/LogMonitor.tsx @@ -3,7 +3,11 @@ import PropTypes from 'prop-types'; import { Action, Dispatch } from 'redux'; import * as themes from 'redux-devtools-themes'; import { Base16Theme } from 'redux-devtools-themes'; -import { ActionCreators, LiftedAction, LiftedState } from 'redux-devtools'; +import { + ActionCreators, + LiftedAction, + LiftedState, +} from '@redux-devtools/core'; import debounce from 'lodash.debounce'; import { updateScrollTop, diff --git a/packages/redux-devtools-log-monitor/src/LogMonitorButtonBar.tsx b/packages/redux-devtools-log-monitor/src/LogMonitorButtonBar.tsx index abb2ec7a..ba44b88d 100644 --- a/packages/redux-devtools-log-monitor/src/LogMonitorButtonBar.tsx +++ b/packages/redux-devtools-log-monitor/src/LogMonitorButtonBar.tsx @@ -1,6 +1,6 @@ import React, { CSSProperties, PureComponent } from 'react'; import PropTypes from 'prop-types'; -import { ActionCreators, LiftedAction } from 'redux-devtools'; +import { ActionCreators, LiftedAction } from '@redux-devtools/core'; import { Base16Theme } from 'redux-devtools-themes'; import { Action, Dispatch } from 'redux'; import LogMonitorButton from './LogMonitorButton'; diff --git a/packages/redux-devtools-log-monitor/src/LogMonitorEntryList.tsx b/packages/redux-devtools-log-monitor/src/LogMonitorEntryList.tsx index ce3c074a..61342622 100644 --- a/packages/redux-devtools-log-monitor/src/LogMonitorEntryList.tsx +++ b/packages/redux-devtools-log-monitor/src/LogMonitorEntryList.tsx @@ -1,7 +1,7 @@ import React, { PureComponent } from 'react'; import PropTypes from 'prop-types'; import { Action } from 'redux'; -import { PerformAction } from 'redux-devtools'; +import { PerformAction } from '@redux-devtools/core'; import { Base16Theme } from 'redux-devtools-themes'; import LogMonitorEntry from './LogMonitorEntry'; diff --git a/packages/redux-devtools-slider-monitor/examples/todomvc/containers/DevTools.tsx b/packages/redux-devtools-slider-monitor/examples/todomvc/containers/DevTools.tsx index 1d809b14..1dd6bb8c 100644 --- a/packages/redux-devtools-slider-monitor/examples/todomvc/containers/DevTools.tsx +++ b/packages/redux-devtools-slider-monitor/examples/todomvc/containers/DevTools.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import { createDevTools } from 'redux-devtools'; +import { createDevTools } from '@redux-devtools/core'; import DockMonitor from 'redux-devtools-dock-monitor'; import SliderMonitor from 'redux-devtools-slider-monitor'; diff --git a/packages/redux-devtools-slider-monitor/examples/todomvc/package.json b/packages/redux-devtools-slider-monitor/examples/todomvc/package.json index 5528cb3c..abf884ca 100644 --- a/packages/redux-devtools-slider-monitor/examples/todomvc/package.json +++ b/packages/redux-devtools-slider-monitor/examples/todomvc/package.json @@ -15,13 +15,13 @@ "type-check:watch": "npm run type-check -- --watch" }, "dependencies": { + "@redux-devtools/core": "^3.7.0", "classnames": "^2.2.6", "react": "^16.13.1", "react-dom": "^16.13.1", "react-hot-loader": "^4.12.21", "react-redux": "^7.2.1", "redux": "^4.0.5", - "redux-devtools": "^3.7.0", "redux-devtools-dock-monitor": "^1.2.0", "redux-devtools-log-monitor": "^2.1.0", "redux-devtools-slider-monitor": "^2.0.0-5", diff --git a/packages/redux-devtools-slider-monitor/examples/todomvc/store/configureStore.dev.ts b/packages/redux-devtools-slider-monitor/examples/todomvc/store/configureStore.dev.ts index d5886984..10f5c1a7 100644 --- a/packages/redux-devtools-slider-monitor/examples/todomvc/store/configureStore.dev.ts +++ b/packages/redux-devtools-slider-monitor/examples/todomvc/store/configureStore.dev.ts @@ -1,5 +1,5 @@ import { createStore, compose, PreloadedState } from 'redux'; -import { persistState } from 'redux-devtools'; +import { persistState } from '@redux-devtools/core'; import rootReducer, { TodoState } from '../reducers'; import DevTools from '../containers/DevTools'; diff --git a/packages/redux-devtools-slider-monitor/package.json b/packages/redux-devtools-slider-monitor/package.json index e316e60e..95e51171 100644 --- a/packages/redux-devtools-slider-monitor/package.json +++ b/packages/redux-devtools-slider-monitor/package.json @@ -38,15 +38,15 @@ "redux-devtools-themes": "^1.0.0" }, "devDependencies": { + "@redux-devtools/core": "^3.7.0", "@types/react": "^16.9.46", "react": "^16.13.1", - "redux": "^4.0.5", - "redux-devtools": "^3.7.0" + "redux": "^4.0.5" }, "peerDependencies": { + "@redux-devtools/core": "^3.4.0", "@types/react": "^16.3.18", "react": "^16.3.0", - "redux": "^3.4.0 || ^4.0.0", - "redux-devtools": "^3.4.0" + "redux": "^3.4.0 || ^4.0.0" } } diff --git a/packages/redux-devtools-slider-monitor/src/SliderMonitor.tsx b/packages/redux-devtools-slider-monitor/src/SliderMonitor.tsx index 05df27e3..643957d0 100644 --- a/packages/redux-devtools-slider-monitor/src/SliderMonitor.tsx +++ b/packages/redux-devtools-slider-monitor/src/SliderMonitor.tsx @@ -3,7 +3,11 @@ import PropTypes from 'prop-types'; import { Action, Dispatch } from 'redux'; import * as themes from 'redux-devtools-themes'; import { Base16Theme } from 'redux-devtools-themes'; -import { ActionCreators, LiftedAction, LiftedState } from 'redux-devtools'; +import { + ActionCreators, + LiftedAction, + LiftedState, +} from '@redux-devtools/core'; import { Toolbar, Divider } from 'devui/lib/Toolbar'; import Slider from 'devui/lib/Slider'; import Button from 'devui/lib/Button'; diff --git a/packages/redux-devtools/examples/counter/package.json b/packages/redux-devtools/examples/counter/package.json index a3a6814f..96d91bc0 100644 --- a/packages/redux-devtools/examples/counter/package.json +++ b/packages/redux-devtools/examples/counter/package.json @@ -19,13 +19,13 @@ "type-check:watch": "npm run type-check -- --watch" }, "dependencies": { + "@redux-devtools/core": "^3.7.0", "prop-types": "^15.7.2", "react": "^16.13.1", "react-dom": "^16.13.1", "react-hot-loader": "^4.12.21", "react-redux": "^7.2.1", "redux": "^4.0.5", - "redux-devtools": "^3.7.0", "redux-devtools-dock-monitor": "^1.2.0", "redux-devtools-log-monitor": "^2.1.0", "redux-thunk": "^2.3.0" diff --git a/packages/redux-devtools/examples/counter/src/containers/DevTools.tsx b/packages/redux-devtools/examples/counter/src/containers/DevTools.tsx index 6c8bb38f..89310a32 100644 --- a/packages/redux-devtools/examples/counter/src/containers/DevTools.tsx +++ b/packages/redux-devtools/examples/counter/src/containers/DevTools.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import { createDevTools } from 'redux-devtools'; +import { createDevTools } from '@redux-devtools/core'; import LogMonitor from 'redux-devtools-log-monitor'; import DockMonitor from 'redux-devtools-dock-monitor'; diff --git a/packages/redux-devtools/examples/counter/src/store/configureStore.dev.ts b/packages/redux-devtools/examples/counter/src/store/configureStore.dev.ts index 347834fb..15d7cfc2 100644 --- a/packages/redux-devtools/examples/counter/src/store/configureStore.dev.ts +++ b/packages/redux-devtools/examples/counter/src/store/configureStore.dev.ts @@ -1,5 +1,5 @@ import { createStore, applyMiddleware, compose, PreloadedState } from 'redux'; -import { persistState } from 'redux-devtools'; +import { persistState } from '@redux-devtools/core'; import thunk from 'redux-thunk'; import rootReducer, { CounterState } from '../reducers'; import DevTools from '../containers/DevTools'; diff --git a/packages/redux-devtools/examples/todomvc/containers/DevTools.tsx b/packages/redux-devtools/examples/todomvc/containers/DevTools.tsx index 6c8bb38f..89310a32 100644 --- a/packages/redux-devtools/examples/todomvc/containers/DevTools.tsx +++ b/packages/redux-devtools/examples/todomvc/containers/DevTools.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import { createDevTools } from 'redux-devtools'; +import { createDevTools } from '@redux-devtools/core'; import LogMonitor from 'redux-devtools-log-monitor'; import DockMonitor from 'redux-devtools-dock-monitor'; diff --git a/packages/redux-devtools/examples/todomvc/package.json b/packages/redux-devtools/examples/todomvc/package.json index de83e978..3e74987c 100644 --- a/packages/redux-devtools/examples/todomvc/package.json +++ b/packages/redux-devtools/examples/todomvc/package.json @@ -31,6 +31,7 @@ "type-check:watch": "npm run type-check -- --watch" }, "dependencies": { + "@redux-devtools/core": "^3.7.0", "classnames": "^2.2.6", "prop-types": "^15.7.2", "react": "^16.13.1", @@ -38,7 +39,6 @@ "react-hot-loader": "^4.12.21", "react-redux": "^7.2.1", "redux": "^4.0.5", - "redux-devtools": "^3.7.0", "redux-devtools-dock-monitor": "^1.2.0", "redux-devtools-log-monitor": "^2.1.0", "todomvc-app-css": "^2.3.0" diff --git a/packages/redux-devtools/examples/todomvc/store/configureStore.dev.ts b/packages/redux-devtools/examples/todomvc/store/configureStore.dev.ts index e314d624..7398c6c5 100644 --- a/packages/redux-devtools/examples/todomvc/store/configureStore.dev.ts +++ b/packages/redux-devtools/examples/todomvc/store/configureStore.dev.ts @@ -1,5 +1,5 @@ import { createStore, compose, PreloadedState } from 'redux'; -import { persistState } from 'redux-devtools'; +import { persistState } from '@redux-devtools/core'; import rootReducer, { TodoState } from '../reducers'; import DevTools from '../containers/DevTools'; diff --git a/packages/redux-devtools/package.json b/packages/redux-devtools/package.json index eb323fa9..cc8815b9 100644 --- a/packages/redux-devtools/package.json +++ b/packages/redux-devtools/package.json @@ -1,5 +1,5 @@ { - "name": "redux-devtools", + "name": "@redux-devtools/core", "version": "3.7.0", "description": "Redux DevTools with hot reloading and time travel", "keywords": [