diff --git a/package-lock.json b/package-lock.json index b3d4bd05c1..abec13b907 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4560,7 +4560,6 @@ "resolved": "https://registry.npmjs.org/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.5.tgz", "integrity": "sha512-SbcrWzkKBw2cdwRTwQAswfpB9g9LJWfjtUeW/jvNwbhC8cpmmNYVePa+ncbUe0rGTQ7G3Ff6mYUN2VMfLVr+Sg==", "license": "MIT", - "peer": true, "dependencies": { "@types/react": "*", "hoist-non-react-statics": "^3.3.0" @@ -4867,8 +4866,7 @@ "version": "0.0.3", "resolved": "https://registry.npmjs.org/@types/use-sync-external-store/-/use-sync-external-store-0.0.3.tgz", "integrity": "sha512-EwmlvuaxPNej9+T4v5AuBPJa2x2UOJVdjCtDHgcDqitUeOtjnJKJ+apYjVcAoBEMjKW1VVFGZLUb5+qqa09XFA==", - "license": "MIT", - "peer": true + "license": "MIT" }, "node_modules/@types/ws": { "version": "8.5.12", @@ -16354,7 +16352,6 @@ "resolved": "https://registry.npmjs.org/react-redux/-/react-redux-8.1.3.tgz", "integrity": "sha512-n0ZrutD7DaX/j9VscF+uTALI3oUPa/pO4Z3soOBIjuRn/FzVu6aehhysxZCLi6y7duMf52WNZGMl7CtuK5EnRw==", "license": "MIT", - "peer": true, "dependencies": { "@babel/runtime": "^7.12.1", "@types/hoist-non-react-statics": "^3.3.1", @@ -19253,7 +19250,6 @@ "resolved": "https://registry.npmjs.org/use-sync-external-store/-/use-sync-external-store-1.2.2.tgz", "integrity": "sha512-PElTlVMwpblvbNqQ82d2n6RjStvdSoNe9FG28kNfz3WiXilJm4DdNkEzRhCZuIDwY8U08WVihhGR5iRqAwfDiw==", "license": "MIT", - "peer": true, "peerDependencies": { "react": "^16.8.0 || ^17.0.0 || ^18.0.0" } @@ -20171,12 +20167,6 @@ "vite-plugin-imp": "^2.4.0" } }, - "packages/jaeger-ui/node_modules/@types/use-sync-external-store": { - "version": "0.0.6", - "resolved": "https://registry.npmjs.org/@types/use-sync-external-store/-/use-sync-external-store-0.0.6.tgz", - "integrity": "sha512-zFDAD+tlpf2r4asuHEj0XH6pY6i0g5NeAHPn+15wk3BV6JA69eERFXC1gyGThDkVa1zCyKr5jox1+2LbV/AMLg==", - "license": "MIT" - }, "packages/jaeger-ui/node_modules/@vitejs/plugin-legacy": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/@vitejs/plugin-legacy/-/plugin-legacy-6.0.0.tgz", @@ -20355,44 +20345,6 @@ "node": "^10 || ^12 || >=14" } }, - "packages/jaeger-ui/node_modules/react-redux": { - "version": "9.2.0", - "resolved": "https://registry.npmjs.org/react-redux/-/react-redux-9.2.0.tgz", - "integrity": "sha512-ROY9fvHhwOD9ySfrF0wmvu//bKCQ6AeZZq1nJNtbDC+kk5DuSuNX/n6YWYF/SYy7bSba4D4FSz8DJeKY/S/r+g==", - "license": "MIT", - "dependencies": { - "@types/use-sync-external-store": "^0.0.6", - "use-sync-external-store": "^1.4.0" - }, - "peerDependencies": { - "@types/react": "^18.2.25 || ^19", - "react": "^18.0 || ^19", - "redux": "^5.0.0" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - }, - "redux": { - "optional": true - } - } - }, - "packages/jaeger-ui/node_modules/react-redux/node_modules/use-sync-external-store": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/use-sync-external-store/-/use-sync-external-store-1.4.0.tgz", - "integrity": "sha512-9WXSPC5fMv61vaupRkCKCxsPxBocVnwakBEkMIHHpkTTg6icbJtg6jzgtLDm4bl3cSHAca52rYWih0k4K3PfHw==", - "license": "MIT", - "peerDependencies": { - "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0" - } - }, - "packages/jaeger-ui/node_modules/redux": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/redux/-/redux-5.0.1.tgz", - "integrity": "sha512-M9/ELqF6fy8FwmkpnF0S3YKOqMyoWJ4+CS5Efg2ct3oY9daQvd/Pc71FpGZsVsbl3Cpb+IIcjBDUnnyBdQbq4w==", - "license": "MIT" - }, "packages/jaeger-ui/node_modules/vite": { "version": "6.0.7", "resolved": "https://registry.npmjs.org/vite/-/vite-6.0.7.tgz", @@ -20537,7 +20489,7 @@ "style-loader": "4.0.0", "webpack": "^5.92.0", "webpack-cli": "^5.1.4", - "webpack-dev-server": "^5.0.4", + "webpack-dev-server": "^5.2.0", "webpack-node-externals": "3.0.0", "worker-loader": "3.0.8" }, diff --git a/packages/jaeger-ui/package.json b/packages/jaeger-ui/package.json index a6cb6d52c9..0ed6e30cbc 100644 --- a/packages/jaeger-ui/package.json +++ b/packages/jaeger-ui/package.json @@ -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", diff --git a/packages/jaeger-ui/src/components/TraceDiff/TraceDiff.test.js b/packages/jaeger-ui/src/components/TraceDiff/TraceDiff.test.js index d9880d7427..5744ecc5ce 100644 --- a/packages/jaeger-ui/src/components/TraceDiff/TraceDiff.test.js +++ b/packages/jaeger-ui/src/components/TraceDiff/TraceDiff.test.js @@ -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'; diff --git a/packages/jaeger-ui/src/types/index.tsx b/packages/jaeger-ui/src/types/index.tsx index 801ae69b27..f4f592b695 100644 --- a/packages/jaeger-ui/src/types/index.tsx +++ b/packages/jaeger-ui/src/types/index.tsx @@ -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'; @@ -46,7 +47,7 @@ export type LocationState = { export type ReduxState = { archive: TracesArchive; - type: string; + type: Action; config: Config; ddg: TDdgState; dependencies: {