github-mirror/discourse
github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-04-19 10:19:05 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

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

Browse Source 
This reverts commit d4a418e295d17aa5c9b8598495d71998eaf5e6ea.
This commit is contained in:
Robin Ward 2021-08-25 17:15:44 -04:00
parent 85b8fea262
commit 167fcb5eef
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/discourse-shims.js
View File

@ -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__) {

4
app/assets/javascripts/discourse/app/lib/uppy-checksum-plugin.js
View File

@ -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";

4
app/assets/javascripts/discourse/app/lib/uppy-media-optimization-plugin.js
View File

@ -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";

1
vendor/assets/javascripts/uppy.js vendored
View File

@ -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')