Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Companion: remove searchProviders wrapper & move s3 options #3781

Merged
merged 12 commits into from May 30, 2022
Merged

Companion: remove searchProviders wrapper & move s3 options #3781

merged 12 commits into from May 30, 2022

Conversation

Murderlon
Copy link
Member

  • searchProviders inside providerOptions is a redundant wrapper and not documented.
  • s3 is a destination, not a source, so it doesn't belong in providerOptions

@Murderlon Murderlon added the safe to test Add this label on trustworthy PRs to spawn the e2e test suite label May 24, 2022
@Murderlon Murderlon requested review from mifi and aduh95 May 24, 2022 11:53
@Murderlon Murderlon added the 3.0 label May 24, 2022
@github-actions github-actions bot removed the safe to test Add this label on trustworthy PRs to spawn the e2e test suite label May 24, 2022
@aduh95
Copy link
Member

aduh95 commented May 24, 2022 •
edited

What would be the semverness of such change? Maybe it's best to leave it for the next major?
EDIT: oh nevermind, that's for the next major 😅

Murderlon and others added 2 commits May 25, 2022 11:07
@Murderlon @aduh95
Use nullish coalescing
e3b485b 
Co-authored-by: Antoine du Hamel <duhamelantoine1995@gmail.com>
@Murderlon
Revert "Use nullish coalescing"
0cf123e 
This reverts commit e3b485b.
@Murderlon
Copy link
Member Author

Of course, we still run tests against Node 10 so that change will fail. There are lots of places that could be updated to nullish coalescing, better to change them in after we drop ci actions. Which could be done on the 3x branch already.

