From df69ac05e7a137a447e25d4ddda8d7925bebd1f5 Mon Sep 17 00:00:00 2001 From: Etheryte Date: Thu, 24 Nov 2022 12:59:48 +0100 Subject: [PATCH 1/3] Fix dependabot issues --- web/html/src/package.json | 2 ++ web/html/src/yarn.lock | 44 +++++++-------------------------------- 2 files changed, 10 insertions(+), 36 deletions(-) diff --git a/web/html/src/package.json b/web/html/src/package.json index dd19aaf40490..32c457699cf1 100644 --- a/web/html/src/package.json +++ b/web/html/src/package.json @@ -133,7 +133,9 @@ "ansi-regex": "5.0.1", "glob-parent": "5.1.2", "immer": "9.0.6", + "loader-utils": "1.4.2", "lodash": "4.17.21", + "minimatch": "3.0.5", "minimist": "1.2.6", "moment": "2.29.4", "path-parse": "1.0.7", diff --git a/web/html/src/yarn.lock b/web/html/src/yarn.lock index e063c34223a1..fcb7208e4bee 100644 --- a/web/html/src/yarn.lock +++ b/web/html/src/yarn.lock @@ -5100,11 +5100,6 @@ emoji-regex@^9.0.0: resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-9.2.0.tgz#a26da8e832b16a9753309f25e35e3c0efb9a066a" integrity sha512-DNc3KFPK18bPdElMJnf/Pkv5TXhxFU3YFDEuGLDRtPmV4rkmCjBkCSEp22u6rBHdSN9Vlp/GK7k98prmE1Jgug== -emojis-list@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389" - integrity sha1-TapNnbAPmBmIDHn6RXrlsJof04k= - emojis-list@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz#5570662046ad29e2e916e71aae260abdff4f6a78" @@ -8207,38 +8202,15 @@ loader-runner@^4.2.0: resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-4.2.0.tgz#d7022380d66d14c5fb1d496b89864ebcfd478384" integrity sha512-92+huvxMvYlMzMt0iIOukcwYBFpkYJdpl2xsZ7LrlayO7E8SOv+JJUEK17B/dJIHAOLMfh2dZZ/Y18WgmGtYNw== -loader-utils@^1.1.0, loader-utils@^1.2.3: - version "1.2.3" - resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.2.3.tgz#1ff5dc6911c9f0a062531a4c04b609406108c2c7" - integrity sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA== - dependencies: - big.js "^5.2.2" - emojis-list "^2.0.0" - json5 "^1.0.1" - -loader-utils@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.0.tgz#c579b5e34cb34b1a74edc6c1fb36bfa371d5a613" - integrity sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA== +loader-utils@1.4.2, loader-utils@^1.1.0, loader-utils@^1.2.3, loader-utils@^1.4.0, loader-utils@^2.0.0, loader-utils@^3.2.0: + version "1.4.2" + resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.2.tgz#29a957f3a63973883eb684f10ffd3d151fec01a3" + integrity sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg== dependencies: big.js "^5.2.2" emojis-list "^3.0.0" json5 "^1.0.1" -loader-utils@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.0.tgz#e4cace5b816d425a166b5f097e10cd12b36064b0" - integrity sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ== - dependencies: - big.js "^5.2.2" - emojis-list "^3.0.0" - json5 "^2.1.2" - -loader-utils@^3.2.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-3.2.0.tgz#bcecc51a7898bee7473d4bc6b845b23af8304d4f" - integrity sha512-HVl9ZqccQihZ7JM85dco1MvO9G+ONvxoGa9rkhzFsneGLKSUg1gJf9bWzhRhcvm2qChhWpebQhP44qxjKIUCaQ== - locate-path@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e" @@ -8709,10 +8681,10 @@ minimalistic-assert@^1.0.0: resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7" integrity sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A== -minimatch@3.0.4, minimatch@^3.0.2, minimatch@^3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" - integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA== +minimatch@3.0.4, minimatch@3.0.5, minimatch@^3.0.2, minimatch@^3.0.4: + version "3.0.5" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.5.tgz#4da8f1290ee0f0f8e83d60ca69f8f134068604a3" + integrity sha512-tUpxzX0VAzJHjLu0xUfFv1gwVp9ba3IOuRAVH2EGuRW8a5emA2FlACLqiT/lDVtS1W+TGNwqz3sWaNyLgDJWuw== dependencies: brace-expansion "^1.1.7" From 074cf7c6f47042d194ef29495486c012f80a92a4 Mon Sep 17 00:00:00 2001 From: Etheryte Date: Wed, 7 Dec 2022 17:57:13 +0100 Subject: [PATCH 2/3] Pin d3-color --- web/html/src/package.json | 1 + web/html/src/yarn.lock | 13 ++++--------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/web/html/src/package.json b/web/html/src/package.json index 32c457699cf1..4bdcd0d8c144 100644 --- a/web/html/src/package.json +++ b/web/html/src/package.json @@ -131,6 +131,7 @@ "resolutions": { "@babel/runtime": "7.16.3", "ansi-regex": "5.0.1", + "d3-color": "3.1.0", "glob-parent": "5.1.2", "immer": "9.0.6", "loader-utils": "1.4.2", diff --git a/web/html/src/yarn.lock b/web/html/src/yarn.lock index fcb7208e4bee..a4cd79f79ef0 100644 --- a/web/html/src/yarn.lock +++ b/web/html/src/yarn.lock @@ -4427,15 +4427,10 @@ d3-collection@1.0.2: resolved "https://registry.yarnpkg.com/d3-collection/-/d3-collection-1.0.2.tgz#df5acb5400443e9eabe9c1379896c67e52426b39" integrity sha1-31rLVABEPp6r6cE3mJbGflJCazk= -d3-color@1: - version "1.4.1" - resolved "https://registry.yarnpkg.com/d3-color/-/d3-color-1.4.1.tgz#c52002bf8846ada4424d55d97982fef26eb3bc8a" - integrity sha512-p2sTHSLCJI2QKunbGb7ocOh7DgTAn8IrLx21QRc/BSnodXM4sv6aLQlnfpvehFMLZEfBc6g9pH9SWQccFYfJ9Q== - -d3-color@1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/d3-color/-/d3-color-1.0.2.tgz#83cb4b3a9474e40795f009d97e97a15649830bbc" - integrity sha1-g8tLOpR05AeV8AnZfpehVkmDC7w= +d3-color@1, d3-color@1.0.2, d3-color@3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/d3-color/-/d3-color-3.1.0.tgz#395b2833dfac71507f12ac2f7af23bf819de24e2" + integrity sha512-zg/chbXyeBtMQ1LbD/WSoW2DpC3I0mpmPdW+ynRTj/x2DAWYrIY7qeZIHidozwV24m4iavr15lNwIwLxRmOxhA== d3-dispatch@1: version "1.0.6" From ec79a176fc190e44164abbd1d5aefa75c3646dc3 Mon Sep 17 00:00:00 2001 From: Etheryte Date: Wed, 7 Dec 2022 18:21:33 +0100 Subject: [PATCH 3/3] Rollback d3 --- web/html/src/package.json | 1 - web/html/src/yarn.lock | 13 +++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/web/html/src/package.json b/web/html/src/package.json index 4bdcd0d8c144..32c457699cf1 100644 --- a/web/html/src/package.json +++ b/web/html/src/package.json @@ -131,7 +131,6 @@ "resolutions": { "@babel/runtime": "7.16.3", "ansi-regex": "5.0.1", - "d3-color": "3.1.0", "glob-parent": "5.1.2", "immer": "9.0.6", "loader-utils": "1.4.2", diff --git a/web/html/src/yarn.lock b/web/html/src/yarn.lock index a4cd79f79ef0..283c85db0cea 100644 --- a/web/html/src/yarn.lock +++ b/web/html/src/yarn.lock @@ -4427,10 +4427,15 @@ d3-collection@1.0.2: resolved "https://registry.yarnpkg.com/d3-collection/-/d3-collection-1.0.2.tgz#df5acb5400443e9eabe9c1379896c67e52426b39" integrity sha1-31rLVABEPp6r6cE3mJbGflJCazk= -d3-color@1, d3-color@1.0.2, d3-color@3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/d3-color/-/d3-color-3.1.0.tgz#395b2833dfac71507f12ac2f7af23bf819de24e2" - integrity sha512-zg/chbXyeBtMQ1LbD/WSoW2DpC3I0mpmPdW+ynRTj/x2DAWYrIY7qeZIHidozwV24m4iavr15lNwIwLxRmOxhA== +d3-color@1: + version "1.4.1" + resolved "https://registry.yarnpkg.com/d3-color/-/d3-color-1.4.1.tgz#c52002bf8846ada4424d55d97982fef26eb3bc8a" + integrity sha512-p2sTHSLCJI2QKunbGb7ocOh7DgTAn8IrLx21QRc/BSnodXM4sv6aLQlnfpvehFMLZEfBc6g9pH9SWQccFYfJ9Q== + +d3-color@1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/d3-color/-/d3-color-1.0.2.tgz#83cb4b3a9474e40795f009d97e97a15649830bbc" + integrity sha512-qGW1ZBlfyzTTpTgvyunxk1QlxZ0Vob60Wb3yKKCCpese0djNa/5FBC0a6orxMV6eysVV0zdecRX84/Cw2GSl5w== d3-dispatch@1: version "1.0.6"