Merge pull request #18543 from abpframework/liangshiwei/uppy

Upgrade UPPY to the latest

modules/cms-kit/host/Volo.CmsKit.Web.Unified/wwwroot/libs/uppy/uppy.js

@@ -25442,7 +25442,7 @@ module.exports = (_temp = _class = /*#__PURE__*/function (_Plugin) {
         _this.uppy.log(err);
       });
 
-      _this.uppy.cancelAll();
+      _this.uppy.reset();
 
       _this.uppy.setState({
         recoveredState: null
@@ -28560,7 +28560,7 @@ module.exports = (_temp = _class = /*#__PURE__*/function (_Plugin) {
         // Implement monitors actions
         switch (message.payload.type) {
           case 'RESET':
-            _this2.uppy.reset();
+            _this2.UPPY.cancelAll();
 
             return;
 

modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/create.js

@@ -140,9 +140,9 @@ $(function () {
             headers: getUppyHeaders()
         };
 
-        var UPPY = Uppy.Core().use(Uppy.XHRUpload, UPPY_OPTIONS);
+        var UPPY = new Uppy.Uppy().use(Uppy.XHRUpload, UPPY_OPTIONS);
 
-        UPPY.reset();
+        UPPY.cancelAll();
 
         var file = $fileInput[0].files[0];
 
@@ -307,9 +307,9 @@ $(function () {
             headers: getUppyHeaders()
         };
 
-        var UPPY = Uppy.Core().use(Uppy.XHRUpload, UPPY_OPTIONS);
+        var UPPY = new Uppy.Uppy().use(Uppy.XHRUpload, UPPY_OPTIONS);
 
-        UPPY.reset();
+        UPPY.cancelAll();
 
         UPPY.addFile({
             id: "content-file",

modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/update.js

@@ -104,9 +104,9 @@ $(function () {
             headers: getUppyHeaders()
         };
 
-        var UPPY = Uppy.Core().use(Uppy.XHRUpload, UPPY_OPTIONS);
+        var UPPY = new Uppy.Uppy().use(Uppy.XHRUpload, UPPY_OPTIONS);
 
-        UPPY.reset();
+        UPPY.cancelAll();
 
         var file = $fileInput[0].files[0];
 
@@ -218,9 +218,9 @@ $(function () {
             headers: getUppyHeaders()
         };
 
-        var UPPY = Uppy.Core().use(Uppy.XHRUpload, UPPY_OPTIONS);
+        var UPPY = new Uppy.Uppy().use(Uppy.XHRUpload, UPPY_OPTIONS);
 
-        UPPY.reset();
+        UPPY.cancelAll();
 
         UPPY.addFile({
             id: "content-file",

modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/create.js

@@ -146,9 +146,9 @@ $(function () {
             headers: getUppyHeaders()
         };
 
-        var UPPY = Uppy.Core().use(Uppy.XHRUpload, UPPY_OPTIONS);
+        var UPPY = new Uppy.Uppy().use(Uppy.XHRUpload, UPPY_OPTIONS);
 
-        UPPY.reset();
+        UPPY.cancelAll();
 
         UPPY.addFile({
             id: "content-file",

modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/update.js

@@ -116,9 +116,9 @@ $(function () {
             headers: getUppyHeaders()
         };
 
-        var UPPY = Uppy.Core().use(Uppy.XHRUpload, UPPY_OPTIONS);
+        var UPPY = new Uppy.Uppy().use(Uppy.XHRUpload, UPPY_OPTIONS);
 
-        UPPY.reset();
+        UPPY.cancelAll();
 
         UPPY.addFile({
             id: "content-file",

npm/packs/uppy/package.json

@@ -6,7 +6,7 @@
   },
   "dependencies": {
     "@abp/core": "~8.0.0",
-    "uppy": "^1.16.1"
+    "uppy": "^3.21.0"
   },
   "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431",
   "homepage": "https://abp.io",