Upgrade all dependencies by regenerating lockfile (#2470)

jaegertracing · Oct 10, 2024 · 4484633 · 4484633
1 parent 05fe72c
commit 4484633
Show file tree

Hide file tree

Showing 6 changed files with 1,728 additions and 2,371 deletions.
diff --git a/package.json b/package.json
@@ -12,8 +12,8 @@
   },
   "devDependencies": {
     "@babel/eslint-parser": "^7.24.6",
-    "@typescript-eslint/eslint-plugin": "7.4.0",
-    "@typescript-eslint/parser": "7.4.0",
+    "@typescript-eslint/eslint-plugin": "^7.4.0",
+    "@typescript-eslint/parser": "^7.4.0",
     "depcheck": "1.4.7",
     "eslint": "8.57.0",
     "eslint-config-airbnb": "19.0.4",
@@ -30,7 +30,8 @@
   },
   "resolutions": {
     "**/lodash": "^4.17.21",
-    "rollup": "^4.13.1"
+    "rollup": "^4.13.1",
+    "cheerio": "1.0.0-rc.12"
   },
   "workspaces": {
     "packages": [

diff --git a/packages/jaeger-ui/package.json b/packages/jaeger-ui/package.json
@@ -26,7 +26,6 @@
     "@types/react-router-dom": "^5.1.0",
     "@types/redux-actions": "2.2.1",
     "@types/object-hash": "^3.0.2",
-    "@types/rollup-plugin-visualizer": "^4.2.1",
     "@vitejs/plugin-legacy": "^5.4.1",
     "@vitejs/plugin-react": "^4.3.1",
     "@wojtekmaj/enzyme-adapter-react-17": "^0.8.0",
@@ -80,7 +79,7 @@
     "react-redux": "^8.1.2",
     "react-router-dom": "5.3.4",
     "react-router-dom-v5-compat": "^6.24.0",
-    "react-vis": "^1.7.2",
+    "react-vis": "1.11.12",
     "react-vis-force": "^0.3.1",
     "react-window": "^1.8.10",
     "redux": "^4.2.1",

diff --git a/packages/jaeger-ui/src/components/SearchTracePage/SearchResults/ResultItemTitle.tsx b/packages/jaeger-ui/src/components/SearchTracePage/SearchResults/ResultItemTitle.tsx
@@ -99,7 +99,7 @@ export default class ResultItemTitle extends React.PureComponent<Props> {
       <div className="ResultItemTitle">
         {!disableComparision && <Checkbox {...checkboxProps} />}
         {/* TODO: Shouldn't need cast */}
-        <WrapperComponent {...(wrapperProps as { [key: string]: string; to: string })}>
+        <WrapperComponent {...(wrapperProps as any)}>
           <span
             className="ResultItemTitle--durationBar"
             style={{ width: `${durationPercent || DEFAULT_DURATION_PERCENT}%` }}

diff --git a/packages/jaeger-ui/src/components/TracePage/index.tsx b/packages/jaeger-ui/src/components/TracePage/index.tsx
@@ -48,7 +48,7 @@ import { extractUiFindFromState } from '../common/UiFindInput';
 import * as jaegerApiActions from '../../actions/jaeger-api';
 import { getUiFindVertexKeys } from '../TraceDiff/TraceDiffGraph/traceDiffGraphUtils';
 import { fetchedState } from '../../constants';
-import { FetchedTrace, ReduxState, TNil } from '../../types';
+import { FetchedTrace, LocationState, ReduxState, TNil } from '../../types';
 import { Trace } from '../../types/trace';
 import { TraceArchive } from '../../types/archive';
 import { EmbeddedState } from '../../types/embedded';
@@ -72,7 +72,7 @@ type TDispatchProps = {
 
 type TOwnProps = {
   history: RouterHistory;
-  location: Location;
+  location: Location<LocationState>;
   params: { id: string };
 };
 

diff --git a/packages/jaeger-ui/src/types/index.tsx b/packages/jaeger-ui/src/types/index.tsx
@@ -41,6 +41,10 @@ export type FetchedTrace = {
   state?: FetchedState;
 };
 
+export type LocationState = {
+  fromSearch?: string;
+};
+
 export type ReduxState = {
   archive: TracesArchive;
   type: Action;
@@ -53,7 +57,7 @@ export type ReduxState = {
   };
   embedded: EmbeddedState;
   router: Router & {
-    location: Location;
+    location: Location<LocationState>;
   };
   services: {
     services: string[] | TNil;