Merge branch 'main' into cypress-dashboard

* main: (43 commits)
  Revert "Revert "@uppy/companion-client: refactor to ESM"" (#3730)
  @uppy/dashboard: refactor to ESM (#3701)
  fixup! @uppy/tus: wait for user promise on beforeRequest (#3712)
  @uppy/store-default: refactor to ESM (#3746)
  @uppy/store-redux: refactor to ESM (#3745)
  @uppy/tus: wait for user promise on beforeRequest (#3712)
  Add `onShouldRetry` as option to @uppy/tus (#3720)
  @uppy/transloadit: refactor to ESM (#3725)
  fixup! e2e: run CI on PRs that modify the workflow file (#3740)
  @uppy/golden-retriever: refactor to ESM (#3731)
  @uppy/aws-s3-multipart: refactor to ESM (#3672)
  @uppy/aws-s3: refactor to ESM (#3673)
  e2e: run CI on PRs that modify the workflow file (#3740)
  @uppy/informer: remove remaining `require` call (#3737)
  @uppy/thumbnail-generator: refactor to ESM (#3734)
  @uppy/redux-dev-tools: refactor to ESM (#3733)
  @uppy/Informer: refactor to ESM (#3732)
  @uppy/unsplash: refactor to ESM (#3728)
  @uppy/tus: fix broken import (#3729)
  meta: fix dev env Vite's config
  ...

.eslintrc.js

@@ -197,20 +197,44 @@ module.exports = {
 
         // Packages that have switched to ESM sources:
         'packages/@uppy/audio/src/**/*.js',
+        'packages/@uppy/aws-s3/src/**/*.js',
+        'packages/@uppy/aws-s3-multipart/src/**/*.js',
         'packages/@uppy/box/src/**/*.js',
+        'packages/@uppy/companion-client/src/**/*.js',
         'packages/@uppy/compressor/src/**/*.js',
+        'packages/@uppy/dashboard/src/**/*.js',
         'packages/@uppy/drag-drop/src/**/*.js',
         'packages/@uppy/drop-target/src/**/*.js',
         'packages/@uppy/dropbox/src/**/*.js',
         'packages/@uppy/facebook/src/**/*.js',
         'packages/@uppy/file-input/src/**/*.js',
         'packages/@uppy/form/src/**/*.js',
+        'packages/@uppy/golden-retriever/src/**/*.js',
         'packages/@uppy/google-drive/src/**/*.js',
         'packages/@uppy/image-editor/src/**/*.js',
+        'packages/@uppy/informer/src/**/*.js',
+        'packages/@uppy/instagram/src/**/*.js',
+        'packages/@uppy/locales/src/**/*.js',
+        'packages/@uppy/locales/template.js',
+        'packages/@uppy/onedrive/src/**/*.js',
+        'packages/@uppy/progress-bar/src/**/*.js',
+        'packages/@uppy/provider-views/src/**/*.js',
+        'packages/@uppy/redux-dev-tools/src/**/*.js',
+        'packages/@uppy/screen-capture/src/**/*.js',
+        'packages/@uppy/status-bar/src/**/*.js',
+        'packages/@uppy/store-default/src/**/*.js',
+        'packages/@uppy/store-redux/src/**/*.js',
         'packages/@uppy/svelte/src/**/*.js',
         'packages/@uppy/svelte/rollup.config.js',
+        'packages/@uppy/thumbnail-generator/src/**/*.js',
+        'packages/@uppy/tus/src/**/*.js',
+        'packages/@uppy/unsplash/src/**/*.js',
+        'packages/@uppy/transloadit/src/**/*.js',
+        'packages/@uppy/url/src/**/*.js',
         'packages/@uppy/vue/src/**/*.js',
         'packages/@uppy/webcam/src/**/*.js',
+        'packages/@uppy/xhr-upload/src/**/*.js',
+        'packages/@uppy/zoom/src/**/*.js',
       ],
       parser: 'espree',
       parserOptions: {
@@ -247,6 +271,14 @@ module.exports = {
         'import/extensions': ['error', 'ignorePackages'],
       },
     },
+    {
+      files: [
+        'packages/@uppy/dashboard/src/components/**/*.jsx',
+      ],
+      rules: {
+        'react/destructuring-assignment': 'off',
+      },
+    },
     {
       files: [
         // Those need looser rules, and cannot be made part of the stricter rules above.

.github/workflows/e2e.yml

@@ -4,6 +4,10 @@ on:
     branches: [ main ]
   pull_request_target:
     types: [ opened, synchronize, reopened, labeled ]
+  pull_request:
+    types: [ opened, synchronize, reopened ]
+    paths:
+      - .github/workflows/e2e.yml
 
 concurrency: ${{ github.workflow }}--${{ github.ref }}
 

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.9.5/uppy.min.js"></script>`) or bundle it with your webapp.
+this from a CDN (`<script src="https://releases.transloadit.com/uppy/v2.10.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,59 @@ Please add your entries in this format:
 
 In the current stage we aim to release a new version at least every month.
 
+## 2.10.0
+
+Released: 2022-05-14
+
+| Package                | Version | Package                | Version |
+| ---------------------- | ------- | ---------------------- | ------- |
+| @uppy/audio            |   0.3.1 | @uppy/provider-views   |   2.1.0 |
+| @uppy/aws-s3           |   2.1.0 | @uppy/react            |   2.2.0 |
+| @uppy/aws-s3-multipart |   2.3.0 | @uppy/react-native     |   0.3.0 |
+| @uppy/companion-client |   2.1.0 | @uppy/screen-capture   |   2.1.0 |
+| @uppy/core             |   2.2.0 | @uppy/status-bar       |   2.2.0 |
+| @uppy/dashboard        |   2.2.0 | @uppy/svelte           |   1.0.8 |
+| @uppy/drag-drop        |   2.1.0 | @uppy/transloadit      |   2.2.0 |
+| @uppy/file-input       |   2.1.0 | @uppy/tus              |   2.3.0 |
+| @uppy/google-drive     |   2.1.0 | @uppy/url              |   2.1.0 |
+| @uppy/image-editor     |   1.2.0 | @uppy/webcam           |   2.2.0 |
+| @uppy/instagram        |   2.1.0 | @uppy/xhr-upload       |   2.1.0 |
+| @uppy/locales          |   2.1.0 | @uppy/zoom             |   1.1.0 |
+| @uppy/onedrive         |   2.1.0 | @uppy/robodog          |   2.6.0 |
+| @uppy/progress-bar     |   2.1.0 | uppy                   |  2.10.0 |
+
+- @uppy/audio: fix types (Merlijn Vos / #3689)
+- @uppy/aws-s3-multipart,@uppy/aws-s3,@uppy/core,@uppy/react,@uppy/transloadit,@uppy/tus,@uppy/xhr-upload: proposal: Cancel assemblies optional (Mikael Finstad / #3575)
+- @uppy/aws-s3-multipart: export interface AwsS3MultipartOptions (Matteo Padovano / #3709)
+- @uppy/companion-client: refactor to ESM (Antoine du Hamel / #3693)
+- @uppy/companion: Only deploy on companion changes (kiloreux / #3677)
+- @uppy/core: add definition for addFiles method (Matteo Padovano / #3556)
+- @uppy/core: wrap plugins in div.uppy-Root and set dir attrubute in UIPlugin (Artur Paikin / #3692)
+- @uppy/google-drive: refactor to ESM (Antoine du Hamel / #3683)
+- @uppy/image-editor: refactor to ESM (Antoine du Hamel / #3685)
+- @uppy/instagram: refactor to ESM (Antoine du Hamel / #3696)
+- @uppy/locales: Add `save` translation to Spanish locale (Juan Carlos Alonso / #3678)
+- @uppy/locales: refactor to ESM (Antoine du Hamel / #3707)
+- @uppy/onedrive: refactor to ESM (Antoine du Hamel / #3694)
+- @uppy/progress-bar: refactor to ESM (Antoine du Hamel / #3706)
+- @uppy/provider-views: refactor to ESM (Antoine du Hamel / #3715)
+- @uppy/react: Support React 18 in @uppy/react (Merlijn Vos / #3680)
+- @uppy/screen-capture: refactor to ESM (Antoine du Hamel / #3698)
+- @uppy/status-bar: refactor to ESM (Antoine du Hamel / #3697)
+- @uppy/transloadit: add rate limiting for assembly creation and status polling (Antoine du Hamel / #3718)
+- @uppy/tus: refactor to ESM (Antoine du Hamel / #3724)
+- @uppy/url: refactor to ESM (Antoine du Hamel / #3713)
+- @uppy/webcam: refactor to ESM (Antoine du Hamel / #3686)
+- @uppy/xhr-upload: refactor to ESM (Antoine du Hamel / #3695)
+- @uppy/zoom: refactor to ESM (Antoine du Hamel / #3699)
+- meta: e2e: fix failing test (Antoine du Hamel / #3722)
+- test: harden linter rule for JSX/ESM validation (Antoine du Hamel / #3681)
+- test: harden linter rules for ESM/CJS validation (Antoine du Hamel / #3674)
+- test: Increase retries to trigger longer retryDelay in tus (Artur Paikin / #3726)
+- test: Remove `it.only` from e2e test (Merlijn Vos / #3690)
+- tests: Make Cypress more stable & add e2e test for error events when upload fails (Merlijn Vos / #3662)
+
+
 ## 2.9.5
 
 Released: 2022-04-27