From 8e17269fdb56fbaabda7d2a622cdedf2658095da Mon Sep 17 00:00:00 2001 From: Mikael Finstad Date: Mon, 25 Jul 2022 19:52:48 +0800 Subject: [PATCH 1/2] Companion app type (#3899) * fix companion app type fixes #3862 * remove unnecessary ts-ignores * Revert "remove unnecessary ts-ignores" This reverts commit 76ee67dc943b09bc4aaccdfc07fa039778f938ba. --- src/companion.js | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/companion.js b/src/companion.js index 15853fb5c4..b3bb94b4b0 100644 --- a/src/companion.js +++ b/src/companion.js @@ -156,8 +156,5 @@ module.exports.app = (optionsArg = {}) => { processId, }) - // todo split emitter from app in next major - // @ts-ignore - app.companionEmitter = emitter - return app + return Object.assign(app, { companionEmitter: emitter }) } From 44245022ed373db8e8d713ae7f18f2de8c7fb2a6 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 27 Jul 2022 17:33:08 +0100 Subject: [PATCH 2/2] Release: uppy@2.13.1 (#3916) | Package | Version | Package | Version | | -------------------- | ------- | -------------------- | ------- | | @uppy/companion | 3.7.1 | @uppy/remote-sources | 0.1.1 | | @uppy/compressor | 0.3.1 | @uppy/transloadit | 2.3.5 | | @uppy/core | 2.3.2 | @uppy/robodog | 2.9.1 | | @uppy/dashboard | 2.4.1 | uppy | 2.13.1 | | @uppy/image-editor | 1.4.1 | | | - @uppy/compressor: fix upload causing meta name to reset (Justin / #3890) - @uppy/transloadit: cancel assemblies when all its files have been removed (Antoine du Hamel / #3893) - e2e: Add retries for flaky e2e test (Merlijn Vos / #3915) - @uppy/dashboard,@uppy/image-editor,@uppy/remote-sources: Fix `uppy.close()` crashes when remote-sources or image-editor is installed (Merlijn Vos / #3914) - @uppy/core: Add missing type for retry-all event (Luc Boissaye / #3901) - @uppy/companion: Companion app type (Mikael Finstad / #3899) - e2e: upgrade to Cypress 10 (Antoine du Hamel / #3896) - meta: Fix website build (Murderlon) - meta: Create new issue templates (Merlijn Vos / #3879) --- CHANGELOG.md | 7 +++++++ package.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2a3dbcba6d..b3c5841aa4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # @uppy/companion +## 3.7.1 + +Released: 2022-07-27 +Included in: Uppy v2.13.1 + +- @uppy/companion: Companion app type (Mikael Finstad / #3899) + ## 3.7.0 Released: 2022-07-06 diff --git a/package.json b/package.json index ceca24f13a..afa9961d09 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@uppy/companion", - "version": "3.7.0", + "version": "3.7.1", "description": "OAuth helper and remote fetcher for Uppy's (https://uppy.io) extensible file upload widget with support for drag&drop, resumable uploads, previews, restrictions, file processing/encoding, remote providers like Dropbox and Google Drive, S3 and more :dog:", "main": "lib/companion.js", "types": "lib/companion.d.ts",