Skip to content

Commit

Permalink
[revert]: revert redux and react-redux dependency upgrades (#2553)
Browse files Browse the repository at this point in the history
Reverts #2537
Reason:
#2542 (comment)
Part of #2530

---------

Signed-off-by: Hariom Gupta <guptahariom03082003@gmail.com>
  • Loading branch information
hari45678 authored Jan 5, 2025
1 parent 4a428bf commit 355758b
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 60 deletions.
52 changes: 2 additions & 50 deletions package-lock.json

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

4 changes: 2 additions & 2 deletions packages/jaeger-ui/package.json
Original file line number Diff line number Diff line change
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
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
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

0 comments on commit 355758b

Please sign in to comment.