Merge branch 'main' into ts-core

* main: Migrate to AWS-SDK V3 syntax (#4810) @uppy/utils: fix import in test files (#4806) Fix onBeforeFileAdded with Golden Retriever (#4799) @uppy/image-editor: respect `cropperOptions.initialAspectRatio` (#4805) Release: uppy@3.20.0 (#4804)
transloadit · Dec 5, 2023 · ca98717 · ca98717
2 parents 521e4df + a116db5
commit ca98717
Show file tree

Hide file tree

Showing 20 changed files with 132 additions and 81 deletions.
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/v3.19.1/uppy.min.js"></script>`) or bundle it with your webapp.
+this from a CDN (`<script src="https://releases.transloadit.com/uppy/v3.20.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

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,25 @@ Please add your entries in this format:
 
 In the current stage we aim to release a new version at least every month.
 
+## 3.20.0
+
+Released: 2023-11-24
+
+| Package                | Version | Package                | Version |
+| ---------------------- | ------- | ---------------------- | ------- |
+| @uppy/companion-client |   3.6.1 | @uppy/store-default    |   3.1.0 |
+| @uppy/locales          |   3.5.0 | uppy                   |  3.20.0 |
+
+- meta: uppy CDN: Export UIPlugin and BasePlugin (Artur Paikin / #4774)
+- @uppy/locales: Add missing translations to de_DE (Leonhard Melzer / #4800)
+- @uppy/store-default: refactor to typescript (Antoine du Hamel / #4785)
+- meta: improve js2ts script (Antoine du Hamel / #4786)
+- @uppy/companion-client: fix log type error (Mikael Finstad / #4766)
+- @uppy/companion-client: revert breaking change (Antoine du Hamel / #4801)
+- @uppy/locales: use TypeScript for source files (Antoine du Hamel / #4779)
+- meta: migrate AWS SDK v2 to v3 in `bin/uploadcdn` (Trivikram Kamat / #4776)
+
+
 ## 3.19.1
 
 Released: 2023-11-12

diff --git a/README.md b/README.md
diff --git a/bin/upload-to-cdn.js b/bin/upload-to-cdn.js
@@ -24,7 +24,7 @@
 const path = require('node:path')
 const { pipeline, finished } = require('node:stream/promises')
 const { readFile } = require('node:fs/promises')
-const { S3 } = require('@aws-sdk/client-s3');
+const { S3Client, ListObjectsV2Command, PutObjectCommand } = require('@aws-sdk/client-s3');
 
 const packlist = require('npm-packlist')
 const tar = require('tar')
@@ -109,7 +109,7 @@ async function main (packageName, version) {
   // where we force push a local build
   if (version?.startsWith('-')) version = undefined // eslint-disable-line no-param-reassign
 
-  const s3 = new S3({
+  const s3Client = new S3Client({
     credentials: {
       accessKeyId: process.env.EDGLY_KEY,
       secretAccessKey: process.env.EDGLY_SECRET,
@@ -144,11 +144,12 @@ async function main (packageName, version) {
 
   const outputPath = path.posix.join(dirName, `v${version}`)
 
-  const { Contents: existing } = await s3.listObjects({
+  const { Contents: existing } = await s3Client.send(new ListObjectsV2Command({
     Bucket: AWS_BUCKET,
     Prefix: outputPath,
-  })
-  if (existing.length > 0) {
+  }))
+
+  if (existing?.length > 0) {
     if (process.argv.includes('--force')) {
       console.warn(`WARN Release files for ${dirName} v${version} already exist, overwriting...`)
     } else {
@@ -174,16 +175,16 @@ async function main (packageName, version) {
   for (const [filename, buffer] of files.entries()) {
     const key = path.posix.join(outputPath, filename)
     console.log(`pushing s3://${AWS_BUCKET}/${key}`)
-    await s3.putObject({
+    await s3Client.send(new PutObjectCommand({
       Bucket: AWS_BUCKET,
       Key: key,
       ContentType: mime.lookup(filename),
       Body: buffer,
-    })
+    }))
   }
 }
 
 main(...process.argv.slice(2)).catch((err) => {
-  console.error(err.stack)
+  console.error(err)
   process.exit(1)
 })
diff --git a/examples/aws-nodejs/public/drag.html b/examples/aws-nodejs/public/drag.html
@@ -4,7 +4,7 @@
     <meta charset="utf-8" />
     <title>Uppy</title>
     <link
-      href="https://releases.transloadit.com/uppy/v3.19.1/uppy.min.css"
+      href="https://releases.transloadit.com/uppy/v3.20.0/uppy.min.css"
       rel="stylesheet"
     />
   </head>
@@ -22,7 +22,7 @@ <h5>Uploaded files:</h5>
           DragDrop,
           ProgressBar,
           AwsS3,
