From e8d11ecbea24f647bec28b6fcd28df53b07f267c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Apr 2024 00:45:02 +0000 Subject: [PATCH 001/319] Bump actions/upload-artifact from 3 to 4 Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 3 to 4. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/bundlers.yml | 2 +- .github/workflows/companion-deploy.yml | 2 +- .github/workflows/e2e.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/bundlers.yml b/.github/workflows/bundlers.yml index d8fb4f388b..2dc91df08d 100644 --- a/.github/workflows/bundlers.yml +++ b/.github/workflows/bundlers.yml @@ -73,7 +73,7 @@ jobs: pack --install-if-needed -o /tmp/artifacts/%s-${{ github.sha }}.tgz - name: Upload artifact if: success() - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: packages path: /tmp/artifacts/ diff --git a/.github/workflows/companion-deploy.yml b/.github/workflows/companion-deploy.yml index 06a734d1cb..88dc5ee06d 100644 --- a/.github/workflows/companion-deploy.yml +++ b/.github/workflows/companion-deploy.yml @@ -33,7 +33,7 @@ jobs: /tmp/companion-${{ github.sha }}.tar.gz - name: Upload artifact if: success() - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: companion-${{ github.sha }}.tar.gz path: /tmp/companion-${{ github.sha }}.tar.gz diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 28c4c9ea41..61168b6697 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -283,7 +283,7 @@ jobs: # https://docs.cypress.io/guides/references/advanced-installation#Binary-cache CYPRESS_CACHE_FOLDER: ${{ steps.cypress-cache-dir-path.outputs.dir }} - name: Upload videos in case of failure - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 if: failure() with: name: videos-and-screenshots From 8ffe60dd3ba437d77cfdcc52cf981337b4d155e8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Apr 2024 00:44:56 +0000 Subject: [PATCH 002/319] Bump actions/download-artifact from 3 to 4 Bumps [actions/download-artifact](https://github.com/actions/download-artifact) from 3 to 4. - [Release notes](https://github.com/actions/download-artifact/releases) - [Commits](https://github.com/actions/download-artifact/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/download-artifact dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/bundlers.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/bundlers.yml b/.github/workflows/bundlers.yml index 2dc91df08d..b7208d673f 100644 --- a/.github/workflows/bundlers.yml +++ b/.github/workflows/bundlers.yml @@ -87,7 +87,7 @@ jobs: bundler-version: [latest] steps: - name: Download uppy tarball - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: path: /tmp/ - name: Extract tarball @@ -125,7 +125,7 @@ jobs: bundler-version: [latest] steps: - name: Download uppy tarball - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: path: /tmp/ - name: Extract tarball @@ -151,7 +151,7 @@ jobs: bundler-version: [latest] steps: - name: Download uppy tarball - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: path: /tmp/ - name: Extract tarball @@ -181,7 +181,7 @@ jobs: bundler-version: [latest] steps: - name: Download uppy tarball - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: path: /tmp/ - name: Extract tarball @@ -206,7 +206,7 @@ jobs: bundler-version: [latest] steps: - name: Download uppy tarball - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: path: /tmp/ - name: Extract tarball From 832a9342c91ee89f22e69a498254d71da0b0d460 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Apr 2024 10:57:34 +0200 Subject: [PATCH 003/319] Bump docker/login-action from 2 to 3 (#5101) Bumps [docker/login-action](https://github.com/docker/login-action) from 2 to 3. - [Release notes](https://github.com/docker/login-action/releases) - [Commits](https://github.com/docker/login-action/compare/v2...v3) --- updated-dependencies: - dependency-name: docker/login-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Antoine du Hamel --- .github/workflows/companion-deploy.yml | 2 +- .github/workflows/release.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/companion-deploy.yml b/.github/workflows/companion-deploy.yml index 88dc5ee06d..ea23ec635c 100644 --- a/.github/workflows/companion-deploy.yml +++ b/.github/workflows/companion-deploy.yml @@ -58,7 +58,7 @@ jobs: - uses: docker/setup-qemu-action@68827325e0b33c7199eb31dd4e31fbe9023e06e3 # v3.0.0 - uses: docker/setup-buildx-action@v2 - name: Log in to DockerHub - uses: docker/login-action@v2 + uses: docker/login-action@e92390c5fb421da1463c202d546fed0ec5c39f20 # v3.1.0 with: username: ${{secrets.DOCKER_USERNAME}} password: ${{secrets.DOCKER_PASSWORD}} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 206ebdd776..40f06a2527 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -154,7 +154,7 @@ jobs: - uses: docker/setup-qemu-action@68827325e0b33c7199eb31dd4e31fbe9023e06e3 # v3.0.0 - uses: docker/setup-buildx-action@v2 - name: Log in to DockerHub - uses: docker/login-action@v2 + uses: docker/login-action@e92390c5fb421da1463c202d546fed0ec5c39f20 # v3.1.0 with: username: ${{secrets.DOCKER_USERNAME}} password: ${{secrets.DOCKER_PASSWORD}} From 390d1efc259d6ab5742b31b1e89a8b8c5b4281b7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Apr 2024 11:01:50 +0200 Subject: [PATCH 004/319] Bump akhileshns/heroku-deploy from 3.12.12 to 3.13.15 (#5102) Bumps [akhileshns/heroku-deploy](https://github.com/akhileshns/heroku-deploy) from 3.12.12 to 3.13.15. - [Release notes](https://github.com/akhileshns/heroku-deploy/releases) - [Commits](https://github.com/akhileshns/heroku-deploy/compare/v3.12.12...v3.13.15) --- updated-dependencies: - dependency-name: akhileshns/heroku-deploy dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Antoine du Hamel --- .github/workflows/companion-deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/companion-deploy.yml b/.github/workflows/companion-deploy.yml index ea23ec635c..c84d54e623 100644 --- a/.github/workflows/companion-deploy.yml +++ b/.github/workflows/companion-deploy.yml @@ -82,7 +82,7 @@ jobs: run: | sed -i 's/^EXPOSE 3020$/EXPOSE $PORT/g' Dockerfile - name: Deploy to heroku - uses: akhileshns/heroku-deploy@v3.12.12 + uses: akhileshns/heroku-deploy@581dd286c962b6972d427fcf8980f60755c15520 # v3.13.15 with: heroku_api_key: ${{secrets.HEROKU_API_KEY}} heroku_app_name: companion-demo From 0bdc35a6382648027eeeedc7ad1cc3f6bafa359c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Apr 2024 11:48:58 +0200 Subject: [PATCH 005/319] Bump docker/build-push-action from 3 to 5 (#5105) Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 3 to 5. - [Release notes](https://github.com/docker/build-push-action/releases) - [Commits](https://github.com/docker/build-push-action/compare/v3...v5) --- updated-dependencies: - dependency-name: docker/build-push-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Antoine du Hamel --- .github/workflows/companion-deploy.yml | 2 +- .github/workflows/release.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/companion-deploy.yml b/.github/workflows/companion-deploy.yml index c84d54e623..1d8212e42b 100644 --- a/.github/workflows/companion-deploy.yml +++ b/.github/workflows/companion-deploy.yml @@ -63,7 +63,7 @@ jobs: username: ${{secrets.DOCKER_USERNAME}} password: ${{secrets.DOCKER_PASSWORD}} - name: Build and push - uses: docker/build-push-action@v3 + uses: docker/build-push-action@2cdde995de11925a030ce8070c3d77a52ffcf1c0 # v5.3.0 with: push: true context: . diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 40f06a2527..ff303cf33c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -159,7 +159,7 @@ jobs: username: ${{secrets.DOCKER_USERNAME}} password: ${{secrets.DOCKER_PASSWORD}} - name: Build and push - uses: docker/build-push-action@v3 + uses: docker/build-push-action@2cdde995de11925a030ce8070c3d77a52ffcf1c0 # v5.3.0 with: push: true context: . From 5d407087d4bb7cae75835cb5ca8f07ba18e8e504 Mon Sep 17 00:00:00 2001 From: Merlijn Vos Date: Mon, 22 Apr 2024 14:59:36 +0200 Subject: [PATCH 006/319] @uppy/form: fix `submitOnSuccess` and `triggerUploadOnSubmit` combination (#5058) --- packages/@uppy/form/src/index.ts | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/packages/@uppy/form/src/index.ts b/packages/@uppy/form/src/index.ts index 93a28c05de..9ad700aefe 100644 --- a/packages/@uppy/form/src/index.ts +++ b/packages/@uppy/form/src/index.ts @@ -52,6 +52,12 @@ export default class Form extends BasePlugin< form: HTMLFormElement // TODO: make this private (or at least, mark it as readonly) + /** + * Unfortunately Uppy isn't a state machine in which we can guarantee it's + * currently in one state and one state only so we use this completed property which is set on `upload-success'. + */ + #completed = false + constructor(uppy: Uppy, opts?: FormOptions) { super(uppy, { ...defaultOptions, ...opts }) this.type = 'acquirer' @@ -65,12 +71,14 @@ export default class Form extends BasePlugin< } handleUploadStart(): void { + this.#completed = false if (this.opts.getMetaFromForm) { this.getMetaFromForm() } } handleSuccess(result: Result): void { + this.#completed = true if (this.opts.addResultToForm) { this.addResultToForm(result) } @@ -81,7 +89,7 @@ export default class Form extends BasePlugin< } handleFormSubmit(ev: Event): void { - if (this.opts.triggerUploadOnSubmit) { + if (this.opts.triggerUploadOnSubmit && !this.#completed) { ev.preventDefault() const elements = toArray((ev.target as HTMLFormElement).elements) const disabledByUppy: HTMLButtonElement[] = [] From 9e8c6df67443829334386be2cd21a959667f7dc7 Mon Sep 17 00:00:00 2001 From: Antoine du Hamel Date: Tue, 23 Apr 2024 14:29:25 +0200 Subject: [PATCH 007/319] meta: fix linter --- .github/workflows/companion-deploy.yml | 6 +++--- .github/workflows/release.yml | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/companion-deploy.yml b/.github/workflows/companion-deploy.yml index 1d8212e42b..55b94bc17e 100644 --- a/.github/workflows/companion-deploy.yml +++ b/.github/workflows/companion-deploy.yml @@ -58,12 +58,12 @@ jobs: - uses: docker/setup-qemu-action@68827325e0b33c7199eb31dd4e31fbe9023e06e3 # v3.0.0 - uses: docker/setup-buildx-action@v2 - name: Log in to DockerHub - uses: docker/login-action@e92390c5fb421da1463c202d546fed0ec5c39f20 # v3.1.0 + uses: docker/login-action@e92390c5fb421da1463c202d546fed0ec5c39f20 # v3.1.0 with: username: ${{secrets.DOCKER_USERNAME}} password: ${{secrets.DOCKER_PASSWORD}} - name: Build and push - uses: docker/build-push-action@2cdde995de11925a030ce8070c3d77a52ffcf1c0 # v5.3.0 + uses: docker/build-push-action@2cdde995de11925a030ce8070c3d77a52ffcf1c0 # v5.3.0 with: push: true context: . @@ -82,7 +82,7 @@ jobs: run: | sed -i 's/^EXPOSE 3020$/EXPOSE $PORT/g' Dockerfile - name: Deploy to heroku - uses: akhileshns/heroku-deploy@581dd286c962b6972d427fcf8980f60755c15520 # v3.13.15 + uses: akhileshns/heroku-deploy@581dd286c962b6972d427fcf8980f60755c15520 # v3.13.15 with: heroku_api_key: ${{secrets.HEROKU_API_KEY}} heroku_app_name: companion-demo diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ff303cf33c..8fa352ab94 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -154,12 +154,12 @@ jobs: - uses: docker/setup-qemu-action@68827325e0b33c7199eb31dd4e31fbe9023e06e3 # v3.0.0 - uses: docker/setup-buildx-action@v2 - name: Log in to DockerHub - uses: docker/login-action@e92390c5fb421da1463c202d546fed0ec5c39f20 # v3.1.0 + uses: docker/login-action@e92390c5fb421da1463c202d546fed0ec5c39f20 # v3.1.0 with: username: ${{secrets.DOCKER_USERNAME}} password: ${{secrets.DOCKER_PASSWORD}} - name: Build and push - uses: docker/build-push-action@2cdde995de11925a030ce8070c3d77a52ffcf1c0 # v5.3.0 + uses: docker/build-push-action@2cdde995de11925a030ce8070c3d77a52ffcf1c0 # v5.3.0 with: push: true context: . From ffdfa096d3f92bd0f01e66f50e1dec595de2f980 Mon Sep 17 00:00:00 2001 From: Merlijn Vos Date: Tue, 23 Apr 2024 14:31:50 +0200 Subject: [PATCH 008/319] @uppy/dashboard: fix type of trigger option (#5106) --- packages/@uppy/dashboard/src/Dashboard.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/@uppy/dashboard/src/Dashboard.tsx b/packages/@uppy/dashboard/src/Dashboard.tsx index 3c6d087fc0..65bd3edf46 100644 --- a/packages/@uppy/dashboard/src/Dashboard.tsx +++ b/packages/@uppy/dashboard/src/Dashboard.tsx @@ -166,7 +166,7 @@ interface DashboardMiscOptions thumbnailHeight?: number thumbnailType?: string thumbnailWidth?: number - trigger?: string + trigger?: string | Element waitForThumbnailsBeforeUpload?: boolean } From 98c4b51856727ca92939876281ab86f917dde5c1 Mon Sep 17 00:00:00 2001 From: Mikael Finstad Date: Tue, 23 Apr 2024 14:32:46 +0200 Subject: [PATCH 009/319] @uppy/provider-views: bring back "loaded X files..." (#5097) As discussed with lakesare in #5050. Currently the loadedXFiles i18n key is not in use at all, don't know where/when it got lost in translation. --- packages/@uppy/provider-views/src/Browser.tsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/@uppy/provider-views/src/Browser.tsx b/packages/@uppy/provider-views/src/Browser.tsx index 006b322275..cca61b51f5 100644 --- a/packages/@uppy/provider-views/src/Browser.tsx +++ b/packages/@uppy/provider-views/src/Browser.tsx @@ -195,7 +195,9 @@ function Browser( if (isLoading) { return (
- {i18n('loading')} + + {typeof isLoading === 'string' ? isLoading : i18n('loading')} +
) } From 1ffe3863778bcfd0007690f2e868290ab0262f36 Mon Sep 17 00:00:00 2001 From: Antoine du Hamel Date: Tue, 23 Apr 2024 16:49:48 +0200 Subject: [PATCH 010/319] meta: bump Prettier version (#5114) --- .prettierrc.js | 12 +++++++++--- yarn.lock | 6 +++--- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/.prettierrc.js b/.prettierrc.js index 0d6abbfa58..a64dbe40c8 100644 --- a/.prettierrc.js +++ b/.prettierrc.js @@ -13,11 +13,17 @@ module.exports = { }, }, { - files: "docs/**", + files: 'docs/**', options: { semi: true, useTabs: true, - } - } + }, + }, + { + files: ['tsconfig.json'], + options: { + parser: 'jsonc', + }, + }, ], } diff --git a/yarn.lock b/yarn.lock index 506ac97866..aec86e2f55 100644 --- a/yarn.lock +++ b/yarn.lock @@ -25872,11 +25872,11 @@ __metadata: linkType: hard "prettier@npm:^3.0.3": - version: 3.2.4 - resolution: "prettier@npm:3.2.4" + version: 3.2.5 + resolution: "prettier@npm:3.2.5" bin: prettier: bin/prettier.cjs - checksum: 6ec9385a836e0b9bac549e585101c086d1521c31d7b882d5c8bb7d7646da0693da5f31f4fff6dc080710e5e2d34c85e6fb2f8766876b3645c8be2f33b9c3d1a3 + checksum: 2ee4e1417572372afb7a13bb446b34f20f1bf1747db77cf6ccaf57a9be005f2f15c40f903d41a6b79eec3f57fff14d32a20fb6dee1f126da48908926fe43c311 languageName: node linkType: hard From 2f5c32a269a0906aed13c3aeeae92ec426090967 Mon Sep 17 00:00:00 2001 From: Antoine du Hamel Date: Tue, 23 Apr 2024 17:45:45 +0200 Subject: [PATCH 011/319] @uppy/image-editor: fix label definitions (#5111) --- packages/@uppy/image-editor/src/Editor.tsx | 56 +++++++--------------- 1 file changed, 16 insertions(+), 40 deletions(-) diff --git a/packages/@uppy/image-editor/src/Editor.tsx b/packages/@uppy/image-editor/src/Editor.tsx index 19b6cbfd56..396f18b9b9 100644 --- a/packages/@uppy/image-editor/src/Editor.tsx +++ b/packages/@uppy/image-editor/src/Editor.tsx @@ -170,14 +170,11 @@ export default class Editor extends Component< const { i18n, opts } = this.props return ( -