Merge branch 'main' into aws-e2e

* main:
  Fix webp mimetype (#3961)
  Add compressor string translation to Japanese locale (#3963)
  Fix statement about cropping images in README.md (#3964)

README.md

@@ -194,7 +194,8 @@ bundle, so no need to include anything additionally:
 Having no JavaScript beats having a lot of it, so that’s a fair question! Running an uploading & encoding business for ten years though we found that in cases, the file input leaves some to be desired:
 
 * We received complaints about broken uploads and found that resumable uploads are important, especially for big files and to be inclusive towards people on poorer connections (we also launched [tus.io](https://tus.io) to attack that problem). Uppy uploads can survive network outages and browser crashes or accidental navigate-aways.
-* Uppy supports editing meta information before uploading (such as cropping of images).
+* Uppy supports editing meta information before uploading.
+* Uppy allows cropping images before uploading.
 * There’s the situation where people are using their mobile devices and want to upload on the go, but they have their picture on Instagram, files in Dropbox or a plain file URL from anywhere on the open web. Uppy allows to pick files from those and push it to the destination without downloading it to your mobile device first.
 * Accurate upload progress reporting is an issue on many platforms.
 * Some file validation — size, type, number of files — can be done on the client with Uppy.

packages/@uppy/locales/src/ja_JP.js

@@ -24,6 +24,8 @@ ja_JP.strings = {
   closeModal: 'モーダルを閉じる',
   companionError: 'Companionとの接続に失敗しました',
   complete: '完了しました',
+  compressingImages: '画像を圧縮中...',
+  compressedX: '画像圧縮により%{size}を節約しました',
   connectedToInternet: 'インターネットに接続しました',
   copyLink: 'リンクをコピー',
   copyLinkToClipboardFallback: '以下のURLをコピー',

packages/@uppy/utils/src/getFileType.test.js

@@ -37,6 +37,10 @@ describe('getFileType', () => {
       name: 'bar.dicom',
       data: 'sdfsfhfh329fhwihs',
     }
+    const fileWebp = {
+      name: 'bar.webp',
+      data: 'sdfsfhfh329fhwihs',
+    }
     const toUpper = (file) => ({ ...file, name: file.name.toUpperCase() })
     expect(getFileType(fileMP3)).toEqual('audio/mp3')
     expect(getFileType(toUpper(fileMP3))).toEqual('audio/mp3')
@@ -46,6 +50,8 @@ describe('getFileType', () => {
     expect(getFileType(toUpper(fileMKV))).toEqual('video/x-matroska')
     expect(getFileType(fileDicom)).toEqual('application/dicom')
     expect(getFileType(toUpper(fileDicom))).toEqual('application/dicom')
+    expect(getFileType(fileWebp)).toEqual('image/webp')
+    expect(getFileType(toUpper(fileWebp))).toEqual('image/webp')
   })
 
   it('should fail gracefully if unable to detect', () => {

packages/@uppy/utils/src/mimeTypes.js

@@ -11,6 +11,7 @@ export default {
   svg: 'image/svg+xml',
   jpg: 'image/jpeg',
   png: 'image/png',
+  webp: 'image/webp',
   gif: 'image/gif',
   heic: 'image/heic',
   heif: 'image/heif',