Skip to content

Commit dca567d

Browse files
authored
Merge branch 'master' into dependabot/npm_and_yarn/lodash-4.17.20
2 parents d549ecf + 76115c1 commit dca567d

File tree

2 files changed

+11
-25
lines changed

2 files changed

+11
-25
lines changed

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
"typescript": "^4.1.3"
3535
},
3636
"dependencies": {
37-
"axios": "^0.19.0",
37+
"axios": "^0.21.1",
3838
"axios-cookiejar-support": "^1.0.1",
3939
"cli-progress": "^2.1.1",
4040
"colors": "^1.3.3",

yarn.lock

+10-24
Original file line numberDiff line numberDiff line change
@@ -139,12 +139,12 @@ axios-cookiejar-support@^1.0.1:
139139
is-redirect "^1.0.0"
140140
pify "^5.0.0"
141141

142-
axios@^0.19.0:
143-
version "0.19.0"
144-
resolved "https://registry.yarnpkg.com/axios/-/axios-0.19.0.tgz#8e09bff3d9122e133f7b8101c8fbdd00ed3d2ab8"
142+
axios@^0.21.1:
143+
version "0.21.1"
144+
resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.1.tgz#22563481962f4d6bde9a76d516ef0e5d3c09b2b8"
145+
integrity sha512-dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA==
145146
dependencies:
146-
follow-redirects "1.5.10"
147-
is-buffer "^2.0.2"
147+
follow-redirects "^1.10.0"
148148

149149
balanced-match@^1.0.0:
150150
version "1.0.0"
@@ -304,12 +304,6 @@ csv@^5.1.1:
304304
csv-stringify "^5.1.2"
305305
stream-transform "^1.0.8"
306306

307-
debug@=3.1.0:
308-
version "3.1.0"
309-
resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
310-
dependencies:
311-
ms "2.0.0"
312-
313307
debug@^4.0.1:
314308
version "4.1.1"
315309
resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791"
@@ -513,11 +507,10 @@ flatted@^2.0.0:
513507
version "2.0.1"
514508
resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.1.tgz#69e57caa8f0eacbc281d2e2cb458d46fdb449e08"
515509

516-
517-
version "1.5.10"
518-
resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.5.10.tgz#7b7a9f9aea2fdff36786a94ff643ed07f4ff5e2a"
519-
dependencies:
520-
debug "=3.1.0"
510+
follow-redirects@^1.10.0:
511+
version "1.13.1"
512+
resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.13.1.tgz#5f69b813376cee4fd0474a3aba835df04ab763b7"
513+
integrity sha512-SSG5xmZh1mkPGyKzjZP8zLjltIfpW32Y5QpdNJyjcfGxK3qo3NDDkZOZSFiGn1A6SclQxY9GzEwAHQ3dmYRWpg==
521514

522515
frac@~1.1.2:
523516
version "1.1.2"
@@ -618,10 +611,6 @@ inquirer@^6.2.2:
618611
strip-ansi "^5.1.0"
619612
through "^2.3.6"
620613

621-
is-buffer@^2.0.2:
622-
version "2.0.3"
623-
resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.3.tgz#4ecf3fcf749cbd1e472689e109ac66261a25e725"
624-
625614
is-extglob@^2.1.0, is-extglob@^2.1.1:
626615
version "2.1.1"
627616
resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
@@ -699,6 +688,7 @@ lodash@^4.17.11, lodash@^4.17.12:
699688
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52"
700689
integrity sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==
701690

691+
702692
make-error@^1.1.1:
703693
version "1.3.6"
704694
resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2"
@@ -724,10 +714,6 @@ mkdirp@^0.5.1:
724714
dependencies:
725715
minimist "0.0.8"
726716

727-
728-
version "2.0.0"
729-
resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
730-
731717
ms@^2.1.1:
732718
version "2.1.2"
733719
resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"

0 commit comments

Comments
 (0)