From 3aa72953941a4b49c02cbefa489a3016c7085615 Mon Sep 17 00:00:00 2001 From: Thomas Watson Date: Mon, 16 Mar 2020 17:40:33 +0100 Subject: [PATCH 1/3] Upgrade all minimist (sub)dependencies to either v0.2.1 or v1.2.5 --- package.json | 5 +++++ yarn.lock | 25 +++++-------------------- 2 files changed, 10 insertions(+), 20 deletions(-) diff --git a/package.json b/package.json index 5008bc0bcebc5..d8919ed572694 100644 --- a/package.json +++ b/package.json @@ -77,6 +77,11 @@ "url": "https://github.com/elastic/kibana.git" }, "resolutions": { + "**/@mapbox/geojsonhint/minimist": "^1.2.5", + "**/geojson-flatten/minimist": "^1.2.5", + "**/gonzales-pe-sl/minimist": "^1.2.5", + "**/mkdirp/minimist": "^1.2.5", + "**/sharkdown/minimist": "^0.2.1", "**/@types/node": ">=10.17.17 <10.20.0", "**/@types/react": "^16.9.36", "**/@types/hapi": "^17.0.18", diff --git a/yarn.lock b/yarn.lock index 8bdb06152a7f2..0096e3a32dccf 100644 --- a/yarn.lock +++ b/yarn.lock @@ -19941,27 +19941,12 @@ minimist-options@^4.0.2: is-plain-obj "^1.1.0" kind-of "^6.0.3" -minimist@0.0.5: - version "0.0.5" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.5.tgz#d7aa327bcecf518f9106ac6b8f003fa3bcea8566" - integrity sha1-16oye87PUY+RBqxrjwA/o7zqhWY= - -minimist@0.0.8: - version "0.0.8" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d" - integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0= - -minimist@1.1.x: - version "1.1.3" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.1.3.tgz#3bedfd91a92d39016fcfaa1c681e8faa1a1efda8" - integrity sha1-O+39kaktOQFvz6ocaB6Pqhoe/ag= - -minimist@1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284" - integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ= +minimist@0.0.5, minimist@^0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.2.1.tgz#827ba4e7593464e7c221e8c5bed930904ee2c455" + integrity sha512-GY8fANSrTMfBVfInqJAY41QkOM+upUTytK1jZ0c8+3HdHrJxBJ3rF5i9moClXTE8uUSnUo8cAsCoxDXvSY4DHg== -minimist@^1.1.0, minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0, minimist@^1.2.5, minimist@~1.2.0: +minimist@0.0.8, minimist@1.1.x, minimist@1.2.0, minimist@^1.1.0, minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0, minimist@^1.2.5, minimist@~1.2.0: version "1.2.5" resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== From 1d86c9c7102d858090ce1d35e141fdd117d68785 Mon Sep 17 00:00:00 2001 From: Joe Portner <5295965+jportner@users.noreply.github.com> Date: Wed, 16 Sep 2020 22:05:17 -0400 Subject: [PATCH 2/3] Consolidate last minimist dev dependency This was a transitive dependency: @mapbox/geojson-rewind@^0.4.1 > sharkdown@^0.1.0 > minimist@0.0.5 The sharkdown package had a Yarn dependency resolution to bump minimist to ^0.2.1. By upgrading @mapbox/geojson-rewind, we are able to get rid of all of this. --- package.json | 1 - x-pack/package.json | 2 +- yarn.lock | 80 ++------------------------------------------- 3 files changed, 3 insertions(+), 80 deletions(-) diff --git a/package.json b/package.json index a13f80c59e902..840b58184a6b9 100644 --- a/package.json +++ b/package.json @@ -81,7 +81,6 @@ "**/geojson-flatten/minimist": "^1.2.5", "**/gonzales-pe-sl/minimist": "^1.2.5", "**/mkdirp/minimist": "^1.2.5", - "**/sharkdown/minimist": "^0.2.1", "**/@types/node": ">=10.17.17 <10.20.0", "**/@types/react": "^16.9.36", "**/@types/hapi": "^17.0.18", diff --git a/x-pack/package.json b/x-pack/package.json index 59a43b1f344c8..49136efd46d56 100644 --- a/x-pack/package.json +++ b/x-pack/package.json @@ -39,7 +39,7 @@ "@kbn/storybook": "1.0.0", "@kbn/test": "1.0.0", "@kbn/utility-types": "1.0.0", - "@mapbox/geojson-rewind": "^0.4.1", + "@mapbox/geojson-rewind": "^0.5.0", "@mapbox/mapbox-gl-draw": "^1.2.0", "@mapbox/mapbox-gl-rtl-text": "^0.2.3", "@scant/router": "^0.1.0", diff --git a/yarn.lock b/yarn.lock index 07d0df0dc7cbe..44d268f5f0bc7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2123,7 +2123,7 @@ resolved "https://registry.yarnpkg.com/@mapbox/extent/-/extent-0.4.0.tgz#3e591f32e1f0c3981c864239f7b0ac06e610f8a9" integrity sha1-PlkfMuHww5gchkI597CsBuYQ+Kk= -"@mapbox/geojson-area@0.2.2", "@mapbox/geojson-area@^0.2.1": +"@mapbox/geojson-area@^0.2.1": version "0.2.2" resolved "https://registry.yarnpkg.com/@mapbox/geojson-area/-/geojson-area-0.2.2.tgz#18d7814aa36bf23fbbcc379f8e26a22927debf10" integrity sha1-GNeBSqNr8j+7zDefjiaiKSfevxA= @@ -2153,16 +2153,6 @@ resolved "https://registry.yarnpkg.com/@mapbox/geojson-normalize/-/geojson-normalize-0.0.1.tgz#1da1e6b3a7add3ad29909b30f438f60581b7cd80" integrity sha1-HaHms6et060pkJsw9Dj2BYG3zYA= -"@mapbox/geojson-rewind@^0.4.1": - version "0.4.1" - resolved "https://registry.yarnpkg.com/@mapbox/geojson-rewind/-/geojson-rewind-0.4.1.tgz#357d79300adb7fec7c1f091512988bca6458f068" - integrity sha512-mxo2MEr7izA1uOXcDsw99Kgg6xW3P4H2j4n1lmldsgviIelpssvP+jQDivFKOHrOVJDpTTi5oZJvRcHtU9Uufw== - dependencies: - "@mapbox/geojson-area" "0.2.2" - concat-stream "~1.6.0" - minimist "^1.2.5" - sharkdown "^0.1.0" - "@mapbox/geojson-rewind@^0.5.0": version "0.5.0" resolved "https://registry.yarnpkg.com/@mapbox/geojson-rewind/-/geojson-rewind-0.5.0.tgz#91f0ad56008c120caa19414b644d741249f4f560" @@ -5835,11 +5825,6 @@ ansi@^0.3.0, ansi@~0.3.1: resolved "https://registry.yarnpkg.com/ansi/-/ansi-0.3.1.tgz#0c42d4fb17160d5a9af1e484bace1c66922c1b21" integrity sha1-DELU+xcWDVqa8eSEus4cZpIsGyE= -ansicolors@~0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/ansicolors/-/ansicolors-0.2.1.tgz#be089599097b74a5c9c4a84a0cdbcdb62bd87aef" - integrity sha1-vgiVmQl7dKXJxKhKDNvNtivYeu8= - ansicolors@~0.3.2: version "0.3.2" resolved "https://registry.yarnpkg.com/ansicolors/-/ansicolors-0.3.2.tgz#665597de86a9ffe3aa9bfbe6cae5c6ea426b4979" @@ -8152,14 +8137,6 @@ cardinal@^2.1.1: ansicolors "~0.3.2" redeyed "~2.1.0" -cardinal@~0.4.2: - version "0.4.4" - resolved "https://registry.yarnpkg.com/cardinal/-/cardinal-0.4.4.tgz#ca5bb68a5b511b90fe93b9acea49bdee5c32bfe2" - integrity sha1-ylu2iltRG5D+k7ms6km97lwyv+I= - dependencies: - ansicolors "~0.2.1" - redeyed "~0.4.0" - case-sensitive-paths-webpack-plugin@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/case-sensitive-paths-webpack-plugin/-/case-sensitive-paths-webpack-plugin-2.2.0.tgz#3371ef6365ef9c25fa4b81c16ace0e9c7dc58c3e" @@ -12479,11 +12456,6 @@ expand-tilde@^2.0.0, expand-tilde@^2.0.2: dependencies: homedir-polyfill "^1.0.1" -expect.js@~0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/expect.js/-/expect.js-0.2.0.tgz#1028533d2c1c363f74a6796ff57ec0520ded2be1" - integrity sha1-EChTPSwcNj90pnlv9X7AUg3tK+E= - expect@^24.8.0, expect@^24.9.0: version "24.9.0" resolved "https://registry.yarnpkg.com/expect/-/expect-24.9.0.tgz#b75165b4817074fa4a157794f46fe9f1ba15b6ca" @@ -19943,11 +19915,6 @@ minimist-options@^4.0.2: is-plain-obj "^1.1.0" kind-of "^6.0.3" -minimist@0.0.5, minimist@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.2.1.tgz#827ba4e7593464e7c221e8c5bed930904ee2c455" - integrity sha512-GY8fANSrTMfBVfInqJAY41QkOM+upUTytK1jZ0c8+3HdHrJxBJ3rF5i9moClXTE8uUSnUo8cAsCoxDXvSY4DHg== - minimist@0.0.8, minimist@1.1.x, minimist@1.2.0, minimist@^1.1.0, minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0, minimist@^1.2.5, minimist@~1.2.0: version "1.2.5" resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" @@ -24247,16 +24214,6 @@ readable-stream@1.0, "readable-stream@>=1.0.33-1 <1.1.0-0": string_decoder "^1.1.1" util-deprecate "^1.0.1" -readable-stream@~1.1.0: - version "1.1.14" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9" - integrity sha1-fPTFTvZI44EwhMY23SB54WbAgdk= - dependencies: - core-util-is "~1.0.0" - inherits "~2.0.1" - isarray "0.0.1" - string_decoder "~0.10.x" - readable-stream@~2.0.0: version "2.0.6" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.0.6.tgz#8f90341e68a53ccc928788dacfcd11b36eb9b78e" @@ -24406,13 +24363,6 @@ redent@^3.0.0: indent-string "^4.0.0" strip-indent "^3.0.0" -redeyed@~0.4.0: - version "0.4.4" - resolved "https://registry.yarnpkg.com/redeyed/-/redeyed-0.4.4.tgz#37e990a6f2b21b2a11c2e6a48fd4135698cba97f" - integrity sha1-N+mQpvKyGyoRwuakj9QTVpjLqX8= - dependencies: - esprima "~1.0.4" - redeyed@~2.1.0: version "2.1.1" resolved "https://registry.yarnpkg.com/redeyed/-/redeyed-2.1.1.tgz#8984b5815d99cb220469c99eeeffe38913e6cc0b" @@ -25950,18 +25900,6 @@ shallowequal@1.1.0, shallowequal@^1.1.0: resolved "https://registry.yarnpkg.com/shallowequal/-/shallowequal-1.1.0.tgz#188d521de95b9087404fd4dcb68b13df0ae4e7f8" integrity sha512-y0m1JoUZSlPAjXVtPPW70aZWfIL/dSP7AFkRnniLCrK/8MDKog3TySTBmckD+RObVxH0v4Tox67+F14PdED2oQ== -sharkdown@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/sharkdown/-/sharkdown-0.1.0.tgz#61d4fe529e75d02442127cc9234362265099214f" - integrity sha1-YdT+Up510CRCEnzJI0NiJlCZIU8= - dependencies: - cardinal "~0.4.2" - expect.js "~0.2.0" - minimist "0.0.5" - split "~0.2.10" - stream-spigot "~2.1.2" - through "~2.3.4" - shebang-command@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea" @@ -26472,13 +26410,6 @@ split-string@^3.0.1, split-string@^3.0.2: dependencies: extend-shallow "^3.0.0" -split@~0.2.10: - version "0.2.10" - resolved "https://registry.yarnpkg.com/split/-/split-0.2.10.tgz#67097c601d697ce1368f418f06cd201cf0521a57" - integrity sha1-Zwl8YB1pfOE2j0GPBs0gHPBSGlc= - dependencies: - through "2" - sprintf-js@^1.0.3: version "1.1.1" resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.1.tgz#36be78320afe5801f6cea3ee78b6e5aab940ea0c" @@ -26736,13 +26667,6 @@ stream-slicer@0.0.6: resolved "https://registry.yarnpkg.com/stream-slicer/-/stream-slicer-0.0.6.tgz#f86b2ac5c2440b7a0a87b71f33665c0788046138" integrity sha1-+GsqxcJEC3oKh7cfM2ZcB4gEYTg= -stream-spigot@~2.1.2: - version "2.1.2" - resolved "https://registry.yarnpkg.com/stream-spigot/-/stream-spigot-2.1.2.tgz#7de145e819f8dd0db45090d13dcf73a8ed3cc035" - integrity sha1-feFF6Bn43Q20UJDRPc9zqO08wDU= - dependencies: - readable-stream "~1.1.0" - strict-uri-encode@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713" @@ -27751,7 +27675,7 @@ through2@~2.0.3: readable-stream "~2.3.6" xtend "~4.0.1" -through@2, "through@>=2.2.7 <3", through@^2.3.4, through@^2.3.6, through@^2.3.8, through@~2.3.4, through@~2.3.6, through@~2.3.8: +"through@>=2.2.7 <3", through@^2.3.4, through@^2.3.6, through@^2.3.8, through@~2.3.4, through@~2.3.6, through@~2.3.8: version "2.3.8" resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU= From 421760223838f39767128b789779e2812f44bc61 Mon Sep 17 00:00:00 2001 From: Thomas Watson Date: Thu, 17 Sep 2020 09:32:43 +0200 Subject: [PATCH 3/3] Consolidate forced minimist upgrades to one catch-all --- package.json | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/package.json b/package.json index 9b61a78b2e87c..775bca146ac55 100644 --- a/package.json +++ b/package.json @@ -77,7 +77,6 @@ "url": "https://github.com/elastic/kibana.git" }, "resolutions": { - "**/@mapbox/geojsonhint/minimist": "^1.2.5", "**/@types/angular": "^1.6.56", "**/@types/chai": "^4.2.11", "**/@types/hapi": "^17.0.18", @@ -89,8 +88,6 @@ "**/cypress/lodash": "^4.17.20", "**/deepmerge": "^4.2.2", "**/fast-deep-equal": "^3.1.1", - "**/geojson-flatten/minimist": "^1.2.5", - "**/gonzales-pe-sl/minimist": "^1.2.5", "**/graphql-toolkit/lodash": "^4.17.15", "**/hoist-non-react-statics": "^3.3.2", "**/image-diff/gm/debug": "^2.6.9", @@ -98,7 +95,7 @@ "**/isomorphic-git/**/base64-js": "^1.2.1", "**/istanbul-instrumenter-loader/schema-utils": "1.0.0", "**/load-grunt-config/lodash": "^4.17.20", - "**/mkdirp/minimist": "^1.2.5", + "**/minimist": "^1.2.5", "**/node-jose/node-forge": "^0.10.0", "**/react": "^16.12.0", "**/react-dom": "^16.12.0",