Browse Source

Release: uppy@4.0.0-beta.11 (#5243)


| Package              |       Version | Package              |       Version |
| -------------------- | ------------- | -------------------- | ------------- |
| @uppy/aws-s3         |  4.0.0-beta.6 | @uppy/react          |  4.0.0-beta.6 |
| @uppy/locales        |  4.0.0-beta.3 | @uppy/transloadit    |  4.0.0-beta.8 |
| @uppy/provider-views |  4.0.0-beta.8 | uppy                 | 4.0.0-beta.11 |

- docs: clarify assemblyOptions for @uppy/transloadit (Merlijn Vos / #5226)
- @uppy/react: remove `react:` prefix from `id` & allow `id` as a prop (Merlijn Vos / #5228)
- docs: correct allowedMetaFields (Merlijn Vos / #5227)
- docs: remove `extraData` note from migration guide (Mikael Finstad / #5219)
- meta: fix AWS test suite (Antoine du Hamel / #5229)




| 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)
github-actions[bot] 10 months ago
parent
commit
36c15a3d57

+ 1 - 1
BUNDLE-README.md

@@ -2,7 +2,7 @@
 
 
 Hi, thanks for trying out the bundled version of the Uppy File Uploader. You can
 Hi, thanks for trying out the bundled version of the Uppy File Uploader. You can
 use this from a CDN
 use this from a CDN
-(`<script src="https://releases.transloadit.com/uppy/v4.0.0-beta.10/uppy.min.js"></script>`)
+(`<script src="https://releases.transloadit.com/uppy/v4.0.0-beta.11/uppy.min.js"></script>`)
 or bundle it with your webapp.
 or bundle it with your webapp.
 
 
 Note that the recommended way to use Uppy is to install it with yarn/npm and use
 Note that the recommended way to use Uppy is to install it with yarn/npm and use

+ 32 - 0
CHANGELOG.md

@@ -12,6 +12,23 @@ Please add your entries in this format:
 
 
 In the current stage we aim to release a new version at least every month.
 In the current stage we aim to release a new version at least every month.
 
 
+## 4.0.0-beta.11
+
+Released: 2024-06-11
+
+| Package              |       Version | Package              |       Version |
+| -------------------- | ------------- | -------------------- | ------------- |
+| @uppy/aws-s3         |  4.0.0-beta.6 | @uppy/react          |  4.0.0-beta.6 |
+| @uppy/locales        |  4.0.0-beta.3 | @uppy/transloadit    |  4.0.0-beta.8 |
+| @uppy/provider-views |  4.0.0-beta.8 | uppy                 | 4.0.0-beta.11 |
+
+- docs: clarify assemblyOptions for @uppy/transloadit (Merlijn Vos / #5226)
+- @uppy/react: remove `react:` prefix from `id` & allow `id` as a prop (Merlijn Vos / #5228)
+- docs: correct allowedMetaFields (Merlijn Vos / #5227)
+- docs: remove `extraData` note from migration guide (Mikael Finstad / #5219)
+- meta: fix AWS test suite (Antoine du Hamel / #5229)
+
+
 ## 4.0.0-beta.10
 ## 4.0.0-beta.10
 
 
 Released: 2024-06-04
 Released: 2024-06-04
@@ -420,6 +437,21 @@ Released: 2024-03-28
 - @uppy/vue: [v4.x] remove manual types (Antoine du Hamel / #4803)
 - @uppy/vue: [v4.x] remove manual types (Antoine du Hamel / #4803)
 - meta: prepare release workflow for beta versions (Antoine du Hamel)
 - meta: prepare release workflow for beta versions (Antoine du Hamel)
 
 
+## 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
 ## 3.26.0
 
 
 Released: 2024-06-04
 Released: 2024-06-04

+ 3 - 3
README.md

@@ -79,7 +79,7 @@ npm install @uppy/core @uppy/dashboard @uppy/tus
 ```
 ```
 
 
 Add CSS
 Add CSS
-[uppy.min.css](https://releases.transloadit.com/uppy/v4.0.0-beta.10/uppy.min.css),
+[uppy.min.css](https://releases.transloadit.com/uppy/v4.0.0-beta.11/uppy.min.css),
 either to your HTML page’s `<head>` or include in JS, if your bundler of choice
 either to your HTML page’s `<head>` or include in JS, if your bundler of choice
 supports it.
 supports it.
 
 
@@ -94,7 +94,7 @@ object.
 ```html
 ```html
 <!-- 1. Add CSS to `<head>` -->
 <!-- 1. Add CSS to `<head>` -->
 <link
 <link
-  href="https://releases.transloadit.com/uppy/v4.0.0-beta.10/uppy.min.css"
+  href="https://releases.transloadit.com/uppy/v4.0.0-beta.11/uppy.min.css"
   rel="stylesheet"
   rel="stylesheet"
 />
 />
 
 
@@ -105,7 +105,7 @@ object.
     Uppy,
     Uppy,
     Dashboard,
     Dashboard,
     Tus,
     Tus,
-  } from 'https://releases.transloadit.com/uppy/v4.0.0-beta.10/uppy.min.mjs'
+  } from 'https://releases.transloadit.com/uppy/v4.0.0-beta.11/uppy.min.mjs'
 
 
   const uppy = new Uppy()
   const uppy = new Uppy()
   uppy.use(Dashboard, { target: '#files-drag-drop' })
   uppy.use(Dashboard, { target: '#files-drag-drop' })

+ 58 - 50
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
 It's assumed that you are familiar with AWS, at least, with the storage service
 (S3) and users & policies (IAM).
 (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.
 out of the scope here.
 
 
 ### S3 Setup
 ### S3 Setup
 
 
-- Create new S3 bucket in AWS (e.g. `aws-nodejs`).
-- Add a bucket policy.
-
-  ```json
-  {
-    "Version": "2012-10-17",
-    "Statement": [
-      {
-        "Sid": "PublicAccess",
-        "Effect": "Allow",
-        "Principal": "*",
-        "Action": "s3:GetObject",
-        "Resource": "arn:aws:s3:::aws-nodejs/*"
-      }
-    ]
-  }
-  ```
-
-- Make the S3 bucket public.
-- Add CORS configuration.
-
-  ```json
-  [
-    {
-      "AllowedHeaders": ["*"],
-      "AllowedMethods": ["GET", "PUT", "HEAD", "POST", "DELETE"],
-      "AllowedOrigins": ["*"],
-      "ExposeHeaders": []
-    }
-  ]
-  ```
+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`:
+
+1. Set CORS settings on `MY-UPPY-BUCKET` bucket:
+
+   ```json
+   [
+     {
+       "AllowedHeaders": ["*"],
+       "AllowedMethods": ["GET", "PUT", "HEAD", "POST", "DELETE"],
+       "AllowedOrigins": ["*"],
+       "ExposeHeaders": ["ETag", "Location"]
+     }
+   ]
+   ```
+
+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
 ### 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)
   [environment variables](https://docs.aws.amazon.com/sdk-for-javascript/v3/developer-guide/loading-node-credentials-environment.html)
   or a
   or a
   [credentials file in `~/.aws/credentials`](https://docs.aws.amazon.com/sdk-for-javascript/v3/developer-guide/setting-credentials-node.html).
   [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
 ## 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:
 variables like the example below:
 
 
 ```
 ```
-COMPANION_AWS_BUCKET=aws-nodejs
+COMPANION_AWS_BUCKET=MY-UPPY-BUCKET
 COMPANION_AWS_REGION=…
 COMPANION_AWS_REGION=…
 COMPANION_AWS_KEY=…
 COMPANION_AWS_KEY=…
 COMPANION_AWS_SECRET=…
 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.
 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._
 _Feel free to check how the demo works and feel free to open an issue._

+ 2 - 2
examples/aws-nodejs/public/drag.html

@@ -4,7 +4,7 @@
     <meta charset="utf-8" />
     <meta charset="utf-8" />
     <title>Uppy</title>
     <title>Uppy</title>
     <link
     <link
-      href="https://releases.transloadit.com/uppy/v4.0.0-beta.10/uppy.min.css"
+      href="https://releases.transloadit.com/uppy/v4.0.0-beta.11/uppy.min.css"
       rel="stylesheet"
       rel="stylesheet"
     />
     />
   </head>
   </head>
@@ -22,7 +22,7 @@
           DragDrop,
           DragDrop,
           ProgressBar,
           ProgressBar,
           AwsS3,
           AwsS3,
-        } from 'https://releases.transloadit.com/uppy/v4.0.0-beta.10/uppy.min.mjs'
+        } from 'https://releases.transloadit.com/uppy/v4.0.0-beta.11/uppy.min.mjs'
 
 
         // Function for displaying uploaded files
         // Function for displaying uploaded files
         const onUploadSuccess = (elForUploadedFiles) => (file, response) => {
         const onUploadSuccess = (elForUploadedFiles) => (file, response) => {

+ 2 - 2
examples/aws-nodejs/public/index.html

@@ -4,7 +4,7 @@
     <meta charset="utf-8" />
     <meta charset="utf-8" />
     <title>Uppy – AWS upload example</title>
     <title>Uppy – AWS upload example</title>
     <link
     <link
-      href="https://releases.transloadit.com/uppy/v4.0.0-beta.10/uppy.min.css"
+      href="https://releases.transloadit.com/uppy/v4.0.0-beta.11/uppy.min.css"
       rel="stylesheet"
       rel="stylesheet"
     />
     />
   </head>
   </head>
@@ -16,7 +16,7 @@
         Uppy,
         Uppy,
         Dashboard,
         Dashboard,
         AwsS3,
         AwsS3,
-      } from 'https://releases.transloadit.com/uppy/v4.0.0-beta.10/uppy.min.mjs'
+      } from 'https://releases.transloadit.com/uppy/v4.0.0-beta.11/uppy.min.mjs'
       /**
       /**
        * This generator transforms a deep object into URL-encodable pairs
        * This generator transforms a deep object into URL-encodable pairs
        * to work with `URLSearchParams` on the client and `body-parser` on the server.
        * to work with `URLSearchParams` on the client and `body-parser` on the server.

+ 2 - 2
examples/cdn-example/index.html

@@ -5,7 +5,7 @@
     <meta charset="UTF-8" />
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <link
     <link
-      href="https://releases.transloadit.com/uppy/v4.0.0-beta.10/uppy.min.css"
+      href="https://releases.transloadit.com/uppy/v4.0.0-beta.11/uppy.min.css"
       rel="stylesheet"
       rel="stylesheet"
     />
     />
   </head>
   </head>
@@ -19,7 +19,7 @@
         Dashboard,
         Dashboard,
         Webcam,
         Webcam,
         Tus,
         Tus,
-      } from 'https://releases.transloadit.com/uppy/v4.0.0-beta.10/uppy.min.mjs'
+      } from 'https://releases.transloadit.com/uppy/v4.0.0-beta.11/uppy.min.mjs'
 
 
       const uppy = new Uppy({ debug: true, autoProceed: false })
       const uppy = new Uppy({ debug: true, autoProceed: false })
         .use(Dashboard, { trigger: '#uppyModalOpener' })
         .use(Dashboard, { trigger: '#uppyModalOpener' })

+ 2 - 2
examples/uppy-with-companion/client/index.html

@@ -5,7 +5,7 @@
     <meta charset="UTF-8" />
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <link
     <link
-      href="https://releases.transloadit.com/uppy/v4.0.0-beta.10/uppy.min.css"
+      href="https://releases.transloadit.com/uppy/v4.0.0-beta.11/uppy.min.css"
       rel="stylesheet"
       rel="stylesheet"
     />
     />
   </head>
   </head>
@@ -19,7 +19,7 @@
         Instagram,
         Instagram,
         GoogleDrive,
         GoogleDrive,
         Tus,
         Tus,
-      } from 'https://releases.transloadit.com/uppy/v4.0.0-beta.10/uppy.min.mjs'
+      } from 'https://releases.transloadit.com/uppy/v4.0.0-beta.11/uppy.min.mjs'
 
 
       const uppy = new Uppy({ debug: true, autoProceed: false })
       const uppy = new Uppy({ debug: true, autoProceed: false })
         .use(Dashboard, { trigger: '#uppyModalOpener' })
         .use(Dashboard, { trigger: '#uppyModalOpener' })

+ 1 - 1
packages/@uppy/aws-s3/package.json

@@ -1,7 +1,7 @@
 {
 {
   "name": "@uppy/aws-s3",
   "name": "@uppy/aws-s3",
   "description": "Upload to Amazon S3 with Uppy",
   "description": "Upload to Amazon S3 with Uppy",
-  "version": "4.0.0-beta.5",
+  "version": "4.0.0-beta.6",
   "license": "MIT",
   "license": "MIT",
   "main": "lib/index.js",
   "main": "lib/index.js",
   "type": "module",
   "type": "module",

+ 53 - 64
packages/@uppy/locales/CHANGELOG.md

@@ -2,124 +2,116 @@
 
 
 ## 4.0.0-beta.2
 ## 4.0.0-beta.2
 
 
-Released: 2024-06-04
-Included in: Uppy v4.0.0-beta.10
+Released: 2024-06-04 Included in: Uppy v4.0.0-beta.10
 
 
 - @uppy/locales: remove hacks for legacy bundle (Mikael Finstad / #5200)
 - @uppy/locales: remove hacks for legacy bundle (Mikael Finstad / #5200)
 
 
+## 3.5.4
+
+Released: 2024-06-11 Included in: Uppy v3.26.1
+
+- @uppy/locales: Added translation string (it_IT) (Samuel / #5237)
+
 ## 3.5.3
 ## 3.5.3
 
 
-Released: 2024-05-03
-Included in: Uppy v3.25.1
+Released: 2024-05-03 Included in: Uppy v3.25.1
 
 
-- @uppy/locales: Update ru_RU locale  (Uladzislau Bodryi / #5120)
+- @uppy/locales: Update ru_RU locale (Uladzislau Bodryi / #5120)
 
 
 ## 3.5.2
 ## 3.5.2
 
 
-Released: 2024-02-20
-Included in: Uppy v3.22.1
+Released: 2024-02-20 Included in: Uppy v3.22.1
 
 
 - @uppy/locales: update vi_VN translation (David Nguyen / #4930)
 - @uppy/locales: update vi_VN translation (David Nguyen / #4930)
 
 
 ## 3.5.1
 ## 3.5.1
 
 
-Released: 2024-02-19
-Included in: Uppy v3.22.0
+Released: 2024-02-19 Included in: Uppy v3.22.0
 
 
 - @uppy/locales: fix "save" button translation in hr_hr.ts (žan žlender / #4830)
 - @uppy/locales: fix "save" button translation in hr_hr.ts (žan žlender / #4830)
 
 
 ## 3.5.0
 ## 3.5.0
 
 
-Released: 2023-11-24
-Included in: Uppy v3.20.0
+Released: 2023-11-24 Included in: Uppy v3.20.0
 
 
 - @uppy/locales: Add missing translations to de_DE (Leonhard Melzer / #4800)
 - @uppy/locales: Add missing translations to de_DE (Leonhard Melzer / #4800)
 - @uppy/locales: use TypeScript for source files (Antoine du Hamel / #4779)
 - @uppy/locales: use TypeScript for source files (Antoine du Hamel / #4779)
 
 
 ## 3.4.0
 ## 3.4.0
 
 
-Released: 2023-11-08
-Included in: Uppy v3.19.0
+Released: 2023-11-08 Included in: Uppy v3.19.0
 
 
 - @uppy/locales: locales: add ca_ES (ordago / #4772)
 - @uppy/locales: locales: add ca_ES (ordago / #4772)
 
 
 ## 3.3.1
 ## 3.3.1
 
 
-Released: 2023-09-18
-Included in: Uppy v3.16.0
+Released: 2023-09-18 Included in: Uppy v3.16.0
 
 
 - @uppy/locales: Feature/updating i18n farsi (Parsa Arvaneh / #4638)
 - @uppy/locales: Feature/updating i18n farsi (Parsa Arvaneh / #4638)
 
 
 ## 3.2.4
 ## 3.2.4
 
 
-Released: 2023-07-20
-Included in: Uppy v3.13.0
+Released: 2023-07-20 Included in: Uppy v3.13.0
 
 
 - @uppy/locales: update zh_TW translation (5idereal / #4583)
 - @uppy/locales: update zh_TW translation (5idereal / #4583)
 
 
 ## 3.2.3
 ## 3.2.3
 
 
-Released: 2023-07-13
-Included in: Uppy v3.12.0
+Released: 2023-07-13 Included in: Uppy v3.12.0
 
 
 - @uppy/locales: fix expression and spelling errors in es_ES (Rubén / #4567)
 - @uppy/locales: fix expression and spelling errors in es_ES (Rubén / #4567)
-- @uppy/locales: Add missing pt-BR locales for ImageEditor plugin (Mateus Cruz / #4558)
+- @uppy/locales: Add missing pt-BR locales for ImageEditor plugin (Mateus Cruz /
+  #4558)
 
 
 ## 3.2.2
 ## 3.2.2
 
 
-Released: 2023-06-19
-Included in: Uppy v3.10.0
+Released: 2023-06-19 Included in: Uppy v3.10.0
 
 
 - @uppy/locales: update `fr_FR.js` (Samuel De Backer / #4499)
 - @uppy/locales: update `fr_FR.js` (Samuel De Backer / #4499)
 
 
 ## 3.2.0
 ## 3.2.0
 
 
-Released: 2023-04-18
-Included in: Uppy v3.8.0
+Released: 2023-04-18 Included in: Uppy v3.8.0
 
 
-- @uppy/core,@uppy/locales,@uppy/provider-views: User feedback adding recursive folders take 2 (Mikael Finstad / #4399)
+- @uppy/core,@uppy/locales,@uppy/provider-views: User feedback adding recursive
+  folders take 2 (Mikael Finstad / #4399)
 
 
 ## 3.1.0
 ## 3.1.0
 
 
-Released: 2023-04-04
-Included in: Uppy v3.7.0
+Released: 2023-04-04 Included in: Uppy v3.7.0
 
 
 - @uppy/locales: locales: add es_MX (Kevin van Zonneveld / #4393)
 - @uppy/locales: locales: add es_MX (Kevin van Zonneveld / #4393)
 - @uppy/locales: locales: add hi_IN (Kevin van Zonneveld / #4391)
 - @uppy/locales: locales: add hi_IN (Kevin van Zonneveld / #4391)
 
 
 ## 3.0.7
 ## 3.0.7
 
 
-Released: 2023-03-07
-Included in: Uppy v3.6.0
+Released: 2023-03-07 Included in: Uppy v3.6.0
 
 
 - @uppy/locales: add missing entries after build (Murderlon)
 - @uppy/locales: add missing entries after build (Murderlon)
 
 
 ## 3.0.6
 ## 3.0.6
 
 
-Released: 2023-02-13
-Included in: Uppy v3.5.0
+Released: 2023-02-13 Included in: Uppy v3.5.0
 
 
 - @uppy/locales: Update de_DE.js (Jörn Velten / #4297)
 - @uppy/locales: Update de_DE.js (Jörn Velten / #4297)
-- @uppy/locales: minor enhancements and typo fixes for the hungarian translation (KergeKacsa / #4282)
+- @uppy/locales: minor enhancements and typo fixes for the hungarian translation
+  (KergeKacsa / #4282)
 
 
 ## 3.0.5
 ## 3.0.5
 
 
-Released: 2023-01-26
-Included in: Uppy v3.4.0
+Released: 2023-01-26 Included in: Uppy v3.4.0
 
 
 - @uppy/locales: update zh_TW.js (5idereal / #4270)
 - @uppy/locales: update zh_TW.js (5idereal / #4270)
 
 
 ## 3.0.4
 ## 3.0.4
 
 
-Released: 2022-11-10
-Included in: Uppy v3.3.0
+Released: 2022-11-10 Included in: Uppy v3.3.0
 
 
 - @uppy/locales: Fix UZ locale (Merlijn Vos / #4178)
 - @uppy/locales: Fix UZ locale (Merlijn Vos / #4178)
 
 
 ## 3.0.2
 ## 3.0.2
 
 
-Released: 2022-10-19
-Included in: Uppy v3.2.0
+Released: 2022-10-19 Included in: Uppy v3.2.0
 
 
 - @uppy/locales: Fix duplicate keys in UK_UA.js (Murderlon)
 - @uppy/locales: Fix duplicate keys in UK_UA.js (Murderlon)
 - @uppy/locales: Add missing Ukrainian locale entries (Andrii Bodnar / #4145)
 - @uppy/locales: Add missing Ukrainian locale entries (Andrii Bodnar / #4145)
@@ -127,74 +119,71 @@ Included in: Uppy v3.2.0
 
 
 ## 3.0.1
 ## 3.0.1
 
 
-Released: 2022-09-25
-Included in: Uppy v3.1.0
+Released: 2022-09-25 Included in: Uppy v3.1.0
 
 
 - @uppy/locales: Create uz_UZ (Ozodbek1405 / #4114)
 - @uppy/locales: Create uz_UZ (Ozodbek1405 / #4114)
-- @uppy/audio,@uppy/aws-s3-multipart,@uppy/aws-s3,@uppy/box,@uppy/companion-client,@uppy/companion,@uppy/compressor,@uppy/core,@uppy/dashboard,@uppy/drag-drop,@uppy/drop-target,@uppy/dropbox,@uppy/facebook,@uppy/file-input,@uppy/form,@uppy/golden-retriever,@uppy/google-drive,@uppy/image-editor,@uppy/informer,@uppy/instagram,@uppy/locales,@uppy/onedrive,@uppy/progress-bar,@uppy/provider-views,@uppy/react,@uppy/redux-dev-tools,@uppy/remote-sources,@uppy/screen-capture,@uppy/status-bar,@uppy/store-default,@uppy/store-redux,@uppy/svelte,@uppy/thumbnail-generator,@uppy/transloadit,@uppy/tus,@uppy/unsplash,@uppy/url,@uppy/utils,@uppy/vue,@uppy/webcam,@uppy/xhr-upload,@uppy/zoom: add missing entries to changelog for individual packages (Antoine du Hamel / #4092)
+- @uppy/audio,@uppy/aws-s3-multipart,@uppy/aws-s3,@uppy/box,@uppy/companion-client,@uppy/companion,@uppy/compressor,@uppy/core,@uppy/dashboard,@uppy/drag-drop,@uppy/drop-target,@uppy/dropbox,@uppy/facebook,@uppy/file-input,@uppy/form,@uppy/golden-retriever,@uppy/google-drive,@uppy/image-editor,@uppy/informer,@uppy/instagram,@uppy/locales,@uppy/onedrive,@uppy/progress-bar,@uppy/provider-views,@uppy/react,@uppy/redux-dev-tools,@uppy/remote-sources,@uppy/screen-capture,@uppy/status-bar,@uppy/store-default,@uppy/store-redux,@uppy/svelte,@uppy/thumbnail-generator,@uppy/transloadit,@uppy/tus,@uppy/unsplash,@uppy/url,@uppy/utils,@uppy/vue,@uppy/webcam,@uppy/xhr-upload,@uppy/zoom:
+  add missing entries to changelog for individual packages (Antoine du Hamel /
+  #4092)
 
 
 ## 3.0.0
 ## 3.0.0
 
 
-Released: 2022-08-22
-Included in: Uppy v3.0.0
+Released: 2022-08-22 Included in: Uppy v3.0.0
 
 
 - Switch to ESM
 - Switch to ESM
 
 
 ## 3.0.0-beta.4
 ## 3.0.0-beta.4
 
 
-Released: 2022-08-16
-Included in: Uppy v3.0.0-beta.5
+Released: 2022-08-16 Included in: Uppy v3.0.0-beta.5
 
 
-- @uppy/locales: Add compressor string translation to Japanese locale (kenken / #3963)
+- @uppy/locales: Add compressor string translation to Japanese locale (kenken /
+  #3963)
 
 
 ## 2.1.1
 ## 2.1.1
 
 
-Released: 2022-07-06
-Included in: Uppy v2.12.2
+Released: 2022-07-06 Included in: Uppy v2.12.2
 
 
-- @uppy/locales,@uppy/transloadit: Fix undefined error in in onTusError (Merlijn Vos / #3848)
-- @uppy/locales: Add missing translations and reorder nl_NL locale (Kasper Meinema / #3839)
+- @uppy/locales,@uppy/transloadit: Fix undefined error in in onTusError (Merlijn
+  Vos / #3848)
+- @uppy/locales: Add missing translations and reorder nl_NL locale (Kasper
+  Meinema / #3839)
 
 
 ## 2.1.0
 ## 2.1.0
 
 
-Released: 2022-05-14
-Included in: Uppy v2.10.0
+Released: 2022-05-14 Included in: Uppy v2.10.0
 
 
-- @uppy/locales: Add `save` translation to Spanish locale (Juan Carlos Alonso / #3678)
+- @uppy/locales: Add `save` translation to Spanish locale (Juan Carlos Alonso /
+  #3678)
 - @uppy/locales: refactor to ESM (Antoine du Hamel / #3707)
 - @uppy/locales: refactor to ESM (Antoine du Hamel / #3707)
 
 
 ## 2.0.9
 ## 2.0.9
 
 
-Released: 2022-04-27
-Included in: Uppy v2.9.4
+Released: 2022-04-27 Included in: Uppy v2.9.4
 
 
 - @uppy/locales: Plural translation in cs_CZ local (JakubHaladej / #3666)
 - @uppy/locales: Plural translation in cs_CZ local (JakubHaladej / #3666)
 
 
 ## 2.0.8
 ## 2.0.8
 
 
-Released: 2022-03-16
-Included in: Uppy v2.8.0
+Released: 2022-03-16 Included in: Uppy v2.8.0
 
 
 - @uppy/locales: compressor cleanup (Antoine du Hamel / #3531)
 - @uppy/locales: compressor cleanup (Antoine du Hamel / #3531)
 - @uppy/locales: Update ru_RU.js (Sobakin Sviatoslav / #3529)
 - @uppy/locales: Update ru_RU.js (Sobakin Sviatoslav / #3529)
 
 
 ## 2.0.7
 ## 2.0.7
 
 
-Released: 2022-03-02
-Included in: Uppy v2.7.0
+Released: 2022-03-02 Included in: Uppy v2.7.0
 
 
 - @uppy/locales: Update zh_CN.js (linxunzyf / #3513)
 - @uppy/locales: Update zh_CN.js (linxunzyf / #3513)
 
 
 ## 2.0.6
 ## 2.0.6
 
 
-Released: 2022-02-14
-Included in: Uppy v2.5.0
+Released: 2022-02-14 Included in: Uppy v2.5.0
 
 
 - @uppy/locales: Add "save" to fr_FR.js (Charly Billaud / #3395)
 - @uppy/locales: Add "save" to fr_FR.js (Charly Billaud / #3395)
 
 
 ## 2.0.4
 ## 2.0.4
 
 
-Released: 2021-12-07
-Included in: Uppy v2.3.0
+Released: 2021-12-07 Included in: Uppy v2.3.0
 
 
-- @uppy/aws-s3,@uppy/box,@uppy/core,@uppy/dashboard,@uppy/drag-drop,@uppy/dropbox,@uppy/facebook,@uppy/file-input,@uppy/google-drive,@uppy/image-editor,@uppy/instagram,@uppy/locales,@uppy/onedrive,@uppy/screen-capture,@uppy/status-bar,@uppy/thumbnail-generator,@uppy/transloadit,@uppy/url,@uppy/webcam,@uppy/xhr-upload,@uppy/zoom: Refactor locale scripts & generate types and docs (Merlijn Vos / #3276)
+- @uppy/aws-s3,@uppy/box,@uppy/core,@uppy/dashboard,@uppy/drag-drop,@uppy/dropbox,@uppy/facebook,@uppy/file-input,@uppy/google-drive,@uppy/image-editor,@uppy/instagram,@uppy/locales,@uppy/onedrive,@uppy/screen-capture,@uppy/status-bar,@uppy/thumbnail-generator,@uppy/transloadit,@uppy/url,@uppy/webcam,@uppy/xhr-upload,@uppy/zoom:
+  Refactor locale scripts & generate types and docs (Merlijn Vos / #3276)

+ 1 - 1
packages/@uppy/locales/package.json

@@ -1,7 +1,7 @@
 {
 {
   "name": "@uppy/locales",
   "name": "@uppy/locales",
   "description": "Uppy language packs",
   "description": "Uppy language packs",
-  "version": "4.0.0-beta.2",
+  "version": "4.0.0-beta.3",
   "license": "MIT",
   "license": "MIT",
   "type": "module",
   "type": "module",
   "keywords": [
   "keywords": [

+ 1 - 0
packages/@uppy/locales/src/it_IT.ts

@@ -91,6 +91,7 @@ it_IT.strings = {
   resumeUpload: "Riprendi l'upload",
   resumeUpload: "Riprendi l'upload",
   retry: 'Riprova',
   retry: 'Riprova',
   retryUpload: "Riprova l'upload",
   retryUpload: "Riprova l'upload",
+  save: 'Salva',
   saveChanges: 'Salva le modifiche',
   saveChanges: 'Salva le modifiche',
   selectX: {
   selectX: {
     '0': 'Seleziona %{smart_count}',
     '0': 'Seleziona %{smart_count}',

+ 9 - 0
packages/@uppy/provider-views/CHANGELOG.md

@@ -1,5 +1,6 @@
 # @uppy/provider-views
 # @uppy/provider-views
 
 
+<<<<<<< HEAD
 ## 4.0.0-beta.7
 ## 4.0.0-beta.7
 
 
 Released: 2024-06-04
 Released: 2024-06-04
@@ -24,6 +25,14 @@ Included in: Uppy v4.0.0-beta.1
 - @uppy/provider-views: fix `super.toggleCheckbox` bug (Mikael Finstad / #5004)
 - @uppy/provider-views: fix `super.toggleCheckbox` bug (Mikael Finstad / #5004)
 - @uppy/core,@uppy/provider-views: Fix breadcrumbs (Evgenia Karunus / #4986)
 - @uppy/core,@uppy/provider-views: Fix breadcrumbs (Evgenia Karunus / #4986)
 
 
+=======
+## 3.12.1
+
+Released: 2024-06-11
+Included in: Uppy v3.26.1
+
+- @uppy/provider-views: fix wrong font for files (Merlijn Vos / #5234)
+>>>>>>> a89009dbf007b04caedfb84c7ef3fcc7e8bb1698
 
 
 ## 3.12.0
 ## 3.12.0
 
 

+ 1 - 1
packages/@uppy/provider-views/package.json

@@ -1,7 +1,7 @@
 {
 {
   "name": "@uppy/provider-views",
   "name": "@uppy/provider-views",
   "description": "View library for Uppy remote provider plugins.",
   "description": "View library for Uppy remote provider plugins.",
-  "version": "4.0.0-beta.7",
+  "version": "4.0.0-beta.8",
   "license": "MIT",
   "license": "MIT",
   "main": "lib/index.js",
   "main": "lib/index.js",
   "style": "dist/style.min.css",
   "style": "dist/style.min.css",

+ 1 - 0
packages/@uppy/provider-views/src/style/uppy-ProviderBrowser-viewType--list.scss

@@ -70,6 +70,7 @@
     display: flex;
     display: flex;
     align-items: center;
     align-items: center;
     color: inherit;
     color: inherit;
+    font-family: $font-family-base;
 
 
     // For better outline
     // For better outline
     padding: 2px;
     padding: 2px;

+ 7 - 0
packages/@uppy/react/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @uppy/react
 # @uppy/react
 
 
+## 4.0.0-beta.6
+
+Released: 2024-06-11
+Included in: Uppy v4.0.0-beta.11
+
+- @uppy/react: remove `react:` prefix from `id` & allow `id` as a prop (Merlijn Vos / #5228)
+
 ## 4.0.0-beta.4
 ## 4.0.0-beta.4
 
 
 Released: 2024-04-29
 Released: 2024-04-29

+ 1 - 1
packages/@uppy/react/package.json

@@ -1,7 +1,7 @@
 {
 {
   "name": "@uppy/react",
   "name": "@uppy/react",
   "description": "React component wrappers around Uppy's official UI plugins.",
   "description": "React component wrappers around Uppy's official UI plugins.",
-  "version": "4.0.0-beta.5",
+  "version": "4.0.0-beta.6",
   "license": "MIT",
   "license": "MIT",
   "main": "lib/index.js",
   "main": "lib/index.js",
   "type": "module",
   "type": "module",

+ 94 - 96
packages/@uppy/transloadit/CHANGELOG.md

@@ -2,253 +2,251 @@
 
 
 ## 4.0.0-beta.6
 ## 4.0.0-beta.6
 
 
-Released: 2024-05-23
-Included in: Uppy v4.0.0-beta.9
+Released: 2024-05-23 Included in: Uppy v4.0.0-beta.9
 
 
-- @uppy/transloadit: do not cancel assembly when removing all files (Merlijn Vos / #5191)
+- @uppy/transloadit: do not cancel assembly when removing all files (Merlijn Vos
+  / #5191)
 
 
 ## 4.0.0-beta.2
 ## 4.0.0-beta.2
 
 
-Released: 2024-04-11
-Included in: Uppy v4.0.0-beta.2
+Released: 2024-04-11 Included in: Uppy v4.0.0-beta.2
 
 
 - @uppy/transloadit: remove deprecated options (Merlijn Vos / #5056)
 - @uppy/transloadit: remove deprecated options (Merlijn Vos / #5056)
 
 
 ## 4.0.0-beta.1
 ## 4.0.0-beta.1
 
 
-Released: 2024-03-28
-Included in: Uppy v4.0.0-beta.1
+Released: 2024-03-28 Included in: Uppy v4.0.0-beta.1
 
 
 - @uppy/transloadit: migrate to TS (Merlijn Vos / #4987)
 - @uppy/transloadit: migrate to TS (Merlijn Vos / #4987)
 
 
+## 3.7.1
+
+Released: 2024-06-11 Included in: Uppy v3.26.1
+
+- @uppy/transloadit: fix transloadit:result event (Merlijn Vos / #5231)
+
 ## 3.7.0
 ## 3.7.0
 
 
-Released: 2024-06-04
-Included in: Uppy v3.26.0
+Released: 2024-06-04 Included in: Uppy v3.26.0
 
 
-- @uppy/transloadit: remove `updateNumberOfFilesInAssembly` (Merlijn Vos / #5202)
+- @uppy/transloadit: remove `updateNumberOfFilesInAssembly` (Merlijn Vos /
+  #5202)
 
 
 ## 3.6.2
 ## 3.6.2
 
 
-Released: 2024-05-23
-Included in: Uppy v3.25.5
+Released: 2024-05-23 Included in: Uppy v3.25.5
 
 
-- @uppy/transloadit: do not cancel assembly when removing all files (Merlijn Vos / #5191)
+- @uppy/transloadit: do not cancel assembly when removing all files (Merlijn Vos
+  / #5191)
 
 
 ## 3.6.0
 ## 3.6.0
 
 
-Released: 2024-03-27
-Included in: Uppy v3.24.0
+Released: 2024-03-27 Included in: Uppy v3.24.0
 
 
 - @uppy/transloadit: migrate to TS (Merlijn Vos / #4987)
 - @uppy/transloadit: migrate to TS (Merlijn Vos / #4987)
 
 
 ## 3.5.0
 ## 3.5.0
 
 
-Released: 2024-02-19
-Included in: Uppy v3.22.0
+Released: 2024-02-19 Included in: Uppy v3.22.0
 
 
 - @uppy/transloadit: add `clientname` option (marius / #4920)
 - @uppy/transloadit: add `clientname` option (marius / #4920)
 
 
 ## 3.3.0
 ## 3.3.0
 
 
-Released: 2023-09-05
-Included in: Uppy v3.15.0
+Released: 2023-09-05 Included in: Uppy v3.15.0
 
 
 - @uppy/transloadit: Emit assembly progress events (Marius / #4603)
 - @uppy/transloadit: Emit assembly progress events (Marius / #4603)
 - @uppy/transloadit: remove Socket.io (Antoine du Hamel / #4281)
 - @uppy/transloadit: remove Socket.io (Antoine du Hamel / #4281)
 
 
 ## 3.2.1
 ## 3.2.1
 
 
-Released: 2023-08-15
-Included in: Uppy v3.14.0
+Released: 2023-08-15 Included in: Uppy v3.14.0
 
 
-- @uppy/aws-s3-multipart,@uppy/aws-s3,@uppy/companion,@uppy/transloadit,@uppy/xhr-upload: use uppercase HTTP method names (Antoine du Hamel / #4612)
+- @uppy/aws-s3-multipart,@uppy/aws-s3,@uppy/companion,@uppy/transloadit,@uppy/xhr-upload:
+  use uppercase HTTP method names (Antoine du Hamel / #4612)
 
 
 ## 3.2.0
 ## 3.2.0
 
 
-Released: 2023-07-13
-Included in: Uppy v3.12.0
+Released: 2023-07-13 Included in: Uppy v3.12.0
 
 
 - @uppy/transloadit: fix error message (Antoine du Hamel / #4572)
 - @uppy/transloadit: fix error message (Antoine du Hamel / #4572)
 - @uppy/transloadit: implement Server-sent event API (Antoine du Hamel / #4098)
 - @uppy/transloadit: implement Server-sent event API (Antoine du Hamel / #4098)
 
 
 ## 3.1.6
 ## 3.1.6
 
 
-Released: 2023-06-19
-Included in: Uppy v3.10.0
+Released: 2023-06-19 Included in: Uppy v3.10.0
 
 
-- @uppy/transloadit: ensure `fields` is not nullish when there no uploaded files (Antoine du Hamel / #4487)
+- @uppy/transloadit: ensure `fields` is not nullish when there no uploaded files
+  (Antoine du Hamel / #4487)
 
 
 ## 3.1.5
 ## 3.1.5
 
 
-Released: 2023-05-15
-Included in: Uppy v3.9.1
+Released: 2023-05-15 Included in: Uppy v3.9.1
 
 
-- @uppy/transloadit: clean up event listener to prevent cancelled assemblies (Merlijn Vos / #4447)
+- @uppy/transloadit: clean up event listener to prevent cancelled assemblies
+  (Merlijn Vos / #4447)
 
 
 ## 3.1.4
 ## 3.1.4
 
 
-Released: 2023-05-02
-Included in: Uppy v3.9.0
+Released: 2023-05-02 Included in: Uppy v3.9.0
 
 
-- @uppy/transloadit: Reset `tus` key in the file on error, so retried files are re-uploaded (Artur Paikin / #4421)
+- @uppy/transloadit: Reset `tus` key in the file on error, so retried files are
+  re-uploaded (Artur Paikin / #4421)
 
 
 ## 3.1.2
 ## 3.1.2
 
 
-Released: 2023-04-04
-Included in: Uppy v3.7.0
+Released: 2023-04-04 Included in: Uppy v3.7.0
 
 
 - @uppy/transloadit: fix socket error message (Artur Paikin / #4352)
 - @uppy/transloadit: fix socket error message (Artur Paikin / #4352)
 
 
 ## 3.1.1
 ## 3.1.1
 
 
-Released: 2023-02-13
-Included in: Uppy v3.5.0
+Released: 2023-02-13 Included in: Uppy v3.5.0
 
 
 - @uppy/transloadit: fix `assemblyOptions` option (Antoine du Hamel / #4316)
 - @uppy/transloadit: fix `assemblyOptions` option (Antoine du Hamel / #4316)
 
 
 ## 3.1.0
 ## 3.1.0
 
 
-Released: 2023-01-26
-Included in: Uppy v3.4.0
+Released: 2023-01-26 Included in: Uppy v3.4.0
 
 
-- @uppy/transloadit: introduce `assemblyOptions`, deprecate other options (Merlijn Vos / #4059)
+- @uppy/transloadit: introduce `assemblyOptions`, deprecate other options
+  (Merlijn Vos / #4059)
 
 
 ## 3.0.2
 ## 3.0.2
 
 
-Released: 2022-09-25
-Included in: Uppy v3.1.0
+Released: 2022-09-25 Included in: Uppy v3.1.0
 
 
-- @uppy/audio,@uppy/aws-s3-multipart,@uppy/aws-s3,@uppy/box,@uppy/companion-client,@uppy/companion,@uppy/compressor,@uppy/core,@uppy/dashboard,@uppy/drag-drop,@uppy/drop-target,@uppy/dropbox,@uppy/facebook,@uppy/file-input,@uppy/form,@uppy/golden-retriever,@uppy/google-drive,@uppy/image-editor,@uppy/informer,@uppy/instagram,@uppy/locales,@uppy/onedrive,@uppy/progress-bar,@uppy/provider-views,@uppy/react,@uppy/redux-dev-tools,@uppy/remote-sources,@uppy/screen-capture,@uppy/status-bar,@uppy/store-default,@uppy/store-redux,@uppy/svelte,@uppy/thumbnail-generator,@uppy/transloadit,@uppy/tus,@uppy/unsplash,@uppy/url,@uppy/utils,@uppy/vue,@uppy/webcam,@uppy/xhr-upload,@uppy/zoom: add missing entries to changelog for individual packages (Antoine du Hamel / #4092)
+- @uppy/audio,@uppy/aws-s3-multipart,@uppy/aws-s3,@uppy/box,@uppy/companion-client,@uppy/companion,@uppy/compressor,@uppy/core,@uppy/dashboard,@uppy/drag-drop,@uppy/drop-target,@uppy/dropbox,@uppy/facebook,@uppy/file-input,@uppy/form,@uppy/golden-retriever,@uppy/google-drive,@uppy/image-editor,@uppy/informer,@uppy/instagram,@uppy/locales,@uppy/onedrive,@uppy/progress-bar,@uppy/provider-views,@uppy/react,@uppy/redux-dev-tools,@uppy/remote-sources,@uppy/screen-capture,@uppy/status-bar,@uppy/store-default,@uppy/store-redux,@uppy/svelte,@uppy/thumbnail-generator,@uppy/transloadit,@uppy/tus,@uppy/unsplash,@uppy/url,@uppy/utils,@uppy/vue,@uppy/webcam,@uppy/xhr-upload,@uppy/zoom:
+  add missing entries to changelog for individual packages (Antoine du Hamel /
+  #4092)
 
 
 ## 3.0.1
 ## 3.0.1
 
 
-Released: 2022-08-30
-Included in: Uppy v3.0.1
+Released: 2022-08-30 Included in: Uppy v3.0.1
 
 
 - @uppy/transloadit: improve deprecation notice (Antoine du Hamel / #4056)
 - @uppy/transloadit: improve deprecation notice (Antoine du Hamel / #4056)
 
 
 ## 3.0.0
 ## 3.0.0
 
 
-Released: 2022-08-22
-Included in: Uppy v3.0.0
+Released: 2022-08-22 Included in: Uppy v3.0.0
 
 
 - Switch to ESM
 - Switch to ESM
 
 
 ## 3.0.0-beta.4
 ## 3.0.0-beta.4
 
 
-Released: 2022-08-03
-Included in: Uppy v3.0.0-beta.4
+Released: 2022-08-03 Included in: Uppy v3.0.0-beta.4
 
 
-- @uppy/transloadit: remove static properties in favor of exports (Antoine du Hamel / #3927)
+- @uppy/transloadit: remove static properties in favor of exports (Antoine du
+  Hamel / #3927)
 
 
 ## 3.0.0-beta
 ## 3.0.0-beta
 
 
-Released: 2022-05-30
-Included in: Uppy v3.0.0-beta
+Released: 2022-05-30 Included in: Uppy v3.0.0-beta
 
 
 - @uppy/transloadit: remove IE 10 hack (Antoine du Hamel / #3777)
 - @uppy/transloadit: remove IE 10 hack (Antoine du Hamel / #3777)
 
 
 ## 2.3.6
 ## 2.3.6
 
 
-Released: 2022-08-02
-Included in: Uppy v2.13.2
+Released: 2022-08-02 Included in: Uppy v2.13.2
 
 
-- @uppy/transloadit: send `assembly-cancelled` only once (Antoine du Hamel / #3937)
+- @uppy/transloadit: send `assembly-cancelled` only once (Antoine du Hamel /
+  #3937)
 
 
 ## 2.3.5
 ## 2.3.5
 
 
-Released: 2022-07-27
-Included in: Uppy v2.13.1
+Released: 2022-07-27 Included in: Uppy v2.13.1
 
 
-- @uppy/transloadit: cancel assemblies when all its files have been removed (Antoine du Hamel / #3893)
+- @uppy/transloadit: cancel assemblies when all its files have been removed
+  (Antoine du Hamel / #3893)
 
 
 ## 2.3.4
 ## 2.3.4
 
 
-Released: 2022-07-18
-Included in: Uppy v2.13.0
+Released: 2022-07-18 Included in: Uppy v2.13.0
 
 
-- @uppy/transloadit: fix outdated file ids and incorrect usage of files (Merlijn Vos / #3886)
+- @uppy/transloadit: fix outdated file ids and incorrect usage of files (Merlijn
+  Vos / #3886)
 
 
 ## 2.3.3
 ## 2.3.3
 
 
-Released: 2022-07-11
-Included in: Uppy v2.12.3
+Released: 2022-07-11 Included in: Uppy v2.12.3
 
 
-- @uppy/transloadit: fix TypeError when file is cancelled asynchronously (Antoine du Hamel / #3872)
-- @uppy/robodog,@uppy/transloadit: use modern syntax to simplify code (Antoine du Hamel / #3873)
+- @uppy/transloadit: fix TypeError when file is cancelled asynchronously
+  (Antoine du Hamel / #3872)
+- @uppy/robodog,@uppy/transloadit: use modern syntax to simplify code (Antoine
+  du Hamel / #3873)
 
 
 ## 2.3.2
 ## 2.3.2
 
 
-Released: 2022-07-06
-Included in: Uppy v2.12.2
+Released: 2022-07-06 Included in: Uppy v2.12.2
 
 
-- @uppy/locales,@uppy/transloadit: Fix undefined error in in onTusError (Merlijn Vos / #3848)
+- @uppy/locales,@uppy/transloadit: Fix undefined error in in onTusError (Merlijn
+  Vos / #3848)
 
 
 ## 2.3.1
 ## 2.3.1
 
 
-Released: 2022-06-09
-Included in: Uppy v2.12.1
+Released: 2022-06-09 Included in: Uppy v2.12.1
 
 
 - @uppy/transloadit: fix `COMPANION_PATTERN` export (Antoine du Hamel / #3820)
 - @uppy/transloadit: fix `COMPANION_PATTERN` export (Antoine du Hamel / #3820)
 
 
 ## 2.3.0
 ## 2.3.0
 
 
-Released: 2022-05-30
-Included in: Uppy v2.11.0
+Released: 2022-05-30 Included in: Uppy v2.11.0
 
 
-- @uppy/angular,@uppy/audio,@uppy/aws-s3-multipart,@uppy/aws-s3,@uppy/box,@uppy/core,@uppy/dashboard,@uppy/drag-drop,@uppy/dropbox,@uppy/facebook,@uppy/file-input,@uppy/form,@uppy/golden-retriever,@uppy/google-drive,@uppy/image-editor,@uppy/informer,@uppy/instagram,@uppy/onedrive,@uppy/progress-bar,@uppy/react,@uppy/redux-dev-tools,@uppy/robodog,@uppy/screen-capture,@uppy/status-bar,@uppy/store-default,@uppy/store-redux,@uppy/thumbnail-generator,@uppy/transloadit,@uppy/tus,@uppy/unsplash,@uppy/url,@uppy/vue,@uppy/webcam,@uppy/xhr-upload,@uppy/zoom: doc: update bundler recommendation (Antoine du Hamel / #3763)
+- @uppy/angular,@uppy/audio,@uppy/aws-s3-multipart,@uppy/aws-s3,@uppy/box,@uppy/core,@uppy/dashboard,@uppy/drag-drop,@uppy/dropbox,@uppy/facebook,@uppy/file-input,@uppy/form,@uppy/golden-retriever,@uppy/google-drive,@uppy/image-editor,@uppy/informer,@uppy/instagram,@uppy/onedrive,@uppy/progress-bar,@uppy/react,@uppy/redux-dev-tools,@uppy/robodog,@uppy/screen-capture,@uppy/status-bar,@uppy/store-default,@uppy/store-redux,@uppy/thumbnail-generator,@uppy/transloadit,@uppy/tus,@uppy/unsplash,@uppy/url,@uppy/vue,@uppy/webcam,@uppy/xhr-upload,@uppy/zoom:
+  doc: update bundler recommendation (Antoine du Hamel / #3763)
 - @uppy/transloadit: refactor to ESM (Antoine du Hamel / #3725)
 - @uppy/transloadit: refactor to ESM (Antoine du Hamel / #3725)
-- @uppy/transloadit: transloadit: propagate error details when creating Assembly fails (Renée Kooi / #3794)
+- @uppy/transloadit: transloadit: propagate error details when creating Assembly
+  fails (Renée Kooi / #3794)
 
 
 ## 2.2.0
 ## 2.2.0
 
 
-Released: 2022-05-14
-Included in: Uppy v2.10.0
+Released: 2022-05-14 Included in: Uppy v2.10.0
 
 
-- @uppy/aws-s3-multipart,@uppy/aws-s3,@uppy/core,@uppy/react,@uppy/transloadit,@uppy/tus,@uppy/xhr-upload: proposal: Cancel assemblies optional (Mikael Finstad / #3575)
-- @uppy/transloadit: add rate limiting for assembly creation and status polling (Antoine du Hamel / #3718)
+- @uppy/aws-s3-multipart,@uppy/aws-s3,@uppy/core,@uppy/react,@uppy/transloadit,@uppy/tus,@uppy/xhr-upload:
+  proposal: Cancel assemblies optional (Mikael Finstad / #3575)
+- @uppy/transloadit: add rate limiting for assembly creation and status polling
+  (Antoine du Hamel / #3718)
 
 
 ## 2.1.5
 ## 2.1.5
 
 
-Released: 2022-04-27
-Included in: Uppy v2.9.4
+Released: 2022-04-27 Included in: Uppy v2.9.4
 
 
 - @uppy/transloadit: improve fetch error handling (Antoine du Hamel / #3637)
 - @uppy/transloadit: improve fetch error handling (Antoine du Hamel / #3637)
 
 
 ## 2.1.4
 ## 2.1.4
 
 
-Released: 2022-04-07
-Included in: Uppy v2.9.2
+Released: 2022-04-07 Included in: Uppy v2.9.2
 
 
-- @uppy/aws-s3,@uppy/companion-client,@uppy/transloadit,@uppy/utils: Propagate `isNetworkError` through error wrappers (Renée Kooi / #3620)
+- @uppy/aws-s3,@uppy/companion-client,@uppy/transloadit,@uppy/utils: Propagate
+  `isNetworkError` through error wrappers (Renée Kooi / #3620)
 
 
 ## 2.1.2
 ## 2.1.2
 
 
-Released: 2022-03-24
-Included in: Uppy v2.9.0
+Released: 2022-03-24 Included in: Uppy v2.9.0
 
 
-- @uppy/transloadit: close assembly if upload is cancelled (Antoine du Hamel / #3591)
+- @uppy/transloadit: close assembly if upload is cancelled (Antoine du Hamel /
+  #3591)
 
 
 ## 2.1.1
 ## 2.1.1
 
 
-Released: 2022-01-12
-Included in: Uppy v2.4.1
+Released: 2022-01-12 Included in: Uppy v2.4.1
 
 
-- @uppy/transloadit: fix handling of Tus errors and rate limiting (Antoine du Hamel / #3429)
+- @uppy/transloadit: fix handling of Tus errors and rate limiting (Antoine du
+  Hamel / #3429)
 - @uppy/transloadit: simplify `#onTusError` (Antoine du Hamel / #3419)
 - @uppy/transloadit: simplify `#onTusError` (Antoine du Hamel / #3419)
 
 
 ## 2.1.0
 ## 2.1.0
 
 
-Released: 2022-01-10
-Included in: Uppy v2.4.0
+Released: 2022-01-10 Included in: Uppy v2.4.0
 
 
-- @uppy/transloadit: ignore rate limiting errors when polling (Antoine du Hamel / #3418)
-- @uppy/transloadit: better defaults for rate limiting (Antoine du Hamel / #3414)
+- @uppy/transloadit: ignore rate limiting errors when polling (Antoine du Hamel
+  / #3418)
+- @uppy/transloadit: better defaults for rate limiting (Antoine du Hamel /
+  #3414)
 
 
 ## 2.0.5
 ## 2.0.5
 
 
-Released: 2021-12-07
-Included in: Uppy v2.3.0
+Released: 2021-12-07 Included in: Uppy v2.3.0
 
 
-- @uppy/aws-s3,@uppy/box,@uppy/core,@uppy/dashboard,@uppy/drag-drop,@uppy/dropbox,@uppy/facebook,@uppy/file-input,@uppy/google-drive,@uppy/image-editor,@uppy/instagram,@uppy/locales,@uppy/onedrive,@uppy/screen-capture,@uppy/status-bar,@uppy/thumbnail-generator,@uppy/transloadit,@uppy/url,@uppy/webcam,@uppy/xhr-upload,@uppy/zoom: Refactor locale scripts & generate types and docs (Merlijn Vos / #3276)
+- @uppy/aws-s3,@uppy/box,@uppy/core,@uppy/dashboard,@uppy/drag-drop,@uppy/dropbox,@uppy/facebook,@uppy/file-input,@uppy/google-drive,@uppy/image-editor,@uppy/instagram,@uppy/locales,@uppy/onedrive,@uppy/screen-capture,@uppy/status-bar,@uppy/thumbnail-generator,@uppy/transloadit,@uppy/url,@uppy/webcam,@uppy/xhr-upload,@uppy/zoom:
+  Refactor locale scripts & generate types and docs (Merlijn Vos / #3276)

+ 1 - 1
packages/@uppy/transloadit/package.json

@@ -1,7 +1,7 @@
 {
 {
   "name": "@uppy/transloadit",
   "name": "@uppy/transloadit",
   "description": "The Transloadit plugin can be used to upload files to Transloadit for all kinds of processing, such as transcoding video, resizing images, zipping/unzipping, and more",
   "description": "The Transloadit plugin can be used to upload files to Transloadit for all kinds of processing, such as transcoding video, resizing images, zipping/unzipping, and more",
-  "version": "4.0.0-beta.7",
+  "version": "4.0.0-beta.8",
   "license": "MIT",
   "license": "MIT",
   "main": "lib/index.js",
   "main": "lib/index.js",
   "type": "module",
   "type": "module",

+ 2 - 2
packages/@uppy/transloadit/src/Assembly.ts

@@ -104,14 +104,14 @@ class TransloaditAssembly extends Emitter {
 
 
     this.#sse.addEventListener('assembly_upload_finished', (e) => {
     this.#sse.addEventListener('assembly_upload_finished', (e) => {
       const file = JSON.parse(e.data)
       const file = JSON.parse(e.data)
-      this.emit('upload', file)
       this.status.uploads.push(file)
       this.status.uploads.push(file)
+      this.emit('upload', file)
     })
     })
 
 
     this.#sse.addEventListener('assembly_result_finished', (e) => {
     this.#sse.addEventListener('assembly_result_finished', (e) => {
       const [stepName, result] = JSON.parse(e.data)
       const [stepName, result] = JSON.parse(e.data)
-      this.emit('result', stepName, result)
       ;(this.status.results[stepName] ??= []).push(result)
       ;(this.status.results[stepName] ??= []).push(result)
+      this.emit('result', stepName, result)
     })
     })
 
 
     this.#sse.addEventListener('assembly_execution_progress', (e) => {
     this.#sse.addEventListener('assembly_execution_progress', (e) => {

+ 1 - 1
packages/uppy/package.json

@@ -1,7 +1,7 @@
 {
 {
   "name": "uppy",
   "name": "uppy",
   "description": "Extensible JavaScript file upload widget with support for drag&drop, resumable uploads, previews, restrictions, file processing/encoding, remote providers like Instagram, Dropbox, Google Drive, S3 and more :dog:",
   "description": "Extensible JavaScript file upload widget with support for drag&drop, resumable uploads, previews, restrictions, file processing/encoding, remote providers like Instagram, Dropbox, Google Drive, S3 and more :dog:",
-  "version": "4.0.0-beta.10",
+  "version": "4.0.0-beta.11",
   "license": "MIT",
   "license": "MIT",
   "main": "index.mjs",
   "main": "index.mjs",
   "module": "index.mjs",
   "module": "index.mjs",