@uppy/utils: add fetcher #5073

Murderlon · 2024-04-11T11:21:09Z

Taken out of #4745.

Tried to write tests but unsuccessful:

XMLHttpRequest does not work in Node.js so testing without mocking not possible
Tried xhr-mock but it didn't work at all for me
Tried mock-xmlhttprequest but only newServer worked, which wasn't flexible enough, and the more flexible newMockXhr didn't work for me.

However once I add this to xhr-upload, we can indirectly test it in e2e because all requests will be made with fetcher then.

github-actions · 2024-04-11T11:22:34Z

Diff output files

No diff

packages/@uppy/utils/src/fetcher.ts

Co-authored-by: Antoine du Hamel <antoine@transloadit.com>

aduh95 · 2024-04-15T14:20:25Z

packages/@uppy/utils/package.json

    "./lib/CompanionClientProvider": "./lib/CompanionClientProvider.js",
    "./lib/FileProgress": "./lib/FileProgress.js",
    "./src/microtip.scss": "./src/microtip.scss",
-    "./lib/UserFacingApiError": "./lib/UserFacingApiError.js"
+    "./lib/UserFacingApiError": "./lib/UserFacingApiError.js",
+    "./lib/fetcher": "./lib/fetcher.js"


We should consider keeping this list in ASCII order

socket-security · 2024-04-16T07:25:25Z

New dependencies detected. Learn more about Socket for GitHub ↗︎

Package	New capabilities	Transitives	Size	Publisher
npm/tslib@2.6.2	None	`0`	84 kB	typescript-bot

View full report↗︎

