Skip to content

Commit

Permalink
FIX: Revert uppy aws-s3 upgrade (discourse#22376)
Browse files Browse the repository at this point in the history
Reverting discourse@898e571
which is causing upload failures for site settings and custom
avatars, same reason this one was reverted:

discourse@e0a2039
  • Loading branch information
martin-brennan authored Jul 3, 2023
1 parent 19b1ecd commit 7de3cb9
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 19 deletions.
2 changes: 1 addition & 1 deletion app/assets/javascripts/discourse-common/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
},
"dependencies": {
"@ember/string": "^3.1.1",
"@uppy/aws-s3": "3.2.0",
"@uppy/aws-s3": "3.0.6",
"@uppy/aws-s3-multipart": "3.1.3",
"@uppy/core": "3.0.4",
"@uppy/drop-target": "2.0.1",
Expand Down
2 changes: 1 addition & 1 deletion app/assets/javascripts/discourse/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"@glimmer/component": "^1.1.2",
"@glimmer/tracking": "^1.1.2",
"@popperjs/core": "^2.11.8",
"@uppy/aws-s3": "3.2.0",
"@uppy/aws-s3": "3.0.6",
"@uppy/aws-s3-multipart": "3.1.3",
"@uppy/core": "3.0.4",
"@uppy/drop-target": "2.0.1",
Expand Down
25 changes: 8 additions & 17 deletions app/assets/javascripts/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1721,23 +1721,14 @@
"@uppy/companion-client" "^3.1.2"
"@uppy/utils" "^5.2.0"

"@uppy/aws-s3-multipart@^3.4.0":
version "3.4.0"
resolved "https://registry.yarnpkg.com/@uppy/aws-s3-multipart/-/aws-s3-multipart-3.4.0.tgz#1830ac6a019764f35dda2b5c078c852d101ea04a"
integrity sha512-/aJzs3pKaPTtM8Y94hWaW+gvPif/9d8l3e0ECQgX+sB9EWzctjUbn7a6HrNb98PDxwiG1+v84Uj4AwBwio5lqg==
dependencies:
"@uppy/companion-client" "^3.1.3"
"@uppy/utils" "^5.4.0"

"@uppy/[email protected]":
version "3.2.0"
resolved "https://registry.yarnpkg.com/@uppy/aws-s3/-/aws-s3-3.2.0.tgz#1b00dfc4d2c771a3ce1793a8016afb50d10765d6"
integrity sha512-X6Fa8wmGGh/jMidek8w3Y4F0amNOsGBCUXalsc78pGN1eqN68tm0tJP7Qw/h5HnAZvPcskHhCu+i6KumrhCgtw==
"@uppy/[email protected]":
version "3.0.6"
resolved "https://registry.yarnpkg.com/@uppy/aws-s3/-/aws-s3-3.0.6.tgz#09916ad52fe87fd8f0380a37faf4c0ef0126f253"
integrity sha512-T+QC4u8/Dyh4qxW3E/Zy7LPTuT3K8dugrVPF3R3+cwfImmSusQZU6PYww3LhV8iumOwhgfsTll7ip0FcYCm2DA==
dependencies:
"@uppy/aws-s3-multipart" "^3.4.0"
"@uppy/companion-client" "^3.1.3"
"@uppy/utils" "^5.4.0"
"@uppy/xhr-upload" "^3.3.0"
"@uppy/companion-client" "^3.1.2"
"@uppy/utils" "^5.2.0"
"@uppy/xhr-upload" "^3.1.1"
nanoid "^4.0.0"

"@uppy/companion-client@^3.1.2", "@uppy/companion-client@^3.1.3":
Expand Down Expand Up @@ -1790,7 +1781,7 @@
"@uppy/utils" "^5.2.0"
nanoid "^4.0.0"

"@uppy/xhr-upload@^3.3.0":
"@uppy/xhr-upload@^3.1.1":
version "3.3.0"
resolved "https://registry.yarnpkg.com/@uppy/xhr-upload/-/xhr-upload-3.3.0.tgz#37b5f16467e32f39da4323113411b0ea159d4732"
integrity sha512-tgCVlNSBMj94iazCSQoOXfWYPAv6pZSzXK9ljkchKb2fjN6zmbkOJiQIaDUG+LxM/GX0qDi6sNNxUlhvz5cpbg==
Expand Down

0 comments on commit 7de3cb9

Please sign in to comment.