Skip to content

Commit 6ed5895

Browse files
Merge pull request #3053 from RedisInsight/be/bugfix/dependabot-2024-02-18
Dependabot fixes - 2024-02
2 parents cf6c6d8 + 0a9bed6 commit 6ed5895

File tree

11 files changed

+3477
-2541
lines changed

11 files changed

+3477
-2541
lines changed

configs/webpack.config.web.dev.ts

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,32 @@
66
*/
77

88
import path from 'path';
9+
import os from 'os';
910
import webpack from 'webpack';
1011
import { merge } from 'webpack-merge';
11-
import ip from 'ip';
1212
import { toString } from 'lodash'
1313
import commonConfig from './webpack.config.web.common';
1414

1515
function employCache(loaders) {
1616
return ['cache-loader'].concat(loaders);
1717
}
1818

19-
const HOST = process.env.PUBLIC_DEV ? ip.address(): 'localhost'
19+
const getLocalIpAddress = () => {
20+
const ifaces = os.networkInterfaces();
21+
22+
for (const ifaceName of Object.keys(ifaces)) {
23+
const firstIpv4Address = ifaces[ifaceName].find(alias => alias.family === 'IPv4' && !alias.internal);
24+
25+
if (firstIpv4Address) {
26+
return firstIpv4Address.address;
27+
}
28+
}
29+
30+
return 'localhost';
31+
};
32+
33+
34+
const HOST = process.env.PUBLIC_DEV ? getLocalIpAddress(): 'localhost';
2035