* main: Fix prettier @uppy/dashboard: add missing `x-zip-compress` archive type (#5081) Bump docker/metadata-action from 4 to 5 (#5086) Bump actions/setup-node from 3 to 4 (#5087) Bump docker/setup-qemu-action from 2 to 3 (#5089) meta: bump supercharge/redis-github-action from 1.4.0 to 1.8.0 (#5090) meta: bump actions/cache from 3 to 4 (#5088) meta: add `dependabot.yml` to keep GHA up-to-date (#5083) Release: uppy@3.24.2 (#5084) @uppy/core: fix `setOptions` not re-rendereing plugin UI (#5082)

| Package | Version | Package | Version | | --------------- | ------- | --------------- | ------- | | @uppy/dashboard | 3.8.1 | uppy | 3.24.3 | | @uppy/utils | 5.8.0 | | | - docs: add back markdown files (Antoine du Hamel / #5064) - meta: fix custom provider example (Merlijn Vos / #5079) - @uppy/utils: add fetcher (Merlijn Vos / #5073) - meta: Fix prettier (Murderlon) - @uppy/dashboard: add missing `x-zip-compress` archive type (Younes / #5081) - meta: Bump docker/metadata-action from 4 to 5 (dependabot[bot] / #5086) - meta: Bump actions/setup-node from 3 to 4 (dependabot[bot] / #5087) - meta: Bump docker/setup-qemu-action from 2 to 3 (dependabot[bot] / #5089) - meta: bump supercharge/redis-github-action from 1.4.0 to 1.8.0 (dependabot[bot] / #5090) - meta: bump actions/cache from 3 to 4 (dependabot[bot] / #5088) - meta: add `dependabot.yml` to keep GHA up-to-date (Antoine du Hamel / #5083)

* 4.x: (34 commits) Release: uppy@3.24.3 (#5091) docs: add back markdown files (#5064) meta: fix custom provider example (#5079) @uppy/utils: add fetcher (#5073) Fix prettier @uppy/dashboard: add missing `x-zip-compress` archive type (#5081) Bump docker/metadata-action from 4 to 5 (#5086) Bump actions/setup-node from 3 to 4 (#5087) Bump docker/setup-qemu-action from 2 to 3 (#5089) meta: bump supercharge/redis-github-action from 1.4.0 to 1.8.0 (#5090) meta: bump actions/cache from 3 to 4 (#5088) Release: uppy@4.0.0-beta.3 (#5085) meta: add `dependabot.yml` to keep GHA up-to-date (#5083) Release: uppy@3.24.2 (#5084) @uppy/core: fix `setOptions` not re-rendereing plugin UI (#5082) Release: uppy@4.0.0-beta.2 (#5077) @uppy/aws-s3: default to multipart depending on the size of input (#5076) @uppy/aws-s3: remove deprecated `prepareUploadParts` option (#5075) fixup! @uppy/core: use variadic arguments for `uppy.use` (#4888) @uppy/core: use variadic arguments for `uppy.use` (#4888) ...

| Package | Version | Package | Version | | ---------------------- | ------------ | ---------------------- | ------------ | | @uppy/angular | 0.7.0-beta.4 | @uppy/instagram | 4.0.0-beta.4 | | @uppy/audio | 2.0.0-beta.4 | @uppy/onedrive | 4.0.0-beta.4 | | @uppy/aws-s3-multipart | 4.0.0-beta.4 | @uppy/provider-views | 4.0.0-beta.4 | | @uppy/box | 3.0.0-beta.4 | @uppy/react | 4.0.0-beta.4 | | @uppy/companion | 5.0.0-beta.4 | @uppy/status-bar | 4.0.0-beta.4 | | @uppy/companion-client | 4.0.0-beta.4 | @uppy/store-redux | 4.0.0-beta.2 | | @uppy/compressor | 2.0.0-beta.4 | @uppy/svelte | 4.0.0-beta.2 | | @uppy/core | 4.0.0-beta.4 | @uppy/transloadit | 4.0.0-beta.4 | | @uppy/dashboard | 4.0.0-beta.4 | @uppy/unsplash | 4.0.0-beta.4 | | @uppy/drop-target | 3.0.0-beta.4 | @uppy/url | 4.0.0-beta.4 | | @uppy/dropbox | 4.0.0-beta.4 | @uppy/utils | 6.0.0-beta.4 | | @uppy/facebook | 4.0.0-beta.4 | @uppy/webcam | 4.0.0-beta.4 | | @uppy/file-input | 4.0.0-beta.4 | @uppy/xhr-upload | 4.0.0-beta.2 | | @uppy/form | 4.0.0-beta.2 | @uppy/zoom | 3.0.0-beta.4 | | @uppy/google-drive | 4.0.0-beta.4 | uppy | 4.0.0-beta.4 | | @uppy/image-editor | 3.0.0-beta.2 | | | - meta: Upgrade Yarn to 4.x (Merlijn Vos / #4849) - @uppy/utils: fix fetcher export (Murderlon) - @uppy/xhr-upload: refactor to use `fetcher` (Merlijn Vos / #5074) - docs: use StackBlitz for all examples/issue template (Merlijn Vos / #5125) - meta: Update yarn.lock (Murderlon) - @uppy/svelte: Add svelte 5 as peer dep (frederikhors / #5122) - meta: Bump docker/setup-buildx-action from 2 to 3 (dependabot[bot] / #5124) - meta: Bump actions/checkout from 3 to 4 (dependabot[bot] / #5123) - @uppy/dashboard,@uppy/provider-views: Remove JSX global type everywhere (Merlijn Vos / #5117) - @uppy/utils: improve return type of `dataURItoFile` (Antoine du Hamel / #5112) - @uppy/drop-target: change drop event type to DragEvent (Alireza Heydari / #5107) - @uppy/image-editor: fix label definitions (Antoine du Hamel / #5111) - meta: bump Prettier version (Antoine du Hamel / #5114) - @uppy/provider-views: bring back "loaded X files..." (Mikael Finstad / #5097) - @uppy/dashboard: fix type of trigger option (Merlijn Vos / #5106) - meta: fix linter (Antoine du Hamel) - @uppy/companion: bump Node.js version support matrix (Antoine du Hamel / #5035) - @uppy/form: fix `submitOnSuccess` and `triggerUploadOnSubmit` combination (Merlijn Vos / #5058) - meta: Bump docker/build-push-action from 3 to 5 (dependabot[bot] / #5105) - meta: Bump akhileshns/heroku-deploy from 3.12.12 to 3.13.15 (dependabot[bot] / #5102) - meta: Bump docker/login-action from 2 to 3 (dependabot[bot] / #5101) - meta: Bump actions/download-artifact from 3 to 4 (dependabot[bot]) - meta: Bump actions/upload-artifact from 3 to 4 (dependabot[bot]) - @uppy/react: remove `useUppy` & reintroduce `useUppyState` (Merlijn Vos / #5059) - meta: docs: add back markdown files (Antoine du Hamel / #5064) - meta: fix custom provider example (Merlijn Vos / #5079) - @uppy/utils: add fetcher (Merlijn Vos / #5073) - meta: Fix prettier (Murderlon) - @uppy/dashboard: add missing `x-zip-compress` archive type (Younes / #5081) - meta: Bump docker/metadata-action from 4 to 5 (dependabot[bot] / #5086) - meta: Bump actions/setup-node from 3 to 4 (dependabot[bot] / #5087) - meta: Bump docker/setup-qemu-action from 2 to 3 (dependabot[bot] / #5089) - meta: bump supercharge/redis-github-action from 1.4.0 to 1.8.0 (dependabot[bot] / #5090) - meta: bump actions/cache from 3 to 4 (dependabot[bot] / #5088) - meta: add `dependabot.yml` to keep GHA up-to-date (Antoine du Hamel / #5083) - @uppy/core: Release: uppy@3.24.2 (github-actions[bot] / #5084) - @uppy/core: fix `setOptions` not re-rendereing plugin UI (Antoine du Hamel / #5082) - meta: bump vite from 5.0.12 to 5.0.13 (dependabot[bot] / #5060) - meta: bump tar from 6.1.11 to 6.2.1 (dependabot[bot] / #5068) - @uppy/companion,@uppy/file-input: Release: uppy@3.24.1 (github-actions[bot] / #5069) - @uppy/companion: upgrade redis (Mikael Finstad / #5065) - meta: fix `watch:*` scripts (Antoine du Hamel / #5046) - meta: include more packages in `compare_diff` CI (Antoine du Hamel / #5044) - @uppy/file-input: add missing export (Antoine du Hamel / #5045) - meta: Bump express from 4.18.1 to 4.19.2 in /packages/@uppy/companion (dependabot[bot] / #5036) - @uppy/companion: Bump express from 4.18.1 to 4.19.2 (dependabot[bot] / #5037) | Package | Version | Package | Version | | ---------------------- | ------- | ---------------------- | ------- | | @uppy/audio | 1.1.9 | @uppy/instagram | 3.3.1 | | @uppy/aws-s3-multipart | 3.11.1 | @uppy/onedrive | 3.3.1 | | @uppy/box | 2.3.1 | @uppy/provider-views | 3.12.0 | | @uppy/companion-client | 3.8.1 | @uppy/react | 3.3.1 | | @uppy/compressor | 1.1.3 | @uppy/status-bar | 3.3.2 | | @uppy/core | 3.11.0 | @uppy/svelte | 3.1.4 | | @uppy/dashboard | 3.8.2 | @uppy/transloadit | 3.6.1 | | @uppy/drop-target | 2.1.0 | @uppy/unsplash | 3.3.1 | | @uppy/dropbox | 3.3.1 | @uppy/url | 3.6.1 | | @uppy/facebook | 3.3.1 | @uppy/utils | 5.9.0 | | @uppy/file-input | 3.1.2 | @uppy/webcam | 3.4.1 | | @uppy/form | 3.2.1 | @uppy/xhr-upload | 3.6.5 | | @uppy/google-drive | 3.5.1 | @uppy/zoom | 2.3.1 | | @uppy/image-editor | 2.4.5 | uppy | 3.25.0 | - meta: enforce use of `.js` extension in `import type` declarations (Antoine du Hamel / #5126) - @uppy/core: add instance ID to generated IDs (Merlijn Vos / #5080) - @uppy/core: reference updated i18n in Restricter (Merlijn Vos / #5118) - @uppy/xhr-upload: refactor to use `fetcher` (Merlijn Vos / #5074) - meta: docs: use StackBlitz for all examples/issue template (Merlijn Vos / #5125) - meta: Update yarn.lock (Murderlon) - @uppy/svelte: Add svelte 5 as peer dep (frederikhors / #5122) - meta: Bump docker/setup-buildx-action from 2 to 3 (dependabot[bot] / #5124) - meta: Bump actions/checkout from 3 to 4 (dependabot[bot] / #5123) - @uppy/dashboard,@uppy/provider-views: Remove JSX global type everywhere (Merlijn Vos / #5117) - @uppy/utils: improve return type of `dataURItoFile` (Antoine du Hamel / #5112) - @uppy/drop-target: change drop event type to DragEvent (Alireza Heydari / #5107) - @uppy/image-editor: fix label definitions (Antoine du Hamel / #5111) - meta: bump Prettier version (Antoine du Hamel / #5114) - @uppy/provider-views: bring back "loaded X files..." (Mikael Finstad / #5097) - @uppy/dashboard: fix type of trigger option (Merlijn Vos / #5106) - meta: fix linter (Antoine du Hamel) - @uppy/form: fix `submitOnSuccess` and `triggerUploadOnSubmit` combination (Merlijn Vos / #5058) - meta: Bump docker/build-push-action from 3 to 5 (dependabot[bot] / #5105) - meta: Bump akhileshns/heroku-deploy from 3.12.12 to 3.13.15 (dependabot[bot] / #5102) - meta: Bump docker/login-action from 2 to 3 (dependabot[bot] / #5101) - meta: Bump actions/download-artifact from 3 to 4 (dependabot[bot]) - meta: Bump actions/upload-artifact from 3 to 4 (dependabot[bot])

@uppy/utils: add fetcher

a445a43

Murderlon self-assigned this Apr 11, 2024

Improve callbacks

33582de

Murderlon marked this pull request as ready for review April 11, 2024 12:12

Murderlon requested a review from aduh95 April 11, 2024 12:13

Murderlon added 2 commits April 11, 2024 14:20

Add to export map

ef3bf22

Make body type more correct

a9ab8ee

Murderlon mentioned this pull request Apr 11, 2024

@uppy/xhr-upload: refactor to use fetcher #5074

Merged

aduh95 approved these changes Apr 15, 2024

View reviewed changes

packages/@uppy/utils/src/fetcher.ts Outdated Show resolved Hide resolved

packages/@uppy/utils/src/fetcher.ts Outdated Show resolved Hide resolved

Apply suggestions from code review

62c1c8c

Co-authored-by: Antoine du Hamel <antoine@transloadit.com>

aduh95 reviewed Apr 15, 2024

View reviewed changes

Prettier

e996a3f

Murderlon merged commit 377c3be into main Apr 16, 2024
17 checks passed

Murderlon deleted the fetcher-util branch April 16, 2024 10:35

github-actions bot mentioned this pull request Apr 16, 2024

Release: uppy@3.24.3 #5091

Merged

Murderlon mentioned this pull request Apr 17, 2024

Full header information not sent to companion on Firefox for XHR/URL upload #5095

Open

2 tasks

This was referenced Apr 29, 2024

Release: uppy@4.0.0-beta.4 #5129

Closed

Release: uppy@4.0.0-beta.4 #5130

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

@uppy/utils: add fetcher #5073

@uppy/utils: add fetcher #5073

Murderlon commented Apr 11, 2024 •

edited

Loading

github-actions bot commented Apr 11, 2024

aduh95 Apr 15, 2024

socket-security bot commented Apr 16, 2024 •

edited

Loading

@uppy/utils: add fetcher #5073

@uppy/utils: add fetcher #5073

Conversation

Murderlon commented Apr 11, 2024 • edited Loading

github-actions bot commented Apr 11, 2024

aduh95 Apr 15, 2024

Choose a reason for hiding this comment

socket-security bot commented Apr 16, 2024 • edited Loading

Murderlon commented Apr 11, 2024 •

edited

Loading

socket-security bot commented Apr 16, 2024 •

edited

Loading