Merge branch 'main' into unsplash

* main:
  Show all details on mobile when `showProgressDetails` is `true` (#3174)
  @uppt/xhr-upload: fix `this.uppy is undefined` error (#3207)
  ci: test on Node.js v16.x (#3205)
  @uppy/dashboard: fix linter (#3206)
  Add `2.1.1` to `CHANGELOG.md`
  Release
  Release
  Fix "attempted to use private field on non-instance" in `SearchProvider` (#3201)
  Add 'done' to `nb_NO.js` (#3200)
  @uppy/transloadit: fix unhandledPromiseRejection failures (#3197)
  fix: AbortController is not defined on Node.js (Server Side Render) (#3169)

.eslintrc.js

@@ -85,7 +85,7 @@ module.exports = {
     'no-param-reassign': ['warn'],
     'no-redeclare': ['warn'],
     'no-shadow': ['warn'],
-    'no-use-before-define': ['warn'],
+    'no-use-before-define': ['warn', { 'functions': false }],
     'radix': ['warn'],
     'react/button-has-type': 'error',
     'react/destructuring-assignment': ['warn'],

.github/workflows/cdn.yml

@@ -12,9 +12,9 @@ jobs:
       - name: Checkout sources
         uses: actions/checkout@v2
       - name: Install Node.js
-        uses: actions/setup-node@v2-beta
+        uses: actions/setup-node@v2
         with:
-          node-version: 14.x
+          node-version: 16.x
       - name: Install npm 7
         run: npm install --global npm@7
       - name: Install dependencies

.github/workflows/ci.yml

@@ -7,12 +7,12 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [12.x, 14.x]
+        node-version: [12.x, 14.x, 16.x]
     steps:
       - name: Checkout sources
         uses: actions/checkout@v2
       - name: Install Node.js
-        uses: actions/setup-node@v2-beta
+        uses: actions/setup-node@v2
         with:
           node-version: ${{matrix.node-version}}
       - name: Install npm 7
@@ -29,7 +29,7 @@ jobs:
       - name: Checkout sources
         uses: actions/checkout@v2
       - name: Install Node.js
-        uses: actions/setup-node@v2-beta
+        uses: actions/setup-node@v2
         with:
           node-version: 14.x
       - name: Install npm 7
@@ -46,7 +46,7 @@ jobs:
       - name: Checkout sources
         uses: actions/checkout@v2
       - name: Install Node.js
-        uses: actions/setup-node@v2-beta
+        uses: actions/setup-node@v2
         with:
           node-version: 14.x
       - name: Install npm 7
@@ -63,7 +63,7 @@ jobs:
       - name: Checkout sources
         uses: actions/checkout@v2
       - name: Install Node.js
-        uses: actions/setup-node@v2-beta
+        uses: actions/setup-node@v2
         with:
           node-version: 14.x
       - name: Install npm 7

.github/workflows/companion.yml

@@ -12,7 +12,7 @@ jobs:
       - name: Checkout sources
         uses: actions/checkout@v2
       - name: Install Node.js
-        uses: actions/setup-node@v2-beta
+        uses: actions/setup-node@v2
         with:
           node-version: ${{matrix.node-version}}
       - name: Install npm 7

.github/workflows/end-to-end.yml

@@ -15,7 +15,7 @@ jobs:
       - name: Checkout sources
         uses: actions/checkout@v2
       - name: Install Node.js
-        uses: actions/setup-node@v2-beta
+        uses: actions/setup-node@v2
         with:
           node-version: 14.x
       - name: Install npm 7

.github/workflows/website.yml

@@ -12,7 +12,7 @@ jobs:
       - name: Checkout sources
         uses: actions/checkout@v2
       - name: Install Node.js
-        uses: actions/setup-node@v2-beta
+        uses: actions/setup-node@v2
         with:
           node-version: 14.x
       - name: Install npm 7

BACKLOG.md

@@ -50,7 +50,6 @@ PRs are welcome! Please do open an issue to discuss first if it's a big feature,
 - [ ] Display data like image resolution on file cards. should be done by thumbnail generator maybe #783
 - [ ] Possibility to edit/delete more than one file at once. example: add copyrigh info to 1000 files #118, #97
 - [ ] Possibility to work on already uploaded / in progress files. We'll just provide the `fileId` to the `file-edit-complete` event so that folks can more easily roll out custom code for this themselves #112, #113, #2063
-- [ ] Show upload speed too if `showProgressDetails: true`. Maybe have separate options for which things are displayed, or at least have css-classes that can be hidden with `display: none` #766
 - [ ] Focus jumps weirdly if you remove a file https://github.com/transloadit/uppy/pull/2161#issuecomment-613565486
 - [ ] A mini UI that features drop & progress (may involve a `mini: true` options for dashboard, may involve drop+progress or new plugin) (@arturi)
 - [ ] Add a Load More button so you don't have to TAB endlessly to get to the upload button (https://github.com/transloadit/uppy/issues/1419)

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 (e.g. `<script src="https://releases.transloadit.com/uppy/v2.1.0/uppy.min.js"></script>`) or bundle it with your webapp. 
+this from a CDN (e.g. `<script src="https://releases.transloadit.com/uppy/v2.1.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

CHANGELOG.md

@@ -12,6 +12,41 @@ Please add your entries in this format:
 
 In the current stage we aim to release a new version at least every month.
 
+## 2.1.1
+
+Released: 2021-09-20
+
+| Package | Version | Package | Version |
+|-|-|-|-|
+| @uppy/angular | 0.2.3 | @uppy/progress-bar | 2.0.2 |
+| @uppy/aws-s3-multipart | 2.0.3 | @uppy/provider-views | 2.0.2 |
+| @uppy/aws-s3 | 2.0.3 | @uppy/react-native | 0.2.2 |
+| @uppy/box | 1.0.2 | @uppy/react | 2.0.3 |
+| @uppy/companion-client | 2.0.1 | @uppy/robodog | 2.0.4 |
+| @uppy/core | 2.0.3 | @uppy/screen-capture | 2.0.2 |
+| @uppy/dashboard | 2.0.3 | @uppy/status-bar | 2.0.2 |
+| @uppy/drag-drop | 2.0.2 | @uppy/svelte | 1.0.3 |
+| @uppy/drop-target | 1.0.2 | @uppy/thumbnail-generator | 2.0.3 |
+| @uppy/dropbox | 2.0.2 | @uppy/transloadit | 2.0.2 |
+| @uppy/facebook | 2.0.2 | @uppy/tus | 2.0.2 |
+| @uppy/file-input | 2.0.2 | @uppy/unsplash | 1.0.2 |
+| @uppy/form | 2.0.2 | @uppy/url | 2.0.2 |
+| @uppy/golden-retriever | 2.0.3 | @uppy/utils | 4.0.1 |
+| @uppy/google-drive | 2.0.2 | @uppy/vue | 0.4.1 |
+| @uppy/image-editor | 1.0.2 | @uppy/webcam | 2.0.2 |
+| @uppy/informer | 2.0.2 | @uppy/xhr-upload | 2.0.3 |
+| @uppy/instagram | 2.0.2 | @uppy/zoom | 1.0.2 |
+| @uppy/locales | 2.0.1 | uppy | 2.1.1 |
+| @uppy/onedrive | 2.0.2 | - | - |
+
+- @uppy/unsplash: Fix "attempted to use private field on non-instance" in `SearchProvider` (#3201)
+- @uppy/locales: Add 'done' to `nb_NO.js` (#3200)
+- @uppy/transloadit: Fix unhandledPromiseRejection failures (#3197)
+- @uppy/aws-s3-multipart: Fix AbortController is not defined on Node.js (Server Side Render) (#3169)
+- @uppy/aws-s3-multipart: Fix `net::ERR_OUT_OF_MEMORY` (#3183)
+- @uppy/dashboard: Fix `autoOpenFileEditor` (#3186)
+- @uppy/dashboard: Update Google Drive for brand compliance (#3178)
+
 ## 2.1.0
 
 Released: 2021-09-01