diff --git a/.changeset/breezy-emus-tie.md b/.changeset/breezy-emus-tie.md new file mode 100644 index 00000000..ddc3be2a --- /dev/null +++ b/.changeset/breezy-emus-tie.md @@ -0,0 +1,13 @@ +--- +'@redux-devtools/app': major +'@redux-devtools/chart-monitor': major +'@redux-devtools/dock-monitor': major +'@redux-devtools/inspector-monitor-test-tab': major +'@redux-devtools/inspector-monitor-trace-tab': major +'@redux-devtools/inspector-monitor': major +'@redux-devtools/log-monitor': major +'@redux-devtools/rtk-query-monitor': major +'@redux-devtools/slider-monitor': major +--- + +Update min required React version to 16.8.4 diff --git a/.changeset/chatty-walls-burn.md b/.changeset/chatty-walls-burn.md new file mode 100644 index 00000000..4b050ce7 --- /dev/null +++ b/.changeset/chatty-walls-burn.md @@ -0,0 +1,5 @@ +--- +'@redux-devtools/core': major +--- + +Remove support for legacy context. Minimum supported react-redux version is 7.0.0 and minimum support React version is 16.8.4. diff --git a/packages/redux-devtools-app/package.json b/packages/redux-devtools-app/package.json index 1287e704..c12ea2b5 100644 --- a/packages/redux-devtools-app/package.json +++ b/packages/redux-devtools-app/package.json @@ -119,8 +119,8 @@ "@emotion/react": "^11.0.0", "@types/react": "^16.8.0 || ^17.0.0 || ^18.0.0", "@types/styled-components": "^5.1.34", - "react": "^16.8.0 || ^17.0.0 || ^18.0.0", - "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0", + "react": "^16.8.4 || ^17.0.0 || ^18.0.0", + "react-dom": "^16.8.4 || ^17.0.0 || ^18.0.0", "styled-components": "^5.3.11" } } diff --git a/packages/redux-devtools-chart-monitor/package.json b/packages/redux-devtools-chart-monitor/package.json index 401bf1d0..6f9f0259 100644 --- a/packages/redux-devtools-chart-monitor/package.json +++ b/packages/redux-devtools-chart-monitor/package.json @@ -68,8 +68,8 @@ }, "peerDependencies": { "@redux-devtools/core": "^3.0.0", - "@types/react": "^16.3.0 || ^17.0.0 || ^18.0.0", - "react": "^16.3.0 || ^17.0.0 || ^18.0.0", + "@types/react": "^16.8.0 || ^17.0.0 || ^18.0.0", + "react": "^16.8.4 || ^17.0.0 || ^18.0.0", "redux": "^3.4.0 || ^4.0.0 || ^5.0.0" } } diff --git a/packages/redux-devtools-dock-monitor/package.json b/packages/redux-devtools-dock-monitor/package.json index dcef607c..2532565b 100644 --- a/packages/redux-devtools-dock-monitor/package.json +++ b/packages/redux-devtools-dock-monitor/package.json @@ -69,8 +69,8 @@ }, "peerDependencies": { "@redux-devtools/core": "^3.0.0", - "@types/react": "^16.3.0 || ^17.0.0 || ^18.0.0", - "react": "^16.3.0 || ^17.0.0 || ^18.0.0", + "@types/react": "^16.8.0 || ^17.0.0 || ^18.0.0", + "react": "^16.8.4 || ^17.0.0 || ^18.0.0", "redux": "^3.4.0 || ^4.0.0 || ^5.0.0" } } diff --git a/packages/redux-devtools-inspector-monitor-test-tab/package.json b/packages/redux-devtools-inspector-monitor-test-tab/package.json index 002af98f..57c81370 100644 --- a/packages/redux-devtools-inspector-monitor-test-tab/package.json +++ b/packages/redux-devtools-inspector-monitor-test-tab/package.json @@ -90,8 +90,8 @@ "@redux-devtools/inspector-monitor": "^5.0.0", "@types/react": "^16.8.0 || ^17.0.0 || ^18.0.0", "@types/styled-components": "^5.1.34", - "react": "^16.8.0 || ^17.0.0 || ^18.0.0", - "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0", + "react": "^16.8.4 || ^17.0.0 || ^18.0.0", + "react-dom": "^16.8.4 || ^17.0.0 || ^18.0.0", "redux": "^3.4.0 || ^4.0.0 || ^5.0.0", "styled-components": "^5.3.11" } diff --git a/packages/redux-devtools-inspector-monitor-trace-tab/package.json b/packages/redux-devtools-inspector-monitor-trace-tab/package.json index e4c3767e..0b9aa70a 100644 --- a/packages/redux-devtools-inspector-monitor-trace-tab/package.json +++ b/packages/redux-devtools-inspector-monitor-trace-tab/package.json @@ -80,8 +80,8 @@ "@emotion/react": "^11.0.0", "@redux-devtools/inspector-monitor": "^5.0.0", "@types/react": "^16.8.0 || ^17.0.0 || ^18.0.0", - "react": "^16.8.0 || ^17.0.0 || ^18.0.0", - "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0", + "react": "^16.8.4 || ^17.0.0 || ^18.0.0", + "react-dom": "^16.8.4 || ^17.0.0 || ^18.0.0", "redux": "^3.4.0 || ^4.0.0 || ^5.0.0" } } diff --git a/packages/redux-devtools-inspector-monitor/package.json b/packages/redux-devtools-inspector-monitor/package.json index 97fd406c..c0f9c1b0 100644 --- a/packages/redux-devtools-inspector-monitor/package.json +++ b/packages/redux-devtools-inspector-monitor/package.json @@ -83,8 +83,8 @@ "@emotion/react": "^11.0.0", "@redux-devtools/core": "^3.0.0", "@types/react": "^16.8.0 || ^17.0.0 || ^18.0.0", - "react": "^16.8.0 || ^17.0.0 || ^18.0.0", - "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0", + "react": "^16.8.4 || ^17.0.0 || ^18.0.0", + "react-dom": "^16.8.4 || ^17.0.0 || ^18.0.0", "redux": "^3.4.0 || ^4.0.0 || ^5.0.0" } } diff --git a/packages/redux-devtools-log-monitor/package.json b/packages/redux-devtools-log-monitor/package.json index 886d9c62..c5916f61 100644 --- a/packages/redux-devtools-log-monitor/package.json +++ b/packages/redux-devtools-log-monitor/package.json @@ -71,8 +71,8 @@ }, "peerDependencies": { "@redux-devtools/core": "^3.0.0", - "@types/react": "^16.3.0 || ^17.0.0 || ^18.0.0", - "react": "^16.3.0 || ^17.0.0 || ^18.0.0", + "@types/react": "^16.8.0 || ^17.0.0 || ^18.0.0", + "react": "^16.8.4 || ^17.0.0 || ^18.0.0", "redux": "^3.4.0 || ^4.0.0 || ^5.0.0" } } diff --git a/packages/redux-devtools-rtk-query-monitor/package.json b/packages/redux-devtools-rtk-query-monitor/package.json index d28ab623..85340212 100644 --- a/packages/redux-devtools-rtk-query-monitor/package.json +++ b/packages/redux-devtools-rtk-query-monitor/package.json @@ -94,9 +94,9 @@ "@emotion/react": "^11.0.0", "@redux-devtools/core": "^3.0.0", "@reduxjs/toolkit": "^1.0.0 || ^2.0.0", - "@types/react": "^16.3.0 || ^17.0.0 || ^18.0.0", + "@types/react": "^16.8.0 || ^17.0.0 || ^18.0.0", "@types/styled-components": "^5.1.34", - "react": "^16.3.0 || ^17.0.0 || ^18.0.0", + "react": "^16.8.4 || ^17.0.0 || ^18.0.0", "redux": "^3.4.0 || ^4.0.0 || ^5.0.0", "styled-components": "^5.3.11" } diff --git a/packages/redux-devtools-slider-monitor/package.json b/packages/redux-devtools-slider-monitor/package.json index c6f7fc0d..d7bb6cac 100644 --- a/packages/redux-devtools-slider-monitor/package.json +++ b/packages/redux-devtools-slider-monitor/package.json @@ -60,9 +60,9 @@ }, "peerDependencies": { "@redux-devtools/core": "^3.0.0", - "@types/react": "^16.3.0 || ^17.0.0 || ^18.0.0", + "@types/react": "^16.8.0 || ^17.0.0 || ^18.0.0", "@types/styled-components": "^5.1.34", - "react": "^16.3.0 || ^17.0.0 || ^18.0.0", + "react": "^16.8.4 || ^17.0.0 || ^18.0.0", "redux": "^3.4.0 || ^4.0.0 || ^5.0.0", "styled-components": "^5.3.11" } diff --git a/packages/redux-devtools/package.json b/packages/redux-devtools/package.json index 05eb2b69..bc1c6507 100644 --- a/packages/redux-devtools/package.json +++ b/packages/redux-devtools/package.json @@ -74,8 +74,8 @@ "typescript": "~5.3.3" }, "peerDependencies": { - "react": "^0.14.9 || ^15.3.0 || ^16.0.0 || ^17.0.0 || ^18.0.0", - "react-redux": "^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0 || ^9.0.0", + "react": "^16.8.4 || ^17.0.0 || ^18.0.0", + "react-redux": "^7.0.0 || ^8.0.0 || ^9.0.0", "redux": "^3.5.2 || ^4.0.0 || ^5.0.0" } } diff --git a/packages/redux-devtools/src/createDevTools.tsx b/packages/redux-devtools/src/createDevTools.tsx index 967bf829..ef9f288f 100644 --- a/packages/redux-devtools/src/createDevTools.tsx +++ b/packages/redux-devtools/src/createDevTools.tsx @@ -25,12 +25,7 @@ function logError(type: string) { } } -export interface Props< - S, - A extends Action, - MonitorState, - MonitorAction extends Action, -> { +export interface Props, MonitorState> { store?: EnhancedStore; } @@ -65,9 +60,7 @@ export default function createDevTools< (state: LiftedState) => state, )(Monitor as React.ComponentType); - return class DevTools extends Component< - Props - > { + return class DevTools extends Component> { liftedStore?: LiftedStore; static instrument = ( @@ -78,11 +71,8 @@ export default function createDevTools< options, ); - constructor( - props: Props, - context?: { store?: EnhancedStore }, - ) { - super(props, context); + constructor(props: Props) { + super(props); if (ReactReduxContext) { if (this.props.store && !this.props.store.liftedStore) { @@ -91,16 +81,12 @@ export default function createDevTools< return; } - if (!props.store && !context?.store) { + if (!props.store) { logError('NoStore'); return; } - if (context?.store) { - this.liftedStore = context.store.liftedStore; - } else { - this.liftedStore = props.store!.liftedStore; - } + this.liftedStore = props.store.liftedStore; if (!this.liftedStore) { logError('NoLiftedStore'); diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 630e3bef..f1155952 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1621,7 +1621,7 @@ importers: specifier: ^0.9.1 version: link:../react-base16-styling react-dom: - specifier: ^16.8.0 || ^17.0.0 || ^18.0.0 + specifier: ^16.8.4 || ^17.0.0 || ^18.0.0 version: 18.2.0(react@18.2.0) react-json-tree: specifier: ^0.18.0