A platform for community discussion. Free, open, simple.
DEV: Update uppy to 5.x (#39618)
Jarek Radosz5b76a197bbc4
diff --git a/frontend/discourse/app/lib/composer/text-manipulation.js b/frontend/discourse/app/lib/composer/text-manipulation.jsindex 224e4c87e07..d1b37a6b642 100644--- a/frontend/discourse/app/lib/composer/text-manipulation.js+++ b/frontend/discourse/app/lib/composer/text-manipulation.js@@ -211,7 +211,7 @@ export const TextManipulation = {};* @readonly*/-/** @typedef {import("@uppy/utils/lib/UppyFile").MinimalRequiredUppyFile<any,any>} UppyFile */+/** @typedef {import("@uppy/utils").MinimalRequiredUppyFile<any,any>} UppyFile *//*** Interface for handling placeholders on upload eventsdiff --git a/frontend/discourse/app/lib/uppy-chunked-upload.js b/frontend/discourse/app/lib/uppy-chunked-upload.jsindex c6bce92156c..76dbbbcae9f 100644--- a/frontend/discourse/app/lib/uppy-chunked-upload.js+++ b/frontend/discourse/app/lib/uppy-chunked-upload.js@@ -1,8 +1,4 @@-import {- AbortController,- createAbortError,-} from "@uppy/utils/lib/AbortController";-import delay from "@uppy/utils/lib/delay";+import { AbortController, createAbortError, delay } from "@uppy/utils";import { Promise } from "rsvp";const MB = 1024 * 1024;diff --git a/frontend/discourse/app/lib/uppy-chunked-uploader-plugin.js b/frontend/discourse/app/lib/uppy-chunked-uploader-plugin.jsindex 677080c0d48..86e25b02614 100644--- a/frontend/discourse/app/lib/uppy-chunked-uploader-plugin.js+++ b/frontend/discourse/app/lib/uppy-chunked-uploader-plugin.js@@ -1,5 +1,5 @@import { next } from "@ember/runloop";-import EventTracker from "@uppy/utils/lib/EventTracker";+import { EventManager } from "@uppy/core";import { Promise } from "rsvp";import getURL from "discourse/lib/get-url";import UppyChunkedUpload from "discourse/lib/uppy-chunked-upload";@@ -101,7 +101,7 @@ export default class UppyChunkedUploader extends UploaderPlugin {});this.uploaders[file.id] = upload;- this.uploaderEvents[file.id] = new EventTracker(this.uppy);+ this.uploaderEvents[file.id] = new EventManager(this.uppy);next(() => {if (!file.isPaused) {diff --git a/frontend/discourse/app/lib/uppy/composer-upload.js b/frontend/discourse/app/lib/uppy/composer-upload.jsindex 2642b363a05..948ca11dcec 100644--- a/frontend/discourse/app/lib/uppy/composer-upload.js+++ b/frontend/discourse/app/lib/uppy/composer-upload.js@@ -269,7 +269,7 @@ export default class UppyComposerUpload {this.uppyWrapper.uppyInstance.on("progress", (progress) => {run(() => {- if (this.isDestroying || this.isDestroyed) {+ if (this.composer.isDestroying || this.composer.isDestroyed) {return;}diff --git a/frontend/discourse/app/loader-shims.js b/frontend/discourse/app/loader-shims.jsindex 49a8616d2fc..1e244431e77 100644--- a/frontend/discourse/app/loader-shims.js+++ b/frontend/discourse/app/loader-shims.js@@ -67,13 +67,7 @@ loaderShim("@glimmer/tracking", () => importSync("@glimmer/tracking"));loaderShim("@uppy/aws-s3", () => importSync("@uppy/aws-s3"));loaderShim("@uppy/core", () => importSync("@uppy/core"));loaderShim("@uppy/drop-target", () => importSync("@uppy/drop-target"));-loaderShim("@uppy/utils/lib/AbortController", () =>- importSync("@uppy/utils/lib/AbortController")-);-loaderShim("@uppy/utils/lib/delay", () => importSync("@uppy/utils/lib/delay"));-loaderShim("@uppy/utils/lib/EventTracker", () =>- importSync("@uppy/utils/lib/EventTracker")-);+loaderShim("@uppy/utils", () => importSync("@uppy/utils"));loaderShim("@uppy/xhr-upload", () => importSync("@uppy/xhr-upload"));loaderShim("a11y-dialog", () => importSync("a11y-dialog"));loaderShim("discourse-i18n", () => importSync("discourse-i18n"));diff --git a/frontend/discourse/package.json b/frontend/discourse/package.jsonindex c98ce5c4232..f1f2e57375b 100644--- a/frontend/discourse/package.json+++ b/frontend/discourse/package.json@@ -100,11 +100,11 @@"@types/qunit": "^2.19.13","@types/rsvp": "^4.0.9","@types/sinon": "^21.0.1",- "@uppy/aws-s3": "^4.1.0",- "@uppy/core": "^4.2.2",- "@uppy/drop-target": "3.0.1",- "@uppy/utils": "^6.0.3",- "@uppy/xhr-upload": "^4.2.1",+ "@uppy/aws-s3": "^5.1.0",+ "@uppy/core": "^5.2.0",+ "@uppy/drop-target": "^4.1.0",+ "@uppy/utils": "^7.2.0",+ "@uppy/xhr-upload": "^5.2.0","a11y-dialog": "8.1.5","autosize": "^6.0.1","babel-import-util": "^3.0.1",diff --git a/pnpm-lock.yaml b/pnpm-lock.yamlindex f9d8e33d415..9e9ecc51b38 100644--- a/pnpm-lock.yaml+++ b/pnpm-lock.yaml@@ -454,20 +454,20 @@ importers:specifier: ^21.0.1version: 21.0.1'@uppy/aws-s3':- specifier: ^4.1.0- version: 4.1.0(@uppy/[email protected])+ specifier: ^5.1.0+ version: 5.1.0(@uppy/[email protected])'@uppy/core':- specifier: ^4.2.2- version: 4.2.2+ specifier: ^5.2.0+ version: 5.2.0'@uppy/drop-target':- specifier: 3.0.1- version: 3.0.1(@uppy/[email protected])+ specifier: ^4.1.0+ version: 4.1.0(@uppy/[email protected])'@uppy/utils':- specifier: ^6.0.3- version: 6.0.3+ specifier: ^7.2.0+ version: 7.2.0'@uppy/xhr-upload':- specifier: ^4.2.1- version: 4.2.1(@uppy/[email protected])+ specifier: ^5.2.0+ version: 5.2.0(@uppy/[email protected])a11y-dialog:specifier: 8.1.5version: 8.1.5@@ -746,259 +746,259 @@ importers:dependencies:discourse:specifier: npm:@discourse/types@*- version: '@discourse/[email protected]'+ version: '@discourse/[email protected]'plugins/chat:dependencies:discourse:specifier: npm:@discourse/types@*- version: '@discourse/[email protected]'+ version: '@discourse/[email protected]'plugins/checklist:dependencies:discourse:specifier: npm:@discourse/types@*- version: '@discourse/[email protected]'+ version: '@discourse/[email protected]'plugins/discourse-adplugin:dependencies:discourse:specifier: npm:@discourse/types@*- version: '@discourse/[email protected]'+ version: '@discourse/[email protected]'plugins/discourse-affiliate:dependencies:discourse:specifier: npm:@discourse/types@*- version: '@discourse/[email protected]'+ version: '@discourse/[email protected]'plugins/discourse-ai:dependencies:discourse:specifier: npm:@discourse/types@*- version: '@discourse/[email protected]'+ version: '@discourse/[email protected]'plugins/discourse-apple-auth:dependencies:discourse:specifier: npm:@discourse/types@*- version: '@discourse/[email protected]'+ version: '@discourse/[email protected]'plugins/discourse-assign:dependencies:discourse:specifier: npm:@discourse/types@*- version: '@discourse/[email protected]'+ version: '@discourse/[email protected]'plugins/discourse-cakeday:dependencies:discourse:specifier: npm:@discourse/types@*- version: '@discourse/[email protected]'+ version: '@discourse/[email protected]'plugins/discourse-calendar:dependencies:discourse:specifier: npm:@discourse/types@*- version: '@discourse/[email protected]'+ version: '@discourse/[email protected]'plugins/discourse-chat-integration:dependencies:discourse:specifier: npm:@discourse/types@*- version: '@discourse/[email protected]'+ version: '@discourse/[email protected]'plugins/discourse-data-explorer:dependencies:discourse:specifier: npm:@discourse/types@*- version: '@discourse/[email protected]'+ version: '@discourse/[email protected]'plugins/discourse-details:dependencies:discourse:specifier: npm:@discourse/types@*- version: '@discourse/[email protected]'+ version: '@discourse/[email protected]'plugins/discourse-gamification:dependencies:discourse:specifier: npm:@discourse/types@*- version: '@discourse/[email protected]'+ version: '@discourse/[email protected]'plugins/discourse-github:dependencies:discourse:specifier: npm:@discourse/types@*- version: '@discourse/[email protected]'+ version: '@discourse/[email protected]'plugins/discourse-graphviz:dependencies:discourse:specifier: npm:@discourse/types@*- version: '@discourse/[email protected]'+ version: '@discourse/[email protected]'plugins/discourse-hcaptcha:dependencies:discourse:specifier: npm:@discourse/types@*- version: '@discourse/[email protected]'+ version: '@discourse/[email protected]'plugins/discourse-lazy-videos:dependencies:discourse:specifier: npm:@discourse/types@*- version: '@discourse/[email protected]'+ version: '@discourse/[email protected]'plugins/discourse-local-dates:dependencies:discourse:specifier: npm:@discourse/types@*- version: '@discourse/[email protected]'+ version: '@discourse/[email protected]'plugins/discourse-login-with-amazon:dependencies:discourse:specifier: npm:@discourse/types@*- version: '@discourse/[email protected]'+ version: '@discourse/[email protected]'plugins/discourse-lti:dependencies:discourse:specifier: npm:@discourse/types@*- version: '@discourse/[email protected]'+ version: '@discourse/[email protected]'plugins/discourse-math:dependencies:discourse:specifier: npm:@discourse/types@*- version: '@discourse/[email protected]'+ version: '@discourse/[email protected]'plugins/discourse-microsoft-auth:dependencies:discourse:specifier: npm:@discourse/types@*- version: '@discourse/[email protected]'+ version: '@discourse/[email protected]'plugins/discourse-narrative-bot:dependencies:discourse:specifier: npm:@discourse/types@*- version: '@discourse/[email protected]'+ version: '@discourse/[email protected]'plugins/discourse-oauth2-basic:dependencies:discourse:specifier: npm:@discourse/types@*- version: '@discourse/[email protected]'+ version: '@discourse/[email protected]'plugins/discourse-openid-connect:dependencies:discourse:specifier: npm:@discourse/types@*- version: '@discourse/[email protected]'+ version: '@discourse/[email protected]'plugins/discourse-patreon:dependencies:discourse:specifier: npm:@discourse/types@*- version: '@discourse/[email protected]'+ version: '@discourse/[email protected]'plugins/discourse-policy:dependencies:discourse:specifier: npm:@discourse/types@*- version: '@discourse/[email protected]'+ version: '@discourse/[email protected]'plugins/discourse-post-voting:dependencies:discourse:specifier: npm:@discourse/types@*- version: '@discourse/[email protected]'+ version: '@discourse/[email protected]'plugins/discourse-presence:dependencies:discourse:specifier: npm:@discourse/types@*- version: '@discourse/[email protected]'+ version: '@discourse/[email protected]'plugins/discourse-reactions:dependencies:discourse:specifier: npm:@discourse/types@*- version: '@discourse/[email protected]'+ version: '@discourse/[email protected]'plugins/discourse-rss-polling:dependencies:discourse:specifier: npm:@discourse/types@*- version: '@discourse/[email protected]'+ version: '@discourse/[email protected]'plugins/discourse-solved:dependencies:discourse:specifier: npm:@discourse/types@*- version: '@discourse/[email protected]'+ version: '@discourse/[email protected]'plugins/discourse-subscriptions:dependencies:discourse:specifier: npm:@discourse/types@*- version: '@discourse/[email protected]'+ version: '@discourse/[email protected]'plugins/discourse-templates:dependencies:discourse:specifier: npm:@discourse/types@*- version: '@discourse/[email protected]'+ version: '@discourse/[email protected]'plugins/discourse-topic-voting:dependencies:discourse:specifier: npm:@discourse/types@*- version: '@discourse/[email protected]'+ version: '@discourse/[email protected]'plugins/discourse-user-notes:dependencies:discourse:specifier: npm:@discourse/types@*- version: '@discourse/[email protected]'+ version: '@discourse/[email protected]'plugins/discourse-zendesk-plugin:dependencies:discourse:specifier: npm:@discourse/types@*- version: '@discourse/[email protected]'+ version: '@discourse/[email protected]'plugins/footnote:dependencies:discourse:specifier: npm:@discourse/types@*- version: '@discourse/[email protected]'+ version: '@discourse/[email protected]'plugins/poll:dependencies:discourse:specifier: npm:@discourse/types@*- version: '@discourse/[email protected]'+ version: '@discourse/[email protected]'plugins/spoiler-alert:dependencies:discourse:specifier: npm:@discourse/types@*- version: '@discourse/[email protected]'+ version: '@discourse/[email protected]'plugins/styleguide:dependencies:discourse:specifier: npm:@discourse/types@*- version: '@discourse/[email protected]'+ version: '@discourse/[email protected]'themes/horizon:dependencies:discourse:specifier: npm:@discourse/types@*- version: '@discourse/[email protected]'+ version: '@discourse/[email protected]'packages:@@ -1742,8 +1742,8 @@ packages:'@discourse/[email protected]':resolution: {integrity: sha512-4xr1QWQ0nzmFa2ZXQgWZA+dtE/BU2ePA+qkJWPFzNpq4ZnQi8MmMMAS2285t3rc2ySMBQqYaAArmcSUiufUgRA==}- '@discourse/[email protected]':- resolution: {integrity: sha512-73Fr5RIzLK17qUdZrb2MjpYJVEnvgkh3Gm2hp6+d4krT5iI9u9AlAJaXt3ISQNBSWe1+fEY8mzizxLTQare/lg==}+ '@discourse/[email protected]':+ resolution: {integrity: sha512-7hTABdsykcyG5yzBVbhK28pjqPmOEU4bvC8j7jD118KUVwiqKye7wrJQtEcXICp6yygXE/NpZt410vczw9bURg==}engines: {node: '>= 20', npm: please-use-pnpm, pnpm: ^10, yarn: please-use-pnpm}'@ember-compat/[email protected]':@@ -3160,34 +3160,34 @@ packages:peerDependencies:typescript: '>=4.8.4 <6.0.0'- '@uppy/[email protected]':- resolution: {integrity: sha512-xRip1Lo3He+3J3fP/SooEFQJKWMCVADTl8J375PzvpaeNnDFKa6W2XLEEl/fGy/K7vI4sH8Znz4+omdtSFCPSQ==}+ '@uppy/[email protected]':+ resolution: {integrity: sha512-UBz+shrtDbnOf11AboDrkc9Fq2Cdf8HbFftE+gqfxig6fkv5rHpHhBCLkl8wCGAq+X/CxdqvvNhm/OM23Uzw2w==}peerDependencies:- '@uppy/core': ^4.2.0+ '@uppy/core': ^5.2.0- '@uppy/[email protected]':- resolution: {integrity: sha512-nQ8CQfZcYVBNtFQ6ePj7FDIq38DXlH0YpzP/91LR9gnDVISJKKUuvWfr6tPktj1lRw9FZV8jLmlMKT2ituVKiw==}+ '@uppy/[email protected]':+ resolution: {integrity: sha512-DzrOWTbIZHvtgAFXBMYHk2wD27NjpBSVhY2tEiEIUhPd2CxbFRZjHM/N3HOt3VwZEAP471QWFLlJRWPcIY3A2Q==}peerDependencies:- '@uppy/core': ^4.2.0+ '@uppy/core': ^5.1.1- '@uppy/[email protected]':- resolution: {integrity: sha512-TfTXngDLHK+gNwbpt1tgKfQ0vQwa7V5ilAnD/VNT+6AGW+/dqGFLZbA6q8xKvVTZ2sUbwDMSWFtqem+G04AhNQ==}+ '@uppy/[email protected]':+ resolution: {integrity: sha512-uvfNyz4cnaplt7LYJmEZHuqOuav0tKp4a9WKJIaH6iIj7XiqYvS2J5SEByexAlUFlzefOAyjzj4Ja2dd/8aMrw==}- '@uppy/[email protected]':- resolution: {integrity: sha512-nDWXUYtTyyq0Vq7/J0WeRi8eyevGmAIoA5Uy/IJJiKYI5MXP7X3eSIXym161wrsyHZi0ZGUkf0XAwl9e6ZLe/A==}+ '@uppy/[email protected]':+ resolution: {integrity: sha512-QPOwlOfYlf4gOzdj75Mx0YxM0d6Jv1ui2aCERse1pwtIeQGQ0QPe5lmTi0o3p8dTnqACUmoM6SJOpAHQozCSkA==}peerDependencies:- '@uppy/core': ^4.0.1+ '@uppy/core': ^5.2.0- '@uppy/[email protected]':- resolution: {integrity: sha512-z5VSc4PNXpAtrrUPg5hdKJO5Ul7u4ZYLyK+tYzvEgzgR4nLVZmpGzj/d4N90jXpUqEibWKXvevODEB5VlTLHzg==}+ '@uppy/[email protected]':+ resolution: {integrity: sha512-hQtCSQ1yGiaval/wVYUWquYGDJ+bpQ7e4FhUUAsRQz1x1K+o7NBtjfp63O9I4Ks1WRoKunpkarZ+as09l02cPw==}- '@uppy/[email protected]':- resolution: {integrity: sha512-GBVzyAIeVKNe/F3TT63rXR80MSL9ov/FG3BbApO+4wbIt4vai7xpOxGCeTXpW2JjEeOwEb50n1fn92zMCdV9Dg==}+ '@uppy/[email protected]':+ resolution: {integrity: sha512-6lC246qszMv6bTyl/+QyHwrudgeguWkA94ME1wHn+a6uRAvmtAEaUManIfGqTJfoKvWAiCJqdJPl5xRJjhAloQ==}- '@uppy/[email protected]':- resolution: {integrity: sha512-pafgk0vLr+FKDHo+xmBMwNncj68oRNoaTnj0por7LPND0QGXV7xwBZnGGkQhiHLooV2MNBEhFQtx93A76cEINg==}+ '@uppy/[email protected]':+ resolution: {integrity: sha512-3LV/X5Of6BINnKplP+CwUJ0a4/7cRFfzxwGyXnW+uCrNQHoo09dttcz3begWHejGvzenQHuUnMO3Fxyc71Pryg==}peerDependencies:- '@uppy/core': ^4.2.2+ '@uppy/core': ^5.2.0'@vitest/[email protected]':resolution: {integrity: sha512-8sCWUyckXXYvx4opfzVY03EOiYVxyNrHS5QxX3DAIi5dpJAAkyJezHCP77VMX4HKA2LDT/Jpfo8i2r5BE3GnQQ==}@@ -6994,8 +6994,8 @@ packages:engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}hasBin: true- resolution: {integrity: sha512-TcJPw+9RV9dibz1hHUzlLVy8N4X9TnwirAjrU08Juo6BNKggzVfP2ZJ/3ZUSq15Xl5i85i+Z89XBO90pB2PghQ==}+ resolution: {integrity: sha512-ZUvP7KeBLe3OZ1ypw6dI/TzYJuvHP77IM4Ry73waSQTLn8/g8rpdjfyVAh7t1/+FjBtG4lCP42MEbDxOsRpBMw==}engines: {node: ^18 || >=20}hasBin: true@@ -7600,8 +7600,8 @@ packages:resolution: {integrity: sha512-l8386ixSsBdbreOAkqtrwqHwdvR35ID8c3rKPa8lCWuO86dBi32QWHV4vfsZK1utLLFMvw+Z5Ad4XLkZzchscg==}- resolution: {integrity: sha512-kKYfePf9rzKnxOAKDpsWhg/ysrHPqT+yQ7UW4JjdnqjFIeNUnNcEJvhuA8fDenxAGWzUqtd51DfVg7xp/8T9NA==}+ resolution: {integrity: sha512-gQCLc/vWroE8lIpleXtdJhTFDogTdZG9AjMUpVkDf2iTCNwYNWA+u16dL41TqUDJO4gm2IgrcMv3uTpjd4Pwmg==}resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}@@ -10383,7 +10383,7 @@ snapshots:'@discourse/[email protected]': {}- '@discourse/[email protected]': {}+ '@discourse/[email protected]': {}'@ember-compat/[email protected](patch_hash=febdd1f1d24565f6f3be7747fd89cbc86a4476e2836e383610c6bc430436a842)':dependencies:@@ -11950,47 +11950,47 @@ snapshots:dependencies:typescript: 5.9.3- '@uppy/[email protected](@uppy/[email protected])':+ '@uppy/[email protected](@uppy/[email protected])':dependencies:- '@uppy/companion-client': 4.1.0(@uppy/[email protected])- '@uppy/core': 4.2.2- '@uppy/utils': 6.0.3+ '@uppy/companion-client': 5.1.1(@uppy/[email protected])+ '@uppy/core': 5.2.0+ '@uppy/utils': 7.2.0- '@uppy/[email protected](@uppy/[email protected])':+ '@uppy/[email protected](@uppy/[email protected])':dependencies:- '@uppy/core': 4.2.2- '@uppy/utils': 6.0.3+ '@uppy/core': 5.2.0+ '@uppy/utils': 7.2.0namespace-emitter: 2.0.1p-retry: 6.2.0- '@uppy/[email protected]':+ '@uppy/[email protected]':dependencies:'@transloadit/prettier-bytes': 0.3.4- '@uppy/store-default': 4.1.0- '@uppy/utils': 6.0.3+ '@uppy/store-default': 5.0.0+ '@uppy/utils': 7.2.0lodash: 4.18.1mime-match: 1.0.2namespace-emitter: 2.0.1- nanoid: 5.0.8- preact: 10.23.2+ nanoid: 5.1.9+ preact: 10.29.1- '@uppy/[email protected](@uppy/[email protected])':+ '@uppy/[email protected](@uppy/[email protected])':dependencies:- '@uppy/core': 4.2.2- '@uppy/utils': 6.0.3+ '@uppy/core': 5.2.0+ '@uppy/utils': 7.2.0- '@uppy/[email protected]': {}+ '@uppy/[email protected]': {}- '@uppy/[email protected]':+ '@uppy/[email protected]':dependencies:lodash: 4.18.1- preact: 10.23.2+ preact: 10.29.1- '@uppy/[email protected](@uppy/[email protected])':+ '@uppy/[email protected](@uppy/[email protected])':dependencies:- '@uppy/companion-client': 4.1.0(@uppy/[email protected])- '@uppy/core': 4.2.2- '@uppy/utils': 6.0.3+ '@uppy/companion-client': 5.1.1(@uppy/[email protected])+ '@uppy/core': 5.2.0+ '@uppy/utils': 7.2.0'@vitest/[email protected]':dependencies:@@ -16769,7 +16769,7 @@ snapshots:- [email protected]: {}+ [email protected]: {}dependencies:@@ -17390,7 +17390,7 @@ snapshots:- [email protected]: {}+ [email protected]: {}