diff --git a/packages/redux-devtools-chart-monitor/README.md b/packages/redux-devtools-chart-monitor/README.md index bbdd5608..04429e46 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 diff --git a/packages/redux-devtools-chart-monitor/package.json b/packages/redux-devtools-chart-monitor/package.json index 291d3a0f..707457c7 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.0.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/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": [