merge main

transloadit · Sep 6, 2023 · 8016a5d · 8016a5d
2 parents f2e5aa4 + a4b8683
commit 8016a5d
Show file tree

Hide file tree

Showing 127 changed files with 5,215 additions and 10,866 deletions.
diff --git a/.env.example b/.env.example
@@ -51,6 +51,9 @@ COMPANION_ZOOM_SECRET=***
 COMPANION_UNSPLASH_KEY=***
 COMPANION_UNSPLASH_SECRET=***
 
+COMPANION_ONEDRIVE_KEY=***
+COMPANION_ONEDRIVE_SECRET=****
+
 # Development environment
 # =======================
 

diff --git a/.eslintrc.js b/.eslintrc.js
@@ -335,18 +335,6 @@ module.exports = {
       files: ['./packages/@uppy/companion/**/*.js'],
       rules: {
         'no-underscore-dangle': 'off',
-
-        // transloadit rules we would like to enforce in the future
-        // but will require separate PRs to gradually get there
-        // and so the meantime: just warn
-        'class-methods-use-this': 'warn',
-        'consistent-return': 'warn',
-        'global-require': 'warn',
-        'import/order': 'warn',
-        'no-param-reassign': 'warn',
-        'no-redeclare': 'warn',
-        'no-shadow': 'warn',
-        'no-use-before-define': 'warn',
       },
     },
     {

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.13.1/uppy.min.js"></script>`) or bundle it with your webapp.
+this from a CDN (`<script src="https://releases.transloadit.com/uppy/v3.15.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,89 @@ Please add your entries in this format:
 
 In the current stage we aim to release a new version at least every month.
 
+## 3.15.0
+
+Released: 2023-09-05
+
+| Package                | Version | Package                | Version |
+| ---------------------- | ------- | ---------------------- | ------- |
+| @uppy/angular          |   0.6.0 | @uppy/dashboard        |   3.5.2 |
+| @uppy/aws-s3           |   3.3.0 | @uppy/transloadit      |   3.3.0 |
+| @uppy/aws-s3-multipart |   3.6.0 | @uppy/tus              |   3.2.0 |
+| @uppy/companion        |   4.8.2 | @uppy/utils            |   5.5.0 |
+| @uppy/companion-client |   3.4.0 | @uppy/xhr-upload       |   3.4.0 |
+| @uppy/core             |   3.5.0 | uppy                   |  3.15.0 |
+
+- @uppy/transloadit: Emit assembly progress events (Marius / #4603)
+- @uppy/transloadit: remove Socket.io (Antoine du Hamel / #4281)
+- meta: example: update Angular example to 16.x (Antoine du Hamel / #4642)
+- @uppy/angular: upgrade to Angular 16.x (Antoine du Hamel / #4642)
+- @uppy/companion: refactor `getProtectedHttpAgent` to make TS happy (Antoine du Hamel / #4654)
+- @uppy/companion: Alias "removeListener" as "off" in Redis emitter (Elliot Dickison / #4647)
+- @uppy/aws-s3-multipart,@uppy/aws-s3,@uppy/companion-client,@uppy/core,@uppy/tus,@uppy/utils,@uppy/xhr-upload: Move remote file upload logic into companion-client (Merlijn Vos / #4573)
+- @uppy/dashboard: when showAddFilesPanel  is true, aria-hidden should be the opposite (Artur Paikin / #4643)
+
+
+## 3.14.1
+
+Released: 2023-08-23
+
+| Package                | Version | Package                | Version |
+| ---------------------- | ------- | ---------------------- | ------- |
+| @uppy/aws-s3           |   3.2.3 | @uppy/companion        |   4.8.1 |
+| @uppy/aws-s3-multipart |   3.5.4 | uppy                   |  3.14.1 |
+
+- @uppy/aws-s3-multipart: fix types when using deprecated option (Antoine du Hamel / #4634)
+- @uppy/companion: harden lint rules (Antoine du Hamel / #4641)
+- @uppy/aws-s3-multipart,@uppy/aws-s3: allow empty objects for `fields` types (Antoine du Hamel / #4631)
+- meta: upgrade Node.js docker version (Antoine du Hamel / #4630)
+
+
+## 3.14.0
+
+Released: 2023-08-15
+
+| Package                   | Version | Package                   | Version |
+| ------------------------- | ------- | ------------------------- | ------- |
+| @uppy/audio               |   1.1.2 | @uppy/locales             |   3.3.0 |
+| @uppy/aws-s3              |   3.2.2 | @uppy/onedrive            |   3.1.3 |
+| @uppy/aws-s3-multipart    |   3.5.3 | @uppy/progress-bar        |   3.0.3 |
+| @uppy/box                 |   2.1.3 | @uppy/provider-views      |   3.5.0 |
+| @uppy/companion           |   4.8.0 | @uppy/redux-dev-tools     |   3.0.3 |
+| @uppy/companion-client    |   3.3.0 | @uppy/screen-capture      |   3.1.2 |
+| @uppy/core                |   3.4.0 | @uppy/status-bar          |   3.2.4 |
+| @uppy/dashboard           |   3.5.1 | @uppy/thumbnail-generator |   3.0.4 |
+| @uppy/drag-drop           |   3.0.3 | @uppy/transloadit         |   3.2.1 |
+| @uppy/dropbox             |   3.1.3 | @uppy/tus                 |   3.1.3 |
+| @uppy/facebook            |   3.1.2 | @uppy/unsplash            |   3.2.2 |
+| @uppy/file-input          |   3.0.3 | @uppy/url                 |   3.3.3 |
+| @uppy/google-drive        |   3.2.1 | @uppy/webcam              |   3.3.2 |
+| @uppy/image-editor        |   2.1.3 | @uppy/xhr-upload          |   3.3.2 |
+| @uppy/informer            |   3.0.3 | @uppy/zoom                |   2.1.2 |
+| @uppy/instagram           |   3.1.2 | uppy                      |  3.14.0 |
+
+- meta: Readme improvements (Artur Paikin / #4622)
+- @uppy/companion: Fix typos and add env vars to .env.example (Dominik Schmidt / #4624)
+- @uppy/aws-s3-multipart: pass the `uploadURL` back to the caller (Antoine du Hamel / #4614)
+- meta: update to node-18.17.0-alpine,  (odselsevier / #4617)
+- @uppy/aws-s3,@uppy/aws-s3-multipart: update types (Antoine du Hamel / #4611)
+- @uppy/aws-s3-multipart,@uppy/aws-s3,@uppy/companion,@uppy/transloadit,@uppy/xhr-upload: use uppercase HTTP method names (Antoine du Hamel / #4612)
+- meta: e2e: fix race condition in transloadit test (Antoine du Hamel / #4616)
+- @uppy/aws-s3,@uppy/aws-s3-multipart: update types (bdirito / #4576)
+- @uppy/core: allow duplicate files with onBeforeFileAdded (Merlijn Vos / #4594)
+- @uppy/companion: make CSRF protection helpers available to providers (Dominik Schmidt / #4554)
+- @uppy/companion: fix Redis key default TTL (Subha Sarkar / #4607)
+- @uppy/companion: Fix Uploader.js metadata normalisation (Subha Sarkar / #4608)
+- @uppy/companion-client,@uppy/provider-views: make authentication optional (Dominik Schmidt / #4556)
+- @uppy/provider-views: fix ProviderView error on empty plugin.icon (Dominik Schmidt / #4553)
+- @uppy/aws-s3,@uppy/tus,@uppy/xhr-upload:  Invoke headers function for remote uploads (Dominik Schmidt / #4596)
+- @uppy/companion: Unify redis initialization (Dominik Schmidt / #4597)
+- meta: lock node-js version on ci (Mikael Finstad / #4606)
+- @uppy/companion: allow dynamic S3 bucket (rmoura-92 / #4579)
+- @uppy/status-bar: e2e: add test for retrying and pausing uploads (Antoine du Hamel / #3599)
+- meta: e2e: remove too short timeout (Antoine du Hamel / #4602)
+
+
 ## 3.13.1
 
 Released: 2023-07-24

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:16.13.0-alpine as build
+FROM node:18.17.1-alpine as build
 
 # Create link to node on amd64 so that corepack can find it
 RUN if [ "$(uname -m)" == "aarch64" ]; then mkdir -p /usr/local/sbin/ && ln -s /usr/local/bin/node /usr/local/sbin/node; fi
@@ -19,7 +19,7 @@ RUN cd /app && corepack yarn workspace @uppy/companion build
 # Now remove all non-prod dependencies for a leaner image
 RUN cd /app && corepack yarn workspaces focus @uppy/companion --production
 
-FROM node:16.13.0-alpine
+FROM node:18.17.1-alpine
 
 WORKDIR /app
 

diff --git a/Dockerfile.test b/Dockerfile.test
@@ -1,4 +1,4 @@
-FROM node:16.13.0-alpine
+FROM node:18.17.1-alpine
 
 COPY package.json /app/package.json