Merge branch 'main' into cypress

* main:
  dev: move configuration to a `.env` file (#3430)
  Update ci.yml (#3428)
  @uppy/transloadit: simplify `#onTusError` (#3419)
  Force include babel numeric separator (#3422)
  Release: uppy@2.4.0 (#3420)
  @uppy/transloadit: ignore rate limiting errors when polling (#3418)
  @uppy/tus: pause all requests in response to server rate limiting (#3394)
  @uppy/transloadit: better defaults for rate limiting (#3414)
  Update BACKLOG.md
  Fix Companion deploys (#3388)
  update aws-presigned-url example to use esm (#3413)
  @uppy/image-editor: namespace input range css (#3406)
  Release: uppy@2.3.3 (#3410)
  improve private ip check (#3403)
  Add missing option to the screen capture types (#3400)
  @uppy/drag-drop: fix `undefined is not a function` TypeError (#3397)
  website: update december 2021 blog post (#3396)

.eslintrc.js

@@ -148,6 +148,7 @@ module.exports = {
     {
       files: [
         '*.mjs',
+        'examples/aws-presigned-url/*.js',
         'private/dev/*.js',
         'private/release/*.js',
         'private/remark-lint-uppy/*.js',

.github/workflows/ci.yml

@@ -1,4 +1,4 @@
-name: Tests
+name: CI
 on: [push, pull_request]
 
 jobs:

.github/workflows/companion-deploy.yml

@@ -1,5 +1,6 @@
 name: Companion Deploy
 
+
 on:
   push:
     branches: [main]
@@ -43,10 +44,13 @@ jobs:
     steps:
       - name: Checkout sources
         uses: actions/checkout@v2
+      - name: Alter dockerfile
+        run: |
+          sed -i 's/^EXPOSE 3020$/EXPOSE $PORT/g' Dockerfile
       - name: Deploy to heroku
         uses: akhileshns/heroku-deploy@v3.12.12
         with:
-          appdir: packages/@uppy/companion
           heroku_api_key: ${{secrets.HEROKU_API_KEY}}
           heroku_app_name: companion-demo
           heroku_email: ${{secrets.HEROKU_EMAIL}}
+          usedocker: true

.gitignore

@@ -14,6 +14,7 @@ node_modules
 yarn-error.log
 
 env.sh
+*.local
 
 dist/
 lib/

BACKLOG.md

@@ -5,15 +5,13 @@
 These are ideas that are planned for specific versions or act as a backlog without a clear date.
 PRs are welcome! Please do open an issue to discuss first if it's a big feature, priorities may have changed after something was added here.
 
-## `2.3.0`
+## `2.4.0`
 
-To be released: 2021-11-29
+To be released: 2022-01-27
 
-- [ ] plugin: audio/memo recording similar to Webcam #143 #198 (@arturi)
 - [ ] compressor: move to Uppy repo, add resizing (@arturi)
-- [ ] providers: Box on hosted Companion
+- [ ] providers: Box on hosted Companion (@arturi, @mifi)
 - [ ] robodog: research simplifing Robodog — yes to easy “few lines of code Dashboard+Providers+(?Transloadit) experience”, but currently it’s hard to choose between modes, decide what you need (@Murderlon)
-- [ ] build: add release automations (@aduh95)
 
 ## `3.0.0`
 

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

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.4.0
+
+Released: 2022-01-10
+
+| Package              | Version | Package              | Version |
+| -------------------- | ------- | -------------------- | ------- |
+| @uppy/drag-drop      |   2.0.6 | @uppy/tus            |   2.2.0 |
+| @uppy/image-editor   |   1.1.1 | @uppy/utils          |   4.0.5 |
+| @uppy/screen-capture |   2.0.6 | @uppy/robodog        |   2.2.0 |
+| @uppy/transloadit    |   2.1.0 | uppy                 |   2.4.0 |
+
+- @uppy/transloadit: ignore rate limiting errors when polling (Antoine du Hamel / #3418)
+- @uppy/tus: pause all requests in response to server rate limiting (Antoine du Hamel / #3394)
+- @uppy/transloadit: better defaults for rate limiting (Antoine du Hamel / #3414)
+- @uppy/companion: Fix Companion deploys (kiloreux / #3388)
+- meta: update aws-presigned-url example to use esm (Antoine du Hamel / #3413)
+- @uppy/image-editor: namespace input range css (Merlijn Vos / #3406)
+- @uppy/screen-capture: Add missing option to the screen capture types (Mustafa Navruz / #3400)
+- @uppy/drag-drop: fix `undefined is not a function` TypeError (Antoine du Hamel / #3397)
+- website: update december 2021 blog post (Antoine du Hamel / #3396)
+- website: Polished the latest update blog (AJvanLoon / #3390)
+- website: docs: fix typo in audio.md (heocoi / #3389)
+- website: 2.0-2.3 post draft (Artur Paikin / #3370)
+
+
+## 2.3.3
+
+Released: 2022-01-04
+
+| Package         | Version | Package         | Version |
+| --------------- | ------- | --------------- | ------- |
+| @uppy/companion |   3.1.5 | uppy            |   2.3.3 |
+
+- @uppy/companion: improve private ip check (Mikael Finstad / #3403)
+
+
 ## 2.3.2
 
 Released: 2021-12-21

babel.config.js

@@ -10,6 +10,7 @@ module.exports = (api) => {
         include: [
           '@babel/plugin-proposal-nullish-coalescing-operator',
           '@babel/plugin-proposal-optional-chaining',
+          '@babel/plugin-proposal-numeric-separator',
         ],
         loose: true,
         targets,

examples/aws-presigned-url/.gitignore

@@ -1,4 +1 @@
 vendor
-bundle.js
-uppy.min.css
-bundle.js.*