Mirrors/uppy
1
0
Fork 0
mirror of https://github.com/transloadit/uppy.git synced 2026-01-23 02:25:07 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'main'

Browse source
This commit is contained in:
Antoine du Hamel 2024-01-03 19:14:50 +01:00
commit f62ae48d8e
No known key found for this signature in database
GPG key ID: 21D900FFDB233756
19 changed files with 168 additions and 135 deletions
Download patch file Download diff file Expand all files Collapse all files

181
examples/aws-php/composer.lock generated
View file

@ -8,16 +8,16 @@
"packages": [
{
"name": "aws/aws-crt-php",
"version": "v1.2.1",
"version": "v1.2.4",
"source": {
"type": "git",
"url": "https://github.com/awslabs/aws-crt-php.git",
"reference": "1926277fc71d253dfa820271ac5987bdb193ccf5"
"reference": "eb0c6e4e142224a10b08f49ebf87f32611d162b2"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/awslabs/aws-crt-php/zipball/1926277fc71d253dfa820271ac5987bdb193ccf5",
"reference": "1926277fc71d253dfa820271ac5987bdb193ccf5",
"url": "https://api.github.com/repos/awslabs/aws-crt-php/zipball/eb0c6e4e142224a10b08f49ebf87f32611d162b2",
"reference": "eb0c6e4e142224a10b08f49ebf87f32611d162b2",
"shasum": ""
},
"require": {
@ -56,35 +56,35 @@
],
"support": {
"issues": "https://github.com/awslabs/aws-crt-php/issues",
"source": "https://github.com/awslabs/aws-crt-php/tree/v1.2.1"
"source": "https://github.com/awslabs/aws-crt-php/tree/v1.2.4"
},
"time": "2023-03-24T20:22:19+00:00"
"time": "2023-11-08T00:42:13+00:00"
},
{
"name": "aws/aws-sdk-php",
"version": "3.272.1",
"version": "3.288.1",
"source": {
"type": "git",
"url": "https://github.com/aws/aws-sdk-php.git",
"reference": "a0accaf4a16565c0b4438109c978602f27dff3a0"
"reference": "a1dfa12c7165de0b731ae8074c4ba1f3ae733f89"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/a0accaf4a16565c0b4438109c978602f27dff3a0",
"reference": "a0accaf4a16565c0b4438109c978602f27dff3a0",
"url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/a1dfa12c7165de0b731ae8074c4ba1f3ae733f89",
"reference": "a1dfa12c7165de0b731ae8074c4ba1f3ae733f89",
"shasum": ""
},
"require": {
"aws/aws-crt-php": "^1.0.4",
"aws/aws-crt-php": "^1.2.3",
"ext-json": "*",
"ext-pcre": "*",
"ext-simplexml": "*",
"guzzlehttp/guzzle": "^6.5.8 || ^7.4.5",
"guzzlehttp/promises": "^1.4.0",
"guzzlehttp/promises": "^1.4.0 || ^2.0",
"guzzlehttp/psr7": "^1.9.1 || ^2.4.5",
"mtdowling/jmespath.php": "^2.6",
"php": ">=5.5",
"psr/http-message": "^1.0"
"php": ">=7.2.5",
"psr/http-message": "^1.0 || ^2.0"
},
"require-dev": {
"andrewsville/php-token-reflection": "^1.4",
@ -99,7 +99,7 @@
"ext-sockets": "*",
"nette/neon": "^2.3",
"paragonie/random_compat": ">= 2",
"phpunit/phpunit": "^4.8.35 || ^5.6.3 || ^9.5",
"phpunit/phpunit": "^5.6.3 || ^8.5 || ^9.5",
"psr/cache": "^1.0",
"psr/simple-cache": "^1.0",
"sebastian/comparator": "^1.2.3 || ^4.0",
@ -151,28 +151,28 @@
"support": {
"forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80",
"issues": "https://github.com/aws/aws-sdk-php/issues",
"source": "https://github.com/aws/aws-sdk-php/tree/3.272.1"
"source": "https://github.com/aws/aws-sdk-php/tree/3.288.1"
},
"time": "2023-06-09T18:21:02+00:00"
"time": "2023-11-22T19:35:38+00:00"
},
{
"name": "guzzlehttp/guzzle",
"version": "7.7.0",
"version": "7.8.1",
"source": {
"type": "git",
"url": "https://github.com/guzzle/guzzle.git",
"reference": "fb7566caccf22d74d1ab270de3551f72a58399f5"
"reference": "41042bc7ab002487b876a0683fc8dce04ddce104"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/guzzle/guzzle/zipball/fb7566caccf22d74d1ab270de3551f72a58399f5",
"reference": "fb7566caccf22d74d1ab270de3551f72a58399f5",
"url": "https://api.github.com/repos/guzzle/guzzle/zipball/41042bc7ab002487b876a0683fc8dce04ddce104",
"reference": "41042bc7ab002487b876a0683fc8dce04ddce104",
"shasum": ""
},
"require": {
"ext-json": "*",
"guzzlehttp/promises": "^1.5.3 || ^2.0",
"guzzlehttp/psr7": "^1.9.1 || ^2.4.5",
"guzzlehttp/promises": "^1.5.3 || ^2.0.1",
"guzzlehttp/psr7": "^1.9.1 || ^2.5.1",
"php": "^7.2.5 || ^8.0",
"psr/http-client": "^1.0",
"symfony/deprecation-contracts": "^2.2 || ^3.0"
@ -181,11 +181,11 @@
"psr/http-client-implementation": "1.0"
},
"require-dev": {
"bamarni/composer-bin-plugin": "^1.8.1",
"bamarni/composer-bin-plugin": "^1.8.2",
"ext-curl": "*",
"php-http/client-integration-tests": "dev-master#2c025848417c1135031fdf9c728ee53d0a7ceaee as 3.0.999",
"php-http/message-factory": "^1.1",
"phpunit/phpunit": "^8.5.29 || ^9.5.23",
"phpunit/phpunit": "^8.5.36 || ^9.6.15",
"psr/log": "^1.1 || ^2.0 || ^3.0"
},
"suggest": {
@ -263,7 +263,7 @@
],
"support": {
"issues": "https://github.com/guzzle/guzzle/issues",
"source": "https://github.com/guzzle/guzzle/tree/7.7.0"
"source": "https://github.com/guzzle/guzzle/tree/7.8.1"
},
"funding": [
{
@ -279,33 +279,37 @@
"type": "tidelift"
}
],
"time": "2023-05-21T14:04:53+00:00"
"time": "2023-12-03T20:35:24+00:00"
},
{
"name": "guzzlehttp/promises",
"version": "1.5.3",
"version": "2.0.2",
"source": {
"type": "git",
"url": "https://github.com/guzzle/promises.git",
"reference": "67ab6e18aaa14d753cc148911d273f6e6cb6721e"
"reference": "bbff78d96034045e58e13dedd6ad91b5d1253223"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/guzzle/promises/zipball/67ab6e18aaa14d753cc148911d273f6e6cb6721e",
"reference": "67ab6e18aaa14d753cc148911d273f6e6cb6721e",
"url": "https://api.github.com/repos/guzzle/promises/zipball/bbff78d96034045e58e13dedd6ad91b5d1253223",
"reference": "bbff78d96034045e58e13dedd6ad91b5d1253223",
"shasum": ""
},
"require": {
"php": ">=5.5"
"php": "^7.2.5 || ^8.0"
},
"require-dev": {
"symfony/phpunit-bridge": "^4.4 || ^5.1"
"bamarni/composer-bin-plugin": "^1.8.2",
"phpunit/phpunit": "^8.5.36 || ^9.6.15"
},
"type": "library",
"extra": {
"bamarni-bin": {
"bin-links": true,
"forward-command": false
}
},
"autoload": {
"files": [
"src/functions_include.php"
],
"psr-4": {
"GuzzleHttp\\Promise\\": "src/"
}
@ -342,7 +346,7 @@
],
"support": {
"issues": "https://github.com/guzzle/promises/issues",
"source": "https://github.com/guzzle/promises/tree/1.5.3"
"source": "https://github.com/guzzle/promises/tree/2.0.2"
},
"funding": [
{
@ -358,20 +362,20 @@
"type": "tidelift"
}
],
"time": "2023-05-21T12:31:43+00:00"
"time": "2023-12-03T20:19:20+00:00"
},
{
"name": "guzzlehttp/psr7",
"version": "2.5.0",
"version": "2.6.2",
"source": {
"type": "git",
"url": "https://github.com/guzzle/psr7.git",
"reference": "b635f279edd83fc275f822a1188157ffea568ff6"
"reference": "45b30f99ac27b5ca93cb4831afe16285f57b8221"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/guzzle/psr7/zipball/b635f279edd83fc275f822a1188157ffea568ff6",
"reference": "b635f279edd83fc275f822a1188157ffea568ff6",
"url": "https://api.github.com/repos/guzzle/psr7/zipball/45b30f99ac27b5ca93cb4831afe16285f57b8221",
"reference": "45b30f99ac27b5ca93cb4831afe16285f57b8221",
"shasum": ""
},
"require": {
@ -385,9 +389,9 @@
"psr/http-message-implementation": "1.0"
},
"require-dev": {
"bamarni/composer-bin-plugin": "^1.8.1",
"bamarni/composer-bin-plugin": "^1.8.2",
"http-interop/http-factory-tests": "^0.9",
"phpunit/phpunit": "^8.5.29 || ^9.5.23"
"phpunit/phpunit": "^8.5.36 || ^9.6.15"
},
"suggest": {
"laminas/laminas-httphandlerrunner": "Emit PSR-7 responses"
@ -458,7 +462,7 @@
],
"support": {
"issues": "https://github.com/guzzle/psr7/issues",
"source": "https://github.com/guzzle/psr7/tree/2.5.0"
"source": "https://github.com/guzzle/psr7/tree/2.6.2"
},
"funding": [
{
@ -474,29 +478,29 @@
"type": "tidelift"
}
],
"time": "2023-04-17T16:11:26+00:00"
"time": "2023-12-03T20:05:35+00:00"
},
{
"name": "mtdowling/jmespath.php",
"version": "2.6.1",
"version": "2.7.0",
"source": {
"type": "git",
"url": "https://github.com/jmespath/jmespath.php.git",
"reference": "9b87907a81b87bc76d19a7fb2d61e61486ee9edb"
"reference": "bbb69a935c2cbb0c03d7f481a238027430f6440b"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/jmespath/jmespath.php/zipball/9b87907a81b87bc76d19a7fb2d61e61486ee9edb",
"reference": "9b87907a81b87bc76d19a7fb2d61e61486ee9edb",
"url": "https://api.github.com/repos/jmespath/jmespath.php/zipball/bbb69a935c2cbb0c03d7f481a238027430f6440b",
"reference": "bbb69a935c2cbb0c03d7f481a238027430f6440b",
"shasum": ""
},
"require": {
"php": "^5.4 || ^7.0 || ^8.0",
"php": "^7.2.5 || ^8.0",
"symfony/polyfill-mbstring": "^1.17"
},
"require-dev": {
"composer/xdebug-handler": "^1.4 || ^2.0",
"phpunit/phpunit": "^4.8.36 || ^7.5.15"
"composer/xdebug-handler": "^3.0.3",
"phpunit/phpunit": "^8.5.33"
},
"bin": [
"bin/jp.php"
@ -504,7 +508,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.6-dev"
"dev-master": "2.7-dev"
}
},
"autoload": {
@ -520,6 +524,11 @@
"MIT"
],
"authors": [
{
"name": "Graham Campbell",
"email": "hello@gjcampbell.co.uk",
"homepage": "https://github.com/GrahamCampbell"
},
{
"name": "Michael Dowling",
"email": "mtdowling@gmail.com",
@ -533,22 +542,22 @@
],
"support": {
"issues": "https://github.com/jmespath/jmespath.php/issues",
"source": "https://github.com/jmespath/jmespath.php/tree/2.6.1"
"source": "https://github.com/jmespath/jmespath.php/tree/2.7.0"
},
"time": "2021-06-14T00:11:39+00:00"
"time": "2023-08-25T10:54:48+00:00"
},
{
"name": "psr/http-client",
"version": "1.0.2",
"version": "1.0.3",
"source": {
"type": "git",
"url": "https://github.com/php-fig/http-client.git",
"reference": "0955afe48220520692d2d09f7ab7e0f93ffd6a31"
"reference": "bb5906edc1c324c9a05aa0873d40117941e5fa90"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/php-fig/http-client/zipball/0955afe48220520692d2d09f7ab7e0f93ffd6a31",
"reference": "0955afe48220520692d2d09f7ab7e0f93ffd6a31",
"url": "https://api.github.com/repos/php-fig/http-client/zipball/bb5906edc1c324c9a05aa0873d40117941e5fa90",
"reference": "bb5906edc1c324c9a05aa0873d40117941e5fa90",
"shasum": ""
},
"require": {
@ -585,9 +594,9 @@
"psr-18"
],
"support": {
"source": "https://github.com/php-fig/http-client/tree/1.0.2"
"source": "https://github.com/php-fig/http-client"
},
"time": "2023-04-10T20:12:12+00:00"
"time": "2023-09-23T14:17:50+00:00"
},
{
"name": "psr/http-factory",
@ -646,16 +655,16 @@
},
{
"name": "psr/http-message",
"version": "1.1",
"version": "2.0",
"source": {
"type": "git",
"url": "https://github.com/php-fig/http-message.git",
"reference": "cb6ce4845ce34a8ad9e68117c10ee90a29919eba"
"reference": "402d35bcb92c70c026d1a6a9883f06b2ead23d71"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/php-fig/http-message/zipball/cb6ce4845ce34a8ad9e68117c10ee90a29919eba",
"reference": "cb6ce4845ce34a8ad9e68117c10ee90a29919eba",
"url": "https://api.github.com/repos/php-fig/http-message/zipball/402d35bcb92c70c026d1a6a9883f06b2ead23d71",
"reference": "402d35bcb92c70c026d1a6a9883f06b2ead23d71",
"shasum": ""
},
"require": {
@ -664,7 +673,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.1.x-dev"
"dev-master": "2.0.x-dev"
}
},
"autoload": {
@ -679,7 +688,7 @@
"authors": [
{
"name": "PHP-FIG",
"homepage": "http://www.php-fig.org/"
"homepage": "https://www.php-fig.org/"
}
],
"description": "Common interface for HTTP messages",
@ -693,9 +702,9 @@
"response"
],
"support": {
"source": "https://github.com/php-fig/http-message/tree/1.1"
"source": "https://github.com/php-fig/http-message/tree/2.0"
},
"time": "2023-04-04T09:50:52+00:00"
"time": "2023-04-04T09:54:51+00:00"
},
{
"name": "ralouphie/getallheaders",
@ -743,25 +752,25 @@
},
{
"name": "symfony/deprecation-contracts",
"version": "v3.3.0",
"version": "v2.5.2",
"source": {
"type": "git",
"url": "https://github.com/symfony/deprecation-contracts.git",
"reference": "7c3aff79d10325257a001fcf92d991f24fc967cf"
"reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/7c3aff79d10325257a001fcf92d991f24fc967cf",
"reference": "7c3aff79d10325257a001fcf92d991f24fc967cf",
"url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/e8b495ea28c1d97b5e0c121748d6f9b53d075c66",
"reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66",
"shasum": ""
},
"require": {
"php": ">=8.1"
"php": ">=7.1"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-main": "3.4-dev"
"dev-main": "2.5-dev"
},
"thanks": {
"name": "symfony/contracts",
@ -790,7 +799,7 @@
"description": "A generic function and convention to trigger deprecation notices",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/deprecation-contracts/tree/v3.3.0"
"source": "https://github.com/symfony/deprecation-contracts/tree/v2.5.2"
},
"funding": [
{
@ -806,20 +815,20 @@
"type": "tidelift"
}
],
"time": "2023-05-23T14:45:45+00:00"
"time": "2022-01-02T09:53:40+00:00"
},
{
"name": "symfony/polyfill-mbstring",
"version": "v1.27.0",
"version": "v1.28.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-mbstring.git",
"reference": "8ad114f6b39e2c98a8b0e3bd907732c207c2b534"
"reference": "42292d99c55abe617799667f454222c54c60e229"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/8ad114f6b39e2c98a8b0e3bd907732c207c2b534",
"reference": "8ad114f6b39e2c98a8b0e3bd907732c207c2b534",
"url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/42292d99c55abe617799667f454222c54c60e229",
"reference": "42292d99c55abe617799667f454222c54c60e229",
"shasum": ""
},
"require": {
@ -834,7 +843,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-main": "1.27-dev"
"dev-main": "1.28-dev"
},
"thanks": {
"name": "symfony/polyfill",
@ -873,7 +882,7 @@
"shim"
],
"support": {
"source": "https://github.com/symfony/polyfill-mbstring/tree/v1.27.0"
"source": "https://github.com/symfony/polyfill-mbstring/tree/v1.28.0"
},
"funding": [
{
@ -889,7 +898,7 @@
"type": "tidelift"
}
],
"time": "2022-11-03T14:55:06+00:00"
"time": "2023-07-28T09:04:16+00:00"
}
],
"packages-dev": [],
@ -900,5 +909,5 @@
"prefer-lowest": false,
"platform": [],
"platform-dev": [],
"plugin-api-version": "2.3.0"
"plugin-api-version": "2.6.0"
}

