@uppy/xhr-upload: pass files to onBeforeRequest

[Murderlon]

Ref: https://community.transloadit.com/t/how-to-access-the-file-or-file-name-in-xhr-plugin-onbeforerequest/

We also pass the file onBeforeRequest for @uppy/tus.

[github-actions]

Diff output files

diff --git a/packages/@uppy/xhr-upload/lib/index.js b/packages/@uppy/xhr-upload/lib/index.js
index a5737d1..0f8848c 100644
--- a/packages/@uppy/xhr-upload/lib/index.js
+++ b/packages/@uppy/xhr-upload/lib/index.js
@@ -133,10 +133,15 @@ export default class XHRUpload extends BasePlugin {
     _classPrivateFieldLooseBase(this, _getFetcher)[_getFetcher] = files => {
       return async (url, options) => {
         try {
-          var _this$opts$getRespons, _this$opts, _body2;
+          var _this$opts$getRespons, _this$opts2, _body2;
           const res = await fetcher(url, {
             ...options,
-            onBeforeRequest: this.opts.onBeforeRequest,
+            onBeforeRequest: (xhr, retryCount) => {
+              var _this$opts$onBeforeRe, _this$opts;
+              return (_this$opts$onBeforeRe = (_this$opts = this.opts).onBeforeRequest) == null
+                ? void 0
+                : _this$opts$onBeforeRe.call(_this$opts, xhr, retryCount, files);
+            },
             shouldRetry: this.opts.shouldRetry,
             onAfterResponse: this.opts.onAfterResponse,
             onTimeout: timeout => {
@@ -161,9 +166,9 @@ export default class XHRUpload extends BasePlugin {
               }
             },
           });
-          let body = await ((_this$opts$getRespons = (_this$opts = this.opts).getResponseData) == null
+          let body = await ((_this$opts$getRespons = (_this$opts2 = this.opts).getResponseData) == null
             ? void 0
-            : _this$opts$getRespons.call(_this$opts, res));
+            : _this$opts$getRespons.call(_this$opts2, res));
           try {
             var _body;
             (_body = body) != null ? _body : body = JSON.parse(res.responseText);

[aduh95]

Why this change?

[Murderlon]

Because in this plugin we expect url to be a string, regardless of what fetcher supports so it's better to match it to the plugin code. fetcher also expects a string and should it ever change in fetcher we still get a type error.

[aduh95]

Where? AFAICT url is only passed to fetcher, so it only matters what fetcher supports IMO

[Murderlon]

No, it only matters what this type supports:

uppy/packages/@uppy/xhr-upload/src/index.ts

Line 30 in 4442722

endpoint: string

So it's either string or Opts<M, B>['endpoint']. But it's such I minor thing I wouldn't overthink it.

[aduh95]

I guess it only matters if fetcher has a change in its signature where it no longer supports string, but we'd get a type error anyway.