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

Jump to bottom

Upgrade all dependencies by regenerating lockfile #2470

Merged
merged 1 commit into from
Oct 10, 2024
Merged

Upgrade all dependencies by regenerating lockfile #2470

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
7 changes: 4 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -30,7 +30,8 @@
},
"resolutions": {
"**/lodash": "^4.17.21",
"rollup": "^4.13.1"
"rollup": "^4.13.1",
"cheerio": "1.0.0-rc.12"
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

see enzymejs/enzyme#2518

},
"workspaces": {
"packages": [
Expand Down
3 changes: 1 addition & 2 deletions packages/jaeger-ui/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

latest version of rollup-plugin-visualizer is written in typescript, therefore types are not required anymore

"@vitejs/plugin-legacy": "^5.4.1",
"@vitejs/plugin-react": "^4.3.1",
"@wojtekmaj/enzyme-adapter-react-17": "^0.8.0",
Expand Down Expand Up @@ -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",
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

1.11.12 is the current version in Jaeger UI, and the latest has some issues (see uber/react-vis#1485 (comment))

"react-vis-force": "^0.3.1",
"react-window": "^1.8.10",
"redux": "^4.2.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/jaeger-ui/src/components/SearchTracePage/SearchResults/ResultItemTitle.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}%` }}
Expand Down
4 changes: 2 additions & 2 deletions packages/jaeger-ui/src/components/TracePage/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand All @@ -72,7 +72,7 @@ type TDispatchProps = {

type TOwnProps = {
history: RouterHistory;
location: Location;
location: Location<LocationState>;
params: { id: string };
};

Expand Down
6 changes: 5 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 @@ -41,6 +41,10 @@ export type FetchedTrace = {
state?: FetchedState;
};

export type LocationState = {
fromSearch?: string;
};

export type ReduxState = {
archive: TracesArchive;
type: Action;
Expand All @@ -53,7 +57,7 @@ export type ReduxState = {
};
embedded: EmbeddedState;
router: Router & {
location: Location;
location: Location<LocationState>;
};
services: {
services: string[] | TNil;
Expand Down
Loading
Loading