dry retryAll() and upload()

[mifi]

improvement of #5677

[github-actions]

Diff output files

diff --git a/packages/@uppy/core/lib/Uppy.js b/packages/@uppy/core/lib/Uppy.js
index 815b687..1d1c207 100644
--- a/packages/@uppy/core/lib/Uppy.js
+++ b/packages/@uppy/core/lib/Uppy.js
@@ -42,6 +42,7 @@ var _assertNewUploadAllowed = _classPrivateFieldLooseKey("assertNewUploadAllowed
 var _transformFile = _classPrivateFieldLooseKey("transformFile");
 var _startIfAutoProceed = _classPrivateFieldLooseKey("startIfAutoProceed");
 var _checkAndUpdateFileState = _classPrivateFieldLooseKey("checkAndUpdateFileState");
+var _getFilesToRetry = _classPrivateFieldLooseKey("getFilesToRetry");
 var _handleUploadProgress = _classPrivateFieldLooseKey("handleUploadProgress");
 var _updateTotalProgress = _classPrivateFieldLooseKey("updateTotalProgress");
 var _updateTotalProgressThrottled = _classPrivateFieldLooseKey("updateTotalProgressThrottled");
@@ -76,6 +77,9 @@ export class Uppy {
     Object.defineProperty(this, _updateTotalProgress, {
       value: _updateTotalProgress2,
     });
+    Object.defineProperty(this, _getFilesToRetry, {
+      value: _getFilesToRetry2,
+    });
     Object.defineProperty(this, _checkAndUpdateFileState, {
       value: _checkAndUpdateFileState2,
     });
@@ -729,20 +733,17 @@ export class Uppy {
     });
     this.emit("resume-all");
   }
-  retryAll() {
+  async retryAll() {
+    const filesToRetry = _classPrivateFieldLooseBase(this, _getFilesToRetry)[_getFilesToRetry]();
     const updatedFiles = {
       ...this.getState().files,
     };
-    const filesToRetry = Object.keys(updatedFiles).filter(file => {
-      return updatedFiles[file].error;
-    });
-    filesToRetry.forEach(file => {
-      const updatedFile = {
-        ...updatedFiles[file],
+    filesToRetry.forEach(fileID => {
+      updatedFiles[fileID] = {
+        ...updatedFiles[fileID],
         isPaused: false,
         error: null,
       };
-      updatedFiles[file] = updatedFile;
     });
     this.setState({
       files: updatedFiles,
@@ -750,10 +751,10 @@ export class Uppy {
     });
     this.emit("retry-all", Object.values(updatedFiles));
     if (filesToRetry.length === 0) {
-      return Promise.resolve({
+      return {
         successful: [],
         failed: [],
-      });
+      };
     }
     const uploadID = _classPrivateFieldLooseBase(this, _createUpload)[_createUpload](filesToRetry, {
       forceAllowNewUpload: true,
@@ -994,33 +995,17 @@ export class Uppy {
     let {
       files,
     } = this.getState();
-    const filesToRetry = Object.keys(files).filter(fileID => files[fileID].error);
-    const hasFilesToRetry = filesToRetry.length > 0;
-    if (hasFilesToRetry) {
-      const updatedFiles = {
-        ...files,
-      };
-      filesToRetry.forEach(fileID => {
-        updatedFiles[fileID] = {
-          ...updatedFiles[fileID],
-          isPaused: false,
-          error: null,
-        };
-      });
-      this.setState({
-        files: updatedFiles,
-        error: null,
-      });
-      this.emit("retry-all", Object.values(updatedFiles));
-      const uploadID = _classPrivateFieldLooseBase(this, _createUpload)[_createUpload](filesToRetry, {
-        forceAllowNewUpload: true,
-      });
-      const result = await _classPrivateFieldLooseBase(this, _runUpload)[_runUpload](uploadID);
+    const filesToRetry = _classPrivateFieldLooseBase(this, _getFilesToRetry)[_getFilesToRetry]();
+    if (filesToRetry.length > 0) {
+      const retryResult = await this.retryAll();
       const hasNewFiles = this.getFiles().filter(file => file.progress.uploadStarted == null);
       if (!hasNewFiles) {
-        return result;
+        return retryResult;
       }
-      files = this.getState().files;
+
+      ({
+        files,
+      } = this.getState());
     }
     const onBeforeUploadResult = this.opts.onBeforeUpload(files);
     if (onBeforeUploadResult === false) {
@@ -1260,6 +1245,14 @@ function _checkAndUpdateFileState2(filesToAdd) {
     errors,
   };
 }
+function _getFilesToRetry2() {
+  const {
+    files,
+  } = this.getState();
+  return Object.keys(files).filter(file => {
+    return files[file].error;
+  });
+}
 function _updateTotalProgress2() {
   var _totalProgressPercent, _totalProgressPercent2;
   const totalProgress = _classPrivateFieldLooseBase(this, _calculateTotalProgress)[_calculateTotalProgress]();