Skip to content

Commit 054dd40

Browse files
authored
Merge pull request #1376 from hackmdio/fix/minio-can-not-upload
fix: minio cannot upload caused by package upgrade
2 parents b771baf + d212d3f commit 054dd40

File tree

2 files changed

+49
-28
lines changed

2 files changed

+49
-28
lines changed

Diff for: package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@
101101
"mermaid": "~8.2.3",
102102
"method-override": "~3.0.0",
103103
"minimist": "~1.2.0",
104-
"minio": "~7.0.10",
104+
"minio": "~6.0.0",
105105
"moment": "~2.24.0",
106106
"morgan": "~1.9.1",
107107
"mysql": "~2.17.1",

Diff for: yarn.lock

+48-27
Original file line numberDiff line numberDiff line change
@@ -1743,7 +1743,7 @@ async-limiter@^1.0.0, async-limiter@~1.0.0:
17431743
resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.1.tgz#dd379e94f0db8310b08291f9d64c3209766617fd"
17441744
integrity sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==
17451745

1746-
async@>=0.6.0, async@^3.1.0, async@~3.1.0:
1746+
async@>=0.6.0, async@~3.1.0:
17471747
version "3.1.0"
17481748
resolved "https://registry.yarnpkg.com/async/-/async-3.1.0.tgz#42b3b12ae1b74927b5217d8c0016baaf62463772"
17491749
integrity sha512-4vx/aaY6j/j3Lw3fbCHNWP0pPaTCew3F6F3hYyl/tHs/ndmV1q7NW9T5yuJ2XAGwdQrP+6Wu20x06U4APo/iQQ==
@@ -2485,12 +2485,14 @@ [email protected]:
24852485
resolved "https://registry.yarnpkg.com/blob/-/blob-0.0.5.tgz#d680eeef25f8cd91ad533f5b01eed48e64caf683"
24862486
integrity sha512-gaqbzQPqOoamawKg0LGVd7SzLgXS+JH61oWprSLH+P+abTczqJbhTR8CmJ2u9/bUYNmHTGJx/UEmn6doAvvuig==
24872487

2488-
block-stream2@^2.0.0:
2489-
version "2.0.0"
2490-
resolved "https://registry.yarnpkg.com/block-stream2/-/block-stream2-2.0.0.tgz#680b9d357ca8b9d5637f4ec8a41fb5968029108f"
2491-
integrity sha512-1oI+RHHUEo64xomy1ozLgVJetFlHkIfQfJzTBQrj6xWnEMEPooeo2fZoqFjp0yzfHMBrgxwgh70tKp6T17+i3g==
2488+
block-stream2@^1.0.0:
2489+
version "1.1.0"
2490+
resolved "https://registry.yarnpkg.com/block-stream2/-/block-stream2-1.1.0.tgz#c738e3a91ba977ebb5e1fef431e13ca11d8639e2"
2491+
integrity sha1-xzjjqRupd+u14f70MeE8oR2GOeI=
24922492
dependencies:
2493-
readable-stream "^3.4.0"
2493+
defined "^1.0.0"
2494+
inherits "^2.0.1"
2495+
readable-stream "^2.0.4"
24942496

24952497
bluebird@^3.5.0, bluebird@^3.5.1, bluebird@^3.5.3, bluebird@^3.5.5:
24962498
version "3.5.5"
@@ -3302,7 +3304,7 @@ [email protected]:
33023304
resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
33033305
integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
33043306

3305-
[email protected], concat-stream@^1.4.7, concat-stream@^1.5.0, concat-stream@^1.6.0:
3307+
[email protected], concat-stream@^1.4.7, concat-stream@^1.4.8, concat-stream@^1.5.0, concat-stream@^1.6.0:
33063308
version "1.6.2"
33073309
resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"
33083310
integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==
@@ -4878,7 +4880,12 @@ es5-ext@^0.10.35, es5-ext@^0.10.45, es5-ext@^0.10.46, es5-ext@^0.10.50, es5-ext@
48784880
es6-symbol "~3.1.1"
48794881
next-tick "^1.0.0"
48804882

4881-
es6-error@^4.0.1, es6-error@^4.1.1:
4883+
es6-error@^2.0.2:
4884+
version "2.1.1"
4885+
resolved "https://registry.yarnpkg.com/es6-error/-/es6-error-2.1.1.tgz#91384301ec5ed1c9a7247d1128247216f03547cd"
4886+
integrity sha1-kThDAexe0cmnJH0RKCRyFvA1R80=
4887+
4888+
es6-error@^4.0.1:
48824889
version "4.1.1"
48834890
resolved "https://registry.yarnpkg.com/es6-error/-/es6-error-4.1.1.tgz#9e3af407459deed47e9a91f9b885a84eb05c561d"
48844891
integrity sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==
@@ -8367,20 +8374,23 @@ minimist@~0.0.1:
83678374
resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
83688375
integrity sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=
83698376

