Skip to content

Commit

Permalink
Merge branch 'main' into lakesare/type-dashboard-2
Browse files Browse the repository at this point in the history
* main: (65 commits)
  `.handleInputChange()` - use `.currentTarget`; clear the input using `''` (#5381)
  build(deps): bump @blakeembrey/template from 1.1.0 to 1.2.0 (#5448)
  Update packages/@uppy/locales/src/fr_FR.ts (#5472)
  @uppy/svelte: use SvelteKit as the build tool (#5484)
  @uppy/xhr-upload: add response to upload-error callback (#5486)
  tus: Avoid duplicate `upload-error` event (#5485)
  Fix redis emitter (#5474)
  build(deps): bump docker/build-push-action from 6.8.0 to 6.9.0 (#5483)
  Release: [email protected] (#5479)
  @uppy/transloadit: fix multiple upload batches & run again (#5478)
  build(deps): bump docker/build-push-action from 6.7.0 to 6.8.0 (#5477)
  build(deps): bump vite from 5.2.11 to 5.4.8 (#5471)
  build(deps-dev): bump rollup from 4.18.0 to 4.22.4 (#5470)
  build(deps): bump vite from 5.2.11 to 5.4.6 (#5466)
  Release: [email protected] (#5467)
  @uppy/tus: fix retry check for status code 400 (#5461)
  meta: fix AwsS3 endpoint option in private/dev
  build(deps): bump body-parser from 1.20.2 to 1.20.3 (#5462)
  build(deps-dev): bump vite from 5.3.1 to 5.3.6 (#5459)
  @uppy/tus: set response from tus-js-client (#5456)
  ...
  • Loading branch information
Murderlon committed Oct 15, 2024
2 parents 94b6a47 + 9a4b8ef commit 2ef3b4d
Show file tree
Hide file tree
Showing 263 changed files with 3,035 additions and 1,118 deletions.
15 changes: 13 additions & 2 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -447,8 +447,11 @@ module.exports = {
rules: {
'no-extra-semi': 'off',
'no-restricted-syntax': ['error', {
selector: 'ImportDeclaration[importKind="type"][source.value=/^(\\.+|@uppy\\x2F[a-z-0-9]+)\\x2F/]:not([source.value=/^@uppy\\x2Futils\\x2F/]):not([source.value=/\\.js$/])',
message: 'Use ".js" file extension for import type declarations',
selector: 'ImportDeclaration[importKind="type"][source.value=/^@uppy\\x2F[a-z-0-9]+\\x2F/]:not([source.value=/^@uppy\\x2Futils\\x2F/]):not([source.value=/\\.js$/])',
message: 'Use ".js" file extension for import type declarations from a different package',
}, {
selector: 'ImportDeclaration[importKind="type"][source.value=/^\\.\\.?\\x2F.+\\.js$/]',
message: 'Do not use ".js" file extension for relative import type declarations',
}, {
selector: 'ImportDeclaration[source.value=/^@uppy\\x2Futils\\x2Flib\\x2F.+\\.[mc]?[jt]sx?$/]',
message: 'Do not use file extension when importing from @uppy/utils',
Expand Down Expand Up @@ -497,6 +500,14 @@ module.exports = {
'no-unused-vars': 'off',
},
},
{
files: [
'packages/@uppy/svelte/**',
],
parserOptions: {
sourceType: 'module',
},
},
{
files: ['e2e/**/*.ts'],
extends: ['plugin:cypress/recommended'],
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/bundlers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ jobs:
} from "@rollup/plugin-node-resolve";
export default {
input: "./index.mjs",
input: "./lib/index.js",
output: {
file: "/dev/null",
},
Expand Down Expand Up @@ -137,9 +137,9 @@ jobs:
- run: npx webpack --version
- name: Create Webpack config file
run:
echo
'module.exports={mode:"production",target:"web",entry:"./index.mjs"}'
> webpack.config.js
echo 'export default
{mode:"production",target:"web",entry:"./lib/index.js"}' >
webpack.config.js
- name: Bundle
run: npx webpack

Expand Down Expand Up @@ -171,7 +171,7 @@ jobs:
run: npm i --save-dev parcel@${{matrix.bundler-version}}
- run: npx parcel --version
- name: Bundle
run: npx parcel build index.mjs
run: npx parcel build lib/index.js

vite:
needs: isolate_uppy
Expand All @@ -194,7 +194,7 @@ jobs:
- name: Create index.html
run:
echo '<!doctype html><html><head><script type="module"
src="./index.mjs"></script></head></html>' > index.html
src="./lib/index.js"></script></head></html>' > index.html
- name: Bundle
run: npx vite build

Expand All @@ -217,6 +217,6 @@ jobs:
run: npm i --save-dev esbuild@${{matrix.bundler-version}}
- run: npx esbuild --version
- name: Bundle
run: npx esbuild index.mjs --bundle --outfile=/dev/null
run: npx esbuild lib/index.js --bundle --outfile=/dev/null

# Browserify: doesn't support ESM.
6 changes: 3 additions & 3 deletions .github/workflows/companion-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,15 +55,15 @@ jobs:
tags: |
type=edge
type=raw,value=latest,enable=false
- uses: docker/setup-qemu-action@5927c834f5b4fdf503fca6f4c7eccda82949e1ee # v3.1.0
- uses: docker/setup-qemu-action@49b3bc8e6bdd4a60e6116a5414239cba5943d3cf # v3.2.0
- uses: docker/setup-buildx-action@v3
- name: Log in to DockerHub
uses: docker/login-action@0d4c9c5ea7693da7b068278f7b52bda2a190a446 # v3.2.0
uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
with:
username: ${{secrets.DOCKER_USERNAME}}
password: ${{secrets.DOCKER_PASSWORD}}
- name: Build and push
uses: docker/build-push-action@1ca370b3a9802c92e886402e0dd88098a2533b12 # v6.4.1
uses: docker/build-push-action@4f58ea79222b3b9dc2c8bbdd6debcef730109a75 # v6.9.0
with:
push: true
context: .
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -151,15 +151,15 @@ jobs:
type=semver,pattern={{version}},value=${{ needs.release.outputs.companionWasReleased }}
# set latest tag for default branch
type=raw,value=latest,enable=true
- uses: docker/setup-qemu-action@5927c834f5b4fdf503fca6f4c7eccda82949e1ee # v3.1.0
- uses: docker/setup-qemu-action@49b3bc8e6bdd4a60e6116a5414239cba5943d3cf # v3.2.0
- uses: docker/setup-buildx-action@v3
- name: Log in to DockerHub
uses: docker/login-action@0d4c9c5ea7693da7b068278f7b52bda2a190a446 # v3.2.0
uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
with:
username: ${{secrets.DOCKER_USERNAME}}
password: ${{secrets.DOCKER_PASSWORD}}
- name: Build and push
uses: docker/build-push-action@1ca370b3a9802c92e886402e0dd88098a2533b12 # v6.4.1
uses: docker/build-push-action@4f58ea79222b3b9dc2c8bbdd6debcef730109a75 # v6.9.0
with:
push: true
context: .
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ tsconfig.build.tsbuildinfo

dist/
lib/
# @uppy/svelte needs lib inside src
!src/lib
coverage/
examples/dev/bundle.js
examples/aws-php/vendor/*
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
diff --git a/package.json b/package.json
index 8367745346fffd144a817ccf04912bb799e18b66..66dd17a4cd736089a332d72a70040701b0cd9c93 100644
index d4133284745349488cf0e623b983c78fd7cc7fb7..52433fa0ecea99ebbfe5b94a8023f73350896f7d 100644
--- a/package.json
+++ b/package.json
@@ -6,6 +6,7 @@
"repository": "sindresorhus/p-queue",
"funding": "https://github.com/sponsors/sindresorhus",
"type": "module",
+ "main": "./dist/index.js",
"exports": "./dist/index.js",
"engines": {
"node": ">=12"
"exports": {
"types": "./dist/index.d.ts",
"default": "./dist/index.js"
16 changes: 7 additions & 9 deletions BUNDLE-README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

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/v4.1.0/uppy.min.js"></script>`)
(`<script src="https://releases.transloadit.com/uppy/v4.4.1/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
Expand Down Expand Up @@ -83,14 +83,12 @@ inline into the page. This, and many more configuration options can be found
here: <https://uppy.io/docs/dashboard/>.

Uppy has many more Plugins besides Xhr and the Dashboard. For example, you can
enable Webcam, Instagram, or video encoding support. For a full list of Plugins
check here: <https://uppy.io/docs/plugins/>.

Note that for some Plugins, you will need to run a server side component called:
Companion. Those plugins are marked with a (c) symbol. Alternatively, you can
sign up for a free Transloadit account. Transloadit runs Companion for you, tusd
servers to handle resumable file uploads, and can post-process files to scan for
viruses, recognize faces, etc. Check: <https://transloadit.com>.
enable Webcam, Instagram, or video encoding support. Note that for some Plugins,
you will need to run a server side component called: Companion. Those plugins
are marked with a (c) symbol. Alternatively, you can sign up for a free
Transloadit account. Transloadit runs Companion for you, tusd servers to handle
resumable file uploads, and can post-process files to scan for viruses,
recognize faces, etc. Check: <https://transloadit.com>.

## Getting help

Expand Down
139 changes: 138 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,143 @@ Please add your entries in this format:

In the current stage we aim to release a new version at least every month.

## 4.4.1

Released: 2024-09-30

| Package | Version | Package | Version |
| ----------------- | ------- | ----------------- | ------- |
| @uppy/core | 4.2.1 | uppy | 4.4.1 |
| @uppy/transloadit | 4.1.2 | | |

- @uppy/transloadit: fix multiple upload batches & run again (Merlijn Vos / #5478)
- meta: build(deps): bump docker/build-push-action from 6.7.0 to 6.8.0 (dependabot[bot] / #5477)
- meta: build(deps): bump vite from 5.2.11 to 5.4.8 (dependabot[bot] / #5471)
- @uppy/svelte: build(deps-dev): bump rollup from 4.18.0 to 4.22.4 (dependabot[bot] / #5470)
- meta: build(deps): bump vite from 5.2.11 to 5.4.6 (dependabot[bot] / #5466)


## 4.4.0

Released: 2024-09-20

| Package | Version | Package | Version |
| ----------------- | ------- | ----------------- | ------- |
| @uppy/companion | 5.1.1 | @uppy/tus | 4.1.1 |
| @uppy/svelte | 4.0.2 | @uppy/xhr-upload | 4.2.0 |
| @uppy/transloadit | 4.1.1 | uppy | 4.4.0 |

- @uppy/tus: fix retry check for status code 400 (Merlijn Vos / #5461)
- meta: Merge branch 'main' of https://github.com/transloadit/uppy (Murderlon)
- meta: fix AwsS3 endpoint option in private/dev (Murderlon)
- examples: build(deps): bump body-parser from 1.20.2 to 1.20.3 (dependabot[bot] / #5462)
- examples: build(deps-dev): bump vite from 5.3.1 to 5.3.6 (dependabot[bot] / #5459)
- @uppy/tus: set response from tus-js-client (Merlijn Vos / #5456)
- docs: fix assemblyOptions example for React (Merlijn Vos / #5450)
- docs: rename Edgly to Smart CDN (Merlijn Vos / #5449)
- @uppy/tus: correctly type tus on UppyFile (Merlijn Vos / #5454)
- docs: remove old legacy CDN reference (Murderlon)
- @uppy/xhr-upload: pass files to onBeforeRequest (Merlijn Vos / #5447)
- @uppy/svelte: fix generated module to not bundle Svelte (Antoine du Hamel / #5446)
- examples,@uppy/svelte: Bump svelte from 4.2.18 to 4.2.19 (dependabot[bot] / #5440)
- meta: bump Yarn to 4.4.1 (Antoine du Hamel / #5445)
- docs: fix broken links in locale docs (Serghei Cebotari / #5441)


## 4.3.0

Released: 2024-08-29

| Package | Version | Package | Version |
| ---------------------- | ------- | ---------------------- | ------- |
| @uppy/aws-s3 | 4.1.0 | @uppy/informer | 4.1.0 |
| @uppy/box | 3.1.0 | @uppy/instagram | 4.1.0 |
| @uppy/companion | 5.1.0 | @uppy/locales | 4.1.0 |
| @uppy/companion-client | 4.1.0 | @uppy/onedrive | 4.1.0 |
| @uppy/compressor | 2.1.0 | @uppy/remote-sources | 2.2.0 |
| @uppy/core | 4.2.0 | @uppy/screen-capture | 4.1.0 |
| @uppy/dashboard | 4.1.0 | @uppy/tus | 4.1.0 |
| @uppy/dropbox | 4.1.0 | @uppy/unsplash | 4.1.0 |
| @uppy/facebook | 4.1.0 | @uppy/url | 4.1.0 |
| @uppy/google-drive | 4.1.0 | @uppy/xhr-upload | 4.1.0 |
| @uppy/google-photos | 0.3.0 | @uppy/zoom | 3.1.0 |
| @uppy/image-editor | 3.1.0 | uppy | 4.3.0 |

- @uppy/core,@uppy/dashboard: Pass container to `UIPlugin.render` for non-Preact integration (Merlijn Vos / #5437)
- @uppy/companion: do not use unsafe call to `JSON.stringify` (Antoine du Hamel / #5422)
- meta: Fix yarn.lock (Murderlon)
- @uppy/locales: Fix locale-pack for en_US (Merlijn Vos / #5431)
- meta: Add tsconfig to packages in private/ (Merlijn Vos / #5432)
- @uppy/remote-sources: support companionKeysParams (Merlijn Vos / #5434)
- @uppy/aws-s3,@uppy/box,@uppy/compressor,@uppy/dropbox,@uppy/facebook,@uppy/google-drive,@uppy/google-photos,@uppy/image-editor,@uppy/informer,@uppy/instagram,@uppy/onedrive,@uppy/screen-capture,@uppy/tus,@uppy/unsplash,@uppy/url,@uppy/xhr-upload,@uppy/zoom: export plugin options (Antoine du Hamel / #5433)
- docs: correctly list exported components (Merlijn Vos / #5417)


## 4.2.1

Released: 2024-08-26

| Package | Version | Package | Version |
| ----------- | ------- | ----------- | ------- |
| @uppy/react | 4.0.2 | uppy | 4.2.1 |

- @uppy/react: fix `use-sync-external-store` import (Merlijn Vos / #5426)
- docs: fix Golden Retriever service worker import (mkabatek / #5425)


## 4.2.0

Released: 2024-08-20

| Package | Version | Package | Version |
| ----------------- | ------- | ----------------- | ------- |
| @uppy/core | 4.1.2 | @uppy/transloadit | 4.1.0 |
| @uppy/status-bar | 4.0.3 | uppy | 4.2.0 |
| @uppy/svelte | 4.0.1 | | |

- @uppy/status-bar: show upload button when files are recovered (Merlijn Vos / #5418)
- meta: Bump docker/build-push-action from 6.6.1 to 6.7.0 (dependabot[bot] / #5413)
- docs: remove stale reference to plugins page (Merlijn Vos / #5414)
- @uppy/transloadit: add execution_progress to AssemblyResponse type (Merlijn Vos / #5420)
- @uppy/svelte: fix exports condition (Merlijn Vos / #5416)
- @uppy/transloadit: fix check if all files have been removed (Merlijn Vos / #5419)
- examples: remove `useUppy` from React Native example (Mikael Finstad / #5405)


## 4.1.1

Released: 2024-08-15

| Package | Version | Package | Version |
| ---------------------- | ------- | ---------------------- | ------- |
| @uppy/aws-s3 | 4.0.3 | @uppy/provider-views | 4.0.1 |
| @uppy/companion | 5.0.5 | @uppy/status-bar | 4.0.2 |
| @uppy/companion-client | 4.0.1 | @uppy/transloadit | 4.0.2 |
| @uppy/core | 4.1.1 | @uppy/tus | 4.0.1 |
| @uppy/dashboard | 4.0.3 | @uppy/utils | 6.0.2 |
| @uppy/drag-drop | 4.0.2 | @uppy/vue | 2.0.1 |
| @uppy/file-input | 4.0.1 | uppy | 4.1.1 |
| @uppy/image-editor | 3.0.1 | | |

- @uppy/transloadit: fix issue with `allowMultipleUploadBatches` (Mikael Finstad / #5400)
- meta: Bump elliptic from 6.5.5 to 6.5.7 (dependabot[bot] / #5410)
- meta: add back patch for `p-queue` (Antoine du Hamel / #5409)
- @uppy/transloadit: fix many lurking `TypeError` (Mikael Finstad / #5399)
- docs: improve `corsOrigins` documentation (Mikael Finstad / #5390)
- docs: add `ViewEncapsulation` to Angular example (Aaron Russell / #5395)
- @uppy/companion: fix code for custom providers (Mikael Finstad / #5398)
- docs: add note about throwing in `cancelAll` and `destroy()` (Mikael Finstad / #5408)
- meta: Bump docker/login-action from 3.2.0 to 3.3.0 (dependabot[bot] / #5372)
- meta: Bump docker/setup-qemu-action from 3.1.0 to 3.2.0 (dependabot[bot] / #5370)
- docs: make hosted Companion more clear (Merlijn Vos / #5394)
- meta: Bump docker/build-push-action from 6.4.1 to 6.6.1 (dependabot[bot] / #5403)
- meta: bump p-queue to latest, remove patch (Mikael Finstad / #5391)
- meta: enforce `.ts` extension for relative import types (Antoine du Hamel / #5393)
- @uppy/tus: Fix onShouldRetry type signature (Trent Nadeau / #5387)
- @uppy/dashboard,@uppy/drag-drop,@uppy/file-input: Transform the `accept` prop into a string everywhere (Evgenia Karunus / #5380)
- docs: fix getTemporarySecurityCredentials in aws-s3 (Merlijn Vos / #5363)


## 4.1.0

Released: 2024-07-30
Expand Down Expand Up @@ -6060,7 +6197,7 @@ Released: 2018-02-11.
- dashboard: Use more accessible tip lib microtip (#536 / @arturi)
- docs: Add PHP snippets to XHRUpload docs (#567 / @goto-bus-stop)
- meta: Added instruction to fork the repo first (#512 / muhammadInam)
- meta: Automatically host releases on edgly and use that as our main CDN (#558 / @kvz)
- meta: Automatically host releases on Smart CDN and use that as our main CDN (#558 / @kvz)
- meta: Dependency version updates (#523 / @goto-bus-stop)
- meta: Remove unused files from published package (#586 / @goto-bus-stop)
- s3: Respect `limit` option for upload parameter requests too; fix isXml() check when no content-type is available (#545, #544, #528 / @goto-bus-stop)
Expand Down
Loading

0 comments on commit 2ef3b4d

Please sign in to comment.