diff --git a/BUNDLE-README.md b/BUNDLE-README.md index d865137e56..1890c1b03c 100644 --- 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 (``) or bundle it with your webapp. +this from a CDN (``) 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 index 06f0571372..fef6fd8b27 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,36 @@ 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.4 + +Released: 2022-08-03 + +| Package | Version | Package | Version | +| ---------------------- | ------------ | ---------------------- | ------------ | +| @uppy/aws-s3-multipart | 3.0.0-beta.3 | @uppy/screen-capture | 3.0.0-beta.2 | +| @uppy/companion | 4.0.0-beta.3 | @uppy/status-bar | 3.0.0-beta.2 | +| @uppy/core | 3.0.0-beta.3 | @uppy/store-default | 3.0.0-beta.2 | +| @uppy/dashboard | 3.0.0-beta.3 | @uppy/transloadit | 3.0.0-beta.4 | +| @uppy/drop-target | 2.0.0-beta.2 | @uppy/tus | 3.0.0-beta.2 | +| @uppy/informer | 3.0.0-beta.2 | @uppy/url | 3.0.0-beta.2 | +| @uppy/react | 3.0.0-beta.3 | @uppy/robodog | 3.0.0-beta.4 | +| @uppy/remote-sources | 1.0.0-beta.3 | uppy | 3.0.0-beta.4 | + +- @uppy/companion,@uppy/tus: Upgrade tus-js-client to 3.0.0 (Merlijn Vos / #3942) +- meta: fix release script (Antoine du Hamel) +- @uppy/aws-s3-multipart: Correctly handle errors for `prepareUploadParts` (Merlijn Vos / #3912) +- @uppy/store-default: export the class, don't expose `.callbacks` (Antoine du Hamel / #3928) +- @uppy/remote-sources: do not rely on `.name` property (Antoine du Hamel / #3941) +- @uppy/screen-capture: fix TODOs (Antoine du Hamel / #3930) +- @uppy/status-bar: rename internal modules (Antoine du Hamel / #3929) +- @uppy/transloadit: remove static properties in favor of exports (Antoine du Hamel / #3927) +- @uppy/informer: simplify `render` method (Antoine du Hamel / #3931) +- @uppy/url: remove private methods from public API (Antoine du Hamel / #3934) +- @uppy/dashboard: change `copyToClipboard` signature (Antoine du Hamel / #3933) +- @uppy/drop-target: remove `isFileTransfer` from the public API (Antoine du Hamel / #3932) +- meta: improve beta release script (Antoine du Hamel) + + ## 3.0.0-beta.3 Released: 2022-07-27 @@ -135,6 +165,25 @@ Released: 2022-05-30 - @uppy/transloadit: remove IE 10 hack (Antoine du Hamel / #3777) +## 2.13.2 + +Released: 2022-08-02 + +| Package | Version | Package | Version | +| ----------------- | ------- | ----------------- | ------- | +| @uppy/transloadit | 2.3.6 | @uppy/robodog | 2.9.2 | +| @uppy/tus | 2.4.2 | uppy | 2.13.2 | + +- @uppy/transloadit: send `assembly-cancelled` only once (Antoine du Hamel / #3937) +- meta: `keepNames` in bundle (Antoine du Hamel / #3926) +- meta: e2e: fix Transloadit test suite with Cypress 10 (Antoine du Hamel / #3936) +- meta: Bump guzzlehttp/guzzle from 7.4.1 to 7.4.5 in /examples/aws-presigned-url (dependabot[bot] / #3842) +- @uppy/tus: fix dependencies (Antoine du Hamel / #3923) +- meta: doc: fix linter failure in `image-editor.md` (Antoine du Hamel / #3924) +- meta: doc: Fix typo in image-editor.md (Ikko Ashimine / #3921) +- website: Docs and header fix (Artur Paikin / #3920) + + ## 2.13.1 Released: 2022-07-27 diff --git a/README.md b/README.md index b879f76198..e1e610d344 100644 --- a/README.md +++ b/README.md @@ -67,7 +67,7 @@ const uppy = new Uppy({ autoProceed: false }) $ npm install @uppy/core @uppy/dashboard @uppy/tus ``` -Add CSS [uppy.min.css](https://releases.transloadit.com/uppy/v3.0.0-beta.3/uppy.min.css), either to your HTML page’s `` or include in JS, if your bundler of choice supports it. +Add CSS [uppy.min.css](https://releases.transloadit.com/uppy/v3.0.0-beta.4/uppy.min.css), either to your HTML page’s `` or include in JS, if your bundler of choice supports it. Alternatively, you can also use a pre-built bundle from Transloadit’s CDN: Edgly. In that case `Uppy` will attach itself to the global `window.Uppy` object. @@ -75,10 +75,10 @@ Alternatively, you can also use a pre-built bundle from Transloadit’s CDN: Edg ```html - + - +
@@ -184,7 +184,7 @@ If you’re using Uppy from CDN, those polyfills are already included in the leg bundle, so no need to include anything additionally: ```html - + ``` ## FAQ @@ -250,9 +250,9 @@ Use Uppy in your project? [Let us know](https://github.com/transloadit/uppy/issu :---: |:---: |:---: |:---: |:---: |:---: | [AJvanLoon](https://github.com/AJvanLoon) |[nqst](https://github.com/nqst) |[Murderlon](https://github.com/Murderlon) |[mifi](https://github.com/mifi) |[lakesare](https://github.com/lakesare) |[kiloreux](https://github.com/kiloreux) | -[sadovnychyi](https://github.com/sadovnychyi) |[samuelayo](https://github.com/samuelayo) |[richardwillars](https://github.com/richardwillars) |[ajkachnic](https://github.com/ajkachnic) |[dependabot[bot]](https://github.com/apps/dependabot) |[github-actions[bot]](https://github.com/apps/github-actions) | +[sadovnychyi](https://github.com/sadovnychyi) |[samuelayo](https://github.com/samuelayo) |[github-actions[bot]](https://github.com/apps/github-actions) |[richardwillars](https://github.com/richardwillars) |[ajkachnic](https://github.com/ajkachnic) |[dependabot[bot]](https://github.com/apps/dependabot) | :---: |:---: |:---: |:---: |:---: |:---: | -[sadovnychyi](https://github.com/sadovnychyi) |[samuelayo](https://github.com/samuelayo) |[richardwillars](https://github.com/richardwillars) |[ajkachnic](https://github.com/ajkachnic) |[dependabot\[bot\]](https://github.com/apps/dependabot) |[github-actions\[bot\]](https://github.com/apps/github-actions) | +[sadovnychyi](https://github.com/sadovnychyi) |[samuelayo](https://github.com/samuelayo) |[github-actions\[bot\]](https://github.com/apps/github-actions) |[richardwillars](https://github.com/richardwillars) |[ajkachnic](https://github.com/ajkachnic) |[dependabot\[bot\]](https://github.com/apps/dependabot) | [zcallan](https://github.com/zcallan) |[tim-kos](https://github.com/tim-kos) |[YukeshShr](https://github.com/YukeshShr) |[janko](https://github.com/janko) |[wilkoklak](https://github.com/wilkoklak) |[oliverpool](https://github.com/oliverpool) | :---: |:---: |:---: |:---: |:---: |:---: | @@ -270,25 +270,25 @@ Use Uppy in your project? [Let us know](https://github.com/transloadit/uppy/issu :---: |:---: |:---: |:---: |:---: |:---: | [juliangruber](https://github.com/juliangruber) |[bertho-zero](https://github.com/bertho-zero) |[tranvansang](https://github.com/tranvansang) |[ap--](https://github.com/ap--) |[MikeKovarik](https://github.com/MikeKovarik) |[pauln](https://github.com/pauln) | -[toadkicker](https://github.com/toadkicker) |[ofhope](https://github.com/ofhope) |[johnnyperkins](https://github.com/johnnyperkins) |[dargmuesli](https://github.com/dargmuesli) |[manuelkiessling](https://github.com/manuelkiessling) |[nndevstudio](https://github.com/nndevstudio) | +[toadkicker](https://github.com/toadkicker) |[ofhope](https://github.com/ofhope) |[eltociear](https://github.com/eltociear) |[johnnyperkins](https://github.com/johnnyperkins) |[dargmuesli](https://github.com/dargmuesli) |[manuelkiessling](https://github.com/manuelkiessling) | :---: |:---: |:---: |:---: |:---: |:---: | -[toadkicker](https://github.com/toadkicker) |[ofhope](https://github.com/ofhope) |[johnnyperkins](https://github.com/johnnyperkins) |[dargmuesli](https://github.com/dargmuesli) |[manuelkiessling](https://github.com/manuelkiessling) |[nndevstudio](https://github.com/nndevstudio) | +[toadkicker](https://github.com/toadkicker) |[ofhope](https://github.com/ofhope) |[eltociear](https://github.com/eltociear) |[johnnyperkins](https://github.com/johnnyperkins) |[dargmuesli](https://github.com/dargmuesli) |[manuelkiessling](https://github.com/manuelkiessling) | -[ogtfaber](https://github.com/ogtfaber) |[sksavant](https://github.com/sksavant) |[suchoproduction](https://github.com/suchoproduction) |[timodwhit](https://github.com/timodwhit) |[yonahforst](https://github.com/yonahforst) |[a-kriya](https://github.com/a-kriya) | +[nndevstudio](https://github.com/nndevstudio) |[ogtfaber](https://github.com/ogtfaber) |[sksavant](https://github.com/sksavant) |[suchoproduction](https://github.com/suchoproduction) |[timodwhit](https://github.com/timodwhit) |[yonahforst](https://github.com/yonahforst) | :---: |:---: |:---: |:---: |:---: |:---: | -[ogtfaber](https://github.com/ogtfaber) |[sksavant](https://github.com/sksavant) |[suchoproduction](https://github.com/suchoproduction) |[timodwhit](https://github.com/timodwhit) |[yonahforst](https://github.com/yonahforst) |[a-kriya](https://github.com/a-kriya) | +[nndevstudio](https://github.com/nndevstudio) |[ogtfaber](https://github.com/ogtfaber) |[sksavant](https://github.com/sksavant) |[suchoproduction](https://github.com/suchoproduction) |[timodwhit](https://github.com/timodwhit) |[yonahforst](https://github.com/yonahforst) | -[bencergazda](https://github.com/bencergazda) |[stephentuso](https://github.com/stephentuso) |[jhen0409](https://github.com/jhen0409) |[mskelton](https://github.com/mskelton) |[ahmedkandel](https://github.com/ahmedkandel) |[btrice](https://github.com/btrice) | +[a-kriya](https://github.com/a-kriya) |[bencergazda](https://github.com/bencergazda) |[stephentuso](https://github.com/stephentuso) |[jhen0409](https://github.com/jhen0409) |[mskelton](https://github.com/mskelton) |[ahmedkandel](https://github.com/ahmedkandel) | :---: |:---: |:---: |:---: |:---: |:---: | -[bencergazda](https://github.com/bencergazda) |[stephentuso](https://github.com/stephentuso) |[jhen0409](https://github.com/jhen0409) |[mskelton](https://github.com/mskelton) |[ahmedkandel](https://github.com/ahmedkandel) |[btrice](https://github.com/btrice) | +[a-kriya](https://github.com/a-kriya) |[bencergazda](https://github.com/bencergazda) |[stephentuso](https://github.com/stephentuso) |[jhen0409](https://github.com/jhen0409) |[mskelton](https://github.com/mskelton) |[ahmedkandel](https://github.com/ahmedkandel) | -[behnammodi](https://github.com/behnammodi) |[BePo65](https://github.com/BePo65) |[Burkes](https://github.com/Burkes) |[camiloforero](https://github.com/camiloforero) |[craigjennings11](https://github.com/craigjennings11) |[davekiss](https://github.com/davekiss) | +[btrice](https://github.com/btrice) |[behnammodi](https://github.com/behnammodi) |[BePo65](https://github.com/BePo65) |[bradedelman](https://github.com/bradedelman) |[Burkes](https://github.com/Burkes) |[camiloforero](https://github.com/camiloforero) | :---: |:---: |:---: |:---: |:---: |:---: | -[behnammodi](https://github.com/behnammodi) |[BePo65](https://github.com/BePo65) |[Burkes](https://github.com/Burkes) |[camiloforero](https://github.com/camiloforero) |[craigjennings11](https://github.com/craigjennings11) |[davekiss](https://github.com/davekiss) | +[btrice](https://github.com/btrice) |[behnammodi](https://github.com/behnammodi) |[BePo65](https://github.com/BePo65) |[bradedelman](https://github.com/bradedelman) |[Burkes](https://github.com/Burkes) |[camiloforero](https://github.com/camiloforero) | -[davekiss](https://github.com/davekiss) |[DenysNosov](https://github.com/DenysNosov) |[ethanwillis](https://github.com/ethanwillis) |[frobinsonj](https://github.com/frobinsonj) |[geertclerx](https://github.com/geertclerx) |[eltociear](https://github.com/eltociear) | +[craigjennings11](https://github.com/craigjennings11) |[davekiss](https://github.com/davekiss) |[DenysNosov](https://github.com/DenysNosov) |[ethanwillis](https://github.com/ethanwillis) |[frobinsonj](https://github.com/frobinsonj) |[geertclerx](https://github.com/geertclerx) | :---: |:---: |:---: |:---: |:---: |:---: | -[davekiss](https://github.com/davekiss) |[DenysNosov](https://github.com/DenysNosov) |[ethanwillis](https://github.com/ethanwillis) |[frobinsonj](https://github.com/frobinsonj) |[geertclerx](https://github.com/geertclerx) |[eltociear](https://github.com/eltociear) | +[craigjennings11](https://github.com/craigjennings11) |[davekiss](https://github.com/davekiss) |[DenysNosov](https://github.com/DenysNosov) |[ethanwillis](https://github.com/ethanwillis) |[frobinsonj](https://github.com/frobinsonj) |[geertclerx](https://github.com/geertclerx) | [ghasrfakhri](https://github.com/ghasrfakhri) |[jasonbosco](https://github.com/jasonbosco) |[jedwood](https://github.com/jedwood) |[dogrocker](https://github.com/dogrocker) |[lamartire](https://github.com/lamartire) |[lafe](https://github.com/lafe) | :---: |:---: |:---: |:---: |:---: |:---: | @@ -378,9 +378,9 @@ Use Uppy in your project? [Let us know](https://github.com/transloadit/uppy/issu :---: |:---: |:---: |:---: |:---: |:---: | [jorgeepc](https://github.com/jorgeepc) |[jszobody](https://github.com/jszobody) |[jcalonso](https://github.com/jcalonso) |[jmontoyaa](https://github.com/jmontoyaa) |[tykarol](https://github.com/tykarol) |[firesharkstudios](https://github.com/firesharkstudios) | -[justinjurenka](https://github.com/justinjurenka) |[tykarol](https://github.com/tykarol) |[kaspermeinema](https://github.com/kaspermeinema) |[firesharkstudios](https://github.com/firesharkstudios) |[kevin-west-10x](https://github.com/kevin-west-10x) |[elkebab](https://github.com/elkebab) | +[mellow-fellow](https://github.com/mellow-fellow) |[tykarol](https://github.com/tykarol) |[kaspermeinema](https://github.com/kaspermeinema) |[firesharkstudios](https://github.com/firesharkstudios) |[kevin-west-10x](https://github.com/kevin-west-10x) |[elkebab](https://github.com/elkebab) | :---: |:---: |:---: |:---: |:---: |:---: | -[justinjurenka](https://github.com/justinjurenka) |[tykarol](https://github.com/tykarol) |[kaspermeinema](https://github.com/kaspermeinema) |[firesharkstudios](https://github.com/firesharkstudios) |[kevin-west-10x](https://github.com/kevin-west-10x) |[elkebab](https://github.com/elkebab) | +[mellow-fellow](https://github.com/mellow-fellow) |[tykarol](https://github.com/tykarol) |[kaspermeinema](https://github.com/kaspermeinema) |[firesharkstudios](https://github.com/firesharkstudios) |[kevin-west-10x](https://github.com/kevin-west-10x) |[elkebab](https://github.com/elkebab) | [kyleparisi](https://github.com/kyleparisi) |[leaanthony](https://github.com/leaanthony) |[larowlan](https://github.com/larowlan) |[dviry](https://github.com/dviry) |[galli-leo](https://github.com/galli-leo) |[leods92](https://github.com/leods92) | :---: |:---: |:---: |:---: |:---: |:---: | @@ -471,3 +471,4 @@ We use Browserstack for manual testing { beforeEach(() => { cy.visit('/dashboard-transloadit') @@ -44,6 +50,74 @@ describe('Dashboard with Transloadit', () => { }) }) + it('should emit one assembly-cancelled event when cancelled', FLAKY, () => { + const spy = cy.spy() + + cy.get('@file-input').selectFile(['cypress/fixtures/images/cat.jpg', 'cypress/fixtures/images/traffic.jpg'], { force:true }) + cy.get('.uppy-StatusBar-actionBtn--upload').click() + + cy.intercept({ + method: 'GET', + url: '/assemblies/*', + }).as('assemblyPolling') + cy.intercept( + { method: 'PATCH', pathname: '/files/*', times: 1 }, + { statusCode: 204, body: {} }, + ) + cy.intercept( + { method: 'DELETE', pathname: '/resumable/files/*', times: 2 }, + { statusCode: 204, body: {} }, + ).as('fileDeletion') + cy.intercept( + { method: 'DELETE', pathname: '/assemblies/*', times: 1 }, + ).as('assemblyDeletion') + cy.wait('@assemblyPolling') + cy.window().then(({ uppy }) => { + uppy.on('transloadit:assembly-cancelled', spy) + }) + cy.get('button[data-cy=cancel]').click() + + cy.wait('@assemblyDeletion').then(() => { + expect(spy).to.be.calledOnce + }) + }) + + it('should close assembly polling when all files are removed', FLAKY, () => { + const spy = cy.spy() + + cy.get('@file-input').selectFile(['cypress/fixtures/images/cat.jpg', 'cypress/fixtures/images/traffic.jpg'], { force:true }) + cy.get('.uppy-StatusBar-actionBtn--upload').click() + + cy.intercept({ + method: 'GET', + url: '/assemblies/*', + }).as('assemblyPolling') + cy.intercept( + { method: 'PATCH', pathname: '/files/*', times: 1 }, + { statusCode: 204, body: {} }, + ) + cy.intercept( + { method: 'DELETE', pathname: '/resumable/files/*', times: 2 }, + { statusCode: 204, body: {} }, + ).as('fileDeletion') + cy.intercept( + { method: 'DELETE', pathname: '/assemblies/*', times: 1 }, + ).as('assemblyDeletion') + cy.wait('@assemblyPolling') + cy.window().then(({ uppy }) => { + uppy.on('transloadit:assembly-cancelled', spy) + expect(Object.values(uppy.getPlugin('Transloadit').activeAssemblies).every((a: any) => a.pollInterval)).to.equal(true) + + const { files } = uppy.getState() + uppy.removeFiles(Object.keys(files)) + + cy.wait('@assemblyDeletion').then(() => { + expect(Object.values(uppy.getPlugin('Transloadit').activeAssemblies).some((a: any) => a.pollInterval)).to.equal(false) + expect(spy).to.be.calledOnce + }) + }) + }) + it('should not create assembly when all individual files have been cancelled', () => { cy.get('@file-input').selectFile(['cypress/fixtures/images/cat.jpg', 'cypress/fixtures/images/traffic.jpg'], { force:true }) cy.get('.uppy-StatusBar-actionBtn--upload').click() diff --git a/examples/aws-presigned-url/composer.lock b/examples/aws-presigned-url/composer.lock index df8ef8ef3e..b82773cfac 100644 --- a/examples/aws-presigned-url/composer.lock +++ b/examples/aws-presigned-url/composer.lock @@ -149,22 +149,22 @@ }, { "name": "guzzlehttp/guzzle", - "version": "7.4.1", + "version": "7.4.5", "source": { "type": "git", "url": "https://github.com/guzzle/guzzle.git", - "reference": "ee0a041b1760e6a53d2a39c8c34115adc2af2c79" + "reference": "1dd98b0564cb3f6bd16ce683cb755f94c10fbd82" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle/zipball/ee0a041b1760e6a53d2a39c8c34115adc2af2c79", - "reference": "ee0a041b1760e6a53d2a39c8c34115adc2af2c79", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/1dd98b0564cb3f6bd16ce683cb755f94c10fbd82", + "reference": "1dd98b0564cb3f6bd16ce683cb755f94c10fbd82", "shasum": "" }, "require": { "ext-json": "*", "guzzlehttp/promises": "^1.5", - "guzzlehttp/psr7": "^1.8.3 || ^2.1", + "guzzlehttp/psr7": "^1.9 || ^2.4", "php": "^7.2.5 || ^8.0", "psr/http-client": "^1.0", "symfony/deprecation-contracts": "^2.2 || ^3.0" @@ -191,12 +191,12 @@ } }, "autoload": { - "psr-4": { - "GuzzleHttp\\": "src/" - }, "files": [ "src/functions_include.php" - ] + ], + "psr-4": { + "GuzzleHttp\\": "src/" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -253,7 +253,7 @@ ], "support": { "issues": "https://github.com/guzzle/guzzle/issues", - "source": "https://github.com/guzzle/guzzle/tree/7.4.1" + "source": "https://github.com/guzzle/guzzle/tree/7.4.5" }, "funding": [ { @@ -269,7 +269,7 @@ "type": "tidelift" } ], - "time": "2021-12-06T18:43:05+00:00" + "time": "2022-06-20T22:16:13+00:00" }, { "name": "guzzlehttp/promises", @@ -298,12 +298,12 @@ } }, "autoload": { - "psr-4": { - "GuzzleHttp\\Promise\\": "src/" - }, "files": [ "src/functions_include.php" - ] + ], + "psr-4": { + "GuzzleHttp\\Promise\\": "src/" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -357,16 +357,16 @@ }, { "name": "guzzlehttp/psr7", - "version": "2.1.0", + "version": "2.4.0", "source": { "type": "git", "url": "https://github.com/guzzle/psr7.git", - "reference": "089edd38f5b8abba6cb01567c2a8aaa47cec4c72" + "reference": "13388f00956b1503577598873fffb5ae994b5737" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/psr7/zipball/089edd38f5b8abba6cb01567c2a8aaa47cec4c72", - "reference": "089edd38f5b8abba6cb01567c2a8aaa47cec4c72", + "url": "https://api.github.com/repos/guzzle/psr7/zipball/13388f00956b1503577598873fffb5ae994b5737", + "reference": "13388f00956b1503577598873fffb5ae994b5737", "shasum": "" }, "require": { @@ -390,7 +390,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.1-dev" + "dev-master": "2.4-dev" } }, "autoload": { @@ -452,7 +452,7 @@ ], "support": { "issues": "https://github.com/guzzle/psr7/issues", - "source": "https://github.com/guzzle/psr7/tree/2.1.0" + "source": "https://github.com/guzzle/psr7/tree/2.4.0" }, "funding": [ { @@ -468,7 +468,7 @@ "type": "tidelift" } ], - "time": "2021-10-06T17:43:30+00:00" + "time": "2022-06-20T21:43:11+00:00" }, { "name": "mtdowling/jmespath.php", @@ -737,25 +737,25 @@ }, { "name": "symfony/deprecation-contracts", - "version": "v3.0.0", + "version": "v2.5.1", "source": { "type": "git", "url": "https://github.com/symfony/deprecation-contracts.git", - "reference": "c726b64c1ccfe2896cb7df2e1331c357ad1c8ced" + "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/c726b64c1ccfe2896cb7df2e1331c357ad1c8ced", - "reference": "c726b64c1ccfe2896cb7df2e1331c357ad1c8ced", + "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/e8b495ea28c1d97b5e0c121748d6f9b53d075c66", + "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66", "shasum": "" }, "require": { - "php": ">=8.0.2" + "php": ">=7.1" }, "type": "library", "extra": { "branch-alias": { - "dev-main": "3.0-dev" + "dev-main": "2.5-dev" }, "thanks": { "name": "symfony/contracts", @@ -784,7 +784,7 @@ "description": "A generic function and convention to trigger deprecation notices", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/deprecation-contracts/tree/v3.0.0" + "source": "https://github.com/symfony/deprecation-contracts/tree/v2.5.1" }, "funding": [ { @@ -800,32 +800,35 @@ "type": "tidelift" } ], - "time": "2021-11-01T23:48:49+00:00" + "time": "2022-01-02T09:53:40+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.23.1", + "version": "v1.26.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "9174a3d80210dca8daa7f31fec659150bbeabfc6" + "reference": "9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9174a3d80210dca8daa7f31fec659150bbeabfc6", - "reference": "9174a3d80210dca8daa7f31fec659150bbeabfc6", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e", + "reference": "9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e", "shasum": "" }, "require": { "php": ">=7.1" }, + "provide": { + "ext-mbstring": "*" + }, "suggest": { "ext-mbstring": "For best performance" }, "type": "library", "extra": { "branch-alias": { - "dev-main": "1.23-dev" + "dev-main": "1.26-dev" }, "thanks": { "name": "symfony/polyfill", @@ -833,12 +836,12 @@ } }, "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Mbstring\\": "" - }, "files": [ "bootstrap.php" - ] + ], + "psr-4": { + "Symfony\\Polyfill\\Mbstring\\": "" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -864,7 +867,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.23.1" + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.26.0" }, "funding": [ { @@ -880,7 +883,7 @@ "type": "tidelift" } ], - "time": "2021-05-27T12:26:48+00:00" + "time": "2022-05-24T11:49:31+00:00" } ], "packages-dev": [], @@ -891,5 +894,5 @@ "prefer-lowest": false, "platform": [], "platform-dev": [], - "plugin-api-version": "2.1.0" + "plugin-api-version": "2.3.0" } diff --git a/examples/cdn-example/index.html b/examples/cdn-example/index.html index ad06f43aab..f6cb0fa819 100644 --- a/examples/cdn-example/index.html +++ b/examples/cdn-example/index.html @@ -4,7 +4,7 @@ - + @@ -16,7 +16,7 @@ Dashboard, Webcam, Tus, - } from "https://releases.transloadit.com/uppy/v3.0.0-beta.3/uppy.min.mjs"; + } from "https://releases.transloadit.com/uppy/v3.0.0-beta.4/uppy.min.mjs"; const uppy = new Core.Uppy({ debug: true, autoProceed: false }) .use(Dashboard, { trigger: "#uppyModalOpener" }) @@ -29,7 +29,7 @@ - + + + + ``` Then, a global `Robodog` variable will be available. For usage instructions, please see the [main Robodog documentation](https://uppy.io/docs/robodog). diff --git a/packages/@uppy/robodog/package.json b/packages/@uppy/robodog/package.json index 622dbc1b08..90701a7342 100644 --- a/packages/@uppy/robodog/package.json +++ b/packages/@uppy/robodog/package.json @@ -1,7 +1,7 @@ { "name": "@uppy/robodog", "description": "Transloadit SDK for browsers based on Uppy", - "version": "3.0.0-beta.3", + "version": "3.0.0-beta.4", "license": "MIT", "main": "lib/index.js", "jsnext:main": "src/index.js", diff --git a/packages/@uppy/screen-capture/CHANGELOG.md b/packages/@uppy/screen-capture/CHANGELOG.md index b75bf1ba09..2463c9a8c2 100644 --- a/packages/@uppy/screen-capture/CHANGELOG.md +++ b/packages/@uppy/screen-capture/CHANGELOG.md @@ -1,5 +1,12 @@ # @uppy/screen-capture +## 3.0.0-beta.2 + +Released: 2022-08-03 +Included in: Uppy v3.0.0-beta.4 + +- @uppy/screen-capture: fix TODOs (Antoine du Hamel / #3930) + ## 2.1.1 Released: 2022-05-30 diff --git a/packages/@uppy/screen-capture/package.json b/packages/@uppy/screen-capture/package.json index 117f6e974c..a11e3a1ef6 100644 --- a/packages/@uppy/screen-capture/package.json +++ b/packages/@uppy/screen-capture/package.json @@ -1,7 +1,7 @@ { "name": "@uppy/screen-capture", "description": "Uppy plugin that captures video from display or application.", - "version": "3.0.0-beta.1", + "version": "3.0.0-beta.2", "license": "MIT", "main": "lib/index.js", "style": "dist/style.min.css", diff --git a/packages/@uppy/status-bar/CHANGELOG.md b/packages/@uppy/status-bar/CHANGELOG.md index 0a787e85fe..e9b7fe0557 100644 --- a/packages/@uppy/status-bar/CHANGELOG.md +++ b/packages/@uppy/status-bar/CHANGELOG.md @@ -1,5 +1,12 @@ # @uppy/status-bar +## 3.0.0-beta.2 + +Released: 2022-08-03 +Included in: Uppy v3.0.0-beta.4 + +- @uppy/status-bar: rename internal modules (Antoine du Hamel / #3929) + ## 2.2.1 Released: 2022-05-30 diff --git a/packages/@uppy/status-bar/package.json b/packages/@uppy/status-bar/package.json index 21ebc200cc..9dc073ec8c 100644 --- a/packages/@uppy/status-bar/package.json +++ b/packages/@uppy/status-bar/package.json @@ -1,7 +1,7 @@ { "name": "@uppy/status-bar", "description": "A progress bar for Uppy, with many bells and whistles.", - "version": "3.0.0-beta.1", + "version": "3.0.0-beta.2", "license": "MIT", "main": "lib/index.js", "style": "dist/style.min.css", diff --git a/packages/@uppy/store-default/CHANGELOG.md b/packages/@uppy/store-default/CHANGELOG.md index a1a99facf6..90a6792f4d 100644 --- a/packages/@uppy/store-default/CHANGELOG.md +++ b/packages/@uppy/store-default/CHANGELOG.md @@ -1,5 +1,12 @@ # @uppy/store-default +## 3.0.0-beta.2 + +Released: 2022-08-03 +Included in: Uppy v3.0.0-beta.4 + +- @uppy/store-default: export the class, don't expose `.callbacks` (Antoine du Hamel / #3928) + ## 2.1.0 Released: 2022-05-30 diff --git a/packages/@uppy/store-default/package.json b/packages/@uppy/store-default/package.json index fd4b78a841..fb0838c186 100644 --- 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.0-beta.1", + "version": "3.0.0-beta.2", "license": "MIT", "main": "lib/index.js", "types": "types/index.d.ts", diff --git a/packages/@uppy/transloadit/CHANGELOG.md b/packages/@uppy/transloadit/CHANGELOG.md index dc530ec5ed..8839a43830 100644 --- a/packages/@uppy/transloadit/CHANGELOG.md +++ b/packages/@uppy/transloadit/CHANGELOG.md @@ -1,5 +1,12 @@ # @uppy/transloadit +## 3.0.0-beta.4 + +Released: 2022-08-03 +Included in: Uppy v3.0.0-beta.4 + +- @uppy/transloadit: remove static properties in favor of exports (Antoine du Hamel / #3927) + ## 3.0.0-beta Released: 2022-05-30 @@ -7,6 +14,13 @@ Included in: Uppy v3.0.0-beta - @uppy/transloadit: remove IE 10 hack (Antoine du Hamel / #3777) +## 2.3.6 + +Released: 2022-08-02 +Included in: Uppy v2.13.2 + +- @uppy/transloadit: send `assembly-cancelled` only once (Antoine du Hamel / #3937) + ## 2.3.5 Released: 2022-07-27 diff --git a/packages/@uppy/transloadit/package.json b/packages/@uppy/transloadit/package.json index 353d072f3f..7ce1d13b5c 100644 --- a/packages/@uppy/transloadit/package.json +++ b/packages/@uppy/transloadit/package.json @@ -1,7 +1,7 @@ { "name": "@uppy/transloadit", "description": "The Transloadit plugin can be used to upload files to Transloadit for all kinds of processing, such as transcoding video, resizing images, zipping/unzipping, and more", - "version": "3.0.0-beta.3", + "version": "3.0.0-beta.4", "license": "MIT", "main": "lib/index.js", "types": "types/index.d.ts", diff --git a/packages/@uppy/transloadit/src/index.js b/packages/@uppy/transloadit/src/index.js index 5d3db46601..8735a0fde3 100644 --- a/packages/@uppy/transloadit/src/index.js +++ b/packages/@uppy/transloadit/src/index.js @@ -238,14 +238,13 @@ export default class Transloadit extends BasePlugin { const fileRemovedHandler = (fileRemoved, reason) => { if (reason === 'cancel-all') { assembly.close() - this.client.cancelAssembly(newAssembly).catch(() => { /* ignore potential errors */ }) this.uppy.off(fileRemovedHandler) } else if (fileRemoved.id in updatedFiles) { delete updatedFiles[fileRemoved.id] const nbOfRemainingFiles = Object.keys(updatedFiles).length if (nbOfRemainingFiles === 0) { assembly.close() - this.client.cancelAssembly(newAssembly).catch(() => { /* ignore potential errors */ }) + this.#cancelAssembly(newAssembly).catch(() => { /* ignore potential errors */ }) this.uppy.off(fileRemovedHandler) } else { this.client.updateNumberOfFilesInAssembly(newAssembly, nbOfRemainingFiles) diff --git a/packages/@uppy/tus/CHANGELOG.md b/packages/@uppy/tus/CHANGELOG.md index fccc63d9a9..7771d6d939 100644 --- a/packages/@uppy/tus/CHANGELOG.md +++ b/packages/@uppy/tus/CHANGELOG.md @@ -1,5 +1,19 @@ # @uppy/tus +## 3.0.0-beta.2 + +Released: 2022-08-03 +Included in: Uppy v3.0.0-beta.4 + +- @uppy/companion,@uppy/tus: Upgrade tus-js-client to 3.0.0 (Merlijn Vos / #3942) + +## 2.4.2 + +Released: 2022-08-02 +Included in: Uppy v2.13.2 + +- @uppy/tus: fix dependencies (Antoine du Hamel / #3923) + ## 2.4.1 Released: 2022-06-07 diff --git a/packages/@uppy/tus/package.json b/packages/@uppy/tus/package.json index da7ab3b32c..cf9953384d 100644 --- a/packages/@uppy/tus/package.json +++ b/packages/@uppy/tus/package.json @@ -1,7 +1,7 @@ { "name": "@uppy/tus", "description": "Resumable uploads for Uppy using Tus.io", - "version": "3.0.0-beta.1", + "version": "3.0.0-beta.2", "license": "MIT", "main": "lib/index.js", "types": "types/index.d.ts", diff --git a/packages/@uppy/url/CHANGELOG.md b/packages/@uppy/url/CHANGELOG.md index 2532c69320..efc3453d3c 100644 --- a/packages/@uppy/url/CHANGELOG.md +++ b/packages/@uppy/url/CHANGELOG.md @@ -1,5 +1,12 @@ # @uppy/url +## 3.0.0-beta.2 + +Released: 2022-08-03 +Included in: Uppy v3.0.0-beta.4 + +- @uppy/url: remove private methods from public API (Antoine du Hamel / #3934) + ## 2.2.0 Released: 2022-06-07 diff --git a/packages/@uppy/url/package.json b/packages/@uppy/url/package.json index 1f9e64c2b7..1f3b28361a 100644 --- a/packages/@uppy/url/package.json +++ b/packages/@uppy/url/package.json @@ -1,7 +1,7 @@ { "name": "@uppy/url", "description": "The Url plugin lets users import files from the Internet. Paste any URL and it’ll be added!", - "version": "3.0.0-beta.1", + "version": "3.0.0-beta.2", "license": "MIT", "main": "lib/index.js", "style": "dist/style.min.css", diff --git a/packages/uppy/package.json b/packages/uppy/package.json index fb21fc1dc8..c4355cd6c1 100644 --- 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.0.0-beta.3", + "version": "3.0.0-beta.4", "license": "MIT", "main": "index.mjs", "module": "index.mjs", diff --git a/website/src/_template/integration_help.md b/website/src/_template/integration_help.md index 841eb263fe..5eedaff00e 100644 --- a/website/src/_template/integration_help.md +++ b/website/src/_template/integration_help.md @@ -6,4 +6,4 @@ We offer also a different category of support that we like to call Integration H As much as we at Transloadit would like to provide detailed Integration Help to every non-paying user, Uppy has reached a point where this is no longer sustainable for our small crew. If we end up investing our time in a million different apps that use Uppy, as long as no money is flowing back, we won’t be able to ramp up our team to meet the demand. This would spread the team ever thinner and eventually grind development to a halt. -That is not where we want to be. So, to offer enthusiasts, businesses, and enterprises help in a sustainable way, we’re providing community-based Integration Help for free at . If you are unable to solve your problem with help of the Uppy community, we offer paid Integration Help via . +That is not where we want to be. So, to offer enthusiasts, businesses, and enterprises help in a sustainable way, we’re providing community-based Integration Help for free at . If you are unable to solve your problem with help of the Uppy community, we offer paid Integration Help via . diff --git a/website/src/docs/image-editor.md b/website/src/docs/image-editor.md index 8decd5e5e0..4b7511cbb1 100644 --- a/website/src/docs/image-editor.md +++ b/website/src/docs/image-editor.md @@ -89,7 +89,7 @@ Quality of the resulting blob that will be saved in Uppy after editing/cropping. ### `cropperOptions` Image Editor is using the excellent [Cropper.js](https://fengyuanchen.github.io/cropperjs/). -`cropperOptions` will be directly passed to `Cropper` and therefor can expect the same values as documented +`cropperOptions` will be directly passed to `Cropper` and thus can expect the same values as documented in their [README](https://github.com/fengyuanchen/cropperjs/blob/HEAD/README.md#options), with the addition of `croppedCanvasOptions`, which will be passed to [`getCroppedCanvas`](https://github.com/fengyuanchen/cropperjs/blob/HEAD/README.md#getcroppedcanvasoptions). diff --git a/website/src/docs/index.md b/website/src/docs/index.md index afd7a42567..f28b68a053 100644 --- a/website/src/docs/index.md +++ b/website/src/docs/index.md @@ -19,12 +19,12 @@ Here’s the simplest example html page with Uppy (it uses a CDN bundle, while w Uppy - +
- + + ``` 2\. Add CSS to ``: ```html - + ``` 3\. Initialize at the bottom of the closing `` tag: @@ -181,5 +181,5 @@ export * from '@uppy/core' If you’re using Uppy from CDN, those polyfills are already included in the bundle, no need to include anything additionally: ```html - + ``` diff --git a/website/src/docs/locales.md b/website/src/docs/locales.md index 2179f85084..78d2c0bc38 100644 --- a/website/src/docs/locales.md +++ b/website/src/docs/locales.md @@ -34,7 +34,7 @@ const uppy = new Uppy({ Add a ` + + - - + + ``` Please note that while you may be able to get 2.0 to work in IE11 this way, we do not officially support it anymore. diff --git a/website/src/docs/remote-sources.md b/website/src/docs/remote-sources.md index c902e43ad0..311458a6f9 100644 --- a/website/src/docs/remote-sources.md +++ b/website/src/docs/remote-sources.md @@ -15,7 +15,7 @@ tagline: "Uppy plugin that includes all remote sources that Uppy+Companion offer ```js import Uppy from '@uppy/core' import Dashbaord from '@uppy/dashboard' -import RemoteSources from '@uppy/compressor' +import RemoteSources from '@uppy/remote-sources' const uppy = new Uppy() uppy.use(Dashboard) diff --git a/website/src/docs/robodog-form.md b/website/src/docs/robodog-form.md index a35cc2153c..503d59bc22 100644 --- a/website/src/docs/robodog-form.md +++ b/website/src/docs/robodog-form.md @@ -150,7 +150,7 @@ Make sure to also include the Uppy css file in your `` tag in case you wan ```html - + ``` @@ -162,7 +162,7 @@ Notice how the form is submitted to the inexistant `/uploads` route once all tra Testing Robodog - +
@@ -172,7 +172,7 @@ Notice how the form is submitted to the inexistant `/uploads` route once all tra
- + + + ``` diff --git a/website/src/examples/i18n/app.html b/website/src/examples/i18n/app.html index 1b4b9294ea..96145233e2 100644 --- a/website/src/examples/i18n/app.html +++ b/website/src/examples/i18n/app.html @@ -1,7 +1,7 @@ - +
@@ -12,8 +12,8 @@
Uploaded files:
- - + + +// const robodog = require('@uppy/robodog') const TRANSLOADIT_EXAMPLE_KEY = '35c1aed03f5011e982b6afe82599b6a0' diff --git a/website/src/examples/markdown-snippets/app.html b/website/src/examples/markdown-snippets/app.html index 8006e7a493..39f4708fc8 100644 --- a/website/src/examples/markdown-snippets/app.html +++ b/website/src/examples/markdown-snippets/app.html @@ -1,6 +1,6 @@ + -->

Create a new snippet

diff --git a/website/themes/uppy/layout/index.ejs b/website/themes/uppy/layout/index.ejs index b902eb760e..ad9487c9b9 100644 --- a/website/themes/uppy/layout/index.ejs +++ b/website/themes/uppy/layout/index.ejs @@ -187,9 +187,9 @@

© <%- date(Date.now(), 'YYYY') %> Transloadit

- - - + + +