Merge branch 'main' into locale-docs

* main: Update "AWS S3" to rename master branch to main (#3266) 2.2.1 Release Try removing version altogether Progress object is nested (#3262) @uppy/status-bar: fix `calculateProcessingProgress` is not a function (#3261) Add retext to markdown linter (#3024)
transloadit · Oct 18, 2021 · 92d1ffc · 92d1ffc
2 parents a166f96 + ecc376e
commit 92d1ffc
Show file tree

Hide file tree

Showing 179 changed files with 8,328 additions and 4,111 deletions.
diff --git 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
@@ -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
@@ -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. `<script src="https://releases.transloadit.com/uppy/v2.2.0/uppy.min.js"></script>`) or bundle it with your webapp. 
+this from a CDN (`<script src="https://releases.transloadit.com/uppy/v2.2.1/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 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 <https://uppy.io/docs/#With-a-module-bundler>.
 
 ## 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
 <html>
@@ -62,15 +62,15 @@ 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: <https://uppy.io/docs/xhr-upload/> 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 `<input type="file">` 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: <https://uppy.io/docs/xhr-upload/> 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 `<input type="file">` 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: <https://uppy.io/docs/dashboard/>.
+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: <https://uppy.io/docs/dashboard/>.
 
 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: <https://uppy.io/docs/plugins/>.
 
 Note that for some Plugins, you will need to run a server side component called: Companion. Those plugins are marked with a (c) symbol. Alternatively, you can sign up for a free Transloadit account. Transloadit runs Companion for you, tusd servers to handle resumable file uploads, and can post-process files to scan for viruses, recognize faces, etc. Check: <https://transloadit.com>.
 
 ## Getting help
 
-Stuck with anything? We're welcoming all your questions and feedback over at <https://community.transloadit.com/c/uppy/5>.
+Stuck with anything? We’re welcoming all your questions and feedback over at <https://community.transloadit.com/c/uppy/5>.
diff --git 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