Skip to content

Commit 8e36d11

Browse files
committed
Merge branch 'master' of https://github.com/NCTUCSUnion/UnionFee
2 parents bb51624 + 9e68a02 commit 8e36d11

2 files changed

Lines changed: 11 additions & 25 deletions

File tree

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"dependencies": {
77
"@material-ui/core": "^4.11.0",
88
"@material-ui/icons": "^4.9.1",
9-
"axios": "^0.18.0",
9+
"axios": "^0.21.1",
1010
"classnames": "^2.2.6",
1111
"notistack": "^1.0.0",
1212
"react": "^16.4.2",

yarn.lock

Lines changed: 10 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -440,13 +440,12 @@ aws4@^1.8.0:
440440
version "1.8.0"
441441
resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.8.0.tgz#f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f"
442442

443-
axios@^0.18.0:
444-
version "0.18.1"
445-
resolved "https://registry.yarnpkg.com/axios/-/axios-0.18.1.tgz#ff3f0de2e7b5d180e757ad98000f1081b87bcea3"
446-
integrity sha512-0BfJq4NSfQXd+SkFdrvFbG7addhYSBA2mQwISr46pD6E5iqkWg02RAs8vyTT/j0RTnoYmeXauBuSv1qKwR179g==
443+
axios@^0.21.1:
444+
version "0.21.1"
445+
resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.1.tgz#22563481962f4d6bde9a76d516ef0e5d3c09b2b8"
446+
integrity sha512-dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA==
447447
dependencies:
448-
follow-redirects "1.5.10"
449-
is-buffer "^2.0.2"
448+
follow-redirects "^1.10.0"
450449

451450
axobject-query@^0.1.0:
452451
version "0.1.0"
@@ -2004,7 +2003,7 @@ debug@2.6.9, debug@^2.1.2, debug@^2.2.0, debug@^2.3.3, debug@^2.6.0, debug@^2.6.
20042003
dependencies:
20052004
ms "2.0.0"
20062005

2007-
debug@=3.1.0, debug@^3.0.1, debug@^3.1.0:
2006+
debug@^3.0.1, debug@^3.1.0:
20082007
version "3.1.0"
20092008
resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
20102009
integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==
@@ -2913,18 +2912,10 @@ flatten@^1.0.2:
29132912
version "1.0.2"
29142913
resolved "https://registry.yarnpkg.com/flatten/-/flatten-1.0.2.tgz#dae46a9d78fbe25292258cc1e780a41d95c03782"
29152914

2916-
follow-redirects@1.5.10:
2917-
version "1.5.10"
2918-
resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.5.10.tgz#7b7a9f9aea2fdff36786a94ff643ed07f4ff5e2a"
2919-
integrity sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==
2920-
dependencies:
2921-
debug "=3.1.0"
2922-
2923-
follow-redirects@^1.0.0:
2924-
version "1.5.5"
2925-
resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.5.5.tgz#3c143ca599a2e22e62876687d68b23d55bad788b"
2926-
dependencies:
2927-
debug "^3.1.0"
2915+
follow-redirects@^1.0.0, follow-redirects@^1.10.0:
2916+
version "1.13.1"
2917+
resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.13.1.tgz#5f69b813376cee4fd0474a3aba835df04ab763b7"
2918+
integrity sha512-SSG5xmZh1mkPGyKzjZP8zLjltIfpW32Y5QpdNJyjcfGxK3qo3NDDkZOZSFiGn1A6SclQxY9GzEwAHQ3dmYRWpg==
29282919

29292920
for-in@^1.0.1, for-in@^1.0.2:
29302921
version "1.0.2"
@@ -3576,11 +3567,6 @@ is-buffer@^1.1.5:
35763567
version "1.1.6"
35773568
resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
35783569

3579-
is-buffer@^2.0.2:
3580-
version "2.0.4"
3581-
resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.4.tgz#3e572f23c8411a5cfd9557c849e3665e0b290623"
3582-
integrity sha512-Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A==
3583-
35843570
is-builtin-module@^1.0.0:
35853571
version "1.0.0"
35863572
resolved "https://registry.yarnpkg.com/is-builtin-module/-/is-builtin-module-1.0.0.tgz#540572d34f7ac3119f8f76c30cbc1b1e037affbe"

0 commit comments

Comments
 (0)