diff --git a/packages/@uppy/companion/package.json b/packages/@uppy/companion/package.json index ec2e23396..f7f945ea1 100644 --- a/packages/@uppy/companion/package.json +++ b/packages/@uppy/companion/package.json @@ -86,12 +86,12 @@ "@types/eslint": "9.6.1", "@types/express-session": "1.19.0", "@types/http-proxy": "1.17.17", - "@types/jsonwebtoken": "8.3.7", + "@types/jsonwebtoken": "9.0.10", "@types/lodash": "4.17.24", "@types/mime-types": "3.0.1", "@types/morgan": "1.7.37", "@types/ms": "2.1.0", - "@types/node": "^20.19.0", + "@types/node": "20.19.41", "@types/node-schedule": "2.1.8", "@types/request": "2.48.13", "@types/serialize-javascript": "5.0.4", diff --git a/packages/@uppy/companion/src/server/helpers/jwt.ts b/packages/@uppy/companion/src/server/helpers/jwt.ts index 7d3ef4b0e..18b30c892 100644 --- a/packages/@uppy/companion/src/server/helpers/jwt.ts +++ b/packages/@uppy/companion/src/server/helpers/jwt.ts @@ -38,7 +38,7 @@ const verifyJwtToken = (token: string, secret: EncryptionSecret) => { if (!decoded || typeof decoded !== 'object' || !('data' in decoded)) { throw new Error('Invalid token payload') } - return decoded.data + return decoded['data'] } export const generateEncryptedToken = ( diff --git a/packages/@uppy/companion/src/server/helpers/request.ts b/packages/@uppy/companion/src/server/helpers/request.ts index babf5ff07..2f26afb9b 100644 --- a/packages/@uppy/companion/src/server/helpers/request.ts +++ b/packages/@uppy/companion/src/server/helpers/request.ts @@ -122,7 +122,7 @@ function getProtectedHttpAgent({ override createConnection( options: http.ClientRequestArgs, callback?: (err: Error | null, stream: Duplex) => void, - ): Duplex { + ): Duplex | null | undefined { if (!allowLocalIPs && shouldBlockHost(options.host)) { const socket = undefined as unknown as Duplex // not sure about this but it's how it always worked callback?.(new Error(FORBIDDEN_IP_ADDRESS), socket) @@ -140,7 +140,7 @@ function getProtectedHttpAgent({ override createConnection( options: http.ClientRequestArgs, callback?: (err: Error | null, stream: Duplex) => void, - ): Duplex { + ): Duplex | null | undefined { if (!allowLocalIPs && shouldBlockHost(options.host)) { const socket = undefined as unknown as Duplex // not sure about this but it's how it always worked callback?.(new Error(FORBIDDEN_IP_ADDRESS), socket) diff --git a/packages/@uppy/compressor/package.json b/packages/@uppy/compressor/package.json index cb116dfda..99e74c38b 100644 --- a/packages/@uppy/compressor/package.json +++ b/packages/@uppy/compressor/package.json @@ -31,7 +31,7 @@ "./package.json": "./package.json" }, "dependencies": { - "@transloadit/prettier-bytes": "^0.3.4", + "@transloadit/prettier-bytes": "^1.1.0", "@uppy/utils": "workspace:^", "compressorjs": "^1.3.0", "preact": "^10.29.2", diff --git a/packages/@uppy/compressor/src/index.ts b/packages/@uppy/compressor/src/index.ts index 7fe262b72..9fb3f1293 100644 --- a/packages/@uppy/compressor/src/index.ts +++ b/packages/@uppy/compressor/src/index.ts @@ -1,4 +1,4 @@ -import prettierBytes from '@transloadit/prettier-bytes' +import { prettierBytes } from '@transloadit/prettier-bytes' import type { DefinePluginOpts, PluginOpts } from '@uppy/core' import { BasePlugin, type Uppy } from '@uppy/core' import type { Body, LocalUppyFile, Meta, UppyFile } from '@uppy/utils' diff --git a/packages/@uppy/core/package.json b/packages/@uppy/core/package.json index e97a2c1d0..532f0de1d 100644 --- a/packages/@uppy/core/package.json +++ b/packages/@uppy/core/package.json @@ -41,7 +41,7 @@ "./package.json": "./package.json" }, "dependencies": { - "@transloadit/prettier-bytes": "^0.3.4", + "@transloadit/prettier-bytes": "^1.1.0", "@uppy/store-default": "workspace:^", "@uppy/utils": "workspace:^", "lodash": "^4.18.1", diff --git a/packages/@uppy/core/src/Restricter.ts b/packages/@uppy/core/src/Restricter.ts index 0a009c5fe..83931605b 100644 --- a/packages/@uppy/core/src/Restricter.ts +++ b/packages/@uppy/core/src/Restricter.ts @@ -1,4 +1,4 @@ -import prettierBytes from '@transloadit/prettier-bytes' +import { prettierBytes } from '@transloadit/prettier-bytes' import type { Body, I18n, Meta, UppyFile } from '@uppy/utils' // @ts-expect-error untyped import match from 'mime-match' diff --git a/packages/@uppy/core/src/Uppy.test.ts b/packages/@uppy/core/src/Uppy.test.ts index 9ec252d1c..b3a8afec2 100644 --- a/packages/@uppy/core/src/Uppy.test.ts +++ b/packages/@uppy/core/src/Uppy.test.ts @@ -1,7 +1,7 @@ import assert from 'node:assert' import fs from 'node:fs' import path from 'node:path' -import prettierBytes from '@transloadit/prettier-bytes' +import { prettierBytes } from '@transloadit/prettier-bytes' import type { Body, Meta } from '@uppy/core' import type { Locale } from '@uppy/utils' import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' diff --git a/packages/@uppy/dashboard/package.json b/packages/@uppy/dashboard/package.json index 338dbe132..518ee7c34 100644 --- a/packages/@uppy/dashboard/package.json +++ b/packages/@uppy/dashboard/package.json @@ -44,7 +44,7 @@ "./package.json": "./package.json" }, "dependencies": { - "@transloadit/prettier-bytes": "^0.3.4", + "@transloadit/prettier-bytes": "^1.1.0", "@uppy/provider-views": "workspace:^", "@uppy/thumbnail-generator": "workspace:^", "@uppy/utils": "workspace:^", diff --git a/packages/@uppy/dashboard/src/components/FileItem/FileInfo/index.tsx b/packages/@uppy/dashboard/src/components/FileItem/FileInfo/index.tsx index 023ff770f..15b4c436e 100644 --- a/packages/@uppy/dashboard/src/components/FileItem/FileInfo/index.tsx +++ b/packages/@uppy/dashboard/src/components/FileItem/FileInfo/index.tsx @@ -1,4 +1,4 @@ -import prettierBytes from '@transloadit/prettier-bytes' +import { prettierBytes } from '@transloadit/prettier-bytes' import type { UppyFile } from '@uppy/core' import type { I18n } from '@uppy/utils' import { truncateString } from '@uppy/utils' diff --git a/packages/@uppy/dashboard/src/components/StatusBar/Components.tsx b/packages/@uppy/dashboard/src/components/StatusBar/Components.tsx index 4d1316e8f..c99c41d7e 100644 --- a/packages/@uppy/dashboard/src/components/StatusBar/Components.tsx +++ b/packages/@uppy/dashboard/src/components/StatusBar/Components.tsx @@ -1,4 +1,4 @@ -import prettierBytes from '@transloadit/prettier-bytes' +import { prettierBytes } from '@transloadit/prettier-bytes' import type { Body, Meta, State, Uppy } from '@uppy/core' import type { FileProcessingInfo, I18n } from '@uppy/utils' import { prettyETA } from '@uppy/utils' diff --git a/packages/@uppy/status-bar/package.json b/packages/@uppy/status-bar/package.json index 2a802adff..fdfa289c0 100644 --- a/packages/@uppy/status-bar/package.json +++ b/packages/@uppy/status-bar/package.json @@ -46,7 +46,7 @@ "./package.json": "./package.json" }, "dependencies": { - "@transloadit/prettier-bytes": "^0.3.4", + "@transloadit/prettier-bytes": "^1.1.0", "@uppy/utils": "workspace:^", "classnames": "^2.5.1", "preact": "^10.29.2" diff --git a/packages/@uppy/status-bar/src/Components.tsx b/packages/@uppy/status-bar/src/Components.tsx index 3361fe1cb..e8fc308da 100644 --- a/packages/@uppy/status-bar/src/Components.tsx +++ b/packages/@uppy/status-bar/src/Components.tsx @@ -1,4 +1,4 @@ -import prettierBytes from '@transloadit/prettier-bytes' +import { prettierBytes } from '@transloadit/prettier-bytes' import type { Body, Meta, State, Uppy } from '@uppy/core' import type { FileProcessingInfo, I18n } from '@uppy/utils' import { prettyETA } from '@uppy/utils' diff --git a/yarn.lock b/yarn.lock index e509a536b..c3bd5d62d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7674,10 +7674,10 @@ __metadata: languageName: node linkType: hard -"@transloadit/prettier-bytes@npm:^0.3.4": - version: 0.3.4 - resolution: "@transloadit/prettier-bytes@npm:0.3.4" - checksum: 10/abd6b7a12f57d5db3e744cbfa793e1fbb2aa15943b55901882eed8f32fd95cb72a2805db4e8251862192d8ebaa889a696657f46c9cd41347538d377dea731d58 +"@transloadit/prettier-bytes@npm:^1.1.0": + version: 1.1.0 + resolution: "@transloadit/prettier-bytes@npm:1.1.0" + checksum: 10/93b70acdac989e8bf361424cfa63a0ca33b55b56a96858b1d36eb839f2d3de4175e71f35024f02b6eafe7ad5a585cde836d3365793e481e7ea882cb038ee36e7 languageName: node linkType: hard @@ -8142,12 +8142,13 @@ __metadata: languageName: node linkType: hard -"@types/jsonwebtoken@npm:8.3.7": - version: 8.3.7 - resolution: "@types/jsonwebtoken@npm:8.3.7" +"@types/jsonwebtoken@npm:9.0.10": + version: 9.0.10 + resolution: "@types/jsonwebtoken@npm:9.0.10" dependencies: + "@types/ms": "npm:*" "@types/node": "npm:*" - checksum: 10/646fbcfc2f4979e0ccfffbe0c942afdf9763d40dfc25d1118edf7f507e1061de12e139b35506f4c39fcd8471ebf082068c0d3362660033cd56e3e99be186ea22 + checksum: 10/d7960d995ad815511c7f4e7f09d91522dfe16e7e800cdd6226c8b1b624c534e0f3b8f8f3beb60e3189865269f028002f1a490189beca5afd02bc96ef1d68f21f languageName: node linkType: hard @@ -8195,7 +8196,7 @@ __metadata: languageName: node linkType: hard -"@types/ms@npm:2.1.0": +"@types/ms@npm:*, @types/ms@npm:2.1.0": version: 2.1.0 resolution: "@types/ms@npm:2.1.0" checksum: 10/532d2ebb91937ccc4a89389715e5b47d4c66e708d15942fe6cc25add6dc37b2be058230a327dd50f43f89b8b6d5d52b74685a9e8f70516edfc9bdd6be910eff4 @@ -8229,6 +8230,15 @@ __metadata: languageName: node linkType: hard +"@types/node@npm:20.19.41": + version: 20.19.41 + resolution: "@types/node@npm:20.19.41" + dependencies: + undici-types: "npm:~6.21.0" + checksum: 10/5eb38cabe687130093681fe35e2ee2230c0717ee44a784881229c8ea9ecfb3626be87edb3940c9b60886dc93b5cb5c66a58a4ff44f1de3936e6af92b65a029b2 + languageName: node + linkType: hard + "@types/node@npm:^12.7.1": version: 12.20.55 resolution: "@types/node@npm:12.20.55" @@ -8590,12 +8600,12 @@ __metadata: "@types/eslint": "npm:9.6.1" "@types/express-session": "npm:1.19.0" "@types/http-proxy": "npm:1.17.17" - "@types/jsonwebtoken": "npm:8.3.7" + "@types/jsonwebtoken": "npm:9.0.10" "@types/lodash": "npm:4.17.24" "@types/mime-types": "npm:3.0.1" "@types/morgan": "npm:1.7.37" "@types/ms": "npm:2.1.0" - "@types/node": "npm:^20.19.0" + "@types/node": "npm:20.19.41" "@types/node-schedule": "npm:2.1.8" "@types/request": "npm:2.48.13" "@types/serialize-javascript": "npm:5.0.4" @@ -8685,7 +8695,7 @@ __metadata: version: 0.0.0-use.local resolution: "@uppy/compressor@workspace:packages/@uppy/compressor" dependencies: - "@transloadit/prettier-bytes": "npm:^0.3.4" + "@transloadit/prettier-bytes": "npm:^1.1.0" "@types/node": "npm:^20.19.0" "@uppy/utils": "workspace:^" compressorjs: "npm:^1.3.0" @@ -8703,7 +8713,7 @@ __metadata: version: 0.0.0-use.local resolution: "@uppy/core@workspace:packages/@uppy/core" dependencies: - "@transloadit/prettier-bytes": "npm:^0.3.4" + "@transloadit/prettier-bytes": "npm:^1.1.0" "@types/deep-freeze": "npm:^0" "@types/node": "npm:^20.19.0" "@uppy/store-default": "workspace:^" @@ -8728,7 +8738,7 @@ __metadata: version: 0.0.0-use.local resolution: "@uppy/dashboard@workspace:packages/@uppy/dashboard" dependencies: - "@transloadit/prettier-bytes": "npm:^0.3.4" + "@transloadit/prettier-bytes": "npm:^1.1.0" "@uppy/core": "workspace:^" "@uppy/dropbox": "workspace:^" "@uppy/google-drive": "workspace:^" @@ -9063,7 +9073,7 @@ __metadata: version: 0.0.0-use.local resolution: "@uppy/status-bar@workspace:packages/@uppy/status-bar" dependencies: - "@transloadit/prettier-bytes": "npm:^0.3.4" + "@transloadit/prettier-bytes": "npm:^1.1.0" "@uppy/utils": "workspace:^" classnames: "npm:^2.5.1" cssnano: "npm:^7.0.7"