Skip to content

Dedupe dependencies #6085

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

Merged
Murderlon merged 7 commits into from
Dec 5, 2025
Merged

Dedupe dependencies #6085

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c6a9a70
Dedupe dependencies
Murderlon Dec 3, 2025
089dafc
fix type
Murderlon Dec 3, 2025
fe9c5bd
Fix more type issues
Murderlon Dec 3, 2025
8db31dd
fix s3 tests
Murderlon Dec 3, 2025
326be1f
fix
Murderlon Dec 3, 2025
0fc571d
Merge branch 'main' into dedupe-yarn
Murderlon Dec 5, 2025
5b95865
dedupe again
Murderlon Dec 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/@uppy/audio/src/audio-oscilloscope/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ export default class AudioOscilloscope {

private bufferLength: number

private dataArray?: Uint8Array
private dataArray?: Uint8Array<ArrayBuffer>

private onDrawFrame: (oscilloscope: AudioOscilloscope) => void

Expand Down
2 changes: 1 addition & 1 deletion packages/@uppy/aws-s3/src/createSignedURL.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ async function digest(data: string): ReturnType<SubtleCrypto['digest']> {
return subtle.digest(algorithm.hash, ec.encode(data))
}

async function generateHmacKey(secret: string | Uint8Array | ArrayBuffer) {
async function generateHmacKey(secret: string | ArrayBuffer) {
const { subtle } = globalThis.crypto
return subtle.importKey(
'raw',
Expand Down
4 changes: 1 addition & 3 deletions packages/@uppy/tus/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,9 +342,7 @@ export default class Tus<M extends Meta, B extends Body> extends BasePlugin<
queuedRequest.done()

if (upload.url) {
// @ts-expect-error not typed in tus-js-client
const { name } = upload.file
Copy link
Member Author

@Murderlon Murderlon Dec 3, 2025

Choose a reason for hiding this comment

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

This doesn't exist and caused type errors again 🤔

this.uppy.log(`Download ${name} from ${upload.url}`)
this.uppy.log(`Download ${upload.url}`)
}
if (typeof opts.onSuccess === 'function') {
opts.onSuccess(payload)
Expand Down
Loading
Loading