Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release: uppy@4.0.0-beta.11 #5243

Merged
merged 7 commits into from
Jun 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion BUNDLE-README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

Hi, thanks for trying out the bundled version of the Uppy File Uploader. You can
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.

Note that the recommended way to use Uppy is to install it with yarn/npm and use
Expand Down
32 changes: 32 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

## 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

Released: 2024-06-04
Expand Down Expand Up @@ -420,6 +437,21 @@ Released: 2024-03-28
- @uppy/vue: [v4.x] remove manual types (Antoine du Hamel / #4803)
- 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

Released: 2024-06-04
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ npm install @uppy/core @uppy/dashboard @uppy/tus
```

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
supports it.

Expand All @@ -94,7 +94,7 @@ object.
```html
<!-- 1. Add CSS to `<head>` -->
<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"
/>

Expand All @@ -105,7 +105,7 @@ object.
Uppy,
Dashboard,
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()
uppy.use(Dashboard, { target: '#files-drag-drop' })
Expand Down
108 changes: 58 additions & 50 deletions examples/aws-nodejs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

```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

Expand All @@ -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

Expand All @@ -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=…
Expand All @@ -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._
4 changes: 2 additions & 2 deletions examples/aws-nodejs/public/drag.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<meta charset="utf-8" />
<title>Uppy</title>
<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"
/>
</head>
Expand All @@ -22,7 +22,7 @@ <h5>Uploaded files:</h5>
DragDrop,
ProgressBar,
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
const onUploadSuccess = (elForUploadedFiles) => (file, response) => {
Expand Down
4 changes: 2 additions & 2 deletions examples/aws-nodejs/public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<meta charset="utf-8" />
<title>Uppy – AWS upload example</title>
<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"
/>
</head>
Expand All @@ -16,7 +16,7 @@ <h1>AWS upload example</h1>
Uppy,
Dashboard,
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
* to work with `URLSearchParams` on the client and `body-parser` on the server.
Expand Down
4 changes: 2 additions & 2 deletions examples/cdn-example/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<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"
/>
</head>
Expand All @@ -19,7 +19,7 @@
Dashboard,
Webcam,
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 })
.use(Dashboard, { trigger: '#uppyModalOpener' })
Expand Down
4 changes: 2 additions & 2 deletions examples/uppy-with-companion/client/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<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"
/>
</head>
Expand All @@ -19,7 +19,7 @@
Instagram,
GoogleDrive,
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 })
.use(Dashboard, { trigger: '#uppyModalOpener' })
Expand Down
2 changes: 1 addition & 1 deletion packages/@uppy/aws-s3/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@uppy/aws-s3",
"description": "Upload to Amazon S3 with Uppy",
"version": "4.0.0-beta.5",
"version": "4.0.0-beta.6",
"license": "MIT",
"main": "lib/index.js",
"type": "module",
Expand Down
Loading