Merge branch 'main' into post-failed-e2e-test

* main: Add `save` translation to Spanish locale (#3678) @uppy/google-drive: refactor to ESM (#3683) meta: harden linter rule for JSX/ESM validation (#3681) meta: harden linter rules for ESM/CJS validation (#3674) Release: uppy@2.9.5 (#3671) Bump moment from 2.29.1 to 2.29.2 (#3635) @uppy/core: fix `TypeError` when file was removed (#3670) Release: uppy@2.9.4 (#3667) Plural translation in cs_CZ local (#3666) Add license field to package.json in @uppy/vue (#3664) Add todo comments
transloadit · May 3, 2022 · 87452dc · 87452dc
2 parents 3921e9a + 447cd92
commit 87452dc
Show file tree

Hide file tree

Showing 67 changed files with 510 additions and 327 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -35,7 +35,8 @@ module.exports = {
   ],
   parser: '@babel/eslint-parser',
   parserOptions: {
-    ecmaVersion: 2020,
+    sourceType: 'script',
+    ecmaVersion: 2022,
     ecmaFeatures: {
       jsx: true,
     },
@@ -147,21 +148,10 @@ module.exports = {
   overrides: [
     {
       files: [
-        '*.mjs',
-        'examples/aws-presigned-url/*.js',
-        'private/dev/*.js',
-        'private/release/*.js',
-        'private/remark-lint-uppy/*.js',
-      ],
-      parserOptions: {
-        sourceType: 'module',
-      },
-    },
-    {
-      files: [
-        'packages/@uppy/*/src/**/*.jsx',
-        'packages/uppy/src/**/*.jsx',
+        '*.jsx',
+        'packages/@uppy/react-native/**/*.js',
       ],
+      parser: 'espree',
       parserOptions: {
         sourceType: 'module',
         ecmaFeatures: {
@@ -197,6 +187,14 @@ module.exports = {
     },
     {
       files: [
+        '*.mjs',
+        'e2e/clients/**/*.js',
+        'examples/aws-presigned-url/*.js',
+        'examples/bundled/*.js',
+        'private/dev/*.js',
+        'private/release/*.js',
+        'private/remark-lint-uppy/*.js',
+
         // Packages that have switched to ESM sources:
         'packages/@uppy/audio/src/**/*.js',
         'packages/@uppy/box/src/**/*.js',
@@ -207,15 +205,20 @@ module.exports = {
         'packages/@uppy/facebook/src/**/*.js',
         'packages/@uppy/file-input/src/**/*.js',
         'packages/@uppy/form/src/**/*.js',
+        'packages/@uppy/google-drive/src/**/*.js',
+        'packages/@uppy/svelte/src/**/*.js',
+        'packages/@uppy/svelte/rollup.config.js',
         'packages/@uppy/vue/src/**/*.js',
       ],
+      parser: 'espree',
       parserOptions: {
         sourceType: 'module',
         ecmaFeatures: {
           jsx: false,
         },
       },
       rules: {
+        'import/named': 'off', // Disabled because that rule tries and fails to parse JSX dependencies.
         'no-restricted-globals': [
           'error',
           {
@@ -242,6 +245,19 @@ module.exports = {
         'import/extensions': ['error', 'ignorePackages'],
       },
     },
+    {
+      files: [
+        // Those need looser rules, and cannot be made part of the stricter rules above.
+        // TODO: update those to more modern code when switch to ESM is complete
+        'examples/react-native-expo/*.js',
+        'examples/svelte-example/**/*.js',
+        'examples/vue/**/*.js',
+        'examples/vue3/**/*.js',
+      ],
+      parserOptions: {
+        sourceType: 'module',
+      },
+    },
     {
       files: ['./packages/@uppy/companion/**/*.js'],
       rules: {
@@ -416,7 +432,7 @@ module.exports = {
       extends: ['plugin:cypress/recommended'],
     },
     {
-      files: ['e2e/**/*.ts', 'e2e/**/*.js'],
+      files: ['e2e/**/*.ts', 'e2e/**/*.js', 'e2e/**/*.jsx'],
       rules: { 'import/no-extraneous-dependencies': 'off', 'no-unused-expressions': 'off' },
     },
   ],

diff --git a/BUNDLE-README.md b/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.3/uppy.min.js"></script>`) or bundle it with your webapp.
+this from a CDN (`<script src="https://releases.transloadit.com/uppy/v2.9.5/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

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,58 @@ Please add your entries in this format:
 
 In the current stage we aim to release a new version at least every month.
 
+## 2.9.5
+
+Released: 2022-04-27
+
+| Package         | Version | Package         | Version |
+| --------------- | ------- | --------------- | ------- |
+| @uppy/companion |   3.5.2 | @uppy/robodog   |   2.5.5 |
+| @uppy/core      |  2.1.10 | uppy            |   2.9.5 |
+
+- @uppy/companion: Bump moment from 2.29.1 to 2.29.2 (dependabot[bot] / #3635)
+- @uppy/core: fix `TypeError` when file was removed (Antoine du Hamel / #3670)
+
+
+## 2.9.4
+
+Released: 2022-04-27
+
+| Package                | Version | Package                | Version |
+| ---------------------- | ------- | ---------------------- | ------- |
+| @uppy/aws-s3-multipart |   2.2.2 | @uppy/file-input       |   2.0.6 |
+| @uppy/box              |   1.0.6 | @uppy/form             |   2.0.5 |
+| @uppy/companion        |   3.5.1 | @uppy/locales          |   2.0.9 |
+| @uppy/compressor       |   0.2.5 | @uppy/transloadit      |   2.1.5 |
+| @uppy/core             |   2.1.9 | @uppy/utils            |   4.0.7 |
+| @uppy/drag-drop        |   2.0.7 | @uppy/vue              |   0.4.7 |
+| @uppy/drop-target      |   1.1.3 | @uppy/robodog          |   2.5.4 |
+| @uppy/dropbox          |   2.0.6 | uppy                   |   2.9.4 |
+| @uppy/facebook         |   2.0.6 |                        |         |
+
+- @uppy/locales: Plural translation in cs_CZ local (JakubHaladej / #3666)
+- @uppy/vue: Add license field to package.json in @uppy/vue (Tobias Trumm / #3664)
+- meta: Add todo comments (Murderlon)
+- @uppy/facebook: refactor to ESM (Antoine du Hamel / #3653)
+- meta: locale-pack: refactor to use more parallel processing (Antoine du Hamel / #3630)
+- @uppy/file-input: refactor to ESM (Antoine du Hamel / #3652)
+- meta: sign requests sent to Transloadit in e2e suite (Antoine du Hamel / #3656)
+- meta: add `VITE_TRANSLOADIT_SECRET` for e2e (Antoine du Hamel)
+- meta: Update BACKLOG.md (Artur Paikin)
+- @uppy/form: refactor to ESM (Antoine du Hamel / #3654)
+- @uppy/dropbox: refactor to ESM (Antoine du Hamel / #3651)
+- meta: sign requests sent to Transloadit in dev env (Antoine du Hamel / #3517)
+- @uppy/drop-target: refactor to ESM (Antoine du Hamel / #3648)
+- @uppy/core: fix `TypeError` when file was removed (Antoine du Hamel / #3650)
+- @uppy/drag-drop: refactor to ESM (Antoine du Hamel / #3647)
+- meta: update outdated files (Antoine du Hamel / #3646)
+- @uppy/compressor: Set meta on file compression (Camilo Forero / #3644)
+- @uppy/transloadit: improve fetch error handling (Antoine du Hamel / #3637)
+- @uppy/box: refactor to ESM (Antoine du Hamel / #3643)
+- @uppy/utils: Fix getFileType for dicom images (Merlijn Vos / #3610)
+- @uppy/aws-s3-multipart: Add `companionCookiesRule` type to @uppy/aws-s3-multipart (Mauricio Ribeiro / #3623)
+
+
 ## 2.9.3
 
 Released: 2022-04-07