transloadit · github-actions · Aug 4, 2022 · Aug 4, 2022 · Aug 4, 2022 · Aug 4, 2022
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -243,6 +243,7 @@ module.exports = {
         'packages/@uppy/webcam/src/**/*.js',
         'packages/@uppy/xhr-upload/src/**/*.js',
         'packages/@uppy/zoom/src/**/*.js',
+        'website/src/examples/*/*.es6',
       ],
       parser: 'espree',
       parserOptions: {

diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
@@ -48,6 +48,12 @@ To start the testing suite run:
 
     yarn e2e
 
+This will run Cypress in watch-mode, and it will pick up and rebuild any changes to JS files. If you need to change other files (like CSS for example), you need to run the respective `yarn build:*` scripts.
+
+Alternatively the following command is the same as the above, except it doesn't run `build` first:
+
+    yarn e2e:skip-build
+
 To generate the boilerplate for a new test run:
 
     yarn e2e:generate
@@ -94,7 +100,7 @@ The following steps describe the actions that take place when a user Authenticat
 
 ### Instagram integration
 
-Even though facebook [allows using](https://developers.facebook.com/blog/post/2018/06/08/enforce-https-facebook-login/) http://localhost in dev mode, Instagram doesn’t seem to support that, and seems to need a publically available domain name with HTTPS.
+Even though facebook [allows using](https://developers.facebook.com/blog/post/2018/06/08/enforce-https-facebook-login/) http://localhost in dev mode, Instagram doesn’t seem to support that, and seems to need a publically available domain name with HTTPS. So we will tunnel requests to localhost using `ngrok`.
 
 Make sure that you are using a development facebook app at <https://developers.facebook.com/apps>
 
@@ -103,6 +109,8 @@ Go to “Instagram Basic Display” and find `Instagram App ID` and `Instagram A
     COMPANION_INSTAGRAM_KEY="Instagram App ID"
     COMPANION_INSTAGRAM_SECRET="Instagram App Secret"
 
+**Note!** `ngrok` seems to be blocked by Instagram now, so you may have to find an alternative.
+
 Run
 
 ```bash
@@ -130,6 +138,14 @@ Tester invites -> Accept
 
 Now you should be able to test the Instagram integration.
 
+## Zoom
+
+See above Instagram instructions for setting up a tunnel, but replace `instagram` with `zoom` in the URL. Note that **you also have to add the OAuth redirect URL to `OAuth allow list`** in the Zoom Oauth app settings or it will not work.
+
+Add the following scopes: `recording:read`, `user:read`, `user_info:read`
+
+To test recording a meeting, you need to sign up for a Zoom Pro trial (can be cancelled later), for example using their iOS app.
+
 ## Releases
 
 Before doing a release, check that the examples on the website work:

diff --git a/.github/workflows/release-beta-candidate.yml b/.github/workflows/release-beta-candidate.yml
diff --git a/.github/workflows/release-candidate.yml b/.github/workflows/release-candidate.yml
@@ -1,23 +1,21 @@
-name: Release candidate
+name: Release beta candidate
 on:
   push:
-    branches: release
+    branches: release-beta
+
+env:
+  BETA_BRANCH: 3.x
 
 jobs:
-  prepare-release:
+  prepare-beta-release:
     name: Prepare release candidate Pull Request
     runs-on: ubuntu-latest
     steps:
       - name: Checkout sources
         uses: actions/checkout@v3
         with:
-          branch: release
-      - name: Rebase
-        run: |
-          git fetch origin HEAD --depth=1
-          git config --global user.email "actions@github.com"
-          git config --global user.name "GitHub Actions"
-          git rebase FETCH_HEAD
+          branch: release-beta
+          fetch-depth: 3 # the prepare commit, the merge commit, and the base ones.
       - name: Get yarn cache directory path
         id: yarn-cache-dir-path
         run: echo "::set-output name=dir::$(corepack yarn config get cacheFolder)"
@@ -36,7 +34,7 @@ jobs:
       - name: Install dependencies
         run: corepack yarn install --immutable
       - name: Bump candidate packages version
-        run: corepack yarn version apply --all --json | jq -s > releases.json
+        run: corepack yarn version apply --all --prerelease=beta.%n --json | jq -s > releases.json
       - name: Prepare changelog
         run: corepack yarn workspace @uppy-dev/release update-changelogs releases.json | xargs git add
       - name: Update CDN URLs
@@ -53,13 +51,15 @@ jobs:
           echo "This is a release candidate for the following packages:" >> commitMessage
           echo >> commitMessage
           jq -r 'map("- `"+.ident+"`: "+.oldVersion+" -> "+.newVersion) | join("\n") ' < releases.json >> commitMessage
+          git config --global user.email "actions@github.com"
+          git config --global user.name "GitHub Actions"
           git commit -n --amend --file commitMessage
       - name: Open Pull Request
         id: pr_opening
         run: |
           git push origin HEAD:release-candidate
           gh api repos/${{ github.repository }}/pulls \
-            -F base="$(gh api /repos/${{ github.repository }} | jq -r .default_branch)" \
+            -F base="${{ env.BETA_BRANCH }}" \
             -F head="release-candidate" \
             -F title="$(head -1 commitMessage)" \
             -F body="$(git --no-pager diff HEAD^ -- CHANGELOG.md | awk '{ if( substr($0,0,1) == "+" && $1 != "+##" && $1 != "+Released:" && $1 != "+++" ) { print substr($0,2) } }')" \

diff --git a/.yarn/patches/npm-auth-to-token-npm-1.0.0-c288ce201f b/.yarn/patches/npm-auth-to-token-npm-1.0.0-c288ce201f
diff --git a/.yarn/patches/preact-npm-10.10.0-dd04de05e8.patch b/.yarn/patches/preact-npm-10.10.0-dd04de05e8.patch
@@ -0,0 +1,12 @@
+diff --git a/package.json b/package.json
+index 60279c24a08b808ffbf7dc64a038272bddb6785d..71cb8aa038daeeb7edf43564ed78a219003a0c99 100644
+--- a/package.json
++++ b/package.json
+@@ -9,6 +9,7 @@
+ 	"umd:main": "dist/preact.umd.js",
+ 	"unpkg": "dist/preact.min.js",
+ 	"source": "src/index.js",
++	"type": "module",
+ 	"exports": {
+ 		".": {
+ 			"types": "./src/index.d.ts",
diff --git a/.yarnrc.yml b/.yarnrc.yml
@@ -5,6 +5,7 @@ changesetBaseRefs:
 
 initScope: uppy
 
+enableGlobalCache: false
 nodeLinker: node-modules
 
 plugins:

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.0.0-beta.4/uppy.min.js"></script>`) or bundle it with your webapp.
+this from a CDN (`<script src="https://releases.transloadit.com/uppy/v3.0.0-beta.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,62 @@ Please add your entries in this format:
 
 In the current stage we aim to release a new version at least every month.
 
+## 3.0.0-beta.5
+
+Released: 2022-08-16
+
+| Package                   |      Version | Package                   |      Version |
+| ------------------------- | ------------ | ------------------------- | ------------ |
+| @uppy/angular             | 1.0.0-beta.1 | @uppy/onedrive            | 3.0.0-beta.2 |
+| @uppy/audio               | 1.0.0-beta.2 | @uppy/progress-bar        | 3.0.0-beta.2 |
+| @uppy/aws-s3              | 3.0.0-beta.3 | @uppy/provider-views      | 3.0.0-beta.3 |
+| @uppy/aws-s3-multipart    | 3.0.0-beta.4 | @uppy/react               | 3.0.0-beta.4 |
+| @uppy/box                 | 2.0.0-beta.2 | @uppy/redux-dev-tools     | 3.0.0-beta.2 |
+| @uppy/companion           | 4.0.0-beta.4 | @uppy/remote-sources      | 1.0.0-beta.4 |
+| @uppy/companion-client    | 3.0.0-beta.2 | @uppy/screen-capture      | 3.0.0-beta.3 |
+| @uppy/compressor          | 1.0.0-beta.3 | @uppy/status-bar          | 3.0.0-beta.3 |
+| @uppy/core                | 3.0.0-beta.4 | @uppy/store-default       | 3.0.0-beta.3 |
+| @uppy/dashboard           | 3.0.0-beta.4 | @uppy/store-redux         | 3.0.0-beta.3 |
+| @uppy/drag-drop           | 3.0.0-beta.2 | @uppy/svelte              | 2.0.0-beta.2 |
+| @uppy/drop-target         | 2.0.0-beta.3 | @uppy/thumbnail-generator | 3.0.0-beta.2 |
+| @uppy/dropbox             | 3.0.0-beta.2 | @uppy/transloadit         | 3.0.0-beta.5 |
+| @uppy/facebook            | 3.0.0-beta.2 | @uppy/tus                 | 3.0.0-beta.3 |
+| @uppy/file-input          | 3.0.0-beta.2 | @uppy/unsplash            | 3.0.0-beta.2 |
+| @uppy/form                | 3.0.0-beta.2 | @uppy/url                 | 3.0.0-beta.3 |
+| @uppy/golden-retriever    | 3.0.0-beta.2 | @uppy/utils               | 5.0.0-beta.1 |
+| @uppy/google-drive        | 3.0.0-beta.2 | @uppy/vue                 | 1.0.0-beta.2 |
+| @uppy/image-editor        | 2.0.0-beta.3 | @uppy/webcam              | 3.0.0-beta.3 |
+| @uppy/informer            | 3.0.0-beta.3 | @uppy/xhr-upload          | 3.0.0-beta.3 |
+| @uppy/instagram           | 3.0.0-beta.2 | @uppy/zoom                | 2.0.0-beta.2 |
+| @uppy/locales             | 3.0.0-beta.4 | uppy                      | 3.0.0-beta.5 |
+
+- meta: prepare release workflow for beta versions (Antoine du Hamel)
+- @uppy/provider-views: Reset filter input correctly in provider views (Merlijn Vos / #3978)
+- @uppy/aws-s3-multipart: Fix when using Companion (Merlijn Vos / #3969)
+- @uppy/companion: Companion: bring back default upload protocol (Mikael Finstad / #3967)
+- meta: Update CONTRIBUTING.md (Mikael Finstad / #3966)
+- meta: fix contributing link (Mikael Finstad / #3968)
+- @uppy/companion: enforce usage of uploadUrls (Mikael Finstad / #3965)
+- @uppy/utils: Fix webp mimetype (Merlijn Vos / #3961)
+- @uppy/locales: Add compressor string translation to Japanese locale (kenken / #3963)
+- meta: Fix statement about cropping images in README.md (Mikael Finstad / #3964)
+- @uppy/aws-s3-multipart: Fix race condition in `#uploadParts` (Morgan Zolob / #3955)
+- @uppy/provider-views: core validateRestrictions: return error directly vs the result/reason obj (Artur Paikin / #3951)
+- @uppy/aws-s3: Export AwsS3UploadParameters & AwsS3Options interfaces (Antonina Vertsinskaya / #3956)
+- website: convert all website examples to ESM (Antoine du Hamel / #3957)
+- @uppy/companion: fix crash if redis disconnects (Mikael Finstad / #3954)
+- @uppy/companion: upgrade `ws` version (Antoine du Hamel / #3949)
+- @uppy/companion: sort Dropbox response & refactor to async/await (Mikael Finstad / #3897)
+- @uppy/utils: modernize `getDroppedFiles` (Antoine du Hamel / #3534)
+- @uppy/companion: fix default getKey for non-standalone too (Mikael Finstad / #3945)
+- @uppy/aws-s3-multipart: ignore exception inside `abortMultipartUpload` (Antoine du Hamel / #3950)
+- @uppy/companion: remove `isobject` from dependencies (Antoine du Hamel / #3948)
+- @uppy/compressor: Fix Compressor being broken when no name is in the compressed blob (Artur Paikin / #3947)
+- @uppy/core,@uppy/react: Fix all breaking todo comments for 3.0 (Merlijn Vos / #3907)
+- @uppy/companion: show deprecation message when using legacy s3 options (Antoine du Hamel / #3944)
+- example: fix aws-companion example (Antoine du Hamel / #3850)
+
+
 ## 3.0.0-beta.4
 
 Released: 2022-08-03