Revert "DEV: fixes broken tests on ember-cli due to uppy"

Revert “DEV: fixes broken tests on ember-cli due to uppy”

This reverts commit d4a418e295d17aa5c9b8598495d71998eaf5e6ea.

diff --git a/app/assets/javascripts/discourse-shims.js b/app/assets/javascripts/discourse-shims.js
index c3eb5c9..3f038c1 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 4cd0cea..3e74b36 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 862a55a..dcf3c31 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 6eaffed..ef9e451 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')

GitHub sha: 167fcb5eef4a8b65db2b184d6682bd62ad6bd237

This commit appears in #14153 which was approved by Falco. It was merged by eviltrout.