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.

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

@uppy/companion upgrade grant dependency #4286

Merged
merged 1 commit into from
Feb 2, 2023

Conversation

scottbessler
Copy link
Contributor

Upgrade the grant dependency.

This is necessary in order to get a newer version of the transitive dependency request-compose which works with bundlers like esbuild.

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.

lgtm. seems like the only breaking changes are:

https://github.com/simov/grant/blob/master/CHANGELOG.md#v500-20200418

Breaking: Drop support for Node v4 and v6

ok

Breaking: Return id_token as string by default

we don't use id_token afaik

Breaking: Change in the response configuration

seems like we don't use that either

@mifi
Copy link
Contributor

mifi commented Jan 25, 2023

Dunno why the types are failing.

Error: src/companion.js(2,32): error TS2339: Property 'express' does not exist on type 'typeof import("/home/runner/work/uppy/uppy/packages/@uppy/companion/node_modules/grant/grant")'.

seems like we are using grant according to their docs

const Grant = require('grant').express()

https://github.com/simov/grant#http-frameworks

@scottbessler
Copy link
Contributor Author

ugh, this is one of those fun oddities of js module resolution... adding .default fixes the types, and works fine at run time:

❯ node
Welcome to Node.js v18.13.0.
Type ".help" for more information.
> var e = require('grant').express()
undefined
> var e2 = require('grant').default.express()
undefined
> e == e2
true

@aduh95 aduh95 added the safe to test Add this label on trustworthy PRs to spawn the e2e test suite label Jan 31, 2023
@github-actions github-actions bot removed pending end-to-end tests safe to test Add this label on trustworthy PRs to spawn the e2e test suite labels Jan 31, 2023
@aduh95 aduh95 merged commit 29ad1b6 into transloadit:main Feb 2, 2023
@github-actions github-actions bot mentioned this pull request Feb 13, 2023
github-actions bot added a commit that referenced this pull request Feb 13, 2023
| Package              | Version | Package              | Version |
| -------------------- | ------- | -------------------- | ------- |
| @uppy/audio          |   1.0.4 | @uppy/screen-capture |   3.0.2 |
| @uppy/companion      |   4.3.0 | @uppy/transloadit    |   3.1.1 |
| @uppy/core           |   3.0.6 | @uppy/xhr-upload     |   3.1.0 |
| @uppy/dashboard      |   3.2.2 | uppy                 |   3.5.0 |
| @uppy/locales        |   3.0.6 |                      |         |

- @uppy/transloadit: fix `assemblyOptions` option (Antoine du Hamel / #4316)
- meta: Remove Robodog advice, since it is deprecated (Artur Paikin)
- @uppy/dashboard: fix dashboard acquirers list (Mikael Finstad / #4306)
- @uppy/dashboard: Dashboard: disallow clicking on buttons and links in Dashboard disabled mode (Artur Paikin / #4292)
- @uppy/audio,@uppy/core,@uppy/dashboard,@uppy/screen-capture: Warn more instead of erroring (Artur Paikin / #4302)
- @uppy/locales: Update de_DE.js (Jörn Velten / #4297)
- meta: use load balancer for companion in e2e tests (Mikael Finstad / #4228)
- @uppy/companion: @uppy/companion upgrade grant dependency (Scott Bessler / #4286)
- @uppy/xhr-upload: add `'upload-stalled'` event (Antoine du Hamel / #4247)
- @uppy/locales: minor enhancements and typo fixes for the hungarian translation (KergeKacsa / #4282)
HeavenFox pushed a commit to docsend/uppy that referenced this pull request Jun 27, 2023
HeavenFox pushed a commit to docsend/uppy that referenced this pull request Jun 27, 2023
| Package              | Version | Package              | Version |
| -------------------- | ------- | -------------------- | ------- |
| @uppy/audio          |   1.0.4 | @uppy/screen-capture |   3.0.2 |
| @uppy/companion      |   4.3.0 | @uppy/transloadit    |   3.1.1 |
| @uppy/core           |   3.0.6 | @uppy/xhr-upload     |   3.1.0 |
| @uppy/dashboard      |   3.2.2 | uppy                 |   3.5.0 |
| @uppy/locales        |   3.0.6 |                      |         |

- @uppy/transloadit: fix `assemblyOptions` option (Antoine du Hamel / transloadit#4316)
- meta: Remove Robodog advice, since it is deprecated (Artur Paikin)
- @uppy/dashboard: fix dashboard acquirers list (Mikael Finstad / transloadit#4306)
- @uppy/dashboard: Dashboard: disallow clicking on buttons and links in Dashboard disabled mode (Artur Paikin / transloadit#4292)
- @uppy/audio,@uppy/core,@uppy/dashboard,@uppy/screen-capture: Warn more instead of erroring (Artur Paikin / transloadit#4302)
- @uppy/locales: Update de_DE.js (Jörn Velten / transloadit#4297)
- meta: use load balancer for companion in e2e tests (Mikael Finstad / transloadit#4228)
- @uppy/companion: @uppy/companion upgrade grant dependency (Scott Bessler / transloadit#4286)
- @uppy/xhr-upload: add `'upload-stalled'` event (Antoine du Hamel / transloadit#4247)
- @uppy/locales: minor enhancements and typo fixes for the hungarian translation (KergeKacsa / transloadit#4282)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants