Skip to content

Commit

Permalink
Merge branch 'main' into aws-e2e
Browse files Browse the repository at this point in the history
* main: (63 commits)
  @uppy/angular: fix peer dependencies (#4035)
  uppy.io homepage: Add Tus
  Fix uppy.io homepage example
  Release: uppy@3.0.0 (#4031)
  Update README.md
  Update README.md
  meta: Use RemoteSources in readme example (#4030)
  Add migration guide for Uppy 3.x, Companion 4.x, and Robodog (#3913)
  example: upgrade React example to use React 18 (#4002)
  readme: Use new ESM syntax (#4028)
  fixup! meta: fix linter failures (#4029)
  @uppy/vue: move `@uppy/` packages to peer dependencies (#4024)
  meta: fix linter failures (#4029)
  @uppy/robodog: remove package (#3946)
  example: migrate `digitalocean-spaces` to ESM (#4015)
  example: replace Robodog example with Transloadit + RemoteSources + Form (#4027)
  website: replace Robodog example with Uppy plugins (#4026)
  @uppy/tus, @uppy/xhr-upload, @uppy/aws-s3: `metaFields` -> `allowedMetaFields` (#4023)
  example: showcase migration out of Robodog (#4021)
  example: fix Svelte dev mode (#4025)
  ...
  • Loading branch information
Murderlon committed Aug 23, 2022
2 parents 141c801 + 2ce8036 commit ebb1c07
Show file tree
Hide file tree
Showing 318 changed files with 12,507 additions and 17,388 deletions.
2 changes: 1 addition & 1 deletion .eslintignore
Expand Up @@ -9,7 +9,7 @@ website/themes/uppy/source/js/smooth-scroll.min.js
website/themes/uppy/source/js/uppy.js
website/themes/uppy/source/uppy/**
test/endtoend/*/build
examples/dev/output
examples/svelte-example/public/build/
bundle-legacy.js
website/src/_posts/201*.md
website/src/_posts/2020-*.md
Expand Down
9 changes: 9 additions & 0 deletions .eslintrc.js
Expand Up @@ -195,6 +195,15 @@ module.exports = {
'examples/aws-presigned-url/*.js',
'examples/bundled/*.js',
'examples/custom-provider/client/*.js',
'examples/digitalocean-spaces/*.js',
'examples/multiple-instances/*.js',
'examples/node-xhr/*.js',
'examples/php-xhr/*.js',
'examples/python-xhr/*.js',
'examples/react-example/*.js',
'examples/transloadit/*.js',
'examples/transloadit-markdown-bin/*.js',
'examples/xhr-bundle/*.js',
'private/dev/*.js',
'private/release/*.js',
'private/remark-lint-uppy/*.js',
Expand Down
18 changes: 17 additions & 1 deletion .github/CONTRIBUTING.md
Expand Up @@ -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
Expand Down Expand Up @@ -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>

Expand All @@ -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
Expand Down Expand Up @@ -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:
Expand Down
5 changes: 0 additions & 5 deletions .github/workflows/release.yml
Expand Up @@ -70,11 +70,6 @@ jobs:
env:
EDGLY_KEY: ${{secrets.EDGLY_KEY}}
EDGLY_SECRET: ${{secrets.EDGLY_SECRET}}
- name: Upload `@uppy/robodog` to CDN if it was released
run: git diff --exit-code --quiet HEAD^ -- packages/@uppy/robodog/package.json || corepack yarn run uploadcdn @uppy/robodog
env:
EDGLY_KEY: ${{secrets.EDGLY_KEY}}
EDGLY_SECRET: ${{secrets.EDGLY_SECRET}}
- name: Upload `@uppy/locales` to CDN if it was released
run: git diff --exit-code --quiet HEAD^ -- packages/@uppy/locales/package.json ||corepack yarn run uploadcdn @uppy/locales
env:
Expand Down
79 changes: 0 additions & 79 deletions .yarn/patches/npm-auth-to-token-npm-1.0.0-c288ce201f

This file was deleted.

12 changes: 12 additions & 0 deletions .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",
1 change: 1 addition & 0 deletions .yarnrc.yml
Expand Up @@ -5,6 +5,7 @@ changesetBaseRefs:

initScope: uppy

enableGlobalCache: false
nodeLinker: node-modules

plugins:
Expand Down
6 changes: 3 additions & 3 deletions BACKLOG.md
Expand Up @@ -12,9 +12,9 @@ PRs are welcome! Please do open an issue to discuss first if it's a big feature,
- [ ] Some not too breaking breaking changes. Go through TODOs (@arturi, @aduh95, @Murderlon)
- [ ] Companion breaking changes, like S3 keys (@mifi)
- [x] New remote-sources preset
- [ ] Deprecate Robodog
- [ ] Remove from 3.x branch (@aduh95)
- [ ] Update docs that refer to Robodog (@arturi)
- [x] Deprecate Robodog
- [x] Remove from 3.x branch (@aduh95)
- [x] Update docs that refer to Robodog (@arturi)
- [ ] Update Transloadit.com examples and docs to use @uppy/transloadit + @uppy/remote-sources plugins instead of @uppy/robodog (@arturi)

## `4.0.0`
Expand Down
2 changes: 1 addition & 1 deletion 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/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
Expand Down

0 comments on commit ebb1c07

Please sign in to comment.