Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "[chore] Update redux and react-redux to latest version" #2549

Closed
wants to merge 1 commit into from
Closed

Revert "[chore] Update redux and react-redux to latest version" #2549

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 4 additions & 52 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions packages/jaeger-ui/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@
"@testing-library/react": "^15.0.7",
"@types/deep-freeze": "^0.1.1",
"@types/lodash": "^4.17.0",
"@types/object-hash": "^3.0.2",
"@types/react": "^18.3.11",
"@types/react-window": "^1.8.0",
"@types/redux-form": "^8.3.10",
"@types/react-helmet": "^6.1.5",
"@types/react-router-dom": "^5.1.0",
"@types/react-window": "^1.8.0",
"@types/redux-actions": "2.2.1",
"@types/redux-form": "^8.3.10",
"@types/object-hash": "^3.0.2",
"@vitejs/plugin-legacy": "^5.4.1",
"@vitejs/plugin-react": "^4.3.1",
"@wojtekmaj/enzyme-adapter-react-17": "^0.8.0",
Expand Down Expand Up @@ -76,13 +76,13 @@
"react-icons": "^5.0.1",
"react-is": "^18.2.0",
"react-json-view-lite": "2.0.1",
"react-redux": "^9.2.0",
"react-redux": "^8.1.2",
"react-router-dom": "5.3.4",
"react-router-dom-v5-compat": "^6.24.0",
"react-vis": "1.11.12",
"react-vis-force": "^0.3.1",
"react-window": "^1.8.10",
"redux": "^5.0.1",
"redux": "^4.2.1",
"redux-actions": "2.6.5",
"redux-first-history": "^5.2.0",
"redux-form": "^8.3.10",
Expand Down
7 changes: 0 additions & 7 deletions packages/jaeger-ui/src/components/TraceDiff/TraceDiff.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,6 @@ import * as TraceDiffUrl from './url';
import * as jaegerApiActions from '../../actions/jaeger-api';
import { fetchedState, TOP_NAV_HEIGHT } from '../../constants';

/*
With v5+, redux no longer supports `bindActionCreators` to be configured.
`configurable: true` has to be supported by the compilers for it to be configured.
It has to be explicitly told using `__esModule` to babel for compiling it with that property.
*/
jest.mock('redux', () => ({ __esModule: true, ...jest.requireActual('redux') }));

describe('TraceDiff', () => {
const defaultA = 'trace-id-a';
const defaultB = 'trace-id-b';
Expand Down
3 changes: 2 additions & 1 deletion packages/jaeger-ui/src/types/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
import { Router } from 'react-router-dom';
import { Location } from 'history';

import { Action } from 'redux';
import { ApiError } from './api-error';
import { TracesArchive } from './archive';
import { Config } from './config';
Expand Down Expand Up @@ -46,7 +47,7 @@ export type LocationState = {

export type ReduxState = {
archive: TracesArchive;
type: string;
type: Action;
config: Config;
ddg: TDdgState;
dependencies: {
Expand Down
Loading