diff --git a/private/dev/Dashboard.js b/private/dev/Dashboard.js index 8e9f98f70..d4bd78153 100644 --- a/private/dev/Dashboard.js +++ b/private/dev/Dashboard.js @@ -1,4 +1,3 @@ -// The @uppy/ dependencies are resolved from source /* eslint-disable import/no-extraneous-dependencies */ import Uppy, { debugLogger } from '@uppy/core' import Dashboard from '@uppy/dashboard' @@ -8,7 +7,6 @@ import ScreenCapture from '@uppy/screen-capture' import GoldenRetriever from '@uppy/golden-retriever' import Tus from '@uppy/tus' import AwsS3 from '@uppy/aws-s3' -import AwsS3Multipart from '@uppy/aws-s3-multipart' import XHRUpload from '@uppy/xhr-upload' import Transloadit from '@uppy/transloadit' import Form from '@uppy/form' @@ -23,18 +21,19 @@ import generateSignatureIfSecret from './generateSignatureIfSecret.js' // DEV CONFIG: create a .env file in the project root directory to customize those values. const { - VITE_UPLOADER : UPLOADER, - VITE_COMPANION_URL : COMPANION_URL, - VITE_TUS_ENDPOINT : TUS_ENDPOINT, - VITE_XHR_ENDPOINT : XHR_ENDPOINT, - VITE_TRANSLOADIT_KEY : TRANSLOADIT_KEY, - VITE_TRANSLOADIT_SECRET : TRANSLOADIT_SECRET, - VITE_TRANSLOADIT_TEMPLATE : TRANSLOADIT_TEMPLATE, - VITE_TRANSLOADIT_SERVICE_URL : TRANSLOADIT_SERVICE_URL, + VITE_UPLOADER: UPLOADER, + VITE_COMPANION_URL: COMPANION_URL, + VITE_TUS_ENDPOINT: TUS_ENDPOINT, + VITE_XHR_ENDPOINT: XHR_ENDPOINT, + VITE_TRANSLOADIT_KEY: TRANSLOADIT_KEY, + VITE_TRANSLOADIT_SECRET: TRANSLOADIT_SECRET, + VITE_TRANSLOADIT_TEMPLATE: TRANSLOADIT_TEMPLATE, + VITE_TRANSLOADIT_SERVICE_URL: TRANSLOADIT_SERVICE_URL, } = import.meta.env -const companionAllowedHosts = import.meta.env.VITE_COMPANION_ALLOWED_HOSTS - && new RegExp(import.meta.env.VITE_COMPANION_ALLOWED_HOSTS) +const companionAllowedHosts = + import.meta.env.VITE_COMPANION_ALLOWED_HOSTS && + new RegExp(import.meta.env.VITE_COMPANION_ALLOWED_HOSTS) import.meta.env.VITE_TRANSLOADIT_KEY &&= '***' // to avoid leaking secrets in screenshots. import.meta.env.VITE_TRANSLOADIT_SECRET &&= '***' // to avoid leaking secrets in screenshots. @@ -45,7 +44,7 @@ console.log(import.meta.env) const RESTORE = false const COMPRESS = false -async function assemblyOptions () { +async function assemblyOptions() { return generateSignatureIfSecret(TRANSLOADIT_SECRET, { auth: { key: TRANSLOADIT_KEY, @@ -56,7 +55,7 @@ async function assemblyOptions () { }) } -function getCompanionKeysParams (name) { +function getCompanionKeysParams(name) { const { [`VITE_COMPANION_${name}_KEYS_PARAMS_CREDENTIALS_NAME`]: credentialsName, [`VITE_COMPANION_${name}_KEYS_PARAMS_KEY`]: key, @@ -110,7 +109,12 @@ export default () => { proudlyDisplayPoweredByUppy: true, note: `${JSON.stringify(restrictions)}`, }) - .use(GoogleDrive, { target: Dashboard, companionUrl: COMPANION_URL, companionAllowedHosts, ...getCompanionKeysParams('GOOGLE_DRIVE') }) + .use(GoogleDrive, { + target: Dashboard, + companionUrl: COMPANION_URL, + companionAllowedHosts, + ...getCompanionKeysParams('GOOGLE_DRIVE'), + }) // .use(Instagram, { target: Dashboard, companionUrl: COMPANION_URL, companionAllowedHosts }) // .use(Dropbox, { target: Dashboard, companionUrl: COMPANION_URL, companionAllowedHosts }) // .use(Box, { target: Dashboard, companionUrl: COMPANION_URL, companionAllowedHosts }) @@ -121,7 +125,17 @@ export default () => { // .use(Unsplash, { target: Dashboard, companionUrl: COMPANION_URL, companionAllowedHosts }) .use(RemoteSources, { companionUrl: COMPANION_URL, - sources: ['GooglePhotos', 'Box', 'Dropbox', 'Facebook', 'Instagram', 'OneDrive', 'Unsplash', 'Zoom', 'Url'], + sources: [ + 'GooglePhotos', + 'Box', + 'Dropbox', + 'Facebook', + 'Instagram', + 'OneDrive', + 'Unsplash', + 'Zoom', + 'Url', + ], companionAllowedHosts, }) .use(Webcam, { @@ -152,10 +166,14 @@ export default () => { uppyDashboard.use(AwsS3, { companionUrl: COMPANION_URL, limit: 6 }) break case 's3-multipart': - uppyDashboard.use(AwsS3Multipart, { companionUrl: COMPANION_URL }) + uppyDashboard.use(AwsS3, { companionUrl: COMPANION_URL, shouldUseMultipart: true }) break case 'xhr': - uppyDashboard.use(XHRUpload, { endpoint: XHR_ENDPOINT, limit: 6, bundle: false }) + uppyDashboard.use(XHRUpload, { + endpoint: XHR_ENDPOINT, + limit: 6, + bundle: false, + }) break case 'transloadit': uppyDashboard.use(Transloadit, { diff --git a/private/dev/tsconfig.json b/private/dev/tsconfig.json new file mode 100644 index 000000000..0cdcbab24 --- /dev/null +++ b/private/dev/tsconfig.json @@ -0,0 +1,122 @@ +{ + "extends": "../../tsconfig.shared", + "compilerOptions": { + "emitDeclarationOnly": false, + "noEmit": true, + "allowJs": true, + "paths": { + "@uppy/store-default": [ + "../../packages/@uppy/store-default/src/index.js", + ], + "@uppy/store-default/lib/*": ["../../packages/@uppy/store-default/src/*"], + "@uppy/utils/lib/*": ["../../packages/@uppy/utils/src/*"], + "@uppy/core": ["../../packages/@uppy/core/src/index.js"], + "@uppy/core/lib/*": ["../../packages/@uppy/core/src/*"], + "@uppy/dashboard": ["../../packages/@uppy/dashboard/src/index.js"], + "@uppy/dashboard/lib/*": ["../../packages/@uppy/dashboard/src/*"], + "@uppy/remote-sources": [ + "../../packages/@uppy/remote-sources/src/index.js", + ], + "@uppy/remote-sources/lib/*": [ + "../../packages/@uppy/remote-sources/src/*", + ], + "@uppy/webcam": ["../../packages/@uppy/webcam/src/index.js"], + "@uppy/webcam/lib/*": ["../../packages/@uppy/webcam/src/*"], + "@uppy/screen-capture": [ + "../../packages/@uppy/screen-capture/src/index.js", + ], + "@uppy/screen-capture/lib/*": [ + "../../packages/@uppy/screen-capture/src/*", + ], + "@uppy/golden-retriever": [ + "../../packages/@uppy/golden-retriever/src/index.js", + ], + "@uppy/golden-retriever/lib/*": [ + "../../packages/@uppy/golden-retriever/src/*", + ], + "@uppy/tus": ["../../packages/@uppy/tus/src/index.js"], + "@uppy/tus/lib/*": ["../../packages/@uppy/tus/src/*"], + "@uppy/aws-s3": ["../../packages/@uppy/aws-s3/src/index.js"], + "@uppy/aws-s3/lib/*": ["../../packages/@uppy/aws-s3/src/*"], + "@uppy/aws-s3-multipart": [ + "../../packages/@uppy/aws-s3-multipart/src/index.js", + ], + "@uppy/aws-s3-multipart/lib/*": [ + "../../packages/@uppy/aws-s3-multipart/src/*", + ], + "@uppy/xhr-upload": ["../../packages/@uppy/xhr-upload/src/index.js"], + "@uppy/xhr-upload/lib/*": ["../../packages/@uppy/xhr-upload/src/*"], + "@uppy/transloadit": ["../../packages/@uppy/transloadit/src/index.js"], + "@uppy/transloadit/lib/*": ["../../packages/@uppy/transloadit/src/*"], + "@uppy/form": ["../../packages/@uppy/form/src/index.js"], + "@uppy/form/lib/*": ["../../packages/@uppy/form/src/*"], + "@uppy/image-editor": ["../../packages/@uppy/image-editor/src/index.js"], + "@uppy/image-editor/lib/*": ["../../packages/@uppy/image-editor/src/*"], + "@uppy/drop-target": ["../../packages/@uppy/drop-target/src/index.js"], + "@uppy/drop-target/lib/*": ["../../packages/@uppy/drop-target/src/*"], + "@uppy/audio": ["../../packages/@uppy/audio/src/index.js"], + "@uppy/audio/lib/*": ["../../packages/@uppy/audio/src/*"], + "@uppy/compressor": ["../../packages/@uppy/compressor/src/index.js"], + "@uppy/compressor/lib/*": ["../../packages/@uppy/compressor/src/*"], + "@uppy/google-drive": ["../../packages/@uppy/google-drive/src/index.js"], + "@uppy/google-drive/lib/*": ["../../packages/@uppy/google-drive/src/*"], + }, + }, + "include": ["./package.json", "./*.ts", "./*.js"], + "references": [ + { + "path": "../../packages/@uppy/store-default/tsconfig.build.json", + }, + { + "path": "../../packages/@uppy/utils/tsconfig.build.json", + }, + { + "path": "../../packages/@uppy/core/tsconfig.build.json", + }, + { + "path": "../../packages/@uppy/dashboard/tsconfig.build.json", + }, + { + "path": "../../packages/@uppy/remote-sources/tsconfig.build.json", + }, + { + "path": "../../packages/@uppy/webcam/tsconfig.build.json", + }, + { + "path": "../../packages/@uppy/screen-capture/tsconfig.build.json", + }, + { + "path": "../../packages/@uppy/golden-retriever/tsconfig.build.json", + }, + { + "path": "../../packages/@uppy/tus/tsconfig.build.json", + }, + { + "path": "../../packages/@uppy/aws-s3/tsconfig.build.json", + }, + { + "path": "../../packages/@uppy/xhr-upload/tsconfig.build.json", + }, + { + "path": "../../packages/@uppy/transloadit/tsconfig.build.json", + }, + { + "path": "../../packages/@uppy/form/tsconfig.build.json", + }, + { + "path": "../../packages/@uppy/image-editor/tsconfig.build.json", + }, + { + "path": "../../packages/@uppy/drop-target/tsconfig.build.json", + }, + { + "path": "../../packages/@uppy/audio/tsconfig.build.json", + }, + { + "path": "../../packages/@uppy/compressor/tsconfig.build.json", + }, + { + "path": "../../packages/@uppy/google-drive/tsconfig.build.json", + }, + ], +}