2
packages/@uppy/companion/package.json
View file

@ -65,7 +65,7 @@
"redis": "4.2.0",
"serialize-error": "^2.1.0",
"serialize-javascript": "^6.0.0",
"tus-js-client": "^3.0.0",
"tus-js-client": "^3.1.3",
"validator": "^13.0.0",
"ws": "8.8.1"
},

2
packages/@uppy/compressor/package.json
View file

@ -22,7 +22,7 @@
"url": "git+https://github.com/transloadit/uppy.git"
},
"dependencies": {
"@transloadit/prettier-bytes": "^0.0.9",
"@transloadit/prettier-bytes": "^0.2.0",
"@uppy/utils": "workspace:^",
"compressorjs": "^1.1.1",
"preact": "^10.5.13",

2
packages/@uppy/core/package.json
View file

@ -23,7 +23,7 @@
"url": "git+https://github.com/transloadit/uppy.git"
},
"dependencies": {
"@transloadit/prettier-bytes": "0.0.9",
"@transloadit/prettier-bytes": "^0.2.0",
"@uppy/store-default": "workspace:^",
"@uppy/utils": "workspace:^",
"lodash": "^4.17.21",

1
packages/@uppy/core/src/Restricter.ts
View file

@ -1,6 +1,5 @@
/* eslint-disable @typescript-eslint/ban-ts-comment */
/* eslint-disable max-classes-per-file, class-methods-use-this */
// @ts-ignore untyped
import prettierBytes from '@transloadit/prettier-bytes'
// @ts-ignore untyped
import match from 'mime-match'

1
packages/@uppy/core/src/Uppy.test.ts
View file

@ -6,7 +6,6 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
import assert from 'node:assert'
import fs from 'node:fs'
import path from 'node:path'
// @ts-expect-error untyped
import prettierBytes from '@transloadit/prettier-bytes'
import Core from './index.ts'
import UIPlugin from './UIPlugin.ts'

5
packages/@uppy/core/tsconfig.build.json
View file

@ -5,6 +5,11 @@
"rootDir": "./src",
"resolveJsonModule": false,
"noImplicitAny": false,
"paths": {
"@uppy/store-default": ["../store-default/src/index.js"],
"@uppy/store-default/lib/*": ["../store-default/src/*"],
"@uppy/utils/lib/*": ["../utils/src/*"]
},
"skipLibCheck": true
},
"include": ["./src/**/*.*"],

