Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DEV: Update uppy to 3.x (#18219)

This commit is contained in:
Jarek Radosz 2022-12-12 12:08:57 +01:00 committed by GitHub
parent 2c6d6cf485
commit 80e422cea3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 73 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/assets/javascripts/discourse-common/package.json
View File

@ -15,12 +15,12 @@
"start": "ember serve" "start": "ember serve"
}, },
"dependencies": { "dependencies": {
"@uppy/aws-s3": "^2.2.1", "@uppy/aws-s3": "^3.0.4",
"@uppy/aws-s3-multipart": "^2.4.1", "@uppy/aws-s3-multipart": "^3.1.1",
"@uppy/core": "^2.3.1", "@uppy/core": "^3.0.4",
"@uppy/drop-target": "^1.1.3", "@uppy/drop-target": "^2.0.1",
"@uppy/utils": "^4.1.0", "@uppy/utils": "^5.1.1",
"@uppy/xhr-upload": "^2.1.2", "@uppy/xhr-upload": "^3.0.4",
"ember-auto-import": "^2.5.0", "ember-auto-import": "^2.5.0",
"ember-cli-babel": "^7.26.10", "ember-cli-babel": "^7.26.10",
"ember-cli-htmlbars": "^6.1.1", "ember-cli-htmlbars": "^6.1.1",

7
app/assets/javascripts/discourse/app/mixins/composer-upload-uppy.js
View File

@ -352,8 +352,7 @@ export default Mixin.create(ExtendableUploader, UppyS3Multipart, {
this._uppyInstance.on("upload-error", this._handleUploadError); this._uppyInstance.on("upload-error", this._handleUploadError);
this._uppyInstance.on("cancel-all", () => { this._uppyInstance.on("cancel-all", () => {
// uppyInstance.reset() also fires cancel-all, so we want to // Do the manual cancelling work only if the user clicked cancel
// only do the manual cancelling work if the user clicked cancel
if (this.userCancelled) { if (this.userCancelled) {
Object.values(this.placeholders).forEach((data) => { Object.values(this.placeholders).forEach((data) => {
run(() => { run(() => {
@ -453,7 +452,7 @@ export default Mixin.create(ExtendableUploader, UppyS3Multipart, {
placeholderData.processingPlaceholder placeholderData.processingPlaceholder
); );
// Safari applies user-defined replacements to text inserted programatically. // Safari applies user-defined replacements to text inserted programmatically.
// One of the most common replacements is ... -> …, so we take care of the case // One of the most common replacements is ... -> …, so we take care of the case
// where that transformation has been applied to the original placeholder // where that transformation has been applied to the original placeholder
this.appEvents.trigger( this.appEvents.trigger(
@ -545,7 +544,7 @@ export default Mixin.create(ExtendableUploader, UppyS3Multipart, {
}, },
_reset() { _reset() {
this._uppyInstance?.reset(); this._uppyInstance?.cancelAll();
this.setProperties({ this.setProperties({
uploadProgress: 0, uploadProgress: 0,
isUploading: false, isUploading: false,

2
app/assets/javascripts/discourse/app/mixins/uppy-upload.js
View File

@ -449,7 +449,7 @@ export default Mixin.create(UppyS3Multipart, ExtendableUploader, {
}, },
_reset() { _reset() {
this._uppyInstance?.reset(); this._uppyInstance?.cancelAll();
this.setProperties({ this.setProperties({
uploading: false, uploading: false,
processing: false, processing: false,

12
app/assets/javascripts/discourse/package.json
View File

@ -29,12 +29,12 @@
"@glimmer/syntax": "^0.84.2", "@glimmer/syntax": "^0.84.2",
"@glimmer/tracking": "^1.1.2", "@glimmer/tracking": "^1.1.2",
"@popperjs/core": "^2.11.6", "@popperjs/core": "^2.11.6",
"@uppy/aws-s3": "^2.2.1", "@uppy/aws-s3": "^3.0.4",
"@uppy/aws-s3-multipart": "^2.4.1", "@uppy/aws-s3-multipart": "^3.1.1",
"@uppy/core": "^2.3.1", "@uppy/core": "^3.0.4",
"@uppy/drop-target": "^1.1.3", "@uppy/drop-target": "^2.0.1",
"@uppy/utils": "^4.1.0", "@uppy/utils": "^5.1.1",
"@uppy/xhr-upload": "^2.1.2", "@uppy/xhr-upload": "^3.0.4",
"a11y-dialog": "7.5.2", "a11y-dialog": "7.5.2",
"admin": "1.0.0", "admin": "1.0.0",
"babel-import-util": "^1.3.0", "babel-import-util": "^1.3.0",

109
app/assets/javascripts/yarn.lock
View File

@ -1418,10 +1418,10 @@
resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-2.0.0.tgz#f544a148d3ab35801c1f633a7441fd87c2e484bf" resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-2.0.0.tgz#f544a148d3ab35801c1f633a7441fd87c2e484bf"
integrity sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A== integrity sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==
"@transloadit/prettier-bytes@0.0.7": "@transloadit/prettier-bytes@0.0.9":
version "0.0.7" version "0.0.9"
resolved "https://registry.yarnpkg.com/@transloadit/prettier-bytes/-/prettier-bytes-0.0.7.tgz#cdb5399f445fdd606ed833872fa0cabdbc51686b" resolved "https://registry.yarnpkg.com/@transloadit/prettier-bytes/-/prettier-bytes-0.0.9.tgz#8d3146f75fd9d3c544cb63ec7dbdeb6670d3e2d7"
integrity sha512-VeJbUb0wEKbcwaSlj5n+LscBl9IPgLPkHVGBkh00cztv6X4L/TJXK58LzFuBKX7/GAfiGhIwH67YTLTlzvIzBA== integrity sha512-pCvdmea/F3Tn4hAtHqNXmjcixSaroJJ+L3STXlYJdir1g1m2mRQpWbN8a4SvgQtaw2930Ckhdx8qXdXBFMKbAA==
"@types/body-parser@*": "@types/body-parser@*":
version "1.19.0" version "1.19.0"
@ -1573,73 +1573,73 @@
resolved "https://registry.yarnpkg.com/@types/symlink-or-copy/-/symlink-or-copy-1.2.0.tgz#4151a81b4052c80bc2becbae09f3a9ec010a9c7a" resolved "https://registry.yarnpkg.com/@types/symlink-or-copy/-/symlink-or-copy-1.2.0.tgz#4151a81b4052c80bc2becbae09f3a9ec010a9c7a"
integrity sha512-Lja2xYuuf2B3knEsga8ShbOdsfNOtzT73GyJmZyY7eGl2+ajOqrs8yM5ze0fsSoYwvA6bw7/Qr7OZ7PEEmYwWg== integrity sha512-Lja2xYuuf2B3knEsga8ShbOdsfNOtzT73GyJmZyY7eGl2+ajOqrs8yM5ze0fsSoYwvA6bw7/Qr7OZ7PEEmYwWg==
"@uppy/aws-s3-multipart@^2.4.1": "@uppy/aws-s3-multipart@^3.1.1":
version "2.4.1" version "3.1.1"
resolved "https://registry.yarnpkg.com/@uppy/aws-s3-multipart/-/aws-s3-multipart-2.4.1.tgz#b7e5192ed94b3b56d3d9917d2abc1393b2d2af30" resolved "https://registry.yarnpkg.com/@uppy/aws-s3-multipart/-/aws-s3-multipart-3.1.1.tgz#996184d7c73122d9a33b166e2960215e482e57ab"
integrity sha512-7p+4NhSRrFuGpmaq+fGXxkOEx85+x017TIQPEaN86wvSAaNW9SywEBDvg1QUYE/v/SZQ/rAe3JOMZ2YDTPrWaA== integrity sha512-vL4QtbI5T4cGJLHm2GzKIGeaiy2zbgNW0nn/3LxYQ+wrBHLJoVZ/6uzMiFdNUBNa28rRQ/qxWTmy/kD6co95cg==
dependencies: dependencies:
"@uppy/companion-client" "^2.2.1" "@uppy/companion-client" "^3.1.1"
"@uppy/utils" "^4.1.0" "@uppy/utils" "^5.1.1"
"@uppy/aws-s3@^2.2.1": "@uppy/aws-s3@^3.0.4":
version "2.2.1" version "3.0.4"
resolved "https://registry.yarnpkg.com/@uppy/aws-s3/-/aws-s3-2.2.1.tgz#b097103bb3cdc96f9b3fc97089f12254a7dce2fb" resolved "https://registry.yarnpkg.com/@uppy/aws-s3/-/aws-s3-3.0.4.tgz#a2422a2091c57570ff99a77108296f09ba9e46a5"
integrity sha512-nGRdXWOFNpYU31bD1gcLK1i8ClY7tRvvsSR70bzYI5gFC2Vw07sHk6Tc3yKi9doQoWJ3OnE3IilvfK3iZ/NRmg== integrity sha512-mcwRYUH1TgcCWAkmvx9SCu7A9ylgBX+b1qyVO7ZiHnSbdg1F0H9hd3KkiUHGHkuV+hHz+l4vM9tQJqhxVhpW8w==
dependencies: dependencies:
"@uppy/companion-client" "^2.2.1" "@uppy/companion-client" "^3.0.2"
"@uppy/utils" "^4.1.0" "@uppy/utils" "^5.0.2"
"@uppy/xhr-upload" "^2.1.2" "@uppy/xhr-upload" "^3.0.4"
nanoid "^3.1.25" nanoid "^4.0.0"
"@uppy/companion-client@^2.2.1": "@uppy/companion-client@^3.0.2", "@uppy/companion-client@^3.1.1":
version "2.2.1" version "3.1.1"
resolved "https://registry.yarnpkg.com/@uppy/companion-client/-/companion-client-2.2.1.tgz#cef4b15185dd8ee6024386c8aae809e8e05dcd53" resolved "https://registry.yarnpkg.com/@uppy/companion-client/-/companion-client-3.1.1.tgz#8c9974f70b899a40771da9a90113941356f9842e"
integrity sha512-Y3E10NJLMfp/wjgthNhx3gJtT67fzFCPNPFwpNNRs5iJsW6PANhJ420eyMUFzfmEZ56ZzGYxr5pzJZx8YxHICQ== integrity sha512-S1M37vjWu8gdOgdI3Hh/1fVZ9GaLdyPQjVyUujZDTsr79b4VG7v/zjdqJ0FiOTjfGbpnj8s9kr1uyYi0Zf5VFw==
dependencies: dependencies:
"@uppy/utils" "^4.1.0" "@uppy/utils" "^5.1.1"
namespace-emitter "^2.0.1" namespace-emitter "^2.0.1"
"@uppy/core@^2.3.1": "@uppy/core@^3.0.4":
version "2.3.1" version "3.0.4"
resolved "https://registry.yarnpkg.com/@uppy/core/-/core-2.3.1.tgz#1d7a40f0a0b96a2709115bf7d087b4e6ab1403f4" resolved "https://registry.yarnpkg.com/@uppy/core/-/core-3.0.4.tgz#3bdc08e50ab72749e6f9afa60eec6c836e8b3442"
integrity sha512-KV04X7ueYbYX1p37/i3QsoQSw8IDP8Yb+Bh9KNN0X2Vcun6K2VnNjhVtPmPXtyjDZooK7lVIqhRX8TZWcSfgSQ== integrity sha512-vFofKmmVVsQE9bnOXozAPy94kLQMUdMH/l8m4ncXmxyyGRc2e9VfvY9wiy2EEsoj11O7YVzHOP70FYdRReUpVw==
dependencies: dependencies:
"@transloadit/prettier-bytes" "0.0.7" "@transloadit/prettier-bytes" "0.0.9"
"@uppy/store-default" "^2.1.0" "@uppy/store-default" "^3.0.2"
"@uppy/utils" "^4.1.0" "@uppy/utils" "^5.0.2"
lodash.throttle "^4.1.1" lodash.throttle "^4.1.1"
mime-match "^1.0.2" mime-match "^1.0.2"
namespace-emitter "^2.0.1" namespace-emitter "^2.0.1"
nanoid "^3.1.25" nanoid "^4.0.0"
preact "^10.5.13" preact "^10.5.13"
"@uppy/drop-target@^1.1.3": "@uppy/drop-target@^2.0.1":
version "1.1.3" version "2.0.1"
resolved "https://registry.yarnpkg.com/@uppy/drop-target/-/drop-target-1.1.3.tgz#cb8eb4ff3c6f6e3733c57ad46f9422186c024e56" resolved "https://registry.yarnpkg.com/@uppy/drop-target/-/drop-target-2.0.1.tgz#94e106056a846d9de12b0d12231f66c9718a6778"
integrity sha512-Cd+L3mdVovS6G0Yv0Hah18Utz3czQ75YrGJ65MlHFzfJccOQJczvxn18FVssKyO6Zc0ce1y0mGKGjUClTM5dMA== integrity sha512-FMO8wj+0dx4mlwXKxFWSTUF+irgr0BVXadyc4qaoBBtZ3vEcwc3jP7SQfwk3JizV/D5MYG8MRICRbPAIrY9M8w==
dependencies: dependencies:
"@uppy/utils" "^4.0.7" "@uppy/utils" "^5.0.2"
"@uppy/store-default@^2.1.0": "@uppy/store-default@^3.0.2":
version "2.1.0" version "3.0.2"
resolved "https://registry.yarnpkg.com/@uppy/store-default/-/store-default-2.1.0.tgz#3fbcac626dd515668b88762d812017bd4f9b75d4" resolved "https://registry.yarnpkg.com/@uppy/store-default/-/store-default-3.0.2.tgz#870724c45a2f671d625123cb4a412e3bfae935d9"
integrity sha512-BkcR1wGw6Kwbvr8m1tKF9EDDWSTJoTGnVseBF/iW4bzR22assbtxZIE1iroo68UMqYEG4rv63SX4BUEtNvVjdA== integrity sha512-kIQMCjXui6tjF1E9xGo4YHkvt71McXkU0FStrcQuBrRXuOhb+NcuWh3sMh3KryivVNgT6w5Odrlw2FUFkl9cqA==
"@uppy/utils@^4.0.7", "@uppy/utils@^4.1.0": "@uppy/utils@^5.0.2", "@uppy/utils@^5.1.1":
version "4.1.0" version "5.1.1"
resolved "https://registry.yarnpkg.com/@uppy/utils/-/utils-4.1.0.tgz#19f3f08cd21b383cdcdf95adbec76d9c1a694b68" resolved "https://registry.yarnpkg.com/@uppy/utils/-/utils-5.1.1.tgz#9597e8696e17d71413672bd56eb082c7410514a3"
integrity sha512-C47DUl4uLzmQZdW+VmetIgGRurXuPsvb+/pyYqh9DJn0Phep8u7AOj/tlJA5CHv4pefNHsFjXpaWfSUG3HtW3A== integrity sha512-uoI+PcIVQboky0ZbN4PQeK1seZnnJocomzeK7blId9HKJ6QNgZLf2ibk2CQuQxrOuNsWhgrhs5uLO5Si0oM0Yw==
dependencies: dependencies:
lodash.throttle "^4.1.1" lodash.throttle "^4.1.1"
"@uppy/xhr-upload@^2.1.2": "@uppy/xhr-upload@^3.0.4":
version "2.1.2" version "3.0.4"
resolved "https://registry.yarnpkg.com/@uppy/xhr-upload/-/xhr-upload-2.1.2.tgz#0f644e3371b611b10cd5ddbd7d799ab9f88a3786" resolved "https://registry.yarnpkg.com/@uppy/xhr-upload/-/xhr-upload-3.0.4.tgz#219a92c832bee1f089992958d27ec71dbe9d9d7d"
integrity sha512-VCsb7J5yHsof49nnUa+Y1n27UMtqHPttQmmoCa5hmjqa9R7ZISpBkXKOQmZo526eopKNuAKSAdkHWfCm8efJTA== integrity sha512-uJ1oxcwEaSLnrexvi6Lp57hV3z3DsovgVmYIVwg+z/EnrRcL32wNRE7FcIr8Mk9e1jdMiFYlk6cQmiP2dZep8A==
dependencies: dependencies:
"@uppy/companion-client" "^2.2.1" "@uppy/companion-client" "^3.0.2"
"@uppy/utils" "^4.1.0" "@uppy/utils" "^5.0.2"
nanoid "^3.1.25" nanoid "^4.0.0"
"@webassemblyjs/ast@1.11.1": "@webassemblyjs/ast@1.11.1":
version "1.11.1" version "1.11.1"
@ -7096,11 +7096,16 @@ namespace-emitter@^2.0.1:
resolved "https://registry.yarnpkg.com/namespace-emitter/-/namespace-emitter-2.0.1.tgz#978d51361c61313b4e6b8cf6f3853d08dfa2b17c" resolved "https://registry.yarnpkg.com/namespace-emitter/-/namespace-emitter-2.0.1.tgz#978d51361c61313b4e6b8cf6f3853d08dfa2b17c"
integrity sha512-N/sMKHniSDJBjfrkbS/tpkPj4RAbvW3mr8UAzvlMHyun93XEm83IAvhWtJVHo+RHn/oO8Job5YN4b+wRjSVp5g== integrity sha512-N/sMKHniSDJBjfrkbS/tpkPj4RAbvW3mr8UAzvlMHyun93XEm83IAvhWtJVHo+RHn/oO8Job5YN4b+wRjSVp5g==
nanoid@^3.1.25, nanoid@^3.1.30: nanoid@^3.1.30:
version "3.2.0" version "3.2.0"
resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.2.0.tgz#62667522da6673971cca916a6d3eff3f415ff80c" resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.2.0.tgz#62667522da6673971cca916a6d3eff3f415ff80c"
integrity sha512-fmsZYa9lpn69Ad5eDn7FMcnnSR+8R34W9qJEijxYhTbfOWzr22n1QxCMzXLK+ODyW2973V3Fux959iQoUxzUIA== integrity sha512-fmsZYa9lpn69Ad5eDn7FMcnnSR+8R34W9qJEijxYhTbfOWzr22n1QxCMzXLK+ODyW2973V3Fux959iQoUxzUIA==
nanoid@^4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-4.0.0.tgz#6e144dee117609232c3f415c34b0e550e64999a5"
integrity sha512-IgBP8piMxe/gf73RTQx7hmnhwz0aaEXYakvqZyE302IXW3HyVNhdNGC+O2MwMAVhLEnvXlvKtGbtJf6wvHihCg==
nanomatch@^1.2.9: nanomatch@^1.2.9:
version "1.2.13" version "1.2.13"
resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119" resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119"