Skip to content

Commit 0644719

Browse files
committed
Drop 'ip' package infavor of custom function
1 parent 65b8861 commit 0644719

File tree

3 files changed

+67
-44
lines changed

3 files changed

+67
-44
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: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,6 @@
190190
"husky": "^4.2.5",
191191
"identity-obj-proxy": "^3.0.0",
192192
"ioredis-mock": "^5.5.4",
193-
"ip": "^1.1.8",
194193
"jest": "^29.7.0",
195194
"jest-environment-jsdom": "^29.7.0",
196195
"jest-runner-groups": "^2.2.0",

yarn.lock

Lines changed: 50 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1380,9 +1380,9 @@
13801380
global-agent "^3.0.0"
13811381

13821382
"@electron/rebuild@^3.3.0":
1383-
version "3.3.0"
1384-
resolved "https://registry.yarnpkg.com/@electron/rebuild/-/rebuild-3.3.0.tgz#6ba0ae1cb545b2e314901d2ac175ca9c03a2e3da"
1385-
integrity sha512-S1vgpzIOS1wCJmsYjdLz97MTUV6UTLcMk/HE3w90HYtVxvW+PQdwxLbgsrECX2bysqcnmM5a0K6mXj/gwVgYtQ==
1383+
version "3.6.0"
1384+
resolved "https://registry.yarnpkg.com/@electron/rebuild/-/rebuild-3.6.0.tgz#60211375a5f8541a71eb07dd2f97354ad0b2b96f"
1385+
integrity sha512-zF4x3QupRU3uNGaP5X1wjpmcjfw1H87kyqZ00Tc3HvriV+4gmOGuvQjGNkrJuXdsApssdNyVwLsy+TaeTGGcVw==
13861386
dependencies:
13871387
"@malept/cross-spawn-promise" "^2.0.0"
13881388
chalk "^4.0.0"
@@ -1391,9 +1391,10 @@
13911391
fs-extra "^10.0.0"
13921392
got "^11.7.0"
13931393
node-abi "^3.45.0"
1394-
node-api-version "^0.1.4"
1394+
node-api-version "^0.2.0"
13951395
node-gyp "^9.0.0"
13961396
ora "^5.1.0"
1397+
read-binary-file-arch "^1.0.6"
13971398
semver "^7.3.5"
13981399
tar "^6.0.5"
13991400
yargs "^17.0.1"
@@ -2765,9 +2766,9 @@
27652766
integrity sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==
27662767

27672768
"@types/minimist@^1.2.0":
2768-
version "1.2.2"
2769-
resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.2.tgz#ee771e2ba4b3dc5b372935d549fd9617bf345b8c"
2770-
integrity sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==
2769+
version "1.2.5"
2770+
resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.5.tgz#ec10755e871497bcd83efe927e43ec46e8c0747e"
2771+
integrity sha512-hov8bUuiLiyFPGyFPE1lwWhmzYbirOXQNNo40+y3zow8aFVTeyn3VWL0VFFfdNddA8S4Vf0Tc062rzyNr7Paag==
27712772

27722773
"@types/ms@*":
27732774
version "0.7.31"
@@ -3486,12 +3487,10 @@ agent-base@^7.0.2:
34863487
debug "^4.3.4"
34873488

34883489
agentkeepalive@^4.1.3, agentkeepalive@^4.2.1:
3489-
version "4.3.0"
3490-
resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-4.3.0.tgz#bb999ff07412653c1803b3ced35e50729830a255"
3491-
integrity sha512-7Epl1Blf4Sy37j4v9f9FjICCh4+KAQOyXgHEwlyBiAQLbhKdq/i2QQU3amQalS/wPhdPzDXPL5DMR5bkn+YeWg==
3490+
version "4.5.0"
3491+
resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-4.5.0.tgz#2673ad1389b3c418c5a20c5d7364f93ca04be923"
3492+
integrity sha512-5GG/5IbQQpC9FpkRGsSvZI5QYeSCzlJHdpBQntCsuTOxhKD8lqKhrleg2Yi7yvMIf82Ycmmqln9U8V9qwEiJew==
34923493
dependencies:
3493-
debug "^4.1.0"
3494-
depd "^2.0.0"
34953494
humanize-ms "^1.2.1"
34963495

34973496
aggregate-error@^3.0.0:
@@ -5792,7 +5791,7 @@ delegates@^1.0.0:
57925791
resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
57935792
integrity sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==
57945793

5795-
[email protected], depd@^2.0.0:
5794+
57965795
version "2.0.0"
57975796
resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df"
57985797
integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==
@@ -8413,15 +8412,13 @@ ioredis-mock@^5.5.4:
84138412
lodash "^4.17.21"
84148413
standard-as-callback "^2.1.0"
84158414

