diff --git a/BUNDLE-README.md b/BUNDLE-README.md
index 53105fa168..57c11ac53f 100644
--- a/BUNDLE-README.md
+++ b/BUNDLE-README.md
@@ -1,7 +1,7 @@
# Uppy
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.
+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 a
bundler like Webpack so that you can create a smaller custom build with only the
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 80d20cb0a7..f4a16071ed 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,29 @@ Please add your entries in this format:
In the current stage we aim to release a new version at least every month.
+## 3.0.0-beta.2
+
+Released: 2022-07-06
+
+| Package | Version | Package | Version |
+| -------------------- | ------------ | -------------------- | ------------ |
+| @uppy/companion | 4.0.0-beta.1 | @uppy/transloadit | 3.0.0-beta.2 |
+| @uppy/locales | 3.0.0-beta.2 | @uppy/robodog | 3.0.0-beta.2 |
+| @uppy/provider-views | 3.0.0-beta.2 | uppy | 3.0.0-beta.2 |
+
+- example: fix `custom-provider` example (Antoine du Hamel / #3854)
+- example: fix Vue3 example (Antoine du Hamel / #3774)
+- @uppy/companion: remove deprecated duplicated metrics (Mikael Finstad / #3833)
+- example: update CDN example (Antoine du Hamel / #3803)
+- @uppy/companion: Companion 3 default to no s3 acl (Mikael Finstad / #3826)
+- @uppy/companion: rewrite companion.app() to return an object (Mikael Finstad / #3827)
+- @uppy/companion: remove companion provider compat api (Mikael Finstad / #3828)
+- @uppy/companion: rewrite code for node >=14 (Mikael Finstad / #3829)
+- @uppy/companion: remove chunkSize backwards compatibility (Mikael Finstad / #3830)
+- @uppy/companion: Companion: make `emitSuccess` and `emitError` private (Mikael Finstad / #3832)
+- @uppy/companion: do not use a default upload protocol (Mikael Finstad / #3834)
+
+
## 3.0.0-beta.1
Released: 2022-06-09
diff --git a/README.md b/README.md
index faee5e59ff..a7bba89499 100644
--- a/README.md
+++ b/README.md
@@ -67,7 +67,7 @@ const uppy = new Uppy({ autoProceed: false })
$ npm install @uppy/core @uppy/dashboard @uppy/tus
```
-Add CSS [uppy.min.css](https://releases.transloadit.com/uppy/v3.0.0-beta.1/uppy.min.css), either to your HTML page’s `` or include in JS, if your bundler of choice supports it.
+Add CSS [uppy.min.css](https://releases.transloadit.com/uppy/v3.0.0-beta.2/uppy.min.css), either to your HTML page’s `` or include in JS, if your bundler of choice supports it.
Alternatively, you can also use a pre-built bundle from Transloadit’s CDN: Edgly. In that case `Uppy` will attach itself to the global `window.Uppy` object.
@@ -75,10 +75,10 @@ Alternatively, you can also use a pre-built bundle from Transloadit’s CDN: Edg
```html
-
+
-
+
@@ -184,7 +184,7 @@ If you’re using Uppy from CDN, those polyfills are already included in the leg
bundle, so no need to include anything additionally:
```html
-
+
```
## FAQ
diff --git a/examples/cdn-example/index.html b/examples/cdn-example/index.html
index 34580dcac9..e75fd6a87f 100644
--- a/examples/cdn-example/index.html
+++ b/examples/cdn-example/index.html
@@ -4,7 +4,7 @@
-
+
@@ -16,7 +16,7 @@
Dashboard,
Webcam,
Tus,
- } from "https://releases.transloadit.com/uppy/v3.0.0-beta.1/uppy.min.mjs";
+ } from "https://releases.transloadit.com/uppy/v3.0.0-beta.2/uppy.min.mjs";
const uppy = new Core.Uppy({ debug: true, autoProceed: false })
.use(Dashboard, { trigger: "#uppyModalOpener" })
@@ -29,7 +29,7 @@
-
+
+
+
+
```
Then, a global `Robodog` variable will be available. For usage instructions, please see the [main Robodog documentation](https://uppy.io/docs/robodog).
diff --git a/packages/@uppy/robodog/package.json b/packages/@uppy/robodog/package.json
index 025adcc928..e7025e70f3 100644
--- a/packages/@uppy/robodog/package.json
+++ b/packages/@uppy/robodog/package.json
@@ -1,7 +1,7 @@
{
"name": "@uppy/robodog",
"description": "Transloadit SDK for browsers based on Uppy",
- "version": "3.0.0-beta.1",
+ "version": "3.0.0-beta.2",
"license": "MIT",
"main": "lib/index.js",
"jsnext:main": "src/index.js",
diff --git a/packages/@uppy/transloadit/package.json b/packages/@uppy/transloadit/package.json
index 43385a5bd6..5f2b148956 100644
--- a/packages/@uppy/transloadit/package.json
+++ b/packages/@uppy/transloadit/package.json
@@ -1,7 +1,7 @@
{
"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",
- "version": "3.0.0-beta.1",
+ "version": "3.0.0-beta.2",
"license": "MIT",
"main": "lib/index.js",
"types": "types/index.d.ts",
diff --git a/packages/uppy/package.json b/packages/uppy/package.json
index 8e24b826e2..10b8c7aca4 100644
--- a/packages/uppy/package.json
+++ b/packages/uppy/package.json
@@ -1,7 +1,7 @@
{
"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:",
- "version": "3.0.0-beta.1",
+ "version": "3.0.0-beta.2",
"license": "MIT",
"main": "index.mjs",
"module": "index.mjs",
diff --git a/website/src/docs/index.md b/website/src/docs/index.md
index 21021d7c62..8b7c02ccbb 100644
--- a/website/src/docs/index.md
+++ b/website/src/docs/index.md
@@ -19,12 +19,12 @@ Here’s the simplest example html page with Uppy (it uses a CDN bundle, while w
Uppy
-
+
-
+
+
```
2\. Add CSS to ``:
```html
-
+
```
3\. Initialize at the bottom of the closing `` tag:
@@ -181,5 +181,5 @@ export * from '@uppy/core'
If you’re using Uppy from CDN, those polyfills are already included in the bundle, no need to include anything additionally:
```html
-
+
```
diff --git a/website/src/docs/locales.md b/website/src/docs/locales.md
index ea429c8237..fc29651c3f 100644
--- a/website/src/docs/locales.md
+++ b/website/src/docs/locales.md
@@ -34,8 +34,8 @@ const uppy = new Uppy({
Add a `
-
+
+
+
-
-
+
+
```
Please note that while you may be able to get 2.0 to work in IE11 this way, we do not officially support it anymore.
diff --git a/website/src/docs/robodog-form.md b/website/src/docs/robodog-form.md
index 8fdaa9e362..45637e2179 100644
--- a/website/src/docs/robodog-form.md
+++ b/website/src/docs/robodog-form.md
@@ -150,7 +150,7 @@ Make sure to also include the Uppy css file in your `` tag in case you wan
```html
-
+
```
@@ -162,7 +162,7 @@ Notice how the form is submitted to the inexistant `/uploads` route once all tra
Testing Robodog
-
+
-
+
+
+
```
diff --git a/website/src/examples/dashboard/app.es6 b/website/src/examples/dashboard/app.es6
index b2efd04f29..d7ad2cd37e 100644
--- a/website/src/examples/dashboard/app.es6
+++ b/website/src/examples/dashboard/app.es6
@@ -242,7 +242,7 @@ function loadLocaleFromCDN (localeName) {
const head = document.getElementsByTagName('head')[0]
const js = document.createElement('script')
js.type = 'text/javascript'
- js.src = `https://releases.transloadit.com/uppy/locales/v3.0.0-beta.1/${localeName}.min.js`
+ js.src = `https://releases.transloadit.com/uppy/locales/v3.0.0-beta.2/${localeName}.min.js`
head.appendChild(js)
}
diff --git a/website/src/examples/i18n/app.html b/website/src/examples/i18n/app.html
index 7c52e50b66..fb0b7fffb0 100644
--- a/website/src/examples/i18n/app.html
+++ b/website/src/examples/i18n/app.html
@@ -1,7 +1,7 @@
-
+
@@ -12,9 +12,9 @@