From ded29780b142d124eaf0015b0fc4b3e057f0371a Mon Sep 17 00:00:00 2001 From: Antoine du Hamel Date: Tue, 21 Sep 2021 18:11:44 +0200 Subject: [PATCH 1/3] @uppy/image-editor: add workaround for when `Cropper` is loaded as ESM Fixes: https://github.com/transloadit/uppy/issues/3199 --- packages/@uppy/image-editor/src/Editor.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/@uppy/image-editor/src/Editor.js b/packages/@uppy/image-editor/src/Editor.js index 9a64a0828f..ea7d3fa286 100644 --- a/packages/@uppy/image-editor/src/Editor.js +++ b/packages/@uppy/image-editor/src/Editor.js @@ -1,6 +1,9 @@ -const Cropper = require('cropperjs') +const CropperImport = require('cropperjs') const { h, Component } = require('preact') +// eslint-disable-next-line no-underscore-dangle +const Cropper = CropperImport.__esModule ? CropperImport.default : CropperImport + module.exports = class Editor extends Component { constructor (props) { super(props) From fcb76e2037a7ffe6f8190a3cba71ba329824a87e Mon Sep 17 00:00:00 2001 From: Antoine du Hamel Date: Thu, 23 Sep 2021 11:01:44 +0200 Subject: [PATCH 2/3] Update packages/@uppy/image-editor/src/Editor.js Co-authored-by: Kevin van Zonneveld --- packages/@uppy/image-editor/src/Editor.js | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/@uppy/image-editor/src/Editor.js b/packages/@uppy/image-editor/src/Editor.js index ea7d3fa286..5abc1fd76a 100644 --- a/packages/@uppy/image-editor/src/Editor.js +++ b/packages/@uppy/image-editor/src/Editor.js @@ -1,6 +1,7 @@ const CropperImport = require('cropperjs') const { h, Component } = require('preact') +// @TODO A silly hack that we can get rid of when moving to ESM. // eslint-disable-next-line no-underscore-dangle const Cropper = CropperImport.__esModule ? CropperImport.default : CropperImport From 5ab2d81b972eebfb6edf1a0ac5e23a1ef1ea54ce Mon Sep 17 00:00:00 2001 From: Antoine du Hamel Date: Thu, 23 Sep 2021 11:04:01 +0200 Subject: [PATCH 3/3] Add backlog entry --- BACKLOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/BACKLOG.md b/BACKLOG.md index 7387eba168..a46925d1b7 100644 --- a/BACKLOG.md +++ b/BACKLOG.md @@ -30,6 +30,7 @@ PRs are welcome! Please do open an issue to discuss first if it's a big feature, ## `3.0.0` - [ ] Switch to ES Modules (ESM) +- [ ] @uppy/image-editor: Remove silly hack to work around non-ESM. ## `4.0.0`