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 many dependencies part 2 #1013

Merged
merged 12 commits into from
Nov 8, 2022
Merged

Upgrade many dependencies part 2 #1013

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
52167a1
Update dependabot.yml
mmorel-35 Oct 24, 2022
f2cbb4b
Bump webpack from 4.46.0 to 5.74.0
dependabot[bot] Oct 24, 2022
4277057
Merge branch 'jaegertracing:main' into main
mmorel-35 Nov 2, 2022
7790d78
Bump react-window from 1.8.7 to 1.8.8
dependabot[bot] Nov 2, 2022
6516af1
Bump jsdom from 20.0.1 to 20.0.2
dependabot[bot] Nov 2, 2022
5e56f6a
Bump jest from 29.2.1 to 29.2.2
dependabot[bot] Nov 2, 2022
064cb62
Update dependabot.yml
mmorel-35 Nov 2, 2022
13177c4
Bump redux-promise-middleware from 4.4.2 to 5.1.1
dependabot[bot] Nov 2, 2022
6a252e7
Bump cytoscape-dagre from 2.4.0 to 2.5.0
dependabot[bot] Nov 2, 2022
e588ddf
Bump babel-loader from 8.2.5 to 9.0.1
dependabot[bot] Nov 3, 2022
91b536c
Bump enzyme-adapter-react-16 from 1.10.0 to 1.15.6
dependabot[bot] Nov 4, 2022
9023215
chore: upgrade react to 16.14.0
mmorel-35 Nov 4, 2022
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
1 change: 1 addition & 0 deletions .github/dependabot.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
version: 2
updates:
- package-ecosystem: "npm"
open-pull-requests-limit: 50
directory: "/"
schedule:
interval: "daily"
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"eslint-plugin-react": "7.12.4",
"husky": "8.0.1",
"isomorphic-fetch": "3.0.0",
"jsdom": "20.0.1",
"jsdom": "20.0.2",
"lerna": "6.0.1",
"npm-run-all": "4.1.5",
"prettier": "1.18.2",
Expand Down
6 changes: 3 additions & 3 deletions packages/jaeger-ui/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,10 +85,10 @@
"prop-types": "^15.5.10",
"query-string": "^6.3.0",
"raven-js": "^3.22.1",
"react": "^16.3.2",
"react": "^16.14.0",
"react-circular-progressbar": "^2.0.3",
"react-dimensions": "^1.3.0",
"react-dom": "^16.3.2",
"react-dom": "^16.14.0",
"react-ga": "^3.3.1",
"react-helmet": "^6.1.0",
"react-icons": "2.2.7",
Expand All @@ -105,7 +105,7 @@
"redux-actions": "^2.2.1",
"redux-async-middleware": "^0.0.0",
"redux-form": "^8.3.8",
"redux-promise-middleware": "^4.3.0",
"redux-promise-middleware": "^5.1.1",
"reselect": "^4.1.6",
"store": "^2.0.12",
"ts-key-enum": "^2.0.0",
Expand Down
4 changes: 2 additions & 2 deletions ...i/src/components/DeepDependencies/Header/HopsSelector/__snapshots__/Selector.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ exports[`Selector renders buttons with expected text and classNames 1`] = `
>
4
</button>
<Component
<Memo(ChevronDown)
Copy link
Member

Choose a reason for hiding this comment

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

is there a link to docs that explains this change?

Copy link
Contributor Author

@mmorel-35 mmorel-35 Nov 5, 2022 •
edited
Loading

Choose a reason for hiding this comment

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

I couldn't find one, all that I found was https://github.com/enzymejs/enzyme/blob/master/docs/guides/migration-from-2-to-3.md and https://github.com/enzymejs/enzyme/blob/master/CHANGELOG.md but it seems there is not much about those Memo(), but it seems to be a React 16 feature

className="ub-ml1"
/>
</span>
Expand Down Expand Up @@ -246,7 +246,7 @@ exports[`Selector renders upstream hops with negative distance correctly 1`] = `
>
4
</button>
<Component
<Memo(ChevronDown)
className="ub-ml1"
/>
</span>
Expand Down
8 changes: 4 additions & 4 deletions packages/jaeger-ui/src/components/DeepDependencies/Header/__snapshots__/index.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ exports[`<Header> renders the hops selector if distanceToPathElems is provided 1
className="DdgHeader--controlHeader"
>
<LayoutSettings />
<Component
<Memo(HopsSelector)
distanceToPathElems={Map {}}
handleClick={[Function]}
visEncoding="3"
Expand Down Expand Up @@ -89,7 +89,7 @@ exports[`<Header> renders the operation selector iff a service is selected 1`] =
className="DdgHeader--controlHeader"
>
<LayoutSettings />
<Component
<Memo(HopsSelector)
handleClick={[Function]}
/>
<div
Expand Down Expand Up @@ -160,7 +160,7 @@ exports[`<Header> renders the operation selector iff a service is selected 2`] =
className="DdgHeader--controlHeader"
>
<LayoutSettings />
<Component
<Memo(HopsSelector)
handleClick={[Function]}
/>
<div
Expand Down Expand Up @@ -215,7 +215,7 @@ exports[`<Header> renders with minimal props 1`] = `
className="DdgHeader--controlHeader"
>
<LayoutSettings />
<Component
<Memo(HopsSelector)
handleClick={[Function]}
/>
<div
Expand Down
17 changes: 9 additions & 8 deletions packages/plexus/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,31 +22,32 @@
"@babel/preset-react": "7.18.6",
"@babel/preset-typescript": "7.18.6",
"@types/d3-zoom": "1.7.3",
"@types/react": "^16.7.20",
"@types/react-dom": "^16.0.11",
"babel-loader": "8.2.5",
"@types/react": "^16.14.0",
"@types/react-dom": "^16.9.17",
"babel-loader": "9.0.1",
"babel-plugin-transform-react-remove-prop-types": "0.4.24",
"clean-webpack-plugin": "4.0.0",
"css-loader": "6.7.1",
"enzyme": "3.11.0",
"file-loader": "6.2.0",
"html-loader": "4.2.0",
"html-webpack-plugin": "5.5.0",
"jest": "29.2.1",
"jest": "29.2.2",
"npm-run-all": "4.1.5",
"react": "^16.7.0",
"react-dom": "^16.7.0",
"react": "^16.14.0",
"react-dom": "^16.14.0",
"rimraf": "3.0.2",
"style-loader": "3.3.1",
"url-loader": "4.1.1",
"webpack": "^4.28.4",
"webpack": "^5.74.0",
"webpack-cli": "^4.10.0",
"webpack-dev-server": "^3.1.14",
"webpack-node-externals": "3.0.0",
"worker-loader": "3.0.8"
},
"peerDependencies": {
"react": "16.x"
"react": "^16.x",
"react-dom": "^16.x"
},
"dependencies": {
"d3-selection": "^1.3.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/plexus/src/zoom/ZoomManager.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ export default class ZoomManager {
return getZoomAttr(zoomTransform);
}

static getZoomStyle(zoomTransform: ZoomTransform | void) {
static getZoomStyle(zoomTransform: ZoomTransform | void): React.CSSProperties {
return getZoomStyle(zoomTransform);
}

Expand Down
2 changes: 1 addition & 1 deletion packages/plexus/src/zoom/utils.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ export function constrainZoom(
return transform;
}

export function getZoomStyle(transform: ZoomTransform | void) {
export function getZoomStyle(transform: ZoomTransform | void): React.CSSProperties {
if (transform == null) {
return DEFAULT_ZOOM_STYLE;
}
Expand Down
Loading