From 25a2882a87fcd11a2e5a5807672fecc8ae1dd0df Mon Sep 17 00:00:00 2001 From: Artur Paikin Date: Wed, 3 Aug 2022 19:24:11 +0100 Subject: [PATCH 1/2] Fix Compressor being broken when no name is in the compressed blob --- packages/@uppy/compressor/src/index.js | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/packages/@uppy/compressor/src/index.js b/packages/@uppy/compressor/src/index.js index 66ec022bd2..beb6f7aeaa 100644 --- a/packages/@uppy/compressor/src/index.js +++ b/packages/@uppy/compressor/src/index.js @@ -51,13 +51,14 @@ export default class Compressor extends BasePlugin { const compressedSavingsSize = file.data.size - compressedBlob.size this.uppy.log(`[Image Compressor] Image ${file.id} compressed by ${prettierBytes(compressedSavingsSize)}`) totalCompressedSize += compressedSavingsSize + console.log('YOOOO', compressedBlob) const { name, type, size } = compressedBlob - const { extension } = getFileNameAndExtension(name) + const extension = name && getFileNameAndExtension(name).extension this.uppy.setFileState(file.id, { - name, - extension, - type, - size, + ...(name && { name }), + ...(extension && { extension }), + ...(type && { type }), + ...(size && { size }), data: compressedBlob, }) this.uppy.setFileMeta(file.id, { type }) From a725b41e349b05c2975c607ce49c80b62d421ba1 Mon Sep 17 00:00:00 2001 From: Artur Paikin Date: Thu, 4 Aug 2022 11:07:53 +0100 Subject: [PATCH 2/2] Update packages/@uppy/compressor/src/index.js Co-authored-by: Antoine du Hamel --- packages/@uppy/compressor/src/index.js | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/@uppy/compressor/src/index.js b/packages/@uppy/compressor/src/index.js index beb6f7aeaa..c2efd55477 100644 --- a/packages/@uppy/compressor/src/index.js +++ b/packages/@uppy/compressor/src/index.js @@ -51,7 +51,6 @@ export default class Compressor extends BasePlugin { const compressedSavingsSize = file.data.size - compressedBlob.size this.uppy.log(`[Image Compressor] Image ${file.id} compressed by ${prettierBytes(compressedSavingsSize)}`) totalCompressedSize += compressedSavingsSize - console.log('YOOOO', compressedBlob) const { name, type, size } = compressedBlob const extension = name && getFileNameAndExtension(name).extension this.uppy.setFileState(file.id, {