-        } from 'https://releases.transloadit.com/uppy/v3.19.1/uppy.min.mjs'
+        } from 'https://releases.transloadit.com/uppy/v3.20.0/uppy.min.mjs'
 
         // Function for displaying uploaded files
         const onUploadSuccess = (elForUploadedFiles) => (file, response) => {

diff --git a/examples/aws-nodejs/public/index.html b/examples/aws-nodejs/public/index.html
@@ -4,7 +4,7 @@
     <meta charset="utf-8" />
     <title>Uppy – AWS upload example</title>
     <link
-      href="https://releases.transloadit.com/uppy/v3.19.1/uppy.min.css"
+      href="https://releases.transloadit.com/uppy/v3.20.0/uppy.min.css"
       rel="stylesheet"
     />
   </head>
@@ -16,7 +16,7 @@ <h1>AWS upload example</h1>
         Uppy,
         Dashboard,
         AwsS3,
-      } from 'https://releases.transloadit.com/uppy/v3.19.1/uppy.min.mjs'
+      } from 'https://releases.transloadit.com/uppy/v3.20.0/uppy.min.mjs'
       /**
        * This generator transforms a deep object into URL-encodable pairs
        * to work with `URLSearchParams` on the client and `body-parser` on the server.

diff --git a/examples/cdn-example/index.html b/examples/cdn-example/index.html
@@ -5,7 +5,7 @@
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <link
-      href="https://releases.transloadit.com/uppy/v3.19.1/uppy.min.css"
+      href="https://releases.transloadit.com/uppy/v3.20.0/uppy.min.css"
       rel="stylesheet"
     />
   </head>
@@ -19,7 +19,7 @@
         Dashboard,
         Webcam,
         Tus,
-      } from 'https://releases.transloadit.com/uppy/v3.19.1/uppy.min.mjs'
+      } from 'https://releases.transloadit.com/uppy/v3.20.0/uppy.min.mjs'
 
       const uppy = new Uppy({ debug: true, autoProceed: false })
         .use(Dashboard, { trigger: '#uppyModalOpener' })
@@ -34,7 +34,7 @@
     <!-- To support older browsers, you can use the legacy bundle which adds a global `Uppy` object.  -->
     <script
       nomodule
-      src="https://releases.transloadit.com/uppy/v3.19.1/uppy.legacy.min.js"
+      src="https://releases.transloadit.com/uppy/v3.20.0/uppy.legacy.min.js"
     ></script>
     <script nomodule>
       {

diff --git a/examples/uppy-with-companion/client/index.html b/examples/uppy-with-companion/client/index.html
@@ -5,7 +5,7 @@
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <link
-      href="https://releases.transloadit.com/uppy/v3.19.1/uppy.min.css"
+      href="https://releases.transloadit.com/uppy/v3.20.0/uppy.min.css"
       rel="stylesheet"
     />
   </head>
@@ -19,7 +19,7 @@
         Instagram,
         GoogleDrive,
         Tus,
-      } from 'https://releases.transloadit.com/uppy/v3.19.1/uppy.min.mjs'
+      } from 'https://releases.transloadit.com/uppy/v3.20.0/uppy.min.mjs'
 
       const uppy = new Uppy({ debug: true, autoProceed: false })
         .use(Dashboard, { trigger: '#uppyModalOpener' })

diff --git a/packages/@uppy/companion-client/CHANGELOG.md b/packages/@uppy/companion-client/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @uppy/companion-client
 
+## 3.6.1
+
+Released: 2023-11-24
+Included in: Uppy v3.20.0
+
+- @uppy/companion-client: fix log type error (Mikael Finstad / #4766)
+- @uppy/companion-client: revert breaking change (Antoine du Hamel / #4801)
+
 ## 3.5.0
 
 Released: 2023-10-20

diff --git a/packages/@uppy/companion-client/package.json b/packages/@uppy/companion-client/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@uppy/companion-client",
   "description": "Client library for communication with Companion. Intended for use in Uppy plugins.",
-  "version": "3.6.0",
+  "version": "3.6.1",
   "license": "MIT",
   "main": "lib/index.js",
   "type": "module",

diff --git a/packages/@uppy/core/src/Uppy.ts b/packages/@uppy/core/src/Uppy.ts
@@ -809,8 +809,10 @@ export class Uppy<M extends Meta, B extends Body> {
         // users are asked to re-select these half-recovered files and then this method will be called again.
         // In order to keep the progress, meta and everthing else, we keep the existing file,
         // but we replace `data`, and we remove `isGhost`, because the file is no longer a ghost now
-        if (existingFiles[newFile.id]?.isGhost) {
-          const existingFileState = existingFiles[newFile.id]
+        const isGhost = existingFiles[newFile.id]?.isGhost
+        if (isGhost) {
+          // eslint-disable-next-line @typescript-eslint/no-unused-vars
+          const { isGhost: _, ...existingFileState } = existingFiles[newFile.id]
           newFile = {
             ...existingFileState,
             isGhost: false,
@@ -836,7 +838,8 @@ export class Uppy<M extends Meta, B extends Body> {
           )
         }
 
-        if (onBeforeFileAddedResult === false) {
+        // Pass through reselected files from Golden Retriever
+        if (onBeforeFileAddedResult === false && !isGhost) {
           // Don’t show UI info for this error, as it should be done by the developer
           throw new RestrictionError(
             'Cannot add the file because onBeforeFileAdded returned false.',

diff --git a/packages/@uppy/image-editor/src/Editor.jsx b/packages/@uppy/image-editor/src/Editor.jsx
@@ -127,7 +127,7 @@ export default class Editor extends Component {
   }
 
   renderRevert () {
-    const { i18n } = this.props
+    const { i18n, opts } = this.props
 
     return (
       <label
@@ -140,7 +140,7 @@ export default class Editor extends Component {
           className="uppy-u-reset uppy-c-btn"
           onClick={() => {
             this.cropper.reset()
-            this.cropper.setAspectRatio(0)
+            this.cropper.setAspectRatio(opts.cropperOptions.initialAspectRatio)
             this.setState({ angle90Deg: 0, angleGranular: 0 })
           }}
         >

diff --git a/packages/@uppy/image-editor/src/ImageEditor.jsx b/packages/@uppy/image-editor/src/ImageEditor.jsx
@@ -24,6 +24,7 @@ export default class ImageEditor extends UIPlugin {
       minCropBoxWidth: 70,
       minCropBoxHeight: 70,
       croppedCanvasOptions: {},
+      initialAspectRatio: 0,
     }
 
     const defaultActions = {

diff --git a/packages/@uppy/locales/CHANGELOG.md b/packages/@uppy/locales/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @uppy/locales
 
+## 3.5.0
+
+Released: 2023-11-24
+Included in: Uppy v3.20.0
+
+- @uppy/locales: Add missing translations to de_DE (Leonhard Melzer / #4800)
+- @uppy/locales: use TypeScript for source files (Antoine du Hamel / #4779)
+
 ## 3.4.0
 
 Released: 2023-11-08

diff --git a/packages/@uppy/locales/package.json b/packages/@uppy/locales/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@uppy/locales",
   "description": "Uppy language packs",
-  "version": "3.4.0",
+  "version": "3.5.0",
   "license": "MIT",
   "type": "module",
   "keywords": [

diff --git a/packages/@uppy/store-default/CHANGELOG.md b/packages/@uppy/store-default/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @uppy/store-default
 
+## 3.1.0
+
+Released: 2023-11-24
+Included in: Uppy v3.20.0
+
+- @uppy/store-default: refactor to typescript (Antoine du Hamel / #4785)
+
 ## 3.0.2
 
 Released: 2022-09-25

diff --git a/packages/@uppy/store-default/package.json b/packages/@uppy/store-default/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@uppy/store-default",
   "description": "The default simple object-based store for Uppy.",
-  "version": "3.0.5",
+  "version": "3.1.0",
   "license": "MIT",
   "main": "lib/index.js",
   "type": "module",

diff --git a/packages/@uppy/utils/src/dataURItoBlob.test.ts b/packages/@uppy/utils/src/dataURItoBlob.test.ts
@@ -1,6 +1,6 @@
 import { describe, expect, it } from 'vitest'
 import dataURItoBlob from './dataURItoBlob.ts'
-import sampleImageDataURI from './sampleImageDataURI.js'
+import sampleImageDataURI from './sampleImageDataURI.ts'
 
 describe('dataURItoBlob', () => {
   it('should convert a data uri to a blob', () => {

diff --git a/packages/@uppy/utils/src/dataURItoFile.test.ts b/packages/@uppy/utils/src/dataURItoFile.test.ts
@@ -1,6 +1,6 @@
 import { describe, expect, it } from 'vitest'
 import dataURItoFile from './dataURItoFile.ts'
-import sampleImageDataURI from './sampleImageDataURI.js'
+import sampleImageDataURI from './sampleImageDataURI.ts'
 
 describe('dataURItoFile', () => {
   it('should convert a data uri to a file', () => {

diff --git a/packages/uppy/package.json b/packages/uppy/package.json
@@ -1,7 +1,7 @@
 {
   "name": "uppy",
   "description": "Extensible JavaScript file upload widget with support for drag&drop, resumable uploads, previews, restrictions, file processing/encoding, remote providers like Instagram, Dropbox, Google Drive, S3 and more :dog:",
-  "version": "3.19.1",
+  "version": "3.20.0",
   "license": "MIT",
   "main": "index.mjs",
   "module": "index.mjs",