emuell and others added 2 commits May 25, 2022 12:16
@emuell
@uppy/dashboard: use webkitRelativePath when querying a file's relati…
2f0b39b 
…ve path (#3766)

- fixes missing "relativePath" meta property when adding files via the "Browse Folder" link in the dashboard with Chrome or Edge
@mifi @tim-kos
expire redis keys after 1 day (#3771)
5bd5d38 
* expire redis keys after 1 day

to prevent buildup in redis
fixes #3748

* reuse redis config logic

* Update packages/@uppy/companion/src/server/Uploader.js

Co-authored-by: Tim Koschuetzki <tim-kos@users.noreply.github.com>

Co-authored-by: Tim Koschuetzki <tim-kos@users.noreply.github.com>
mifi
mifi approved these changes May 26, 2022
View reviewed changes
Copy link
Contributor

@mifi mifi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice! I didn't test this but I assume you already did

aduh95 and others added 4 commits May 26, 2022 10:20
@aduh95
@uppy/companion: fix some linter warnings (#3752)
29e8fff
@aduh95
uppy: add Zoom plugin to the bundle and fix ESM exports (#3747)
6b8a16b 
Fixes: #3684
@Murderlon
Merge branch 'main' into companion-provider-options
64e82e3 
* main:
  uppy: add Zoom plugin to the bundle and fix ESM exports (#3747)
  @uppy/companion: fix some linter warnings (#3752)
  expire redis keys after 1 day (#3771)
  @uppy/dashboard: use webkitRelativePath when querying a file's relative path (#3766)
@Murderlon
Use nullish coalescing (again)
6a5f1fb
@Murderlon Murderlon merged commit c0a9e21 into 3.x May 30, 2022
@Murderlon Murderlon deleted the companion-provider-options branch May 30, 2022 11:01
aduh95 pushed a commit that referenced this pull request May 30, 2022
@Murderlon @aduh95
@uppy/companion: remove searchProviders wrapper & move s3 options (…
aaeb89b 
…#3781)
aduh95 pushed a commit that referenced this pull request May 30, 2022
@Murderlon @aduh95
@uppy/companion: remove searchProviders wrapper & move s3 options (…
eea5345 
…#3781)
aduh95 pushed a commit that referenced this pull request May 30, 2022
@Murderlon @aduh95
@uppy/companion: remove searchProviders wrapper & move s3 options (…
a463040 
…#3781)
@github-actions github-actions bot mentioned this pull request May 30, 2022
Merged
github-actions bot added a commit that referenced this pull request May 30, 2022
@github-actions
Release: uppy@3.0.0-beta (#3798)
861f264 
| Package                   |    Version | Package                   |    Version |
| ------------------------- | ---------- | ------------------------- | ---------- |
| @uppy/audio               | 3.0.0-beta | @uppy/progress-bar        | 3.0.0-beta |
| @uppy/aws-s3              | 3.0.0-beta | @uppy/provider-views      | 3.0.0-beta |
| @uppy/aws-s3-multipart    | 3.0.0-beta | @uppy/react               | 3.0.0-beta |
| @uppy/box                 | 3.0.0-beta | @uppy/redux-dev-tools     | 3.0.0-beta |
| @uppy/companion           | 4.0.0-beta | @uppy/robodog             | 3.0.0-beta |
| @uppy/companion-client    | 3.0.0-beta | @uppy/screen-capture      | 3.0.0-beta |
| @uppy/compressor          | 3.0.0-beta | @uppy/status-bar          | 3.0.0-beta |
| @uppy/core                | 3.0.0-beta | @uppy/store-default       | 3.0.0-beta |
| @uppy/dashboard           | 3.0.0-beta | @uppy/store-redux         | 3.0.0-beta |
| @uppy/drag-drop           | 3.0.0-beta | @uppy/svelte              | 3.0.0-beta |
| @uppy/drop-target         | 3.0.0-beta | @uppy/thumbnail-generator | 3.0.0-beta |
| @uppy/dropbox             | 3.0.0-beta | @uppy/transloadit         | 3.0.0-beta |
| @uppy/facebook            | 3.0.0-beta | @uppy/tus                 | 3.0.0-beta |
| @uppy/file-input          | 3.0.0-beta | @uppy/unsplash            | 3.0.0-beta |
| @uppy/form                | 3.0.0-beta | @uppy/url                 | 3.0.0-beta |
| @uppy/golden-retriever    | 3.0.0-beta | @uppy/utils               | 5.0.0-beta |
| @uppy/google-drive        | 3.0.0-beta | @uppy/vue                 | 3.0.0-beta |
| @uppy/image-editor        | 3.0.0-beta | @uppy/webcam              | 3.0.0-beta |
| @uppy/informer            | 3.0.0-beta | @uppy/xhr-upload          | 3.0.0-beta |
| @uppy/instagram           | 3.0.0-beta | @uppy/zoom                | 3.0.0-beta |
| @uppy/locales             | 3.0.0-beta | uppy                      | 3.0.0-beta |
| @uppy/onedrive            | 3.0.0-beta |                           |            |

- meta: temporary adjust release script for the beta (Antoine du Hamel)
- meta: disable ESM to CJS transform in dist files (Antoine du Hamel / #3773)
- @uppy/companion: remove `searchProviders` wrapper & move `s3` options (Merlijn Vos / #3781)
- meta: do not test on EOL versions of Node.js (Antoine du Hamel / #3786)
- @uppy/companion: remove support for EOL versions of Node.js (Antoine du Hamel / #3784)
- @uppy/react: refactor to ESM (Antoine du Hamel / #3780)
- @uppy/transloadit: remove IE 10 hack (Antoine du Hamel / #3777)
@Murderlon Murderlon mentioned this pull request Jul 11, 2022
Merged
HeavenFox pushed a commit to docsend/uppy that referenced this pull request Jun 27, 2023
@Murderlon @aduh95
@uppy/companion: remove searchProviders wrapper & move s3 options (…
f4f1de3 
…transloadit#3781)
HeavenFox pushed a commit to docsend/uppy that referenced this pull request Jun 27, 2023
@github-actions
Release: uppy@3.0.0-beta (transloadit#3798)
78ad7e8 
| Package                   |    Version | Package                   |    Version |
| ------------------------- | ---------- | ------------------------- | ---------- |
| @uppy/audio               | 3.0.0-beta | @uppy/progress-bar        | 3.0.0-beta |
| @uppy/aws-s3              | 3.0.0-beta | @uppy/provider-views      | 3.0.0-beta |
| @uppy/aws-s3-multipart    | 3.0.0-beta | @uppy/react               | 3.0.0-beta |
| @uppy/box                 | 3.0.0-beta | @uppy/redux-dev-tools     | 3.0.0-beta |
| @uppy/companion           | 4.0.0-beta | @uppy/robodog             | 3.0.0-beta |
| @uppy/companion-client    | 3.0.0-beta | @uppy/screen-capture      | 3.0.0-beta |
| @uppy/compressor          | 3.0.0-beta | @uppy/status-bar          | 3.0.0-beta |
| @uppy/core                | 3.0.0-beta | @uppy/store-default       | 3.0.0-beta |
| @uppy/dashboard           | 3.0.0-beta | @uppy/store-redux         | 3.0.0-beta |
| @uppy/drag-drop           | 3.0.0-beta | @uppy/svelte              | 3.0.0-beta |
| @uppy/drop-target         | 3.0.0-beta | @uppy/thumbnail-generator | 3.0.0-beta |
| @uppy/dropbox             | 3.0.0-beta | @uppy/transloadit         | 3.0.0-beta |
| @uppy/facebook            | 3.0.0-beta | @uppy/tus                 | 3.0.0-beta |
| @uppy/file-input          | 3.0.0-beta | @uppy/unsplash            | 3.0.0-beta |
| @uppy/form                | 3.0.0-beta | @uppy/url                 | 3.0.0-beta |
| @uppy/golden-retriever    | 3.0.0-beta | @uppy/utils               | 5.0.0-beta |
| @uppy/google-drive        | 3.0.0-beta | @uppy/vue                 | 3.0.0-beta |
| @uppy/image-editor        | 3.0.0-beta | @uppy/webcam              | 3.0.0-beta |
| @uppy/informer            | 3.0.0-beta | @uppy/xhr-upload          | 3.0.0-beta |
| @uppy/instagram           | 3.0.0-beta | @uppy/zoom                | 3.0.0-beta |
| @uppy/locales             | 3.0.0-beta | uppy                      | 3.0.0-beta |
| @uppy/onedrive            | 3.0.0-beta |                           |            |

- meta: temporary adjust release script for the beta (Antoine du Hamel)
- meta: disable ESM to CJS transform in dist files (Antoine du Hamel / transloadit#3773)
- @uppy/companion: remove `searchProviders` wrapper & move `s3` options (Merlijn Vos / transloadit#3781)
- meta: do not test on EOL versions of Node.js (Antoine du Hamel / transloadit#3786)
- @uppy/companion: remove support for EOL versions of Node.js (Antoine du Hamel / transloadit#3784)
- @uppy/react: refactor to ESM (Antoine du Hamel / transloadit#3780)
- @uppy/transloadit: remove IE 10 hack (Antoine du Hamel / transloadit#3777)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@aduh95 aduh95 aduh95 left review comments

@mifi mifi mifi approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@Murderlon @aduh95 @mifi @emuell