8416-
ip@^1.1.8:
8417-
version "1.1.8"
8418-
resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.8.tgz#ae05948f6b075435ed3307acce04629da8cdbf48"
8419-
integrity sha512-PuExPYUiu6qMBQb4l06ecm6T6ujzhmh+MeJcW9wa89PoAz5pvd4zPgN5WJV104mb6S2T1AwNIAaB70JNrLQWhg==
8420-
8421-
ip@^2.0.0:
8422-
version "2.0.0"
8423-
resolved "https://registry.yarnpkg.com/ip/-/ip-2.0.0.tgz#4cf4ab182fee2314c75ede1276f8c80b479936da"
8424-
integrity sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ==
8415+
ip-address@^9.0.5:
8416+
version "9.0.5"
8417+
resolved "https://registry.yarnpkg.com/ip-address/-/ip-address-9.0.5.tgz#117a960819b08780c3bd1f14ef3c1cc1d3f3ea5a"
8418+
integrity sha512-zHtQzGojZXTwZTHQqra+ETKd4Sn3vgi7uBmlPoXVWZqYvuKmtI0l/VZTjqGmJY9x88GGOaZ9+G9ES8hC4T4X8g==
8419+
dependencies:
8420+
jsbn "1.1.0"
8421+
sprintf-js "^1.1.3"
84258422

84268423
84278424
version "1.9.1"
@@ -9320,6 +9317,11 @@ js-yaml@^4.1.0:
93209317
dependencies:
93219318
argparse "^2.0.1"
93229319

9320+
9321+
version "1.1.0"
9322+
resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-1.1.0.tgz#b01307cb29b618a1ed26ec79e911f803c4da0040"
9323+
integrity sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A==
9324+
93239325
jsdom@^20.0.0:
93249326
version "20.0.3"
93259327
resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-20.0.3.tgz#886a41ba1d4726f67a8858028c99489fed6ad4db"
@@ -10642,11 +10644,6 @@ minipass@^3.0.0, minipass@^3.1.0, minipass@^3.1.1, minipass@^3.1.3, minipass@^3.
1064210644
dependencies:
1064310645
yallist "^4.0.0"
1064410646

10645-
minipass@^4.0.0:
10646-
version "4.2.8"
10647-
resolved "https://registry.yarnpkg.com/minipass/-/minipass-4.2.8.tgz#f0010f64393ecfc1d1ccb5f582bcaf45f48e1a3a"
10648-
integrity sha512-fNzuVyifolSLFL4NzpF+wEF4qrgqaaKX0haXPQEdQ7NKAN+WecoKMHV09YcuL/DHxrUsYQOK3MiuDf7Ip2OXfQ==
10649-
1065010647
minipass@^5.0.0:
1065110648
version "5.0.0"
1065210649
resolved "https://registry.yarnpkg.com/minipass/-/minipass-5.0.0.tgz#3e9788ffb90b694a5d0ec94479a45b5d8738133d"
@@ -10779,9 +10776,9 @@ [email protected]:
1077910776
integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==
1078010777

1078110778
nan@^2.17.0:
10782-
version "2.17.0"
10783-
resolved "https://registry.yarnpkg.com/nan/-/nan-2.17.0.tgz#c0150a2368a182f033e9aa5195ec76ea41a199cb"
10784-
integrity sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ==
10779+
version "2.18.0"
10780+
resolved "https://registry.yarnpkg.com/nan/-/nan-2.18.0.tgz#26a6faae7ffbeb293a39660e88a76b82e30b7554"
10781+
integrity sha512-W7tfG7vMOGtD30sHoZSSc/JVYiyDPEyQVso/Zz+/uQd0B0L46gtC+pHha5FFMRpil6fm/AoEcRWyOVi4+E/f8w==
1078510782

1078610783
nanoid@^3.3.6:
1078710784
version "3.3.6"
@@ -10812,9 +10809,9 @@ no-case@^3.0.4:
1081210809
tslib "^2.0.3"
1081310810

1081410811
node-abi@^3.45.0:
10815-
version "3.51.0"
10816-
resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.51.0.tgz#970bf595ef5a26a271307f8a4befa02823d4e87d"
10817-
integrity sha512-SQkEP4hmNWjlniS5zdnfIXTk1x7Ome85RDzHlTbBtzE97Gfwz/Ipw4v/Ryk20DWIy3yCNVLVlGKApCnmvYoJbA==
10812+
version "3.54.0"
10813+
resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.54.0.tgz#f6386f7548817acac6434c6cba02999c9aebcc69"
10814+
integrity sha512-p7eGEiQil0YUV3ItH4/tBb781L5impVmmx2E9FRKF7d18XXzp4PGT2tdYMFY6wQqgxD0IwNZOiSJ0/K0fSi/OA==
1081810815
dependencies:
1081910816
semver "^7.3.5"
1082010817