7
packages/@uppy/core/tsconfig.json
View file

@ -2,7 +2,12 @@
"extends": "../../../tsconfig.shared",
"compilerOptions": {
"emitDeclarationOnly": false,
"noEmit": true
"noEmit": true,
"paths": {
"@uppy/store-default": ["../store-default/src/index.js"],
"@uppy/store-default/lib/*": ["../store-default/src/*"],
"@uppy/utils/lib/*": ["../utils/src/*"]
}
},
"include": ["./package.json", "./src/**/*.*"],
"references": [

2
packages/@uppy/dashboard/package.json
View file

@ -22,7 +22,7 @@
"url": "git+https://github.com/transloadit/uppy.git"
},
"dependencies": {
"@transloadit/prettier-bytes": "0.0.7",
"@transloadit/prettier-bytes": "^0.2.0",
"@uppy/informer": "workspace:^",
"@uppy/provider-views": "workspace:^",
"@uppy/status-bar": "workspace:^",

2
packages/@uppy/dashboard/src/components/FileItem/FileInfo/index.jsx
View file

@ -31,7 +31,7 @@ const renderFileName = (props) => {
const renderAuthor = (props) => {
const { author } = props.file.meta
const { providerName } = props.file.remote
const providerName = props.file.remote?.providerName
const dot = `\u00B7`
if (!author) {

6
packages/@uppy/dashboard/src/components/FileItem/index.scss
View file

@ -170,12 +170,6 @@
}
}
.uppy-Dashboard-Item.is-inprogress:not(.is-resumable) {
.uppy-Dashboard-Item-action--remove {
display: none;
}
}
.uppy-Dashboard-Item-errorDetails {
position: relative;
top: 0;

1
packages/@uppy/golden-retriever/package.json
View file

@ -23,7 +23,6 @@
"url": "git+https://github.com/transloadit/uppy.git"
},
"dependencies": {
"@transloadit/prettier-bytes": "0.0.9",
"@uppy/utils": "workspace:^",
"lodash": "^4.17.21"
},

1
packages/@uppy/locales/src/hr_HR.ts
View file

@ -92,6 +92,7 @@ hr_HR.strings = {
resumeUpload: 'Nastavi prijenos',
retry: 'Pokušaj ponovo',
retryUpload: 'Ponovno pokušaj prenijeti datoteku',
save: 'Spremi',
saveChanges: 'Spremi promjene',
selectX: {
'0': 'Izaberi datoteku',

3
packages/@uppy/locales/tsconfig.build.json
View file

@ -3,6 +3,9 @@
"compilerOptions": {
"outDir": "./lib",
"rootDir": "./src",
"paths": {
"@uppy/utils/lib/*": ["../utils/src/*"]
},
"skipLibCheck": true
},
"include": ["./src/**/*.*"],

3
packages/@uppy/locales/tsconfig.json
View file

@ -2,6 +2,9 @@
"extends": "../../../tsconfig.shared",
"compilerOptions": {
"emitDeclarationOnly": false,
"paths": {
"@uppy/utils/lib/*": ["../utils/src/*"]
},
"noEmit": true
},
"include": ["./package.json", "./src/**/*.*"],

2
packages/@uppy/status-bar/package.json
View file

@ -26,7 +26,7 @@
"url": "git+https://github.com/transloadit/uppy.git"
},
"dependencies": {
"@transloadit/prettier-bytes": "0.0.9",
"@transloadit/prettier-bytes": "^0.2.0",
"@uppy/utils": "workspace:^",
"classnames": "^2.2.6",
"preact": "^10.5.13"

2
packages/@uppy/tus/package.json
View file

@ -24,7 +24,7 @@
"dependencies": {
"@uppy/companion-client": "workspace:^",
"@uppy/utils": "workspace:^",
"tus-js-client": "^3.0.0"
"tus-js-client": "^3.1.3"
},
"devDependencies": {
"vitest": "^0.34.5"

44
private/js2ts/index.mjs
View file

@ -6,6 +6,7 @@
*/
import { opendir, readFile, open, writeFile, rm } from 'node:fs/promises'
import { createRequire } from 'node:module'
import { argv } from 'node:process'
import { basename, extname, join } from 'node:path'
import { existsSync } from 'node:fs'
@ -26,13 +27,34 @@ if (packageJSON.type !== 'module') {
throw new Error('Cannot convert non-ESM package to TS')
}
const references = Object.keys(packageJSON.dependencies || {})
.concat(Object.keys(packageJSON.peerDependencies || {}))
.concat(Object.keys(packageJSON.devDependencies || {}))
.filter((pkg) => pkg.startsWith('@uppy/'))
.map((pkg) => ({
path: `../${pkg.slice('@uppy/'.length)}/tsconfig.build.json`,
}))
const uppyDeps = new Set(
Object.keys(packageJSON.dependencies || {})
.concat(Object.keys(packageJSON.peerDependencies || {}))
.concat(Object.keys(packageJSON.devDependencies || {}))
.filter((pkg) => pkg.startsWith('@uppy/')),
)
// We want TS to check the source files so it doesn't use outdated (or missing) types:
const paths = Object.fromEntries(
(function* generatePaths() {
const require = createRequire(packageRoot)
for (const pkg of uppyDeps) {
const nickname = pkg.slice('@uppy/'.length)
// eslint-disable-next-line import/no-dynamic-require
const pkgJson = require(`../${nickname}/package.json`)
if (pkgJson.main) {
yield [
pkg,
[`../${nickname}/${pkgJson.main.replace(/^(\.\/)?lib\//, 'src/')}`],
]
}
yield [`${pkg}/lib/*`, [`../${nickname}/src/*`]]
}
})(),
)
const references = Array.from(uppyDeps, (pkg) => ({
path: `../${pkg.slice('@uppy/'.length)}/tsconfig.build.json`,
}))
const depsNotYetConvertedToTS = references.filter(
(ref) => !existsSync(new URL(ref.path, packageRoot)),
@ -93,6 +115,7 @@ await tsConfig.writeFile(
compilerOptions: {
emitDeclarationOnly: false,
noEmit: true,
paths,
},
include: ['./package.json', './src/**/*.*'],
references,
@ -110,10 +133,11 @@ await writeFile(
{
extends: '../../../tsconfig.shared',
compilerOptions: {
outDir: './lib',
rootDir: './src',
resolveJsonModule: false,
noImplicitAny: false,
outDir: './lib',
paths,
resolveJsonModule: false,
rootDir: './src',
skipLibCheck: true,
},
include: ['./src/**/*.*'],

36
yarn.lock
View file

@ -7718,17 +7718,10 @@ __metadata:
languageName: node
linkType: hard
"@transloadit/prettier-bytes@npm:0.0.7":
version: 0.0.7
resolution: "@transloadit/prettier-bytes@npm:0.0.7"
checksum: af075e1b2b045cac55d5ab854b5c94273ef7f4bd825f05fe578559465f206d2a1535343b50170252a9efb31ffdc2d6420e64eb32d2faeabeeb8b7d81d5d46ef0
languageName: node
linkType: hard
"@transloadit/prettier-bytes@npm:0.0.9, @transloadit/prettier-bytes@npm:^0.0.9":
version: 0.0.9
resolution: "@transloadit/prettier-bytes@npm:0.0.9"
checksum: efa5a723c41e7bce7ad17d1affe6a43209df857e17dc2b12a7c7bd6d3c921df8298086dbfb62ed740ca3e617d8c7f47485bb311adb637b20f2f75a28b08bac4f
"@transloadit/prettier-bytes@npm:^0.2.0":
version: 0.2.0
resolution: "@transloadit/prettier-bytes@npm:0.2.0"
checksum: 0faaeffc879754e18103bd576510d4349ec5253c2ebe846f7f8e52f2e9bc4c6877a9197adf4d2f196fa9b442a64cd43c5a742b5b51268e7f56bb3451299af1ce
languageName: node
linkType: hard
@ -9325,7 +9318,7 @@ __metadata:
serialize-error: ^2.1.0
serialize-javascript: ^6.0.0
supertest: 6.2.4
tus-js-client: ^3.0.0
tus-js-client: ^3.1.3
typescript: ~5.1
validator: ^13.0.0
ws: 8.8.1
@ -9338,7 +9331,7 @@ __metadata:
version: 0.0.0-use.local
resolution: "@uppy/compressor@workspace:packages/@uppy/compressor"
dependencies:
"@transloadit/prettier-bytes": ^0.0.9
"@transloadit/prettier-bytes": ^0.2.0
"@uppy/utils": "workspace:^"
compressorjs: ^1.1.1
preact: ^10.5.13
@ -9353,7 +9346,7 @@ __metadata:
version: 0.0.0-use.local
resolution: "@uppy/core@workspace:packages/@uppy/core"
dependencies:
"@transloadit/prettier-bytes": 0.0.9
"@transloadit/prettier-bytes": ^0.2.0
"@uppy/store-default": "workspace:^"
"@uppy/utils": "workspace:^"
lodash: ^4.17.21
@ -9369,7 +9362,7 @@ __metadata:
version: 0.0.0-use.local
resolution: "@uppy/dashboard@workspace:packages/@uppy/dashboard"
dependencies:
"@transloadit/prettier-bytes": 0.0.7
"@transloadit/prettier-bytes": ^0.2.0
"@uppy/google-drive": "workspace:^"
"@uppy/informer": "workspace:^"
"@uppy/provider-views": "workspace:^"
@ -9464,7 +9457,6 @@ __metadata:
version: 0.0.0-use.local
resolution: "@uppy/golden-retriever@workspace:packages/@uppy/golden-retriever"
dependencies:
"@transloadit/prettier-bytes": 0.0.9
"@uppy/utils": "workspace:^"
lodash: ^4.17.21
peerDependencies:
@ -9658,7 +9650,7 @@ __metadata:
version: 0.0.0-use.local
resolution: "@uppy/status-bar@workspace:packages/@uppy/status-bar"
dependencies:
"@transloadit/prettier-bytes": 0.0.9
"@transloadit/prettier-bytes": ^0.2.0
"@uppy/utils": "workspace:^"
classnames: ^2.2.6
preact: ^10.5.13
@ -9741,7 +9733,7 @@ __metadata:
dependencies:
"@uppy/companion-client": "workspace:^"
"@uppy/utils": "workspace:^"
tus-js-client: ^3.0.0
tus-js-client: ^3.1.3
vitest: ^0.34.5
peerDependencies:
"@uppy/core": "workspace:^"
@ -30143,9 +30135,9 @@ __metadata:
languageName: node
linkType: hard
"tus-js-client@npm:^3.0.0":
version: 3.0.0
resolution: "tus-js-client@npm:3.0.0"
"tus-js-client@npm:^3.1.3":
version: 3.1.3
resolution: "tus-js-client@npm:3.1.3"
dependencies:
buffer-from: ^1.1.2
combine-errors: ^3.0.3
@ -30154,7 +30146,7 @@ __metadata:
lodash.throttle: ^4.1.1
proper-lockfile: ^4.1.2
url-parse: ^1.5.7
checksum: dda7921a0d55f3a15535590adb6eb98edfbf6c88dfbcad9bf1013cfa16bc2244fb937ad1d6bc05f34005ee103da31ccbae5ca650d46dc23d6e653946994c9015
checksum: 6f25dbbdbe1de51f44688dfb9ee78cae8deb987ac0a8e5d7d3e09a52ed0a7bfa5e2c3e39e82f0913beb241da78ddf42bdcb4c44369ea57f7cf15fad17e5b954f
languageName: node
linkType: hard