Merge branch 'main' into fix-eslint-unbound-method

This commit is contained in:
Nathan Bierema 2023-12-17 21:31:12 -05:00 committed by GitHub
commit 1a0de37c76
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 45 additions and 41 deletions

View File

@ -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

View File

@ -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.

View File

@ -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"
}
}

View File

@ -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"
}
}

View File

@ -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"
}
}

View File

@ -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"
}

View File

@ -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"
}
}

View File

@ -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"
}
}

View File

@ -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"
}
}

View File

@ -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"
}

View File

@ -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"
}

View File

@ -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"
}
}

View File

@ -25,12 +25,7 @@ function logError(type: string) {
}
}
export interface Props<
S,
A extends Action<string>,
MonitorState,
MonitorAction extends Action<string>,
> {
export interface Props<S, A extends Action<string>, MonitorState> {
store?: EnhancedStore<S, A, MonitorState>;
}
@ -65,9 +60,7 @@ export default function createDevTools<
(state: LiftedState<S, A, MonitorState>) => state,
)(Monitor as React.ComponentType<any>);
return class DevTools extends Component<
Props<S, A, MonitorState, MonitorAction>
> {
return class DevTools extends Component<Props<S, A, MonitorState>> {
liftedStore?: LiftedStore<S, A, MonitorState>;
static instrument = (
@ -78,11 +71,8 @@ export default function createDevTools<
options,
);
constructor(
props: Props<S, A, MonitorState, MonitorAction>,
context?: { store?: EnhancedStore<S, A, MonitorState> },
) {
super(props, context);
constructor(props: Props<S, A, MonitorState>) {
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');

View File

@ -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