2136
const configuration: webpack.Configuration = {
2237
target: 'web',

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,8 @@
8484
"word-wrap": "1.2.4",
8585
"electron-builder/app-builder-lib/@electron/universal/dir-compare/minimatch": "^3.0.5",
8686
"**/semver": "^7.5.2",
87-
"rawproto/protobufjs": "^7.2.4"
87+
"rawproto/protobufjs": "^7.2.4",
88+
"**/follow-redirects": "^1.15.4"
8889
},
8990
"devDependencies": {
9091
"@babel/core": "^7.23.2",
@@ -190,7 +191,6 @@
190191
"husky": "^4.2.5",
191192
"identity-obj-proxy": "^3.0.0",
192193
"ioredis-mock": "^5.5.4",
193-
"ip": "^1.1.8",
194194
"jest": "^29.7.0",
195195
"jest-environment-jsdom": "^29.7.0",
196196
"jest-runner-groups": "^2.2.0",

redisinsight/api/yarn.lock

Lines changed: 64 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -336,11 +336,11 @@
336336
regenerator-runtime "^0.13.11"
337337

338338
"@babel/runtime@^7.15.4":
339-
version "7.22.6"
340-
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.22.6.tgz#57d64b9ae3cff1d67eb067ae117dac087f5bd438"
341-
integrity sha512-wDb5pWm4WDdF6LFUde3Jl8WzPA+3ZbxYqkC6xAXuD3irdEHN1k0NfTRrJD8ZD378SJ61miMLCqIOXYhd8x+AJQ==
339+
version "7.23.9"
340+
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.23.9.tgz#47791a15e4603bb5f905bc0753801cf21d6345f7"
341+
integrity sha512-0CX6F+BI2s9dkUqr08KFrAIZgNFj75rdBU/DjCyYLIaV/quFjkk6T+EJ2LkZHyZTbEV4L5p97mNkUsHl2wLFAw==
342342
dependencies:
343-
regenerator-runtime "^0.13.11"
343+
regenerator-runtime "^0.14.0"
344344

345345
"@babel/template@^7.22.15", "@babel/template@^7.3.3":
346346
version "7.22.15"
@@ -697,9 +697,9 @@
697697
integrity sha512-Z7C/xXCiGWsg0KuKsHTKJxbWhpI3Vs5GwLfOean7MGyVFGqdRgBbAjOCh6u4bbjPc/8MJ2pZmK/0DLdCbivLDA==
698698

699699
"@mapbox/node-pre-gyp@^1.0.0":
700-
version "1.0.10"
701-
resolved "https://registry.yarnpkg.com/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.10.tgz#8e6735ccebbb1581e5a7e652244cadc8a844d03c"
702-
integrity sha512-4ySo4CjzStuprMwk35H5pPbkymjv1SF3jGLj6rAHp/xT/RF7TL7bd9CTm1xDY49K2qF7jmR/g7k+SkLETP6opA==
700+
version "1.0.11"
701+
resolved "https://registry.yarnpkg.com/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.11.tgz#417db42b7f5323d79e93b34a6d7a2a12c0df43fa"
702+
integrity sha512-Yhlar6v9WQgUp/He7BdgzOz8lqMQ8sU+jkCq7Wx8Myc5YFJLbEe7lgui/V7G1qB1DJykHSGwreceSaD60Y0PUQ==
703703
dependencies:
704704
detect-libc "^2.0.0"
705705
https-proxy-agent "^5.0.0"
@@ -1604,12 +1604,10 @@ agent-base@6, agent-base@^6.0.2:
16041604
debug "4"
16051605

16061606
agentkeepalive@^4.1.3:
1607-
version "4.3.0"
1608-
resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-4.3.0.tgz#bb999ff07412653c1803b3ced35e50729830a255"
1609-
integrity sha512-7Epl1Blf4Sy37j4v9f9FjICCh4+KAQOyXgHEwlyBiAQLbhKdq/i2QQU3amQalS/wPhdPzDXPL5DMR5bkn+YeWg==
1607+
version "4.5.0"
1608+
resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-4.5.0.tgz#2673ad1389b3c418c5a20c5d7364f93ca04be923"
1609+
integrity sha512-5GG/5IbQQpC9FpkRGsSvZI5QYeSCzlJHdpBQntCsuTOxhKD8lqKhrleg2Yi7yvMIf82Ycmmqln9U8V9qwEiJew==
16101610
dependencies:
1611-
debug "^4.1.0"
1612-
depd "^2.0.0"
16131611
humanize-ms "^1.2.1"
16141612

16151613
aggregate-error@^3.0.0:
@@ -1919,9 +1917,9 @@ available-typed-arrays@^1.0.5:
19191917
integrity sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==
19201918

19211919
axios-retry@^3.0.2:
1922-
version "3.5.1"
1923-
resolved "https://registry.yarnpkg.com/axios-retry/-/axios-retry-3.5.1.tgz#d902f69fe1b2a71902e29605318f887bef0981c6"
1924-
integrity sha512-mQRJ4IyAUnYig14BQ4MnnNHHuH1cNH7NW4JxEUD6mNJwK6pwOY66wKLCwZ6Y0o3POpfStalqRC+J4+Hnn6Om7w==
1920+
version "3.9.1"
1921+
resolved "https://registry.yarnpkg.com/axios-retry/-/axios-retry-3.9.1.tgz#c8924a8781c8e0a2c5244abf773deb7566b3830d"
1922+
integrity sha512-8PJDLJv7qTTMMwdnbMvrLYuvB47M81wRtxQmEdV5w4rgbTXTt+vtPkXwajOfOdSyv/wZICJOC+/UhXH4aQ/R+w==
19251923
dependencies:
19261924
"@babel/runtime" "^7.15.4"
19271925
is-retry-allowed "^2.2.0"
@@ -1934,11 +1932,11 @@ axios@^0.21.1:
19341932
follow-redirects "^1.14.0"
19351933

19361934
axios@^1.6.0:
1937-
version "1.6.1"
1938-
resolved "https://registry.yarnpkg.com/axios/-/axios-1.6.1.tgz#76550d644bf0a2d469a01f9244db6753208397d7"
1939-
integrity sha512-vfBmhDpKafglh0EldBEbVuoe7DyAavGSLWhuSm5ZSEKQnHhBf0xAAwybbNH1IkrJNGnS/VG4I5yxig1pCEXE4g==
1935+
version "1.6.7"
1936+
resolved "https://registry.yarnpkg.com/axios/-/axios-1.6.7.tgz#7b48c2e27c96f9c68a2f8f31e2ab19f59b06b0a7"
1937+
integrity sha512-/hDJGff6/c7u0hDkvkGxR/oy6CbCs8ziCsC7SqmhjfozqiJGc8Z11wrv9z9lYfY4K8l+H9TpjcMDX0xOZmx+RA==
19401938
dependencies:
1941-
follow-redirects "^1.15.0"
1939+
follow-redirects "^1.15.4"
19421940
form-data "^4.0.0"
19431941
proxy-from-env "^1.1.0"
19441942

@@ -2642,9 +2640,9 @@ component-emitter@^1.2.0, component-emitter@^1.2.1, component-emitter@^1.3.0:
26422640
integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==
26432641

26442642
component-type@^1.2.1:
2645-
version "1.2.1"
2646-
resolved "https://registry.yarnpkg.com/component-type/-/component-type-1.2.1.tgz#8a47901700238e4fc32269771230226f24b415a9"
2647-
integrity sha512-Kgy+2+Uwr75vAi6ChWXgHuLvd+QLD7ssgpaRq2zCvt80ptvAfMc/hijcJxXkBa2wMlEZcJvC2H8Ubo+A9ATHIg==
2643+
version "1.2.2"
2644+
resolved "https://registry.yarnpkg.com/component-type/-/component-type-1.2.2.tgz#4458ecc0c1871efc6288bfaff0cbdab08141d079"
2645+
integrity sha512-99VUHREHiN5cLeHm3YLq312p6v+HUEcwtLCAtelvUDI6+SH5g5Cr85oNR2S1o6ywzL0ykMbuwLzM2ANocjEOIA==
26482646

26492647
26502648
version "0.0.1"
@@ -3006,7 +3004,7 @@ denque@^2.1.0:
30063004
resolved "https://registry.yarnpkg.com/denque/-/denque-2.1.0.tgz#e93e1a6569fb5e66f16a3c2a2964617d349d6ab1"
30073005
integrity sha512-HVQE3AAb/pxF8fQAoiqpvg9i3evqug3hoiwakOyZAwJm+6vZehbkYXZ0l4JxS+I3QxM97v5aaRNhj8v5oBhekw==
30083006

3009-
[email protected], depd@^2.0.0:
3007+
30103008
version "2.0.0"
30113009
resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df"
30123010
integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==
@@ -3894,15 +3892,10 @@ [email protected]:
38943892
resolved "https://registry.yarnpkg.com/fn.name/-/fn.name-1.1.0.tgz#26cad8017967aea8731bc42961d04a3d5988accc"
38953893
integrity sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw==
38963894

3897-
follow-redirects@^1.14.0:
3898-
version "1.15.2"
3899-
resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.2.tgz#b460864144ba63f2681096f274c4e57026da2c13"
3900-
integrity sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==
3901-
3902-
follow-redirects@^1.15.0:
3903-
version "1.15.3"
3904-
resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.3.tgz#fe2f3ef2690afce7e82ed0b44db08165b207123a"
3905-
integrity sha512-1VzOtuEM8pC9SFU1E+8KfTjZyMztRsgEfwQl44z8A25uy13jSzTj6dyK2Df52iV0vgHCfBwLhDWevLn95w5v6Q==
3895+
follow-redirects@^1.14.0, follow-redirects@^1.15.4:
3896+
version "1.15.5"
3897+
resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.5.tgz#54d4d6d062c0fa7d9d17feb008461550e3ba8020"
3898+
integrity sha512-vSFWUON1B+yAw1VN4xMfxgn5fTUiaOzAJCKBwIIgT/+7CuGy9+r+5gITvP62j3RmaD5Ph65UaERdOSRGUzZtgw==
39063899

39073900
for-each@^0.3.3:
39083901
version "0.3.3"
@@ -4621,10 +4614,13 @@ ioredis@^5.2.2:
46214614
redis-parser "^3.0.0"
46224615
standard-as-callback "^2.1.0"
46234616

4624-
ip@^2.0.0:
4625-
version "2.0.0"
4626-
resolved "https://registry.yarnpkg.com/ip/-/ip-2.0.0.tgz#4cf4ab182fee2314c75ede1276f8c80b479936da"
4627-
integrity sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ==
4617+
ip-address@^9.0.5:
4618+
version "9.0.5"
4619+
resolved "https://registry.yarnpkg.com/ip-address/-/ip-address-9.0.5.tgz#117a960819b08780c3bd1f14ef3c1cc1d3f3ea5a"
4620+
integrity sha512-zHtQzGojZXTwZTHQqra+ETKd4Sn3vgi7uBmlPoXVWZqYvuKmtI0l/VZTjqGmJY9x88GGOaZ9+G9ES8hC4T4X8g==
4621+
dependencies:
4622+
jsbn "1.1.0"
4623+
sprintf-js "^1.1.3"
46284624

46294625
46304626
version "1.9.1"
@@ -5452,6 +5448,11 @@ js-yaml@^3.13.1:
54525448
argparse "^1.0.7"
54535449
esprima "^4.0.0"
54545450

5451+
5452+
version "1.1.0"
5453+
resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-1.1.0.tgz#b01307cb29b618a1ed26ec79e911f803c4da0040"
5454+
integrity sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A==
5455+
54555456
jsdom@^16.4.0:
54565457
version "16.7.0"
54575458
resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-16.7.0.tgz#918ae71965424b197c819f8183a754e18977b710"
@@ -5982,7 +5983,7 @@ minipass@^3.0.0, minipass@^3.1.0, minipass@^3.1.1, minipass@^3.1.3:
59825983
dependencies:
59835984
yallist "^4.0.0"
59845985

5985-
minipass@^4.0.0, minipass@^4.2.4:
5986+
minipass@^4.2.4:
59865987
version "4.2.8"
59875988
resolved "https://registry.yarnpkg.com/minipass/-/minipass-4.2.8.tgz#f0010f64393ecfc1d1ccb5f582bcaf45f48e1a3a"
59885989
integrity sha512-fNzuVyifolSLFL4NzpF+wEF4qrgqaaKX0haXPQEdQ7NKAN+WecoKMHV09YcuL/DHxrUsYQOK3MiuDf7Ip2OXfQ==
@@ -6252,13 +6253,20 @@ [email protected]:
62526253
dependencies:
62536254
whatwg-url "^5.0.0"
62546255

6255-
node-fetch@^2.6.1, node-fetch@^2.6.7:
6256+
node-fetch@^2.6.1:
62566257
version "2.6.9"
62576258
resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.9.tgz#7c7f744b5cc6eb5fd404e0c7a9fec630a55657e6"
62586259
integrity sha512-DJm/CJkZkRjKKj4Zi4BsKVZh3ValV5IR5s7LVZnW+6YMh0W1BfNA8XSs6DLMGYlId5F3KnA70uu2qepcR08Qqg==
62596260
dependencies:
62606261
whatwg-url "^5.0.0"
62616262

6263+
node-fetch@^2.6.7:
6264+
version "2.7.0"
6265+
resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.7.0.tgz#d0f0fa6e3e2dc1d27efcd8ad99d550bda94d187d"
6266+
integrity sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==
6267+
dependencies:
6268+
whatwg-url "^5.0.0"
6269+
62626270
62636271
version "8.4.1"
62646272
resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-8.4.1.tgz#3d49308fc31f768180957d6b5746845fbd429937"
@@ -7149,6 +7157,11 @@ regenerator-runtime@^0.13.11:
71497157
resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz#f6dca3e7ceec20590d07ada785636a90cdca17f9"
71507158
integrity sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==
71517159

7160+
regenerator-runtime@^0.14.0:
7161+
version "0.14.1"
7162+
resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz#356ade10263f685dda125100cd862c1db895327f"
7163+
integrity sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==
7164+
71527165
regex-not@^1.0.0, regex-not@^1.0.2:
71537166
version "1.0.2"
71547167
resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c"
@@ -7658,11 +7671,11 @@ socks-proxy-agent@^6.0.0:
76587671
socks "^2.6.2"
76597672

76607673
socks@^2.6.2:
7661-
version "2.7.1"
7662-
resolved "https://registry.yarnpkg.com/socks/-/socks-2.7.1.tgz#d8e651247178fde79c0663043e07240196857d55"
7663-
integrity sha512-7maUZy1N7uo6+WVEX6psASxtNlKaNVMlGQKkG/63nEDdLOWNbiUMoLK7X4uYoLhQstau72mLgfEWcXcwsaHbYQ==
7674+
version "2.7.3"
7675+
resolved "https://registry.yarnpkg.com/socks/-/socks-2.7.3.tgz#7d8a75d7ce845c0a96f710917174dba0d543a785"
7676+
integrity sha512-vfuYK48HXCTFD03G/1/zkIls3Ebr2YNa4qU9gHDZdblHLiqhJrJGkY3+0Nx0JpN9qBhJbVObc1CNciT1bIZJxw==
76647677
dependencies:
7665-
ip "^2.0.0"
7678+
ip-address "^9.0.5"
76667679
smart-buffer "^4.2.0"
76677680

76687681
source-map-resolve@^0.5.0:
@@ -7759,6 +7772,11 @@ sprintf-js@^1.1.1:
77597772
resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.2.tgz#da1765262bf8c0f571749f2ad6c26300207ae673"
77607773
integrity sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==
77617774

7775+
sprintf-js@^1.1.3:
7776+
version "1.1.3"
7777+
resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.3.tgz#4914b903a2f8b685d17fdf78a70e917e872e444a"
7778+
integrity sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==
7779+
77627780
sprintf-js@~1.0.2:
77637781
version "1.0.3"
77647782
resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
@@ -8102,13 +8120,13 @@ tar-stream@^2.1.4:
81028120
readable-stream "^3.1.1"
81038121

81048122
tar@^6.0.2, tar@^6.1.11, tar@^6.1.2:
8105-
version "6.1.13"
8106-
resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.13.tgz#46e22529000f612180601a6fe0680e7da508847b"
8107-
integrity sha512-jdIBIN6LTIe2jqzay/2vtYLlBHa3JF42ot3h1dW8Q0PaAG4v8rm0cvpVePtau5C6OKXGGcgO9q2AMNSWxiLqKw==
8123+
version "6.2.0"
8124+
resolved "https://registry.yarnpkg.com/tar/-/tar-6.2.0.tgz#b14ce49a79cb1cd23bc9b016302dea5474493f73"
8125+
integrity sha512-/Wo7DcT0u5HUV486xg675HtjNd3BXZ6xDbzsCUZPt5iw8bTQ63bP0Raut3mvro9u+CUyq7YQd8Cx55fsZXxqLQ==
81088126
dependencies:
81098127
chownr "^2.0.0"
81108128
fs-minipass "^2.0.0"
8111-
minipass "^4.0.0"
8129+
minipass "^5.0.0"
81128130
minizlib "^2.1.1"
81138131
mkdirp "^1.0.3"
81148132
yallist "^4.0.0"

0 commit comments

Comments
 (0)