Skip to content

Commit 53991ed

Browse files
committed
Merge branch 'master' into develop
2 parents ee47d20 + 7ffd3b7 commit 53991ed

File tree

2 files changed

+36
-31
lines changed

2 files changed

+36
-31
lines changed

package.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@
3737
"version:major": "npm version major"
3838
},
3939
"dependencies": {
40-
"redis": "3.0.2"
40+
"redis": "^3.1.1",
41+
"redis-commands": "^1.3.1"
4142
},
4243
"devDependencies": {
4344
"@types/node": "^14.0.27",

yarn.lock

+34-30
Original file line numberDiff line numberDiff line change
@@ -327,11 +327,6 @@ assertion-error@^1.1.0:
327327
resolved "https://registry.yarnpkg.com/assertion-error/-/assertion-error-1.1.0.tgz#e60b6b0e8f301bd97e5375215bda406c85118c0b"
328328
integrity sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==
329329

330-
astral-regex@^1.0.0:
331-
version "1.0.0"
332-
resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-1.0.0.tgz#6c8c3fb827dd43ee3918f27b82782ab7658a6fd9"
333-
integrity sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==
334-
335330
asynckit@^0.4.0:
336331
version "0.4.0"
337332
resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
@@ -394,6 +389,10 @@ callsites@^3.0.0:
394389
resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
395390
integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==
396391

392+
camelcase@^4.1.0:
393+
version "4.1.0"
394+
resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd"
395+
397396
camelcase@^5.0.0, camelcase@^5.3.1:
398397
version "5.3.1"
399398
resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
@@ -467,8 +466,7 @@ [email protected]:
467466

468467
clean-stack@^2.0.0:
469468
version "2.2.0"
470-
resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b"
471-
integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==
469+
resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz#ff19ede8a9a5e579324147b0c11f0fbcbabed639"
472470

473471
cliui@^5.0.0:
474472
version "5.0.0"
@@ -618,10 +616,9 @@ delayed-stream@~1.0.0:
618616
version "1.0.0"
619617
resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
620618

621-
denque@^1.4.1:
622-
version "1.4.1"
623-
resolved "https://registry.yarnpkg.com/denque/-/denque-1.4.1.tgz#6744ff7641c148c3f8a69c307e51235c1f4a37cf"
624-
integrity sha512-OfzPuSZKGcgr96rf1oODnfjqBFmr1DVoc/TrItj3Ohe0Ah1C5WX5Baquw/9U9KovnQ88EqmJbD66rKYUQYN1tQ==
619+
denque@^1.5.0:
620+
version "1.5.0"
621+
resolved "https://registry.yarnpkg.com/denque/-/denque-1.5.0.tgz#773de0686ff2d8ec2ff92914316a47b73b1c73de"
625622

626623
627624
version "4.0.2"
@@ -1065,6 +1062,10 @@ [email protected]:
10651062
resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f"
10661063
integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==
10671064

1065+
1066+
version "4.2.0"
1067+
resolved "https://registry.yarnpkg.com/hoek/-/hoek-4.2.0.tgz#72d9d0754f7fe25ca2d01ad8f8f9a9449a89526d"
1068+
10681069
html-escaper@^2.0.0:
10691070
version "2.0.2"
10701071
resolved "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.2.tgz#dfd60027da36a36dfcbe236262c00a5822681453"
@@ -1412,10 +1413,7 @@ [email protected]:
14121413

14131414
make-dir@^3.0.0, make-dir@^3.0.2:
14141415
version "3.1.0"
1415-
resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f"
1416-
integrity sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==
1417-
dependencies:
1418-
semver "^6.0.0"
1416+
resolved "https://registry.yarnpkg.com/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz#2f573d85c6a24289ff00663b491c1d338ff3458a"
14191417

14201418
14211419
version "1.44.0"
@@ -1452,7 +1450,6 @@ [email protected]:
14521450
minimist@^1.2.5:
14531451
version "1.2.5"
14541452
resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
1455-
integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
14561453

14571454
mkdirp@^0.5.1:
14581455
version "0.5.1"
@@ -1746,30 +1743,26 @@ readdirp@~3.3.0:
17461743
dependencies:
17471744
picomatch "^2.0.7"
17481745

1749-
redis-commands@^1.5.0:
1750-
version "1.5.0"
1751-
resolved "https://registry.yarnpkg.com/redis-commands/-/redis-commands-1.5.0.tgz#80d2e20698fe688f227127ff9e5164a7dd17e785"
1752-
integrity sha512-6KxamqpZ468MeQC3bkWmCB1fp56XL64D4Kf0zJSwDZbVLLm7KFkoIcHrgRvQ+sk8dnhySs7+yBg94yIkAK7aJg==
1746+
redis-commands@^1.3.1, redis-commands@^1.7.0:
1747+
version "1.7.0"
1748+
resolved "https://registry.yarnpkg.com/redis-commands/-/redis-commands-1.7.0.tgz#15a6fea2d58281e27b1cd1acfb4b293e278c3a89"
17531749

17541750
redis-errors@^1.0.0, redis-errors@^1.2.0:
17551751
version "1.2.0"
17561752
resolved "https://registry.yarnpkg.com/redis-errors/-/redis-errors-1.2.0.tgz#eb62d2adb15e4eaf4610c04afe1529384250abad"
1757-
integrity sha1-62LSrbFeTq9GEMBK/hUpOEJQq60=
17581753

17591754
redis-parser@^3.0.0:
17601755
version "3.0.0"
17611756
resolved "https://registry.yarnpkg.com/redis-parser/-/redis-parser-3.0.0.tgz#b66d828cdcafe6b4b8a428a7def4c6bcac31c8b4"
1762-
integrity sha1-tm2CjNyv5rS4pCin3vTGvKwxyLQ=
17631757
dependencies:
17641758
redis-errors "^1.0.0"
17651759

1766-
1767-
version "3.0.2"
1768-
resolved "https://registry.yarnpkg.com/redis/-/redis-3.0.2.tgz#bd47067b8a4a3e6a2e556e57f71cc82c7360150a"
1769-
integrity sha512-PNhLCrjU6vKVuMOyFu7oSP296mwBkcE6lrAjruBYG5LgdSqtRBoVQIylrMyVZD/lkF24RSNNatzvYag6HRBHjQ==
1760+
redis@^3.1.1:
1761+
version "3.1.1"
1762+
resolved "https://registry.yarnpkg.com/redis/-/redis-3.1.1.tgz#a44bee7c072dcf685e139048d6a1a4d3b00f5d01"
17701763
dependencies:
1771-
denque "^1.4.1"
1772-
redis-commands "^1.5.0"
1764+
denque "^1.5.0"
1765+
redis-commands "^1.7.0"
17731766
redis-errors "^1.2.0"
17741767
redis-parser "^3.0.0"
17751768

@@ -1869,7 +1862,7 @@ semver@^5.4.1:
18691862
resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
18701863
integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
18711864

1872-
semver@^6.0.0, semver@^6.3.0:
1865+
semver@^6.3.0:
18731866
version "6.3.0"
18741867
resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
18751868
integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
@@ -2221,12 +2214,16 @@ [email protected]:
22212214
dependencies:
22222215
mkdirp "^0.5.1"
22232216

2217+
y18n@^3.2.1:
2218+
version "3.2.2"
2219+
resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.2.tgz#85c901bd6470ce71fc4bb723ad209b70f7f28696"
2220+
22242221
y18n@^4.0.0:
22252222
version "4.0.0"
22262223
resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b"
22272224
integrity sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==
22282225

2229-
[email protected], yargs-parser@^13.1.2:
2226+
22302227
version "13.1.2"
22312228
resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.2.tgz#130f09702ebaeef2650d54ce6e3e5706f7a4fb38"
22322229
integrity sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==
@@ -2250,6 +2247,13 @@ yargs-parser@^18.1.2:
22502247
camelcase "^5.0.0"
22512248
decamelize "^1.2.0"
22522249

2250+
yargs-parser@^8.1.0:
2251+
version "8.1.0"
2252+
resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-8.1.0.tgz#f1376a33b6629a5d063782944da732631e966950"
2253+
integrity sha512-yP+6QqN8BmrgW2ggLtTbdrOyBNSI7zBa4IykmiV5R1wl1JWNxQvWhMfMdmzIYtKU7oP3OOInY/tl2ov3BDjnJQ==
2254+
dependencies:
2255+
camelcase "^4.1.0"
2256+
22532257
22542258
version "1.6.1"
22552259
resolved "https://registry.yarnpkg.com/yargs-unparser/-/yargs-unparser-1.6.1.tgz#bd4b0ee05b4c94d058929c32cb09e3fce71d3c5f"

0 commit comments

Comments
 (0)