8370-
minio@~7.0.10:
8371-
version "7.0.11"
8372-
resolved "https://registry.yarnpkg.com/minio/-/minio-7.0.11.tgz#42552b8f083659929b2c6dcd522f8e5f8d370011"
8373-
integrity sha512-krmu+vmczVt9fzN2B3l0OdWUbSk63PF6caJYjmbMgGOsaJNy8rm0U05u6AngORdhP/cvlyoa8HZSly/k0Dl6cA==
8377+
minio@~6.0.0:
8378+
version "6.0.0"
8379+
resolved "https://registry.yarnpkg.com/minio/-/minio-6.0.0.tgz#7e514d38eaacf2264556b232f1c2c063cc6ca7ba"
8380+
integrity sha1-flFNOOqs8iZFVrIy8cLAY8xsp7o=
83748381
dependencies:
8375-
async "^3.1.0"
8376-
block-stream2 "^2.0.0"
8377-
es6-error "^4.1.1"
8382+
async "^1.5.2"
8383+
block-stream2 "^1.0.0"
8384+
concat-stream "^1.4.8"
8385+
es6-error "^2.0.2"
83788386
json-stream "^1.0.0"
83798387
lodash "^4.14.2"
83808388
mime-types "^2.1.14"
83818389
mkdirp "^0.5.1"
83828390
querystring "0.2.0"
8383-
through2 "^3.0.1"
8391+
source-map-support "^0.4.12"
8392+
through2 "^0.6.5"
8393+
uuid "^3.1.0"
83848394
xml "^1.0.0"
83858395
xml2js "^0.4.15"
83868396

@@ -10507,7 +10517,7 @@ read-pkg@^3.0.0:
1050710517
normalize-package-data "^2.3.2"
1050810518
path-type "^3.0.0"
1050910519

10510-
"readable-stream@1 || 2", [email protected], readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.5, readable-stream@^2.3.6, readable-stream@~2.3.6:
10520+
"readable-stream@1 || 2", [email protected], readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.5, readable-stream@^2.3.6, readable-stream@~2.3.6:
1051110521
version "2.3.6"
1051210522
resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
1051310523
integrity sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==
@@ -10520,7 +10530,17 @@ read-pkg@^3.0.0:
1052010530
string_decoder "~1.1.1"
1052110531
util-deprecate "~1.0.1"
1052210532

10523-
"readable-stream@2 || 3", readable-stream@^3.0.1, readable-stream@^3.1.1, readable-stream@^3.4.0:
10533+
"readable-stream@>=1.0.33-1 <1.1.0-0":
10534+
version "1.0.34"
10535+
resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c"
10536+
integrity sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=
10537+
dependencies:
10538+
core-util-is "~1.0.0"
10539+
inherits "~2.0.1"
10540+
isarray "0.0.1"
10541+
string_decoder "~0.10.x"
10542+
10543+
readable-stream@^3.0.1, readable-stream@^3.1.1, readable-stream@^3.4.0:
1052410544
version "3.4.0"
1052510545
resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.4.0.tgz#a51c26754658e0a3c21dbf59163bd45ba6f447fc"
1052610546
integrity sha512-jItXPLmrSR8jmTRmRWJXCnGJsfy85mB3Wd/uINMXA65yrnFo0cPClFIUWzo2najVNSl+mx7/4W8ttlLWJe99pQ==
@@ -11542,7 +11562,7 @@ source-map-resolve@^0.5.0:
1154211562
source-map-url "^0.4.0"
1154311563
urix "^0.1.0"
1154411564

11545-
source-map-support@^0.4.0, source-map-support@^0.4.15:
11565+
source-map-support@^0.4.0, source-map-support@^0.4.12, source-map-support@^0.4.15:
1154611566
version "0.4.18"
1154711567
resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.18.tgz#0286a6de8be42641338594e97ccea75f0a2c585f"
1154811568
integrity sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==
@@ -12170,6 +12190,14 @@ through2-filter@^3.0.0:
1217012190
through2 "~2.0.0"
1217112191
xtend "~4.0.0"
1217212192

12193+
through2@^0.6.5:
12194+
version "0.6.5"
12195+
resolved "https://registry.yarnpkg.com/through2/-/through2-0.6.5.tgz#41ab9c67b29d57209071410e1d7a7a968cd3ad48"
12196+
integrity sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=
12197+
dependencies:
12198+
readable-stream ">=1.0.33-1 <1.1.0-0"
12199+
xtend ">=4.0.0 <4.1.0-0"
12200+
1217312201
through2@^2.0.0, through2@^2.0.3, through2@~2.0.0:
1217412202
version "2.0.5"
1217512203
resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd"
@@ -12178,13 +12206,6 @@ through2@^2.0.0, through2@^2.0.3, through2@~2.0.0:
1217812206
readable-stream "~2.3.6"
1217912207
xtend "~4.0.1"
1218012208

12181-
through2@^3.0.1:
12182-
version "3.0.1"
12183-
resolved "https://registry.yarnpkg.com/through2/-/through2-3.0.1.tgz#39276e713c3302edf9e388dd9c812dd3b825bd5a"
12184-
integrity sha512-M96dvTalPT3YbYLaKaCuwu+j06D/8Jfib0o/PxbVt6Amhv3dUAtW6rTV1jPgJSBG83I/e04Y6xkVdVhSRhi0ww==
12185-
dependencies:
12186-
readable-stream "2 || 3"
12187-
1218812209
through@2, "through@>=2.2.7 <3", through@^2.3.6:
1218912210
version "2.3.8"
1219012211
resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
@@ -13763,7 +13784,7 @@ xss@~1.0.6:
1376313784
commander "^2.9.0"
1376413785
cssfilter "0.0.10"
1376513786

13766-
xtend@^4.0.0, xtend@^4.0.1, xtend@~4.0.0, xtend@~4.0.1:
13787+
"xtend@>=4.0.0 <4.1.0-0", xtend@^4.0.0, xtend@^4.0.1, xtend@~4.0.0, xtend@~4.0.1:
1376713788
version "4.0.2"
1376813789
resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54"
1376913790
integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==

0 commit comments

Comments
 (0)