From 167fcb5eef4a8b65db2b184d6682bd62ad6bd237 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Wed, 25 Aug 2021 17:15:44 -0400
Subject: [PATCH] Revert "DEV: fixes broken tests on ember-cli due to uppy"

This reverts commit d4a418e295d17aa5c9b8598495d71998eaf5e6ea.
---
 app/assets/javascripts/discourse-shims.js                     | 2 +-
 .../javascripts/discourse/app/lib/uppy-checksum-plugin.js     | 4 ++--
 .../discourse/app/lib/uppy-media-optimization-plugin.js       | 4 ++--
 vendor/assets/javascripts/uppy.js                             | 1 +
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/assets/javascripts/discourse-shims.js b/app/assets/javascripts/discourse-shims.js
index c3eb5c9fd38..3f038c12d85 100644
--- a/app/assets/javascripts/discourse-shims.js
+++ b/app/assets/javascripts/discourse-shims.js
@@ -32,7 +32,7 @@ define("@popperjs/core", ["exports"], function (__exports__) {
 
 define("@uppy/core", ["exports"], function (__exports__) {
   __exports__.default = window.Uppy.Core;
-  __exports__.Plugin = window.Uppy.Core.BasePlugin;
+  __exports__.BasePlugin = window.Uppy.BasePlugin;
 });
 
 define("@uppy/aws-s3", ["exports"], function (__exports__) {
diff --git a/app/assets/javascripts/discourse/app/lib/uppy-checksum-plugin.js b/app/assets/javascripts/discourse/app/lib/uppy-checksum-plugin.js
index 4cd0cea0476..3e74b36252f 100644
--- a/app/assets/javascripts/discourse/app/lib/uppy-checksum-plugin.js
+++ b/app/assets/javascripts/discourse/app/lib/uppy-checksum-plugin.js
@@ -1,8 +1,8 @@
-import { Plugin } from "@uppy/core";
+import { BasePlugin } from "@uppy/core";
 import { warn } from "@ember/debug";
 import { Promise } from "rsvp";
 
-export default class UppyChecksum extends Plugin {
+export default class UppyChecksum extends BasePlugin {
   constructor(uppy, opts) {
     super(uppy, opts);
     this.id = opts.id || "uppy-checksum";
diff --git a/app/assets/javascripts/discourse/app/lib/uppy-media-optimization-plugin.js b/app/assets/javascripts/discourse/app/lib/uppy-media-optimization-plugin.js
index 862a55a34d8..dcf3c3121ba 100644
--- a/app/assets/javascripts/discourse/app/lib/uppy-media-optimization-plugin.js
+++ b/app/assets/javascripts/discourse/app/lib/uppy-media-optimization-plugin.js
@@ -1,8 +1,8 @@
-import { Plugin } from "@uppy/core";
+import { BasePlugin } from "@uppy/core";
 import { warn } from "@ember/debug";
 import { Promise } from "rsvp";
 
-export default class UppyMediaOptimization extends Plugin {
+export default class UppyMediaOptimization extends BasePlugin {
   constructor(uppy, opts) {
     super(uppy, opts);
     this.id = opts.id || "uppy-media-optimization";
diff --git a/vendor/assets/javascripts/uppy.js b/vendor/assets/javascripts/uppy.js
index 6eaffed37ad..ef9e4517322 100644
--- a/vendor/assets/javascripts/uppy.js
+++ b/vendor/assets/javascripts/uppy.js
@@ -6,6 +6,7 @@
 // use the plugins we actually want.
 window.Uppy = {}
 Uppy.Core = require('./packages/@uppy/core/lib/index.js')
+Uppy.BasePlugin = Uppy.Core.BasePlugin
 Uppy.XHRUpload = require('./packages/@uppy/xhr-upload/lib/index.js')
 Uppy.AwsS3 = require('./packages/@uppy/aws-s3/lib/index.js')
 Uppy.AwsS3Multipart = require('./packages/@uppy/aws-s3-multipart/lib/index.js')