+ {ifShowFilesUploadedOfTotal
+ && i18n('filesUploadedOfTotal', {
+ complete,
+ smart_count: numUploads,
+ })}
+
+ {/* When should we render this dot?
+ 1. .-additionalInfo is shown (happens only on desktops)
+ 2. AND 'filesUploadedOfTotal' was shown
+ */}
+ {ifShowFilesUploadedOfTotal && renderDot()}
+
+ {i18n('dataUploadedOfTotal', {
+ complete: prettierBytes(totalUploadedSize),
+ total: prettierBytes(totalSize),
+ })}
+
+ {renderDot()}
+
+ {i18n('xTimeLeft', {
+ time: prettyETA(totalETA),
+ })}
+
+
+ )
+}
+
+function UnknownProgressDetails (props) {
+ const { i18n, complete, numUploads } = props
+
+ return (
+
+ {i18n('filesUploadedOfTotal', { complete, smart_count: numUploads })}
+
+ )
+}
+
+function UploadNewlyAddedFiles (props) {
+ const { i18n, newFiles, startUpload } = props
+ const uploadBtnClassNames = classNames(
+ 'uppy-u-reset',
+ 'uppy-c-btn',
+ 'uppy-StatusBar-actionBtn',
+ 'uppy-StatusBar-actionBtn--uploadNewlyAdded'
+ )
+
+ return (
+
- {props.i18n('filesUploadedOfTotal', { complete: props.complete, smart_count: props.numUploads })}
-
- )
-}
-
-const UploadNewlyAddedFiles = (props) => {
- const uploadBtnClassNames = classNames(
- 'uppy-u-reset',
- 'uppy-c-btn',
- 'uppy-StatusBar-actionBtn',
- 'uppy-StatusBar-actionBtn--uploadNewlyAdded'
- )
-
- return (
-
-
-
-
- {i18n('uploadFailed')}
-
+
+ {(recoveredState || showUploadBtn) ? (
+
+ ) : null}
+
+ {showRetryBtn ?
: null}
+
+ {showPauseResumeBtn ? (
+
+ ) : null}
+
+ {showCancelBtn ?
: null}
+
+ {showDoneBtn ? (
+
+ ) : null}
-
)
}
diff --git a/packages/@uppy/status-bar/src/calculateProcessingProgress.js b/packages/@uppy/status-bar/src/calculateProcessingProgress.js
new file mode 100644
index 0000000000..2864022fbf
--- /dev/null
+++ b/packages/@uppy/status-bar/src/calculateProcessingProgress.js
@@ -0,0 +1,26 @@
+module.export = function calculateProcessingProgress (files) {
+ const values = []
+ let mode
+ let message
+
+ for (const { progress } of Object.values(files)) {
+ const { preprocess, postprocess } = progress
+ // In the future we should probably do this differently. For now we'll take the
+ // mode and message from the first file…
+ if (message == null && (preprocess || postprocess)) {
+ ({ mode, message } = preprocess || postprocess)
+ }
+ if (preprocess?.mode === 'determinate') values.push(preprocess.value)
+ if (postprocess?.mode === 'determinate') values.push(postprocess.value)
+ }
+
+ const value = values.reduce((total, progressValue) => {
+ return total + progressValue / values.length
+ }, 0)
+
+ return {
+ mode,
+ message,
+ value,
+ }
+}
diff --git a/packages/@uppy/status-bar/src/index.js b/packages/@uppy/status-bar/src/index.js
index a52b47a66e..30ca006ec5 100644
--- a/packages/@uppy/status-bar/src/index.js
+++ b/packages/@uppy/status-bar/src/index.js
@@ -10,7 +10,8 @@ const StatusBarUI = require('./StatusBar')
* progress percentage and time remaining.
*/
module.exports = class StatusBar extends UIPlugin {
- static VERSION = require('../package.json').version
+ // eslint-disable-next-line global-require
+ static VERSION = require('../package.json').version;
constructor (uppy, opts) {
super(uppy, opts)
@@ -72,74 +73,18 @@ module.exports = class StatusBar extends UIPlugin {
this.install = this.install.bind(this)
}
- getTotalSpeed (files) {
- let totalSpeed = 0
- files.forEach((file) => {
- totalSpeed += getSpeed(file.progress)
- })
- return totalSpeed
- }
-
- getTotalETA (files) {
- const totalSpeed = this.getTotalSpeed(files)
- if (totalSpeed === 0) {
- return 0
- }
-
- const totalBytesRemaining = files.reduce((total, file) => {
- return total + getBytesRemaining(file.progress)
- }, 0)
-
- return Math.round(totalBytesRemaining / totalSpeed * 10) / 10
- }
-
startUpload = () => {
const { recoveredState } = this.uppy.getState()
+
if (recoveredState) {
this.uppy.emit('restore-confirmed')
- return
+ return undefined
}
+
return this.uppy.upload().catch(() => {
// Error logged in Core
})
- }
-
- getUploadingState (isAllErrored, isAllComplete, recoveredState, files) {
- if (isAllErrored) {
- return statusBarStates.STATE_ERROR
- }
-
- if (isAllComplete) {
- return statusBarStates.STATE_COMPLETE
- }
-
- if (recoveredState) {
- return statusBarStates.STATE_WAITING
- }
-
- let state = statusBarStates.STATE_WAITING
- const fileIDs = Object.keys(files)
- for (let i = 0; i < fileIDs.length; i++) {
- const { progress } = files[fileIDs[i]]
- // If ANY files are being uploaded right now, show the uploading state.
- if (progress.uploadStarted && !progress.uploadComplete) {
- return statusBarStates.STATE_UPLOADING
- }
- // If files are being preprocessed AND postprocessed at this time, we show the
- // preprocess state. If any files are being uploaded we show uploading.
- if (progress.preprocess && state !== statusBarStates.STATE_UPLOADING) {
- state = statusBarStates.STATE_PREPROCESSING
- }
- // If NO files are being preprocessed or uploaded right now, but some files are
- // being postprocessed, show the postprocess state.
- if (progress.postprocess
- && state !== statusBarStates.STATE_UPLOADING
- && state !== statusBarStates.STATE_PREPROCESSING) {
- state = statusBarStates.STATE_POSTPROCESSING
- }
- }
- return state
- }
+ };
render (state) {
const {
@@ -168,8 +113,10 @@ module.exports = class StatusBar extends UIPlugin {
// If some state was recovered, we want to show Upload button/counter
// for all the files, because in this case it’s not an Upload button,
// but “Confirm Restore Button”
- const newFilesOrRecovered = recoveredState ? Object.values(files) : newFiles
- const totalETA = this.getTotalETA(inProgressNotPausedFiles)
+ const newFilesOrRecovered = recoveredState
+ ? Object.values(files)
+ : newFiles
+ const totalETA = getTotalETA(inProgressNotPausedFiles)
const resumableUploads = !!capabilities.resumableUploads
const supportsUploadProgress = capabilities.uploadProgress !== false
@@ -177,18 +124,23 @@ module.exports = class StatusBar extends UIPlugin {
let totalUploadedSize = 0
startedFiles.forEach((file) => {
- totalSize += (file.progress.bytesTotal || 0)
- totalUploadedSize += (file.progress.bytesUploaded || 0)
+ totalSize += file.progress.bytesTotal || 0
+ totalUploadedSize += file.progress.bytesUploaded || 0
})
return StatusBarUI({
error,
- uploadState: this.getUploadingState(isAllErrored, isAllComplete, recoveredState, state.files || {}),
+ uploadState: getUploadingState(
+ isAllErrored,
+ isAllComplete,
+ recoveredState,
+ state.files || {}
+ ),
allowNewUpload,
totalProgress,
totalSize,
totalUploadedSize,
- isAllComplete,
+ isAllComplete: false,
isAllPaused,
isAllErrored,
isUploadStarted,
@@ -236,3 +188,63 @@ module.exports = class StatusBar extends UIPlugin {
this.unmount()
}
}
+
+function getTotalSpeed (files) {
+ let totalSpeed = 0
+ files.forEach((file) => {
+ totalSpeed += getSpeed(file.progress)
+ })
+ return totalSpeed
+}
+
+function getTotalETA (files) {
+ const totalSpeed = getTotalSpeed(files)
+ if (totalSpeed === 0) {
+ return 0
+ }
+
+ const totalBytesRemaining = files.reduce((total, file) => {
+ return total + getBytesRemaining(file.progress)
+ }, 0)
+
+ return Math.round((totalBytesRemaining / totalSpeed) * 10) / 10
+}
+
+function getUploadingState (isAllErrored, isAllComplete, recoveredState, files) {
+ if (isAllErrored) {
+ return statusBarStates.STATE_ERROR
+ }
+
+ if (isAllComplete) {
+ return statusBarStates.STATE_COMPLETE
+ }
+
+ if (recoveredState) {
+ return statusBarStates.STATE_WAITING
+ }
+
+ let state = statusBarStates.STATE_WAITING
+ const fileIDs = Object.keys(files)
+ for (let i = 0; i < fileIDs.length; i++) {
+ const { progress } = files[fileIDs[i]]
+ // If ANY files are being uploaded right now, show the uploading state.
+ if (progress.uploadStarted && !progress.uploadComplete) {
+ return statusBarStates.STATE_UPLOADING
+ }
+ // If files are being preprocessed AND postprocessed at this time, we show the
+ // preprocess state. If any files are being uploaded we show uploading.
+ if (progress.preprocess && state !== statusBarStates.STATE_UPLOADING) {
+ state = statusBarStates.STATE_PREPROCESSING
+ }
+ // If NO files are being preprocessed or uploaded right now, but some files are
+ // being postprocessed, show the postprocess state.
+ if (
+ progress.postprocess
+ && state !== statusBarStates.STATE_UPLOADING
+ && state !== statusBarStates.STATE_PREPROCESSING
+ ) {
+ state = statusBarStates.STATE_POSTPROCESSING
+ }
+ }
+ return state
+}
diff --git a/packages/@uppy/status-bar/src/style.scss b/packages/@uppy/status-bar/src/style.scss
index ece3152fb2..eea2c756e8 100644
--- a/packages/@uppy/status-bar/src/style.scss
+++ b/packages/@uppy/status-bar/src/style.scss
@@ -6,7 +6,7 @@
position: relative;
z-index: $zIndex-2;
display: flex;
- height: 40px;
+ height: 46px;
color: $white;
font-weight: 400;
font-size: 12px;
@@ -14,10 +14,6 @@
background-color: $white;
transition: height 0.2s;
- .uppy-size--md & {
- height: 46px;
- }
-
[data-uppy-theme="dark"] & {
background-color: $gray-900;
}
diff --git a/packages/@uppy/svelte/package.json b/packages/@uppy/svelte/package.json
index 1ada63c0bf..b336ae9b71 100644
--- a/packages/@uppy/svelte/package.json
+++ b/packages/@uppy/svelte/package.json
@@ -3,7 +3,7 @@
"svelte": "src/index.js",
"module": "dist/index.mjs",
"main": "dist/index.js",
- "version": "1.0.2",
+ "version": "1.0.3",
"scripts": {
"build": "rollup -c",
"prepublishOnly": "npm run build",
diff --git a/packages/@uppy/thumbnail-generator/package.json b/packages/@uppy/thumbnail-generator/package.json
index 18f6d9f5ad..481b066c0d 100644
--- a/packages/@uppy/thumbnail-generator/package.json
+++ b/packages/@uppy/thumbnail-generator/package.json
@@ -1,7 +1,7 @@
{
"name": "@uppy/thumbnail-generator",
"description": "Uppy plugin that generates small previews of images to show on your upload UI.",
- "version": "2.0.2",
+ "version": "2.0.3",
"license": "MIT",
"main": "lib/index.js",
"types": "types/index.d.ts",
diff --git a/packages/@uppy/transloadit/package.json b/packages/@uppy/transloadit/package.json
index 23958af27e..a82f26e805 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": "2.0.1",
+ "version": "2.0.2",
"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 54b3acbf8f..7507c584b1 100644
--- a/packages/@uppy/transloadit/src/index.js
+++ b/packages/@uppy/transloadit/src/index.js
@@ -14,6 +14,12 @@ function defaultGetAssemblyOptions (file, options) {
}
}
+const sendErrorToConsole = originalErr => err => {
+ const error = new Error('Failed to send error to the client')
+ error.cause = err
+ console.error(error, originalErr)
+}
+
const COMPANION = 'https://api2.transloadit.com/companion'
// Regex matching acceptable postMessage() origins for authentication feedback from companion.
const ALLOWED_COMPANION_PATTERN = /\.transloadit\.com$/
@@ -387,7 +393,7 @@ module.exports = class Transloadit extends BasePlugin {
#onCancelAll =() => {
const { uploadsAssemblies } = this.getPluginState()
- const assemblyIDs = Object.values(uploadsAssemblies)
+ const assemblyIDs = Object.values(uploadsAssemblies).flat(1)
const cancelPromises = assemblyIDs.map((assemblyID) => {
const assembly = this.getAssembly(assemblyID)
@@ -405,10 +411,8 @@ module.exports = class Transloadit extends BasePlugin {
*
* @param {Function} setData
*/
- #getPersistentData =(setData) => {
- const state = this.getPluginState()
- const { assemblies } = state
- const { uploadsAssemblies } = state
+ #getPersistentData = (setData) => {
+ const { assemblies, uploadsAssemblies } = this.getPluginState()
setData({
[this.id]: {
@@ -473,11 +477,9 @@ module.exports = class Transloadit extends BasePlugin {
// Set up the assembly watchers again for all the ongoing uploads.
Object.keys(uploadsAssemblies).forEach((uploadID) => {
const assemblyIDs = uploadsAssemblies[uploadID]
- const fileIDsInUpload = assemblyIDs.reduce((acc, assemblyID) => {
- const fileIDsInAssembly = this.getAssemblyFiles(assemblyID).map((file) => file.id)
- acc.push(...fileIDsInAssembly)
- return acc
- }, [])
+ const fileIDsInUpload = assemblyIDs.flatMap((assemblyID) => {
+ return this.getAssemblyFiles(assemblyID).map((file) => file.id)
+ })
this.#createAssemblyWatcher(assemblyIDs, fileIDsInUpload, uploadID)
})
@@ -704,15 +706,17 @@ module.exports = class Transloadit extends BasePlugin {
}
})
this.client.submitError(err)
+ // if we can't report the error that sucks
+ .catch(sendErrorToConsole(err))
}
#onTusError =(err) => {
if (err && /^tus: /.test(err.message)) {
const xhr = err.originalRequest ? err.originalRequest.getUnderlyingObject() : null
const url = xhr && xhr.responseURL ? xhr.responseURL : null
- this.client.submitError(err, { url, type: 'TUS_ERROR' }).then(() => {
+ this.client.submitError(err, { url, type: 'TUS_ERROR' })
// if we can't report the error that sucks
- })
+ .catch(sendErrorToConsole(err))
}
}
diff --git a/packages/@uppy/transloadit/src/index.test.js b/packages/@uppy/transloadit/src/index.test.js
index 4b818c6e62..02790f5dac 100644
--- a/packages/@uppy/transloadit/src/index.test.js
+++ b/packages/@uppy/transloadit/src/index.test.js
@@ -33,10 +33,11 @@ describe('Transloadit', () => {
})
it('Does not leave lingering progress if getAssemblyOptions fails', () => {
+ const error = new Error('expected failure')
const uppy = new Core()
uppy.use(Transloadit, {
getAssemblyOptions () {
- return Promise.reject(new Error('Failure!'))
+ return Promise.reject(error)
},
})
@@ -51,7 +52,7 @@ describe('Transloadit', () => {
}).catch((err) => {
const fileID = Object.keys(uppy.getState().files)[0]
- expect(err.message).toBe('Failure!')
+ expect(err).toBe(error)
expect(uppy.getFile(fileID).progress.uploadStarted).toBe(null)
})
})
diff --git a/packages/@uppy/tus/package.json b/packages/@uppy/tus/package.json
index 931cb27d7f..9a93ffd5a8 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": "2.0.1",
+ "version": "2.0.2",
"license": "MIT",
"main": "lib/index.js",
"types": "types/index.d.ts",
diff --git a/packages/@uppy/unsplash/package.json b/packages/@uppy/unsplash/package.json
index 3daf08657f..83788724cc 100644
--- a/packages/@uppy/unsplash/package.json
+++ b/packages/@uppy/unsplash/package.json
@@ -1,7 +1,7 @@
{
"name": "@uppy/unsplash",
"description": "Import files from Unsplash, the free stock photography resource, into Uppy",
- "version": "1.0.1",
+ "version": "1.0.2",
"license": "MIT",
"main": "lib/index.js",
"types": "types/index.d.ts",
diff --git a/packages/@uppy/url/package.json b/packages/@uppy/url/package.json
index 20cd7beb33..915c44c93e 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": "2.0.1",
+ "version": "2.0.2",
"license": "MIT",
"main": "lib/index.js",
"style": "dist/style.min.css",
diff --git a/packages/@uppy/utils/package.json b/packages/@uppy/utils/package.json
index 7f75792ba3..5bb1ce54ab 100644
--- a/packages/@uppy/utils/package.json
+++ b/packages/@uppy/utils/package.json
@@ -1,7 +1,7 @@
{
"name": "@uppy/utils",
"description": "Shared utility functions for Uppy Core and plugins maintained by the Uppy team.",
- "version": "4.0.0",
+ "version": "4.0.1",
"license": "MIT",
"main": "lib/index.js",
"types": "types/index.d.ts",
diff --git a/packages/@uppy/utils/src/AbortController.js b/packages/@uppy/utils/src/AbortController.js
index 5d228469a2..9aaf0423ff 100644
--- a/packages/@uppy/utils/src/AbortController.js
+++ b/packages/@uppy/utils/src/AbortController.js
@@ -1,6 +1,6 @@
/**
* Little AbortController proxy module so we can swap out the implementation easily later.
*/
-exports.AbortController = AbortController
-exports.AbortSignal = AbortSignal
+exports.AbortController = globalThis.AbortController
+exports.AbortSignal = globalThis.AbortSignal
exports.createAbortError = (message = 'Aborted') => new DOMException(message, 'AbortError')
diff --git a/packages/@uppy/vue/package.json b/packages/@uppy/vue/package.json
index 547256b0e7..0877b06c1f 100644
--- a/packages/@uppy/vue/package.json
+++ b/packages/@uppy/vue/package.json
@@ -1,6 +1,6 @@
{
"name": "@uppy/vue",
- "version": "0.4.0",
+ "version": "0.4.1",
"private": false,
"main": "lib/index.js",
"types": "types/index.d.ts",
diff --git a/packages/@uppy/webcam/package.json b/packages/@uppy/webcam/package.json
index 1820214ca5..143b9c8a93 100644
--- a/packages/@uppy/webcam/package.json
+++ b/packages/@uppy/webcam/package.json
@@ -1,7 +1,7 @@
{
"name": "@uppy/webcam",
"description": "Uppy plugin that takes photos or records videos using the device's camera.",
- "version": "2.0.1",
+ "version": "2.0.2",
"license": "MIT",
"main": "lib/index.js",
"style": "dist/style.min.css",
diff --git a/packages/@uppy/xhr-upload/package.json b/packages/@uppy/xhr-upload/package.json
index 8259cf18a3..b68ea535f7 100644
--- a/packages/@uppy/xhr-upload/package.json
+++ b/packages/@uppy/xhr-upload/package.json
@@ -1,7 +1,7 @@
{
"name": "@uppy/xhr-upload",
"description": "Plain and simple classic HTML multipart form uploads with Uppy, as well as uploads using the HTTP PUT method.",
- "version": "2.0.2",
+ "version": "2.0.3",
"license": "MIT",
"main": "lib/index.js",
"types": "types/index.d.ts",
diff --git a/packages/@uppy/xhr-upload/src/index.js b/packages/@uppy/xhr-upload/src/index.js
index 02a5877fc7..307e9346a2 100644
--- a/packages/@uppy/xhr-upload/src/index.js
+++ b/packages/@uppy/xhr-upload/src/index.js
@@ -87,7 +87,7 @@ module.exports = class XHRUpload extends BasePlugin {
try {
parsedResponse = JSON.parse(responseText)
} catch (err) {
- this.uppy.log(err)
+ uppy.log(err)
}
return parsedResponse
diff --git a/packages/@uppy/zoom/package.json b/packages/@uppy/zoom/package.json
index 037fc2ed1e..e99dea51bb 100644
--- a/packages/@uppy/zoom/package.json
+++ b/packages/@uppy/zoom/package.json
@@ -1,7 +1,7 @@
{
"name": "@uppy/zoom",
"description": "Import files from zoom, into Uppy.",
- "version": "1.0.1",
+ "version": "1.0.2",
"license": "MIT",
"main": "lib/index.js",
"types": "types/index.d.ts",
diff --git a/packages/uppy/package.json b/packages/uppy/package.json
index 17a95f0b75..950ba9dbdb 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": "2.1.0",
+ "version": "2.1.1",
"license": "MIT",
"main": "index.js",
"module": "index.mjs",
diff --git a/test/endtoend/transloadit2/index.html b/test/endtoend/transloadit2/index.html
new file mode 100644
index 0000000000..4a38ad102e
--- /dev/null
+++ b/test/endtoend/transloadit2/index.html
@@ -0,0 +1,23 @@
+
+
+
+
+
+
Uppy test page
+
+
+
+
+ Uppy Transloadit
+
+
+
+
+
+
+
diff --git a/test/endtoend/transloadit2/main.js b/test/endtoend/transloadit2/main.js
new file mode 100644
index 0000000000..48986ad68a
--- /dev/null
+++ b/test/endtoend/transloadit2/main.js
@@ -0,0 +1,57 @@
+const Uppy = require('@uppy/core')
+const Dashboard = require('@uppy/dashboard')
+const Transloadit = require('@uppy/transloadit')
+
+function initUppyTransloadit (transloaditKey) {
+ const uppyTransloadit = new Uppy({
+ id: 'uppyTransloadit',
+ debug: true,
+ autoProceed: true,
+ })
+
+ uppyTransloadit
+ .use(Dashboard, {
+ target: '#uppy-transloadit',
+ inline: true,
+ })
+ .use(Transloadit, {
+ service: 'https://api2-ap-southeast-1.transloadit.com',
+ params: {
+ steps: {
+ crop_thumbed: {
+ use: [':original'],
+ robot: '/image/resize',
+ height: 100,
+ resize_strategy: 'crop',
+ width: 100,
+ },
+ },
+ },
+ getAssemblyOptions () {
+ return {
+ params: {
+ auth: { key: transloaditKey },
+ template_id: 'uppyTransloadit',
+ },
+ }
+ },
+ waitForEncoding: true,
+ })
+
+ uppyTransloadit.on('transloadit:result', (stepName, result) => {
+ // use transloadit encoding result here.
+ console.log('Result here ====>', stepName, result)
+ console.log('Cropped image url is here ====>', result.url)
+
+ const img = new Image()
+ img.onload = function onload () {
+ const result = document.createElement('div')
+ result.setAttribute('id', 'uppy-result')
+ result.textContent = 'ok'
+ document.body.appendChild(result)
+ }
+ img.src = result.url
+ })
+}
+
+window.initUppyTransloadit = initUppyTransloadit
diff --git a/test/endtoend/transloadit2/test.js b/test/endtoend/transloadit2/test.js
new file mode 100644
index 0000000000..7623c0d7b5
--- /dev/null
+++ b/test/endtoend/transloadit2/test.js
@@ -0,0 +1,52 @@
+/* global browser, expect, capabilities, $ */
+const path = require('path')
+const fs = require('fs')
+const { selectFakeFile, supportsChooseFile, ensureInputVisible } = require('../utils')
+
+const testURL = 'http://localhost:4567/transloadit'
+
+function setTransloaditKeyAndInit (transloaditKey) {
+ window.initUppyTransloadit(transloaditKey)
+}
+
+describe('Transloadit file processing', () => {
+ beforeEach(async () => {
+ await browser.url(testURL)
+ })
+
+ it('should upload a file to Transloadit and crop it', async function test () {
+ const transloaditKey = process.env.TRANSLOADIT_KEY
+ if (transloaditKey === undefined) {
+ console.log('skipping Transloadit integration test')
+ return this.skip()
+ }
+
+ const wrapper = await $('#uppy-transloadit')
+ await wrapper.waitForExist()
+
+ await browser.execute(setTransloaditKeyAndInit, transloaditKey)
+
+ const input = await $('#uppy-transloadit .uppy-Dashboard-input')
+ const result = await $('#uppy-result')
+
+ await input.waitForExist()
+ await browser.execute(ensureInputVisible, '#uppy-transloadit .uppy-Dashboard-input')
+
+ if (supportsChooseFile(capabilities)) {
+ await input.setValue(path.join(__dirname, '../../resources/image.jpg'))
+ } else {
+ const img = path.join(__dirname, '../../resources/image.jpg')
+ await browser.execute(
+ selectFakeFile,
+ 'uppyTransloadit',
+ path.basename(img), // name
+ 'image/jpeg', // type
+ fs.readFileSync(img, 'base64') // b64
+ )
+ // browser.execute(selectFakeFile, 'uppyTransloadit')
+ }
+ await result.waitForExist(25000)
+ const text = await result.getText()
+ expect(text).to.be.equal('ok')
+ })
+})
diff --git a/test/endtoend/wdio.base.conf.js b/test/endtoend/wdio.base.conf.js
index 24eee4db28..ac1c0c1d65 100644
--- a/test/endtoend/wdio.base.conf.js
+++ b/test/endtoend/wdio.base.conf.js
@@ -95,6 +95,7 @@ exports.config = {
{ mount: '/providers', path: './providers/dist' },
{ mount: '/thumbnails', path: './thumbnails/dist' },
{ mount: '/transloadit', path: './transloadit/dist' },
+ { mount: '/transloadit2', path: './transloadit2/dist' },
{ mount: '/tus-drag-drop', path: './tus-drag-drop/dist' },
{ mount: '/typescript', path: './typescript/dist' },
{ mount: '/url-plugin', path: './url-plugin/dist' },
diff --git a/website/src/docs/index.md b/website/src/docs/index.md
index b7a8c99280..a8989ffe00 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:
@@ -184,5 +184,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 ead2159952..e12c8a1ece 100644
--- a/website/src/docs/locales.md
+++ b/website/src/docs/locales.md
@@ -34,8 +34,8 @@ 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/examples/dashboard/app.es6 b/website/src/examples/dashboard/app.es6
index abbd0c5956..c75abec877 100644
--- a/website/src/examples/dashboard/app.es6
+++ b/website/src/examples/dashboard/app.es6
@@ -213,7 +213,7 @@ function loadLocaleFromCDN (localeName) {
const head = document.getElementsByTagName('head')[0]
const js = document.createElement('script')
js.type = 'text/javascript'
- js.src = `https://releases.transloadit.com/uppy/locales/v2.0.0/${localeName}.min.js`
+ js.src = `https://releases.transloadit.com/uppy/locales/v2.0.1/${localeName}.min.js`
head.appendChild(js)
}
diff --git a/website/src/examples/i18n/app.html b/website/src/examples/i18n/app.html
index 63153eed12..6dfb2644dd 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:
](https://github.com/nqst) |[
](https://github.com/aduh95) |[
](https://github.com/lakesare) |[
](https://github.com/kiloreux) |[
](https://github.com/Murderlon) |[
](https://github.com/sadovnychyi) |
+[
](https://github.com/samuelayo) |[
](https://github.com/richardwillars) |[
](https://github.com/ajkachnic) |[![dependabot[bot]](https://avatars.githubusercontent.com/in/29110?v=4&s=117)
](https://github.com/apps/dependabot) |[
](https://github.com/mifi) |[
](https://github.com/zcallan) |
+[
](https://github.com/tim-kos) |[
](https://github.com/janko) |[
](https://github.com/wilkoklak) |[
](https://github.com/oliverpool) |[
](https://github.com/Botz) |[
](https://github.com/mcallistertyler) |
:---: |:---: |:---: |:---: |:---: |:---: |
[tim-kos](https://github.com/tim-kos) |[janko](https://github.com/janko) |[wilkoklak](https://github.com/wilkoklak) |[oliverpool](https://github.com/oliverpool) |[Botz](https://github.com/Botz) |[mcallistertyler](https://github.com/mcallistertyler) |
-[
](https://github.com/mokutsu-coursera) |[
](https://github.com/DJWassink) |[
](https://github.com/taoqf) |[
](https://github.com/tuoxiansp) |[
](https://github.com/dominiceden) |[
](https://github.com/elenalape) |
+[
](https://github.com/YukeshShr) |[
](https://github.com/mejiaej) |[
](https://github.com/gavboulton) |[
](https://github.com/Hawxy) |[
](https://github.com/bertho-zero) |[
](https://github.com/tranvansang) |[
](https://github.com/ap--) |
+[
](https://github.com/mrbatista) |[
](https://github.com/MikeKovarik) |[
](https://github.com/pauln) |[
](https://github.com/szh) |[
](https://github.com/toadkicker) |[
](https://github.com/ofhope) |
+[
](https://github.com/johnnyperkins) |[
](https://github.com/dargmuesli) |[
](https://github.com/juliangruber) |[
](https://github.com/manuelkiessling) |[
](https://github.com/nndevstudio) |[
](https://github.com/ogtfaber) |
+[
](https://github.com/sksavant) |[
](https://github.com/suchoproduction) |[
](https://github.com/sunil-shrestha) |[
](https://github.com/timodwhit) |[
](https://github.com/yonahforst) |[
](https://github.com/a-kriya) |
+[
](https://github.com/stephentuso) |[
](https://github.com/jhen0409) |[
](https://github.com/mskelton) |[
](https://github.com/ahmedkandel) |[
](https://github.com/btrice) |[
](https://github.com/behnammodi) |
+[
](https://github.com/craigjennings11) |[
](https://github.com/davekiss) |[
](https://github.com/DenysNosov) |[
](https://github.com/ethanwillis) |[
](https://github.com/frobinsonj) |[
](https://github.com/geertclerx) |
+[
](https://github.com/BePo65) |[
](https://github.com/Burkes) |[
](https://github.com/ghasrfakhri) |[
](https://github.com/jasonbosco) |[
](https://github.com/jedwood) |[
](https://github.com/dogrocker) |[
](https://github.com/lamartire) |[
](https://github.com/Mactaivsh) |
+[
](https://github.com/maferland) |[
](https://github.com/Martin005) |[
](https://github.com/martiuslim) |[
](https://github.com/MatthiasKunnen) |[
](https://github.com/msand) |[
](https://github.com/paescuj) |
+[
](https://github.com/richartkeil) |[
](https://github.com/richmeij) |[
](https://github.com/rosenfeld) |[
](https://github.com/jrschumacher) |[
](https://github.com/ThomasG77) |[
](https://github.com/sparanoid) |
+[
](https://github.com/zhuangya) |[
](https://github.com/allenfantasy) |[
](https://github.com/Zyclotrop-j) |[
](https://github.com/anark) |[
](https://github.com/fortrieb) |
+[
](https://github.com/jarey) |[
](https://github.com/muhammadInam) |[
](https://github.com/rettgerst) |[
](https://github.com/mkabatek) |[
](https://github.com/jukakoski) |
+[
](https://github.com/olemoign) |[
](https://github.com/ajschmidt8) |[
](https://github.com/superhawk610) |[
](https://github.com/abannach) |[
](https://github.com/adamelmore) |[
](https://github.com/ajh-sr) |
+[
](https://github.com/adamvigneault) |[
](https://github.com/adritasharma) |[
](https://github.com/asmt3) |[
](https://github.com/alexnj) |[
](https://github.com/aalepis) |[
](https://github.com/Dogfalo) |
+[
](https://github.com/Adrrei) |[
](https://github.com/tekacs) |[
](https://github.com/amitport) |[
](https://github.com/functino) |[
](https://github.com/radarhere) |[
](https://github.com/superandrew213) |[
](https://github.com/andychongyz) |
+[
](https://github.com/anthony0030) |[
](https://github.com/Abourass) |[
](https://github.com/arthurdenner) |[
](https://github.com/apuyou) |[
](https://github.com/atsawin) |[
](https://github.com/ayhankesicioglu) |
+[
](https://github.com/azeemba) |[
](https://github.com/azizk) |[
](https://github.com/bducharme) |[
](https://github.com/Quorafind) |[
](https://github.com/wbaaron) |[
](https://github.com/bedgerotto) |
+[
](https://github.com/cyu) |[
](https://github.com/cartfisk) |[
](https://github.com/cellvinchung) |[
](https://github.com/chao) |[
](https://github.com/csprance) |[
](https://github.com/Aarbel) |
+[
](https://github.com/cbush06) |[
](https://github.com/czj) |[
](https://github.com/ardeois) |[
](https://github.com/sercraig) |[
](https://github.com/Cruaier) |[
](https://github.com/danmichaelo) |
+[
](https://github.com/mrboomer) |[
](https://github.com/akizor) |[
](https://github.com/davilima6) |[
](https://github.com/DennisKofflard) |[
](https://github.com/jeetiss) |[
](https://github.com/sweetro) |
+[
](https://github.com/efbautista) |[
](https://github.com/yoldar) |[
](https://github.com/eliOcs) |[
](https://github.com/EnricoSottile) |[
](https://github.com/Gkleinereva) |[
](https://github.com/fgallinari) |
+[
](https://github.com/ferdiusa) |[
](https://github.com/dtrucs) |[
](https://github.com/geoffappleford) |[
](https://github.com/gjungb) |[
](https://github.com/roenschg) |[
](https://github.com/HughbertD) |
+[
](https://github.com/HussainAlkhalifah) |[
](https://github.com/huydod) |[
](https://github.com/IanVS) |[
](https://github.com/ishendyweb) |[
](https://github.com/NaxYo) |[
](https://github.com/intenzive) |
+[
](https://github.com/GreenJimmy) |[
](https://github.com/mazoruss) |[
](https://github.com/JacobMGEvans) |[
](https://github.com/jdssem) |[
](https://github.com/Jbithell) |[
](https://github.com/jcjmcclean) |
+[
](https://github.com/janklimo) |[
](https://github.com/janwilts) |[
](https://github.com/vith) |[
](https://github.com/jessica-coursera) |[
](https://github.com/Jmales) |[
](https://github.com/theJoeBiz) |
+[
](https://github.com/profsmallpine) |[
](https://github.com/jonathanarbely) |[
](https://github.com/jderrough) |[
](https://github.com/jonathanly) |[
](https://github.com/jorgeepc) |[
](https://github.com/jszobody) |
+[
](https://github.com/julianocomg) |[
](https://github.com/jmontoyaa) |[
](https://github.com/firesharkstudios) |[
](https://github.com/elkebab) |[
](https://github.com/kyleparisi) |
+[
](https://github.com/lafe) |[
](https://github.com/leaanthony) |[
](https://github.com/larowlan) |[
](https://github.com/dviry) |[
](https://github.com/galli-leo) |[
](https://github.com/leods92) |
+[
](https://github.com/louim) |[
](https://github.com/lucaperret) |[
](https://github.com/mperrando) |[
](https://github.com/marcosthejew) |[
](https://github.com/marcusforsberg) |[
](https://github.com/Acconut) |
+[
](https://github.com/onhate) |[
](https://github.com/martin-brennan) |[
](https://github.com/masaok) |[
](https://github.com/mattfik) |[
](https://github.com/matthewhartstonge) |[
](https://github.com/hrsh) |[
](https://github.com/mhulet) |
+[
](https://github.com/mkopinsky) |[
](https://github.com/achmiral) |[
](https://github.com/mnafees) |[
](https://github.com/shahimclt) |[
](https://github.com/pleasespammelater) |[
](https://github.com/naveed-ahmad) |
+[
](https://github.com/coreprocess) |[
](https://github.com/nil1511) |[
](https://github.com/leftdevel) |[
](https://github.com/cryptic022) |[
](https://github.com/patricklindsay) |[
](https://github.com/pedrofs) |
+[
](https://github.com/nicojones) |[
](https://github.com/phillipalexander) |[
](https://github.com/ppadmavilasom) |[
](https://github.com/Pzoco) |[
](https://github.com/eman8519) |[
](https://github.com/luarmr) |[
](https://github.com/SxDx) |
+[
](https://github.com/robwilson1) |[
](https://github.com/romain-preston) |[
](https://github.com/scherroman) |[
](https://github.com/rossng) |[
](https://github.com/rart) |[
](https://github.com/fortunto2) |
+[
](https://github.com/samuelcolburn) |[
](https://github.com/sergei-zelinsky) |[
](https://github.com/SpazzMarticus) |[
](https://github.com/waptik) |[
](https://github.com/steverob) |[
](https://github.com/taj) |
+[
](https://github.com/Tashows) |[
](https://github.com/twarlop) |[
](https://github.com/tmaier) |[
](https://github.com/tomsaleeba) |[
](https://github.com/tvaliasek) |[
](https://github.com/vially) |
+[
](https://github.com/valentinoli) |[
](https://github.com/nagyv) |[
](https://github.com/dwnste) |[
](https://github.com/willycamargo) |[
](https://github.com/xhocquet) |[
](https://github.com/yaegor) |
+[
](https://github.com/YehudaKremer) |[
](https://github.com/zachconner) |[
](https://github.com/zacharylawson) |[
](https://github.com/agreene-coursera) |[
](https://github.com/alfatv) |[
](https://github.com/arggh) |
+[
](https://github.com/avalla) |[
](https://github.com/bdirito) |[
](https://github.com/bencergazda) |[
](https://github.com/c0b41) |[
](https://github.com/canvasbh) |[
](https://github.com/craigcbrunner) |
+[
](https://github.com/darthf1) |[
](https://github.com/dkisic) |[
](https://github.com/fingul) |[
](https://github.com/franckl) |[
](https://github.com/gaelicwinter) |[
](https://github.com/green-mike) |
+[
](https://github.com/christianwengert) |[
](https://github.com/hxgf) |[
](https://github.com/johnmanjiro13) |[
](https://github.com/kode-ninja) |[
](https://github.com/magumbo) |[
](https://github.com/ninesalt) |[
](https://github.com/phil714) |
+[
](https://github.com/luntta) |[
](https://github.com/rhymes) |[
](https://github.com/rlebosse) |[
](https://github.com/rtaieb) |[
](https://github.com/slawexxx44) |
+[
](https://github.com/thanhthot) |[
](https://github.com/tinny77) |[
](https://github.com/vedran555) |[
](https://github.com/yoann-hellopret) |[
](https://github.com/olitomas) |[
](https://github.com/JimmyLv) |
+[