diff --git a/packages/redux-devtools-chart-monitor/src/Chart.tsx b/packages/redux-devtools-chart-monitor/src/Chart.tsx index f0b6d098..8947741b 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-instrument'; +import { LiftedAction, LiftedState } from 'redux-devtools'; import * as themes from 'redux-devtools-themes'; import { Base16Theme } from 'react-base16-styling'; import { ChartMonitorState } from './reducers'; diff --git a/packages/redux-devtools-core/package.json b/packages/redux-devtools-core/package.json index a51cebe3..30aacab4 100644 --- a/packages/redux-devtools-core/package.json +++ b/packages/redux-devtools-core/package.json @@ -57,7 +57,6 @@ "redux-devtools-inspector-monitor": "^0.14.0", "redux-devtools-inspector-monitor-test-tab": "^0.6.2", "redux-devtools-inspector-monitor-trace-tab": "^0.1.3", - "redux-devtools-instrument": "^1.10.0", "redux-devtools-log-monitor": "^2.1.0", "redux-devtools-serialize": "^0.2.0", "redux-devtools-slider-monitor": "^2.0.0-5", diff --git a/packages/redux-devtools-core/src/app/actions/index.ts b/packages/redux-devtools-core/src/app/actions/index.ts index 10617a12..3c585024 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-instrument'; +import { LiftedAction } from 'redux-devtools'; 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 e183742a..040fa8d0 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-instrument'; +import { ActionCreators, LiftedAction } from 'redux-devtools'; 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 cbfff2de..2d359af2 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-instrument'; +import { LiftedAction, LiftedState } from 'redux-devtools'; 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 03a5fe4f..0ee8184d 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-instrument'; +import { LiftedAction } from 'redux-devtools'; 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 aa98f2c3..5652dadb 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-instrument'; +import { PerformAction } from 'redux-devtools'; 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 eb2ba394..c0eccdbe 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-instrument'; +import { PerformAction } from 'redux-devtools'; 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 9c9644b1..65c57753 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-instrument'; +import { PerformAction } from 'redux-devtools'; import { Action } from 'redux'; import { State } from '../app/reducers/instances'; 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 321cd5ce..1304727a 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-instrument'; +import { PerformAction } from 'redux-devtools'; import { Action } from 'redux'; import TestGenerator from '../src/TestGenerator'; import fnTemplate from '../src/redux/mocha'; diff --git a/packages/redux-devtools-instrument/README.md b/packages/redux-devtools-instrument/README.md index b804bd3e..019d4ffd 100644 --- a/packages/redux-devtools-instrument/README.md +++ b/packages/redux-devtools-instrument/README.md @@ -5,7 +5,7 @@ Redux enhancer used along with [Redux DevTools](https://github.com/reduxjs/redux ### Installation ``` -npm install --save-dev redux-devtools-instrument +yarn add @redux-devtools/instrument ``` ### Usage diff --git a/packages/redux-devtools-instrument/package.json b/packages/redux-devtools-instrument/package.json index 03ab19bd..438b472a 100644 --- a/packages/redux-devtools-instrument/package.json +++ b/packages/redux-devtools-instrument/package.json @@ -1,5 +1,5 @@ { - "name": "redux-devtools-instrument", + "name": "@redux-devtools/instrument", "version": "1.10.0", "description": "Redux DevTools instrumentation", "keywords": [ diff --git a/packages/redux-devtools/package.json b/packages/redux-devtools/package.json index d499ecea..eb323fa9 100644 --- a/packages/redux-devtools/package.json +++ b/packages/redux-devtools/package.json @@ -40,10 +40,10 @@ "prepublishOnly": "npm run clean && npm run build" }, "dependencies": { + "@redux-devtools/instrument": "^1.10.0", "@types/prop-types": "^15.7.3", "lodash": "^4.17.19", - "prop-types": "^15.7.2", - "redux-devtools-instrument": "^1.10.0" + "prop-types": "^15.7.2" }, "devDependencies": { "@types/lodash": "^4.14.159", diff --git a/packages/redux-devtools/src/createDevTools.tsx b/packages/redux-devtools/src/createDevTools.tsx index 5fe59db6..4734f11e 100644 --- a/packages/redux-devtools/src/createDevTools.tsx +++ b/packages/redux-devtools/src/createDevTools.tsx @@ -6,7 +6,7 @@ import instrument, { LiftedState, LiftedStore, Options, -} from 'redux-devtools-instrument'; +} from '@redux-devtools/instrument'; import { Action } from 'redux'; function logError(type: string) { diff --git a/packages/redux-devtools/src/index.ts b/packages/redux-devtools/src/index.ts index 76f04091..c663d0b9 100644 --- a/packages/redux-devtools/src/index.ts +++ b/packages/redux-devtools/src/index.ts @@ -5,6 +5,6 @@ export { PerformAction, LiftedAction, LiftedState, -} from 'redux-devtools-instrument'; +} from '@redux-devtools/instrument'; export { default as persistState } from './persistState'; export { default as createDevTools, Monitor } from './createDevTools'; diff --git a/packages/redux-devtools/src/persistState.ts b/packages/redux-devtools/src/persistState.ts index d89ca383..aba52164 100644 --- a/packages/redux-devtools/src/persistState.ts +++ b/packages/redux-devtools/src/persistState.ts @@ -1,7 +1,7 @@ import mapValues from 'lodash/mapValues'; import identity from 'lodash/identity'; import { Action, PreloadedState, Reducer, StoreEnhancer } from 'redux'; -import { LiftedState } from 'redux-devtools-instrument'; +import { LiftedState } from '@redux-devtools/instrument'; export default function persistState< S,