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.

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

Upgrade many dependencies #1001

Merged
merged 95 commits into from
Oct 20, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
95 commits
Select commit Hold shift + click to select a range
00d0245
Update package.json
mmorel-35 Oct 19, 2022
5cf97b8
Create run-commit.yml
mmorel-35 Oct 19, 2022
4969ab1
Commit from GitHub Actions (Run and commit)
mmorel-35 Oct 19, 2022
1f9368c
Update dependabot.yml
mmorel-35 Oct 19, 2022
5967f4d
Bump style-loader from 0.23.1 to 3.3.1
dependabot[bot] Oct 19, 2022
826cd14
Bump @babel/cli from 7.13.14 to 7.19.3
dependabot[bot] Oct 19, 2022
c80a910
Bump http-proxy-middleware from 0.19.1 to 2.0.6
dependabot[bot] Oct 19, 2022
073f0dd
Bump @babel/core from 7.3.4 to 7.19.3
dependabot[bot] Oct 19, 2022
3c4659e
Update dependabot.yml
mmorel-35 Oct 19, 2022
8375366
Bump worker-loader from 2.0.0 to 3.0.8
dependabot[bot] Oct 19, 2022
283904a
Bump @babel/preset-env from 7.3.4 to 7.19.4
dependabot[bot] Oct 19, 2022
fb1b5ae
Bump enzyme from 3.9.0 to 3.11.0
dependabot[bot] Oct 19, 2022
89ece96
Bump css-loader from 2.1.1 to 6.7.1
dependabot[bot] Oct 19, 2022
70520fa
Bump eslint-config-prettier from 4.0.0 to 6.15.0
dependabot[bot] Oct 19, 2022
19c2570
Bump prettier from 1.18.2 to 2.7.1
dependabot[bot] Oct 19, 2022
07f0062
Bump url-loader from 1.1.2 to 4.1.1
dependabot[bot] Oct 19, 2022
66f9f20
Bump combokeys from 3.0.0 to 3.0.1
dependabot[bot] Oct 19, 2022
9460ed0
Bump rxjs-compat from 6.4.0 to 6.6.7
dependabot[bot] Oct 19, 2022
02ee5b4
Bump copy-to-clipboard from 3.1.0 to 3.3.2
dependabot[bot] Oct 19, 2022
a03ba31
Bump raven-js from 3.27.0 to 3.27.2
dependabot[bot] Oct 19, 2022
699bd2a
Bump cytoscape-dagre from 2.3.2 to 2.4.0
dependabot[bot] Oct 19, 2022
eb638ef
Update dependabot.yml
mmorel-35 Oct 19, 2022
c208386
Bump u-basscss from 2.0.0 to 2.0.1
dependabot[bot] Oct 19, 2022
2899183
Bump react-helmet from 5.2.0 to 6.1.0
dependabot[bot] Oct 19, 2022
9942b43
Bump file-loader from 3.0.1 to 6.2.0
dependabot[bot] Oct 19, 2022
8627a57
Bump bluebird from 3.5.3 to 3.7.2
dependabot[bot] Oct 19, 2022
a945704
Update package.json
mmorel-35 Oct 19, 2022
3db0c3b
Commit from GitHub Actions (Run and commit)
mmorel-35 Oct 19, 2022
0156ac7
Bump webpack from 4.29.6 to 4.46.0
dependabot[bot] Oct 19, 2022
2919328
Bump webpack-node-externals from 1.7.2 to 3.0.0
dependabot[bot] Oct 19, 2022
48df751
Bump webpack-cli from 3.2.3 to 4.10.0
dependabot[bot] Oct 19, 2022
6dd1bf2
Bump react-window from 1.8.3 to 1.8.7
dependabot[bot] Oct 19, 2022
4cee5de
Bump source-map-explorer from 1.7.0 to 2.5.3
dependabot[bot] Oct 19, 2022
8a0c080
Update dependabot.yml
mmorel-35 Oct 19, 2022
d270587
Bump @typescript-eslint/parser from 1.12.0 to 1.13.0
dependabot[bot] Oct 19, 2022
2459422
Bump @types/react-copy-to-clipboard from 4.2.6 to 5.0.4
dependabot[bot] Oct 19, 2022
b92bdf1
Bump rimraf from 2.6.3 to 3.0.2
dependabot[bot] Oct 19, 2022
155af57
Bump dagre from 0.7.4 to 0.8.5
dependabot[bot] Oct 19, 2022
a8a6bf7
Bump jest from 23.6.0 to 29.2.1
dependabot[bot] Oct 19, 2022
f6e8b15
Bump chance from 1.0.18 to 1.1.9
dependabot[bot] Oct 19, 2022
a6dffe0
Bump react-ga from 2.5.7 to 3.3.1
dependabot[bot] Oct 19, 2022
243564d
Bump jest-junit from 10.0.0 to 14.0.1
dependabot[bot] Oct 19, 2022
5411fda
Bump eslint-plugin-import from 2.16.0 to 2.26.0
dependabot[bot] Oct 19, 2022
eb1edb4
Bump @babel/plugin-syntax-dynamic-import from 7.2.0 to 7.8.3
dependabot[bot] Oct 19, 2022
284c06e
Bump classnames from 2.2.6 to 2.3.2
dependabot[bot] Oct 19, 2022
f0adfe4
Bump clean-webpack-plugin from 2.0.1 to 4.0.0
dependabot[bot] Oct 19, 2022
38d91f6
Bump isomorphic-fetch from 2.2.1 to 3.0.0
dependabot[bot] Oct 19, 2022
72ba8c8
Bump @babel/plugin-proposal-class-properties from 7.3.4 to 7.18.6
dependabot[bot] Oct 19, 2022
7089954
Bump ts-key-enum from 2.0.0 to 2.0.12
dependabot[bot] Oct 19, 2022
d5d572f
Bump react-router-redux from 5.0.0-alpha.6 to 5.0.0-alpha.8
dependabot[bot] Oct 19, 2022
a620a25
Bump react-vis from 1.11.6 to 1.11.7
dependabot[bot] Oct 19, 2022
793a650
Bump drange from 2.0.0 to 2.0.1
dependabot[bot] Oct 19, 2022
8f23e9f
Bump eslint from 5.14.1 to 5.16.0
dependabot[bot] Oct 19, 2022
0e6da66
Bump cytoscape from 3.19.0 to 3.23.0
dependabot[bot] Oct 19, 2022
205311f
Bump lerna from 3.13.0 to 6.0.1
dependabot[bot] Oct 19, 2022
b1e5624
Update package.json
mmorel-35 Oct 19, 2022
8a3061c
Commit from GitHub Actions (Run and commit)
mmorel-35 Oct 19, 2022
a562fdc
Bump @typescript-eslint/eslint-plugin from 1.12.0 to 1.13.0
dependabot[bot] Oct 19, 2022
bd1595d
Bump babel-plugin-import from 1.11.0 to 1.13.5
dependabot[bot] Oct 19, 2022
41d1e98
Bump @babel/preset-typescript from 7.1.0 to 7.18.6
dependabot[bot] Oct 19, 2022
406c5dc
Bump eslint-plugin-flowtype from 3.4.2 to 3.13.0
dependabot[bot] Oct 19, 2022
0e16b91
Bump babel-loader from 8.0.5 to 8.2.5
dependabot[bot] Oct 19, 2022
2737df1
Bump react-test-renderer from 15.6.2 to 16.14.0
dependabot[bot] Oct 19, 2022
bfefa32
Bump @babel/preset-react from 7.0.0 to 7.18.6
dependabot[bot] Oct 19, 2022
abae4ef
Bump husky from 1.3.1 to 8.0.1
dependabot[bot] Oct 19, 2022
61e6a5e
Bump react-circular-progressbar from 2.0.3 to 2.1.0
dependabot[bot] Oct 19, 2022
62ac2fb
Bump is-promise from 2.1.0 to 4.0.0
dependabot[bot] Oct 19, 2022
9a8ce83
Bump recompose from 0.25.1 to 0.30.0
dependabot[bot] Oct 19, 2022
7d65097
Bump react-app-rewired from 2.0.1 to 2.2.1
dependabot[bot] Oct 20, 2022
5f6cc5b
Bump prop-types from 15.7.2 to 15.8.1
dependabot[bot] Oct 20, 2022
c8e0b5e
Bump global from 4.3.2 to 4.4.0
dependabot[bot] Oct 20, 2022
a2a3469
Bump eslint-plugin-jsx-a11y from 6.2.1 to 6.6.1
dependabot[bot] Oct 20, 2022
2e9e287
Bump logfmt from 1.2.1 to 1.3.2
dependabot[bot] Oct 20, 2022
ef408ce
Bump redux-form from 7.4.2 to 8.3.8
dependabot[bot] Oct 20, 2022
cf0d31f
Bump viz.js from 1.8.1 to 2.1.2
dependabot[bot] Oct 20, 2022
6d3c084
Bump reselect from 3.0.1 to 4.1.6
dependabot[bot] Oct 20, 2022
57d2933
Bump html-webpack-plugin from 5.1.0 to 5.5.0
dependabot[bot] Oct 20, 2022
aa61a0e
Bump @types/recompose from 0.30.5 to 0.30.10
dependabot[bot] Oct 20, 2022
ae6764f
Bump less from 3.9.0 to 3.13.1
dependabot[bot] Oct 20, 2022
db8ad5d
Bump memoize-one from 5.1.1 to 6.0.0
dependabot[bot] Oct 20, 2022
ce26c3b
Bump object-hash from 1.3.1 to 3.0.0
dependabot[bot] Oct 20, 2022
d9b9c52
Bump enzyme-to-json from 3.3.5 to 3.6.2
dependabot[bot] Oct 20, 2022
efb13d2
Update dependabot.yml
mmorel-35 Oct 20, 2022
0fad3dc
Delete run-commit.yml
mmorel-35 Oct 20, 2022
569c65f
Update dependabot.yml
mmorel-35 Oct 20, 2022
b837423
Bump @babel/core from 7.19.3 to 7.19.6
dependabot[bot] Oct 20, 2022
38b5980
Bump @types/memoize-one from 4.1.1 to 5.1.2
dependabot[bot] Oct 20, 2022
6648b89
Bump @types/object-hash from 1.3.0 to 2.2.1
dependabot[bot] Oct 20, 2022
2de4b5a
Bump @types/deep-freeze from 0.1.1 to 0.1.2
dependabot[bot] Oct 20, 2022
f945f6e
Bump @types/react-virtualized-select from 3.0.8 to 3.0.11
dependabot[bot] Oct 20, 2022
2b50be1
Bump webpack-dev-server from 3.2.1 to 3.11.3
dependabot[bot] Oct 20, 2022
765d13b
Update dependabot.yml
mmorel-35 Oct 20, 2022
7c428e9
prettier avoid arrowParens
mmorel-35 Oct 20, 2022
801975b
rollback prettier to 1.18.2
mmorel-35 Oct 20, 2022
18fd3fe
tollback arrowParens override
mmorel-35 Oct 20, 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
28 changes: 11 additions & 17 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,35 +8,29 @@
"url": "https://github.com/jaegertracing/jaeger-ui.git"
},
"devDependencies": {
"@typescript-eslint/eslint-plugin": "1.12.0",
"@typescript-eslint/parser": "1.12.0",
"@typescript-eslint/eslint-plugin": "1.13.0",
"@typescript-eslint/parser": "1.13.0",
"@typescript-eslint/typescript-estree": "1.12.0",
"babel-eslint": "10.1.0",
"eslint": "5.14.1",
"eslint": "5.16.0",
"eslint-config-airbnb": "17.1.0",
"eslint-config-prettier": "4.0.0",
"eslint-config-prettier": "6.15.0",
"eslint-config-react-app": "3.0.7",
"eslint-plugin-flowtype": "^3.4.2",
"eslint-plugin-import": "2.16.0",
"eslint-plugin-jsx-a11y": "6.2.1",
"eslint-plugin-import": "2.26.0",
"eslint-plugin-jsx-a11y": "6.6.1",
"eslint-plugin-react": "7.12.4",
"husky": "1.3.1",
"isomorphic-fetch": "2.2.1",
"husky": "8.0.1",
"isomorphic-fetch": "3.0.0",
"jsdom": "20.0.1",
"lerna": "3.13.0",
"lerna": "6.0.1",
"npm-run-all": "4.1.5",
"prettier": "1.18.2",
"rxjs-compat": "6.4.0",
"rxjs-compat": "6.6.7",
"typescript": "3.5.3"
},
"resolutions": {
"**/cheerio/parse5": "4.0.0",
"**/fstream": "1.0.12",
"**/handlebars": "4.7.7",
"**/js-yaml": "3.13.1",
"**/lodash": "4.17.21",
"**/node-gyp/tar": "2.2.2",
"**/prettier": "1.18.2"
"**/lodash": "4.17.21"
},
"workspaces": {
"packages": [
Expand Down
45 changes: 23 additions & 22 deletions packages/jaeger-ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,22 +23,22 @@
"devDependencies": {
"@types/match-sorter": "^2.3.0",
"@types/react-window": "^1.8.0",
"babel-plugin-import": "1.11.0",
"babel-plugin-import": "1.13.5",
"bluebird": "^3.5.0",
"customize-cra": "0.2.9",
"enzyme": "^3.8.0",
"enzyme-adapter-react-16": "^1.2.0",
"enzyme-to-json": "^3.3.0",
"http-proxy-middleware": "^0.19.1",
"jest-junit": "^10.0.0",
"less": "3.9.0",
"http-proxy-middleware": "^2.0.6",
"jest-junit": "^14.0.1",
"less": "3.13.1",
"less-loader": "4.1.0",
"less-vars-to-js": "^1.2.1",
"react-app-rewired": "2.0.1",
"react-app-rewired": "2.2.1",
"react-scripts": "2.1.3",
"react-test-renderer": "^15.6.1",
"react-test-renderer": "^16.14.0",
"sinon": "7.3.2",
"source-map-explorer": "^1.6.0"
"source-map-explorer": "^2.5.3"
},
"dependencies": {
"@jaegertracing/plexus": "0.2.0",
Expand All @@ -47,10 +47,11 @@
"@types/deep-freeze": "^0.1.1",
"@types/history": "^4.7.2",
"@types/lodash": "^4.14.123",
"@types/memoize-one": "4.1.1",
"@types/memoize-one": "5.1.2",
"@types/moment": "^2.13.0",
"@types/object-hash": "^1.3.0",
"@types/react-copy-to-clipboard": "^4.2.6",
"@types/object-hash": "^2.2.1",
"@types/react-copy-to-clipboard": "^5.0.4",
"@types/react-helmet": "^6.1.5",
"@types/react-icons": "2.2.7",
"@types/react-redux": "^5.0.6",
"@types/react-router-dom": "^4.3.1",
Expand All @@ -65,52 +66,52 @@
"cytoscape": "^3.2.1",
"cytoscape-dagre": "^2.0.0",
"d3-scale": "^1.0.6",
"dagre": "^0.7.4",
"dagre": "^0.8.5",
"deep-freeze": "^0.0.1",
"drange": "^2.0.0",
"fuzzy": "^0.1.3",
"global": "^4.3.2",
"history": "^4.6.3",
"is-promise": "^2.1.0",
"isomorphic-fetch": "^2.2.1",
"is-promise": "^4.0.0",
"isomorphic-fetch": "^3.0.0",
"json-markup": "^1.1.0",
"lodash": "^4.17.19",
"logfmt": "^1.2.0",
"lru-memoize": "^1.1.0",
"match-sorter": "^3.1.1",
"memoize-one": "^5.0.0",
"memoize-one": "^6.0.0",
"moment": "^2.18.1",
"object-hash": "^1.3.1",
"object-hash": "^3.0.0",
"prop-types": "^15.5.10",
"query-string": "^6.3.0",
"raven-js": "^3.22.1",
"react": "^16.3.2",
"react-circular-progressbar": "^2.0.3",
"react-dimensions": "^1.3.0",
"react-dom": "^16.3.2",
"react-ga": "^2.4.1",
"react-helmet": "^5.1.3",
"react-ga": "^3.3.1",
"react-helmet": "^6.1.0",
"react-icons": "2.2.7",
"react-metrics": "^2.3.2",
"react-redux": "^5.0.6",
"react-router-dom": "4.3.1",
"react-router-redux": "5.0.0-alpha.6",
"react-router-redux": "5.0.0-alpha.8",
"react-virtualized-select": "^3.1.0",
"react-vis": "^1.7.2",
"react-vis-force": "^0.3.1",
"react-window": "^1.8.3",
"recompose": "^0.25.0",
"recompose": "^0.30.0",
"redux": "^3.7.2",
"redux-actions": "^2.2.1",
"redux-async-middleware": "^0.0.0",
"redux-form": "^7.0.3",
"redux-form": "^8.3.8",
"redux-promise-middleware": "^4.3.0",
"reselect": "^3.0.1",
"reselect": "^4.1.6",
"store": "^2.0.12",
"ts-key-enum": "^2.0.0",
"tween-functions": "^1.2.0",
"typescript": "3.5.3",
"u-basscss": "2.0.0"
"u-basscss": "2.0.1"
},
"scripts": {
"analyze": "source-map-explorer build/static/js/main.*",
Expand Down
2 changes: 1 addition & 1 deletion packages/jaeger-ui/src/types/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ export type ReduxState = {
location: Location;
};
services: {
services: (string[]) | TNil;
services: string[] | TNil;
serverOpsForService: Record<string, string[]>;
operationsForService: Record<string, string[]>;
loading: boolean;
Expand Down
45 changes: 22 additions & 23 deletions packages/plexus/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,46 +14,45 @@
"directory": "packages/plexus"
},
"devDependencies": {
"@babel/cli": "7.13.14",
"@babel/core": "7.3.4",
"@babel/plugin-proposal-class-properties": "7.3.4",
"@babel/plugin-syntax-dynamic-import": "7.2.0",
"@babel/preset-env": "7.3.4",
"@babel/preset-react": "7.0.0",
"@babel/preset-typescript": "7.1.0",
"@babel/cli": "7.19.3",
"@babel/core": "7.19.6",
"@babel/plugin-proposal-class-properties": "7.18.6",
"@babel/plugin-syntax-dynamic-import": "7.8.3",
"@babel/preset-env": "7.19.4",
"@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.0.5",
"babel-loader": "8.2.5",
"babel-plugin-transform-react-remove-prop-types": "0.4.24",
"clean-webpack-plugin": "2.0.1",
"css-loader": "2.1.1",
"enzyme": "3.8.0",
"file-loader": "3.0.1",
"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.1.0",
"jest": "23.6.0",
"html-webpack-plugin": "5.5.0",
"jest": "29.2.1",
"npm-run-all": "4.1.5",
"react": "^16.7.0",
"react-addons-test-utils": "15.6.2",
"react-dom": "^16.7.0",
"rimraf": "2.6.3",
"style-loader": "0.23.1",
"url-loader": "1.1.2",
"rimraf": "3.0.2",
"style-loader": "3.3.1",
"url-loader": "4.1.1",
"webpack": "^4.28.4",
"webpack-cli": "^3.2.1",
"webpack-cli": "^4.10.0",
"webpack-dev-server": "^3.1.14",
"webpack-node-externals": "1.7.2",
"worker-loader": "2.0.0"
"webpack-node-externals": "3.0.0",
"worker-loader": "3.0.8"
},
"peerDependencies": {
"react": "16.x"
},
"dependencies": {
"d3-selection": "^1.3.0",
"d3-zoom": "^1.7.1",
"memoize-one": "5.1.1",
"viz.js": "1.8.1"
"memoize-one": "6.0.0",
"viz.js": "2.1.2"
},
"scripts": {
"_tasks/build/lib/js": "node_modules/.bin/babel src --extensions '.tsx,.js' --out-dir lib",
Expand Down
28 changes: 14 additions & 14 deletions packages/plexus/src/types/TOneOf.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,28 +13,28 @@
// limitations under the License.

type TOneOf<A, B, C = {}, D = {}, E = {}> =
| { [P in Exclude<keyof (B & C & D & E), keyof A>]?: undefined } & A
| { [P in Exclude<keyof (A & C & D & E), keyof B>]?: undefined } & B
| { [P in Exclude<keyof (A & B & D & E), keyof C>]?: undefined } & C
| { [P in Exclude<keyof (A & B & C & E), keyof D>]?: undefined } & D
| { [P in Exclude<keyof (A & B & C & D), keyof E>]?: undefined } & E;
| ({ [P in Exclude<keyof (B & C & D & E), keyof A>]?: undefined } & A)
| ({ [P in Exclude<keyof (A & C & D & E), keyof B>]?: undefined } & B)
| ({ [P in Exclude<keyof (A & B & D & E), keyof C>]?: undefined } & C)
| ({ [P in Exclude<keyof (A & B & C & E), keyof D>]?: undefined } & D)
| ({ [P in Exclude<keyof (A & B & C & D), keyof E>]?: undefined } & E);

// eslint-disable-next-line no-undef
export default TOneOf;

export type TOneOfTwo<A, B> =
| { [P in Exclude<keyof B, keyof A>]?: undefined } & A
| { [P in Exclude<keyof A, keyof B>]?: undefined } & B;
| ({ [P in Exclude<keyof B, keyof A>]?: undefined } & A)
| ({ [P in Exclude<keyof A, keyof B>]?: undefined } & B);

export type TOneOfThree<A, B, C> =
| { [P in Exclude<keyof (B & C), keyof A>]?: undefined } & A
| { [P in Exclude<keyof (A & C), keyof B>]?: undefined } & B
| { [P in Exclude<keyof (A & B), keyof C>]?: undefined } & C;
| ({ [P in Exclude<keyof (B & C), keyof A>]?: undefined } & A)
| ({ [P in Exclude<keyof (A & C), keyof B>]?: undefined } & B)
| ({ [P in Exclude<keyof (A & B), keyof C>]?: undefined } & C);

export type TOneOfFour<A, B, C, D> =
| { [P in Exclude<keyof (B & C & D), keyof A>]?: undefined } & A
| { [P in Exclude<keyof (A & C & D), keyof B>]?: undefined } & B
| { [P in Exclude<keyof (A & B & D), keyof C>]?: undefined } & C
| { [P in Exclude<keyof (A & B & C), keyof D>]?: undefined } & D;
| ({ [P in Exclude<keyof (B & C & D), keyof A>]?: undefined } & A)
| ({ [P in Exclude<keyof (A & C & D), keyof B>]?: undefined } & B)
| ({ [P in Exclude<keyof (A & B & D), keyof C>]?: undefined } & C)
| ({ [P in Exclude<keyof (A & B & C), keyof D>]?: undefined } & D);

export type TOneOfFive<A, B, C, D, E> = TOneOf<A, B, C, D, E>;
7 changes: 3 additions & 4 deletions packages/plexus/webpack-factory.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
/* eslint-disable @typescript-eslint/no-var-requires */

const { join } = require('path');
const CleanWebpackPlugin = require('clean-webpack-plugin');
const { CleanWebpackPlugin } = require('clean-webpack-plugin');
const HtmlWebpackPlugin = require('html-webpack-plugin');
const nodeExternals = require('webpack-node-externals');

Expand Down Expand Up @@ -214,9 +214,8 @@ function makeWorkerConfig() {
{
loader: 'worker-loader',
options: {
inline: true,
fallback: false,
name: '[name].js',
inline: 'no-fallback',
filename: '[name].js',
},
},
],
Expand Down
Loading