diff --git a/.eslintignore b/.eslintignore
index 6188469f2c..c3b14aeff3 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -20,3 +20,4 @@ website/src/_posts/2021-03-*.md
website/src/_posts/2021-04-*.md
website/src/_posts/2021-05-*.md
website/src/_posts/2021-06-*.md
+private/remark-lint-uppy/index.js
diff --git a/.remarkignore b/.remarkignore
new file mode 100644
index 0000000000..d6ba4f2afb
--- /dev/null
+++ b/.remarkignore
@@ -0,0 +1,6 @@
+website/src/_posts/201*
+website/src/_posts/2020-*
+website/src/_posts/2021-0*
+examples/
+CHANGELOG.md
+BACKLOG.md
diff --git a/BUNDLE-README.md b/BUNDLE-README.md
index e55b3bdc1f..25c80939df 100644
--- a/BUNDLE-README.md
+++ b/BUNDLE-README.md
@@ -1,17 +1,17 @@
# Uppy
Hi, thanks for trying out the bundled version of the Uppy File Uploader. You can use
-this from a CDN (e.g. ``) 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 just the
+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
things that you need. More info on .
## How to use this bundle
-You can extract the contents of this zip to e.g. `./js/uppy`
+You can extract the contents of this zip to a directory, such as `./js/uppy`.
-Now you can create an HTML file, e.g.: `./upload.html` with the following contents:
+Now you can create an HTML file, for example `./upload.html`, with the following contents:
```html
@@ -62,10 +62,10 @@ Now open `upload.html` in your browser, and the Uppy Dashboard will appear.
## Next steps
-In the example you just built, Uppy uploads to a demo server where files will be deleted
-shortly after uploading. You'll want to target your own tusd server, S3 bucket, or Nginx/Apache server. For the latter, use the Xhr plugin: which uploads using regular multipart form posts, that you'll existing Ruby or PHP backend will be able to make sense of, just as if a `` had been used.
+In the example you built, Uppy uploads to a demo server where files will be deleted
+shortly after uploading. You’ll want to target your own tusd server, S3 bucket, or Nginx/Apache server. For the latter, use the Xhr plugin: which uploads using regular multipart form posts, that you’ll existing Ruby or PHP backend will be able to make sense of, as if a `` had been used.
-The Dashboard currently opens when clicking the button, but you can also draw it inline into the page. This, and many more configuration options can be found here: .
+The Dashboard now opens when clicking the button, but you can also draw it inline into the page. This, and many more configuration options can be found here: .
Uppy has many more Plugins besides Xhr and the Dashboard. For example, you can enable Webcam, Instagram, or video encoding support. For a full list of Plugins check here: .
@@ -73,4 +73,4 @@ Note that for some Plugins, you will need to run a server side component called:
## Getting help
-Stuck with anything? We're welcoming all your questions and feedback over at .
+Stuck with anything? We’re welcoming all your questions and feedback over at .
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f6554e8e9f..76ba4d280c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,42 @@ Please add your entries in this format:
In the current stage we aim to release a new version at least every month.
+## 2.2.1
+
+Released: 2021-10-14
+
+| Package | Version | Package | Version |
+|-|-|-|-|
+| @uppy/angular | 0.2.5 | @uppy/provider-views | 2.0.4 |
+| @uppy/aws-s3-multipart | 2.1.1 | @uppy/react-native | 0.2.4 |
+| @uppy/aws-s3 | 2.0.5 | @uppy/react | 2.1.1 |
+| @uppy/box | 1.0.4 | @uppy/redux-dev-tools | 2.0.3 |
+| @uppy/companion-client | 2.0.3 | @uppy/robodog | 2.1.1 |
+| @uppy/companion | 3.1.1 | @uppy/screen-capture | 2.0.4 |
+| @uppy/core | 2.1.1 | @uppy/status-bar | 2.1.1 |
+| @uppy/dashboard | 2.1.1 | @uppy/store-default | 2.0.2 |
+| @uppy/drag-drop | 2.0.4 | @uppy/store-redux | 2.0.2 |
+| @uppy/drop-target | 1.1.1 | @uppy/svelte | 1.0.5 |
+| @uppy/dropbox | 2.0.4 | @uppy/thumbnail-generator | 2.0.5 |
+| @uppy/facebook | 2.0.4 | @uppy/transloadit | 2.0.4 |
+| @uppy/file-input | 2.0.4 | @uppy/tus | 2.1.1 |
+| @uppy/form | 2.0.4 | @uppy/unsplash | 2.0.1 |
+| @uppy/golden-retriever | 2.0.5 | @uppy/url | 2.0.4 |
+| @uppy/google-drive | 2.0.4 | @uppy/utils | 4.0.3 |
+| @uppy/image-editor | 1.0.4 | @uppy/vue | 0.4.3 |
+| @uppy/informer | 2.0.4 | @uppy/webcam | 2.0.4 |
+| @uppy/instagram | 2.0.4 | @uppy/xhr-upload | 2.0.5 |
+| @uppy/locales | 2.0.3 | @uppy/zoom | 1.0.4 |
+| @uppy/onedrive | 2.0.4 | uppy | 2.2.1 |
+| @uppy/progress-bar | 2.0.4 | - | - |
+
+- @uppy/locale: Update ar_SA.js (issa.ahmd@gmail.com / #3192)
+- @uppy/status-bar: fix `calculateProcessingProgress` is not a function (@aduh95 / #3261)
+- @uppy/status-bar: Progress object is nested (@arturi / #3262)
+- build: Add retext to markdown linter (@aduh95 / #3024)
+- build: Bump tar from 6.1.2 to 6.1.9 (dependabot / #3152)
+- website: Revert "Remove broken link in `plugin_list.ejs` (@aduh95 / #3166)
+
## 2.2.0
Released: 2021-10-06
diff --git a/README.md b/README.md
index f94fb8e337..2d7cfd72a6 100644
--- a/README.md
+++ b/README.md
@@ -9,11 +9,11 @@
| Tests | | | |
| Deploys | | | |
-Uppy is a sleek, modular JavaScript file uploader that integrates seamlessly with any application. It’s fast, easy to use and lets you worry about more important problems than building a file uploader.
+Uppy is a sleek, modular JavaScript file uploader that integrates seamlessly with any application. It’s fast, has a comprehensible API and lets you worry about more important problems than building a file uploader.
-- **Fetch** files from local disk, remote URLs, Google Drive, Dropbox, Box, Instagram or snap and record selfies with a camera
-- **Preview** and edit metadata with a nice interface
-- **Upload** to the final destination, optionally process/encode
+* **Fetch** files from local disk, remote URLs, Google Drive, Dropbox, Box, Instagram or snap and record selfies with a camera
+* **Preview** and edit metadata with a nice interface
+* **Upload** to the final destination, optionally process/encode
@@ -50,37 +50,37 @@ const uppy = new Uppy({ autoProceed: false })
## Features
-- Lightweight, modular plugin-based architecture, easy on dependencies :zap:
-- Resumable file uploads via the open [tus](https://tus.io/) standard, so large uploads survive network hiccups
-- Supports picking files from: Webcam, Dropbox, Box, Google Drive, Instagram, bypassing the user’s device where possible, syncing between servers directly via [@uppy/companion](https://uppy.io/docs/companion)
-- Works great with file encoding and processing backends, such as [Transloadit](https://transloadit.com), works great without (just roll your own Apache/Nginx/Node/FFmpeg/etc backend)
-- Sleek user interface :sparkles:
-- Optional file recovery (after a browser crash) with [Golden Retriever](https://uppy.io/docs/golden-retriever/)
-- Speaks multiple languages (i18n) :earth_africa:
-- Built with accessibility in mind
-- Free for the world, forever (as in beer 🍺, pizza 🍕, and liberty 🗽)
-- Cute as a puppy, also accepts cat pictures :dog:
+* Lightweight, modular plugin-based architecture, light on dependencies :zap:
+* Resumable file uploads via the open [tus](https://tus.io/) standard, so large uploads survive network hiccups
+* Supports picking files from: Webcam, Dropbox, Box, Google Drive, Instagram, bypassing the user’s device where possible, syncing between servers directly via [@uppy/companion](https://uppy.io/docs/companion)
+* Works great with file encoding and processing backends, such as [Transloadit](https://transloadit.com), works great without (all you need is to roll your own Apache/Nginx/Node/FFmpeg/etc backend)
+* Sleek user interface :sparkles:
+* Optional file recovery (after a browser crash) with [Golden Retriever](https://uppy.io/docs/golden-retriever/)
+* Speaks several languages (i18n) :earth\_africa:
+* Built with accessibility in mind
+* Free for the world, forever (as in beer 🍺, pizza 🍕, and liberty 🗽)
+* Cute as a puppy, also accepts cat pictures :dog:
## Installation
-``` bash
+```bash
$ npm install @uppy/core @uppy/dashboard @uppy/tus
```
We recommend installing from npm and then using a module bundler such as [Webpack](https://webpack.js.org/), [Browserify](http://browserify.org/) or [Rollup.js](http://rollupjs.org/).
-Add CSS [uppy.min.css](https://releases.transloadit.com/uppy/v2.2.0/uppy.min.css), either to your HTML page's `` or include in JS, if your bundler of choice supports it — transforms and plugins are available for Browserify and Webpack.
+Add CSS [uppy.min.css](https://releases.transloadit.com/uppy/v2.2.1/uppy.min.css), either to your HTML page’s `` or include in JS, if your bundler of choice supports it — transforms and plugins are available for Browserify and Webpack.
-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.
+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.
-> ⚠️ The bundle currently consists of most Uppy plugins, so this method is not recommended for production, as your users will have to download all plugins when you are likely using just a few.
+> ⚠️ The bundle consists of most Uppy plugins, so this method is not recommended for production, as your users will have to download all plugins when you are likely using only a few.
```html
-
+
-
+
@@ -93,11 +93,11 @@ Alternatively, you can also use a pre-built bundle from Transloadit's CDN: Edgly
## Documentation
-- [Uppy](https://uppy.io/docs/uppy/) — full list of options, methods and events
-- [Plugins](https://uppy.io/docs/plugins/) — list of Uppy plugins and their options
-- [Companion](https://uppy.io/docs/companion/) — setting up and running a Companion instance, which adds support for Instagram, Dropbox, Box, Google Drive and remote URLs
-- [React](https://uppy.io/docs/react/) — components to integrate Uppy UI plugins with React apps
-- [Architecture & Writing a Plugin](https://uppy.io/docs/writing-plugins/) — how to write a plugin for Uppy
+* [Uppy](https://uppy.io/docs/uppy/) — full list of options, methods and events
+* [Plugins](https://uppy.io/docs/plugins/) — list of Uppy plugins and their options
+* [Companion](https://uppy.io/docs/companion/) — setting up and running a Companion instance, which adds support for Instagram, Dropbox, Box, Google Drive and remote URLs
+* [React](https://uppy.io/docs/react/) — components to integrate Uppy UI plugins with React apps
+* [Architecture & Writing a Plugin](https://uppy.io/docs/writing-plugins/) — how to write a plugin for Uppy
## Plugins
@@ -105,49 +105,49 @@ Alternatively, you can also use a pre-built bundle from Transloadit's CDN: Edgly
### UI Elements
-- [`Dashboard`](https://uppy.io/docs/dashboard/) — universal UI with previews, progress bars, metadata editor and all the cool stuff. Required for most UI plugins like Webcam and Instagram
-- [`Progress Bar`](https://uppy.io/docs/progress-bar/) — minimal progress bar that fills itself when upload progresses
-- [`Status Bar`](https://uppy.io/docs/status-bar/) — more detailed progress, pause/resume/cancel buttons, percentage, speed, uploaded/total sizes (included by default with `Dashboard`)
-- [`Informer`](https://uppy.io/docs/informer/) — send notifications like “smile” before taking a selfie or “upload failed” when all is lost (also included by default with `Dashboard`)
+* [`Dashboard`](https://uppy.io/docs/dashboard/) — universal UI with previews, progress bars, metadata editor and all the cool stuff. Required for most UI plugins like Webcam and Instagram
+* [`Progress Bar`](https://uppy.io/docs/progress-bar/) — minimal progress bar that fills itself when upload progresses
+* [`Status Bar`](https://uppy.io/docs/status-bar/) — more detailed progress, pause/resume/cancel buttons, percentage, speed, uploaded/total sizes (included by default with `Dashboard`)
+* [`Informer`](https://uppy.io/docs/informer/) — send notifications like “smile” before taking a selfie or “upload failed” when all is lost (also included by default with `Dashboard`)
### Sources
-- [`Drag & Drop`](https://uppy.io/docs/drag-drop/) — plain and simple drag and drop area
-- [`File Input`](https://uppy.io/docs/file-input/) — even plainer “select files” button
-- [`Webcam`](https://uppy.io/docs/webcam/) — snap and record those selfies 📷
-- ⓒ [`Google Drive`](https://uppy.io/docs/google-drive/) — import files from Google Drive
-- ⓒ [`Dropbox`](https://uppy.io/docs/dropbox/) — import files from Dropbox
-- ⓒ [`Box`](https://uppy.io/docs/box/) — import files from Box
-- ⓒ [`Instagram`](https://uppy.io/docs/instagram/) — import images and videos from Instagram
-- ⓒ [`Facebook`](https://uppy.io/docs/facebook/) — import images and videos from Facebook
-- ⓒ [`OneDrive`](https://uppy.io/docs/onedrive/) — import files from Microsoft OneDrive
-- ⓒ [`Import From URL`](https://uppy.io/docs/url/) — import direct URLs from anywhere on the web
+* [`Drag & Drop`](https://uppy.io/docs/drag-drop/) — plain drag and drop area
+* [`File Input`](https://uppy.io/docs/file-input/) — even plainer “select files” button
+* [`Webcam`](https://uppy.io/docs/webcam/) — snap and record those selfies 📷
+* ⓒ [`Google Drive`](https://uppy.io/docs/google-drive/) — import files from Google Drive
+* ⓒ [`Dropbox`](https://uppy.io/docs/dropbox/) — import files from Dropbox
+* ⓒ [`Box`](https://uppy.io/docs/box/) — import files from Box
+* ⓒ [`Instagram`](https://uppy.io/docs/instagram/) — import images and videos from Instagram
+* ⓒ [`Facebook`](https://uppy.io/docs/facebook/) — import images and videos from Facebook
+* ⓒ [`OneDrive`](https://uppy.io/docs/onedrive/) — import files from Microsoft OneDrive
+* ⓒ [`Import From URL`](https://uppy.io/docs/url/) — import direct URLs from anywhere on the web
The ⓒ mark means that [`@uppy/companion`](https://uppy.io/docs/companion), a server-side component, is needed for a plugin to work.
### Destinations
-- [`Tus`](https://uppy.io/docs/tus/) — resumable uploads via the open [tus](http://tus.io) standard
-- [`XHR Upload`](https://uppy.io/docs/xhr-upload/) — regular uploads for any backend out there (like Apache, Nginx)
-- [`AWS S3`](https://uppy.io/docs/aws-s3/) — plain upload to AWS S3 or compatible services
-- [`AWS S3 Multipart`](https://uppy.io/docs/aws-s3-multipart/) — S3-style "Multipart" upload to AWS or compatible services
+* [`Tus`](https://uppy.io/docs/tus/) — resumable uploads via the open [tus](http://tus.io) standard
+* [`XHR Upload`](https://uppy.io/docs/xhr-upload/) — regular uploads for any backend out there (like Apache, Nginx)
+* [`AWS S3`](https://uppy.io/docs/aws-s3/) — plain upload to AWS S3 or compatible services
+* [`AWS S3 Multipart`](https://uppy.io/docs/aws-s3-multipart/) — S3-style “Multipart” upload to AWS or compatible services
### File Processing
-- [`Robodog`](https://uppy.io/docs/robodog/) — user friendly abstraction to do file processing with Transloadit
-- [`Transloadit`](https://uppy.io/docs/transloadit/) — support for [Transloadit](http://transloadit.com)’s robust file uploading and encoding backend
+* [`Robodog`](https://uppy.io/docs/robodog/) — user friendly abstraction to do file processing with Transloadit
+* [`Transloadit`](https://uppy.io/docs/transloadit/) — support for [Transloadit](http://transloadit.com)’s robust file uploading and encoding backend
### Miscellaneous
-- [`Golden Retriever`](https://uppy.io/docs/golden-retriever/) — restores files after a browser crash, like it’s nothing
-- [`Thumbnail Generator`](https://uppy.io/docs/thumbnail-generator/) — generates image previews (included by default with `Dashboard`)
-- [`Form`](https://uppy.io/docs/form/) — collects metadata from `