From 7aee668ce426dbb95102f573d4750aba21864773 Mon Sep 17 00:00:00 2001 From: Merlijn Vos Date: Fri, 7 Jun 2024 10:02:57 +0200 Subject: [PATCH 1/7] @uppy/provider-views: fix wrong font for files (#5234) --- .../src/style/uppy-ProviderBrowser-viewType--list.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/@uppy/provider-views/src/style/uppy-ProviderBrowser-viewType--list.scss b/packages/@uppy/provider-views/src/style/uppy-ProviderBrowser-viewType--list.scss index 29d12d67a..6ad10f7f9 100644 --- a/packages/@uppy/provider-views/src/style/uppy-ProviderBrowser-viewType--list.scss +++ b/packages/@uppy/provider-views/src/style/uppy-ProviderBrowser-viewType--list.scss @@ -70,6 +70,7 @@ display: flex; align-items: center; color: inherit; + font-family: $font-family-base; // For better outline padding: 2px; From ce66e1259db8c9f3210f6f95e188a978d8e6201a Mon Sep 17 00:00:00 2001 From: Merlijn Vos Date: Mon, 10 Jun 2024 09:28:17 +0200 Subject: [PATCH 2/7] @uppy/transloadit: fix transloadit:result event (#5231) Co-authored-by:: Marius Kleidl --- packages/@uppy/transloadit/src/Assembly.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/@uppy/transloadit/src/Assembly.ts b/packages/@uppy/transloadit/src/Assembly.ts index 765639f88..de8ae1ff8 100644 --- a/packages/@uppy/transloadit/src/Assembly.ts +++ b/packages/@uppy/transloadit/src/Assembly.ts @@ -104,14 +104,14 @@ class TransloaditAssembly extends Emitter { this.#sse.addEventListener('assembly_upload_finished', (e) => { const file = JSON.parse(e.data) - this.emit('upload', file) this.status.uploads.push(file) + this.emit('upload', file) }) this.#sse.addEventListener('assembly_result_finished', (e) => { const [stepName, result] = JSON.parse(e.data) - this.emit('result', stepName, result) ;(this.status.results[stepName] ??= []).push(result) + this.emit('result', stepName, result) }) this.#sse.addEventListener('assembly_execution_progress', (e) => { From e73c5070954e58830e777045351bf97ae4efcfaa Mon Sep 17 00:00:00 2001 From: Samuel Date: Mon, 10 Jun 2024 15:35:26 +0200 Subject: [PATCH 3/7] Added translation string (it_IT) (#5237) --- packages/@uppy/locales/src/it_IT.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/@uppy/locales/src/it_IT.ts b/packages/@uppy/locales/src/it_IT.ts index a6d25140a..31030d8fd 100644 --- a/packages/@uppy/locales/src/it_IT.ts +++ b/packages/@uppy/locales/src/it_IT.ts @@ -91,6 +91,7 @@ it_IT.strings = { resumeUpload: "Riprendi l'upload", retry: 'Riprova', retryUpload: "Riprova l'upload", + save: 'Salva', saveChanges: 'Salva le modifiche', selectX: { '0': 'Seleziona %{smart_count}', From abf65eeb91b0ac3d12059a8f2ac5ccaa51573845 Mon Sep 17 00:00:00 2001 From: Artur Paikin Date: Mon, 10 Jun 2024 14:51:59 +0100 Subject: [PATCH 4/7] meta: Improve aws-node example readme (#4753) Co-authored-by: Antoine du Hamel --- examples/aws-nodejs/README.md | 102 ++++++++++++++------------ examples/aws-nodejs/public/drag.html | 104 --------------------------- 2 files changed, 55 insertions(+), 151 deletions(-) delete mode 100644 examples/aws-nodejs/public/drag.html diff --git a/examples/aws-nodejs/README.md b/examples/aws-nodejs/README.md index 6bc2f94b8..1fc8c7fb5 100644 --- a/examples/aws-nodejs/README.md +++ b/examples/aws-nodejs/README.md @@ -8,42 +8,67 @@ Express.js). It uses presigned URL at the backend level. It's assumed that you are familiar with AWS, at least, with the storage service (S3) and users & policies (IAM). -These instructions are **not fit for production** but tightening the security is +These instructions are **not fit for production**, tightening the security is out of the scope here. ### S3 Setup -- Create new S3 bucket in AWS (e.g. `aws-nodejs`). -- Add a bucket policy. +Assuming you’re trying to setup the user `MY-UPPY-USER` to put the uploaded +files to the bucket `MY-UPPY-BUCKET`, here’s how you can allow `MY-UPPY-USER` to +get STS Federated Token and upload files to `MY-UPPY-BUCKET`: - ```json - { - "Version": "2012-10-17", - "Statement": [ - { - "Sid": "PublicAccess", - "Effect": "Allow", - "Principal": "*", - "Action": "s3:GetObject", - "Resource": "arn:aws:s3:::aws-nodejs/*" - } - ] - } - ``` +1. Set CORS settings on `MY-UPPY-BUCKET` bucket: -- Make the S3 bucket public. -- Add CORS configuration. + ```json + [ + { + "AllowedHeaders": ["*"], + "AllowedMethods": ["GET", "PUT", "HEAD", "POST", "DELETE"], + "AllowedOrigins": ["*"], + "ExposeHeaders": ["ETag", "Location"] + } + ] + ``` - ```json - [ - { - "AllowedHeaders": ["*"], - "AllowedMethods": ["GET", "PUT", "HEAD", "POST", "DELETE"], - "AllowedOrigins": ["*"], - "ExposeHeaders": [] - } - ] - ``` +2. Add the following Policy to `MY-UPPY-BUCKET`: + + ```json + { + "Version": "2012-10-17", + "Statement": [ + { + "Sid": "MyMultipartPolicyStatement1", + "Effect": "Allow", + "Principal": { + "AWS": "arn:aws:iam::*:user/MY-UPPY-USER" + }, + "Action": [ + "s3:PutObject", + "s3:PutObjectAcl", + "s3:ListMultipartUploadParts", + "s3:AbortMultipartUpload" + ], + "Resource": "arn:aws:s3:::MY-UPPY-BUCKET/*" + } + ] + } + ``` + +3. Add the following Policy to `MY-UPPY-USER`: (if you don’t want to enable + signing on the client, you can skip this step) + ```json + { + "Version": "2012-10-17", + "Statement": [ + { + "Sid": "MyStsPolicyStatement1", + "Effect": "Allow", + "Action": ["sts:GetFederationToken"], + "Resource": ["arn:aws:sts::*:federated-user/*"] + } + ] + } + ``` ### AWS Credentials @@ -55,21 +80,6 @@ You may use existing AWS credentials or create a new user in the IAM page. [environment variables](https://docs.aws.amazon.com/sdk-for-javascript/v3/developer-guide/loading-node-credentials-environment.html) or a [credentials file in `~/.aws/credentials`](https://docs.aws.amazon.com/sdk-for-javascript/v3/developer-guide/setting-credentials-node.html). -- You will need at least `PutObject` and `PutObjectAcl` permissions. - -```json -{ - "Version": "2012-10-17", - "Statement": [ - { - "Sid": "VisualEditor0", - "Effect": "Allow", - "Action": ["s3:PutObject", "s3:PutObjectAcl"], - "Resource": "arn:aws:s3:::aws-nodejs/*" - } - ] -} -``` ## Prerequisites @@ -83,7 +93,7 @@ Add a `.env` file to the root directory and define the S3 bucket name and port variables like the example below: ``` -COMPANION_AWS_BUCKET=aws-nodejs +COMPANION_AWS_BUCKET=MY-UPPY-BUCKET COMPANION_AWS_REGION=… COMPANION_AWS_KEY=… COMPANION_AWS_SECRET=… @@ -104,6 +114,4 @@ corepack yarn workspace @uppy-example/aws-nodejs start Dashboard demo should now be available at http://localhost:8080. -You have also a Drag & Drop demo on http://localhost:8080/drag. - _Feel free to check how the demo works and feel free to open an issue._ diff --git a/examples/aws-nodejs/public/drag.html b/examples/aws-nodejs/public/drag.html deleted file mode 100644 index 5d0e77927..000000000 --- a/examples/aws-nodejs/public/drag.html +++ /dev/null @@ -1,104 +0,0 @@ - - - - - Uppy - - - -
-
-
-
-
Uploaded files:
-
    -
    - -
    - - From a89009dbf007b04caedfb84c7ef3fcc7e8bb1698 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 11 Jun 2024 08:36:55 +0000 Subject: [PATCH 5/7] Release: uppy@3.26.1 (#5242) | Package | Version | Package | Version | | -------------------- | ------- | -------------------- | ------- | | @uppy/locales | 3.5.4 | @uppy/transloadit | 3.7.1 | | @uppy/provider-views | 3.12.1 | uppy | 3.26.1 | - meta: Improve aws-node example readme (Artur Paikin / #4753) - @uppy/locales: Added translation string (it_IT) (Samuel / #5237) - @uppy/transloadit: fix transloadit:result event (Merlijn Vos / #5231) - @uppy/provider-views: fix wrong font for files (Merlijn Vos / #5234) --- BUNDLE-README.md | 2 +- CHANGELOG.md | 15 ++++ README.md | 84 +++++++++---------- examples/aws-nodejs/public/index.html | 4 +- examples/cdn-example/index.html | 6 +- .../uppy-with-companion/client/index.html | 4 +- packages/@uppy/locales/CHANGELOG.md | 7 ++ packages/@uppy/locales/package.json | 2 +- packages/@uppy/provider-views/CHANGELOG.md | 7 ++ packages/@uppy/provider-views/package.json | 2 +- packages/@uppy/transloadit/CHANGELOG.md | 7 ++ packages/@uppy/transloadit/package.json | 2 +- packages/uppy/package.json | 2 +- 13 files changed, 90 insertions(+), 54 deletions(-) diff --git a/BUNDLE-README.md b/BUNDLE-README.md index f1bf1c793..4fd4d7915 100644 --- a/BUNDLE-README.md +++ b/BUNDLE-README.md @@ -2,7 +2,7 @@ Hi, thanks for trying out the bundled version of the Uppy File Uploader. You can use this from a CDN -(``) +(``) or bundle it with your webapp. Note that the recommended way to use Uppy is to install it with yarn/npm and use diff --git a/CHANGELOG.md b/CHANGELOG.md index f1eaeced7..257c60206 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,21 @@ Please add your entries in this format: In the current stage we aim to release a new version at least every month. +## 3.26.1 + +Released: 2024-06-11 + +| Package | Version | Package | Version | +| -------------------- | ------- | -------------------- | ------- | +| @uppy/locales | 3.5.4 | @uppy/transloadit | 3.7.1 | +| @uppy/provider-views | 3.12.1 | uppy | 3.26.1 | + +- meta: Improve aws-node example readme (Artur Paikin / #4753) +- @uppy/locales: Added translation string (it_IT) (Samuel / #5237) +- @uppy/transloadit: fix transloadit:result event (Merlijn Vos / #5231) +- @uppy/provider-views: fix wrong font for files (Merlijn Vos / #5234) + + ## 3.26.0 Released: 2024-06-04 diff --git a/README.md b/README.md index 9ee95c03d..4d31e7666 100644 --- a/README.md +++ b/README.md @@ -79,7 +79,7 @@ npm install @uppy/core @uppy/dashboard @uppy/tus ``` Add CSS -[uppy.min.css](https://releases.transloadit.com/uppy/v3.26.0/uppy.min.css), +[uppy.min.css](https://releases.transloadit.com/uppy/v3.26.1/uppy.min.css), either to your HTML page’s `` or include in JS, if your bundler of choice supports it. @@ -94,7 +94,7 @@ object. ```html @@ -105,7 +105,7 @@ object. Uppy, Dashboard, Tus, - } from 'https://releases.transloadit.com/uppy/v3.26.0/uppy.min.mjs' + } from 'https://releases.transloadit.com/uppy/v3.26.1/uppy.min.mjs' const uppy = new Uppy() uppy.use(Dashboard, { target: '#files-drag-drop' }) @@ -240,7 +240,7 @@ If you’re using Uppy from CDN, those polyfills are already included in the legacy bundle, so no need to include anything additionally: ```html - + ``` ## FAQ @@ -347,21 +347,21 @@ Use Uppy in your project? darthf1fortriebfrederikhorsheocoijareymuhammadInam rettgerstmkabatekjukakoskiolemoignbtrice5idereal AndrwMbehnammodiBePo65bradedelmancamiloforerocommand-tab -craig-jenningsdavekissdenysdesignethanwillisfrobinsonjrichmeij -richartkeilpaescujmsandmartiuslimMartin005mskelton -mactavishzlafedogrockerjedwoodgeertclerxjasonbosco -ghasrfakhrirossngscherromanrobwilson1SxDxrefo -raulibanezluarmreman8519Pzocoppadmavilasomphillipalexander -pmusarajpedrofsplnetopatricklindsaypascalwengerterParsaArvanehPA +craig-jenningsdavekissdenysdesignethanwillisfrobinsonjrichartkeil +paescujrichmeijmsandmartiuslimMartin005mskelton +mactavishzlafedogrockerjedwoodjasonboscoghasrfakhri +geertclerxluarmrraulibanezrefoSxDxrobwilson1 +scherromanrossngrarteman8519Pzocoppadmavilasom +phillipalexanderpmusarajpedrofsplnetopatricklindsaypascalwengerter tcgjTashowstajstrayersjauldsteverob amaituquigebowaptikSpazzMarticusszhsergei-zelinsky -sebasegovia01sdebackersamuelcolburnfortunto2GNURubrart -milannakummkopinskymhulethrshmauricioribeiromatthewhartstonge -mjesuelemattfikmateuscruzmasumulu28masaokmartin-brennan -marcusforsbergmarcosthejewmperrandoonhatesercraigcryptic022 -Ozodbek1405leftdevelnil1511coreprocessnicojonestrungcva10a6tn -naveed-ahmadpleasespammelatermarton-laszlo-attilanavruzmmogzolshahimclt -mnafeesboudraachmiralken-kuroneuronet77netdown +sebasegovia01sdebackerRattonesamuelcolburnfortunto2GNURub +ken-kuromilannakummkopinskymhulethrshmauricioribeiro +matthewhartstongemjesuelemattfikmateuscruzmasumulu28masaok +martin-brennanmarcusforsbergmarcosthejewmperrandoonhateParsaArvanehPA +cryptic022Ozodbek1405leftdevelnil1511coreprocessnicojones +trungcva10a6tnnaveed-ahmadpleasespammelatermarton-laszlo-attilanavruzmmogzol +shahimcltmnafeesboudraachmiralneuronet77netdown mosi-khamaddy-jomdxiaohumagumbojx-zyfkode-ninja sontixyoujur-ngjohnmanjiro13jyoungbloodgreen-mikegaelicwinter francklfingulelliotsayesdzcpyJimmyLvzanzlender @@ -373,31 +373,31 @@ Use Uppy in your project? WIStudenttmaierTiarhaitwarlopdkisiccraigcbrunner codehero7386christianwengertcgoinglovecanvasbhc0b41avalla argghalfatvagreene-courseraaduh95-test-accountsartoshi-foot-daozackbloom -zlawson-utzachconneryafkariYehudaKremerardeoisCommanderRoot -czjcbush06Aarbelcfracspranceprattcmp -subvertallchrischarlybillaudCretezychaocellvinchungcartfisk -cyubryanjswiftbedgerottoeliOcsyoldarefbautista -emuellEdgarSantiago93sweetrojeetissDennisKofflardhoangsvit -davilima6akizorKaminskiDaniellCantabarmrboomerdanilat -danschalowdanmichaeloCruaierfunctinoamitporttekacs -Dogfaloalirezahiaalepisalexnjasmt3ahmadissa -adritasharmaAdrreiadityapatadiaadamvigneaultajh-sradamdottv -abannachsuperhawk610ajschmidt8wbaaronQuorafindbducharme -azizkazeembaayhankesiciogluavneetmalhotraatsawinash-jc-allen -apuyouarthurdennerAbourasstyndriaanthony0030andychongyz -andrii-bodnarsuperandrew213radarherekevin-west-10xkergekacsafiresharkstudios -kaspermeinematykaroljveltenmellow-fellowjmontoyaajcalonso -jbelejjszobodyjorgeepcjondewoojonathanarbelyjsanchez034 -Jokcychromacomaprofsmallpinemarc-mabeLucklj521lucax88x -lucaperretombrlouimdolphinigleleomelzerleods92 -galli-leodvirylarowlanleaanthonyhoangbitslabohkip81 -kyleparisielkebabkidonngIanVShuydodHussainAlkhalifah -HughbertDhiromi2424giacomocerquoneroenschggjungbgeoffappleford -gabiganamfuadscodesdtrucsferdiusafgallinariGkleinereva -epexaEnricoSottileelliotdickisontheJoeBizJmalesjessica-coursera -vithjanwiltsjanklimojamestiotiojcjmccleanJbithell -JakubHaladejjakemcallistergaejabongJacobMGEvansmazorussGreenJimmy -intenziveNaxYoishendyweb +zlawson-utzachconneryafkariYehudaKremersercraigardeois +CommanderRootczjcbush06Aarbelcfracsprance +prattcmpsubvertallchrischarlybillaudCretezychaocellvinchung +cartfiskcyubryanjswiftbedgerottoeliOcsyoldar +efbautistaemuellEdgarSantiago93sweetrojeetissDennisKofflard +hoangsvitdavilima6akizorKaminskiDaniellCantabarmrboomer +danilatdanschalowdanmichaeloCruaierfunctinoamitport +tekacsDogfaloalirezahiaalepisalexnjasmt3 +ahmadissaadritasharmaAdrreiadityapatadiaadamvigneaultajh-sr +adamdottvabannachsuperhawk610ajschmidt8wbaaronQuorafind +bducharmeazizkazeembaayhankesiciogluavneetmalhotraatsawin +ash-jc-allenapuyouarthurdennerAbourasstyndriaanthony0030 +andychongyzandrii-bodnarsuperandrew213radarherekevin-west-10xkergekacsa +firesharkstudioskaspermeinematykaroljveltenmellow-fellowjmontoyaa +jcalonsojbelejjszobodyjorgeepcjondewoojonathanarbely +jsanchez034Jokcychromacomaprofsmallpinemarc-mabeLucklj521 +lucax88xlucaperretombrlouimdolphinigleleomelzer +leods92galli-leodvirylarowlanleaanthonyhoangbits +labohkip81kyleparisielkebabkidonngIanVShuydod +HussainAlkhalifahHughbertDhiromi2424giacomocerquoneroenschggjungb +geoffapplefordgabiganamfuadscodesdtrucsferdiusafgallinari +GkleinerevaepexaEnricoSottileelliotdickisontheJoeBizJmales +jessica-courseravithjanwiltsjanklimojamestiotiojcjmcclean +JbithellJakubHaladejjakemcallistergaejabongJacobMGEvansmazoruss +GreenJimmyintenziveNaxYoishendyweb diff --git a/examples/aws-nodejs/public/index.html b/examples/aws-nodejs/public/index.html index 172a3e4d0..884d3b7b6 100644 --- a/examples/aws-nodejs/public/index.html +++ b/examples/aws-nodejs/public/index.html @@ -4,7 +4,7 @@ Uppy – AWS upload example @@ -16,7 +16,7 @@ Uppy, Dashboard, AwsS3, - } from 'https://releases.transloadit.com/uppy/v3.26.0/uppy.min.mjs' + } from 'https://releases.transloadit.com/uppy/v3.26.1/uppy.min.mjs' /** * This generator transforms a deep object into URL-encodable pairs * to work with `URLSearchParams` on the client and `body-parser` on the server. diff --git a/examples/cdn-example/index.html b/examples/cdn-example/index.html index f9519d965..f00a344c3 100644 --- a/examples/cdn-example/index.html +++ b/examples/cdn-example/index.html @@ -5,7 +5,7 @@ @@ -19,7 +19,7 @@ Dashboard, Webcam, Tus, - } from 'https://releases.transloadit.com/uppy/v3.26.0/uppy.min.mjs' + } from 'https://releases.transloadit.com/uppy/v3.26.1/uppy.min.mjs' const uppy = new Uppy({ debug: true, autoProceed: false }) .use(Dashboard, { trigger: '#uppyModalOpener' }) @@ -34,7 +34,7 @@