@@ -10823,10 +10820,10 @@ node-addon-api@^1.6.3:
1082310820
resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-1.7.2.tgz#3df30b95720b53c24e59948b49532b662444f54d"
1082410821
integrity sha512-ibPK3iA+vaY1eEjESkQkM0BbCqFOaZMiXRTtdB0u7b4djtY6JnsjvPdUHVMg6xQt3B8fpTTWHI9A+ADjM9frzg==
1082510822

10826-
node-api-version@^0.1.4:
10827-
version "0.1.4"
10828-
resolved "https://registry.yarnpkg.com/node-api-version/-/node-api-version-0.1.4.tgz#1ed46a485e462d55d66b5aa1fe2821720dedf080"
10829-
integrity sha512-KGXihXdUChwJAOHO53bv9/vXcLmdUsZ6jIptbvYvkpKfth+r7jw44JkVxQFA3kX5nQjzjmGu1uAu/xNNLNlI5g==
10823+
node-api-version@^0.2.0:
10824+
version "0.2.0"
10825+
resolved "https://registry.yarnpkg.com/node-api-version/-/node-api-version-0.2.0.tgz#5177441da2b1046a4d4547ab9e0972eed7b1ac1d"
10826+
integrity sha512-fthTTsi8CxaBXMaBAD7ST2uylwvsnYxh2PfaScwpMhos6KlSFajXQPcM4ogNE1q2s3Lbz9GCGqeIHC+C6OZnKg==
1083010827
dependencies:
1083110828
semver "^7.3.5"
1083210829

@@ -12381,6 +12378,13 @@ react@^18.2.0:
1238112378
dependencies:
1238212379
loose-envify "^1.1.0"
1238312380

12381+
read-binary-file-arch@^1.0.6:
12382+
version "1.0.6"
12383+
resolved "https://registry.yarnpkg.com/read-binary-file-arch/-/read-binary-file-arch-1.0.6.tgz#959c4637daa932280a9b911b1a6766a7e44288fc"
12384+
integrity sha512-BNg9EN3DD3GsDXX7Aa8O4p92sryjkmzYYgmgTAc6CA4uGLEDzFfxOxugu21akOxpcXHiEgsYkC6nPsQvLLLmEg==
12385+
dependencies:
12386+
debug "^4.3.4"
12387+
1238412388
1238512389
version "6.2.0"
1238612390
resolved "https://registry.yarnpkg.com/read-config-file/-/read-config-file-6.2.0.tgz#71536072330bcd62ba814f91458b12add9fc7ade"
@@ -13291,11 +13295,11 @@ socks-proxy-agent@^7.0.0:
1329113295
socks "^2.6.2"
1329213296

1329313297
socks@^2.6.2:
13294-
version "2.7.1"
13295-
resolved "https://registry.yarnpkg.com/socks/-/socks-2.7.1.tgz#d8e651247178fde79c0663043e07240196857d55"
13296-
integrity sha512-7maUZy1N7uo6+WVEX6psASxtNlKaNVMlGQKkG/63nEDdLOWNbiUMoLK7X4uYoLhQstau72mLgfEWcXcwsaHbYQ==
13298+
version "2.7.3"
13299+
resolved "https://registry.yarnpkg.com/socks/-/socks-2.7.3.tgz#7d8a75d7ce845c0a96f710917174dba0d543a785"
13300+
integrity sha512-vfuYK48HXCTFD03G/1/zkIls3Ebr2YNa4qU9gHDZdblHLiqhJrJGkY3+0Nx0JpN9qBhJbVObc1CNciT1bIZJxw==
1329713301
dependencies:
13298-
ip "^2.0.0"
13302+
ip-address "^9.0.5"
1329913303
smart-buffer "^4.2.0"
1330013304

1330113305
sort-keys-length@^1.0.0:
@@ -13435,6 +13439,11 @@ sprintf-js@^1.1.1, sprintf-js@^1.1.2:
1343513439
resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.2.tgz#da1765262bf8c0f571749f2ad6c26300207ae673"
1343613440
integrity sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==
1343713441

13442+
sprintf-js@^1.1.3:
13443+
version "1.1.3"
13444+
resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.3.tgz#4914b903a2f8b685d17fdf78a70e917e872e444a"
13445+
integrity sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==
13446+
1343813447
sprintf-js@~1.0.2:
1343913448
version "1.0.3"
1344013449
resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"

0 commit comments

Comments
 (0)