diff --git a/.eslintrc.js b/.eslintrc.js index 98adc34c4d..a4b2692dae 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -438,12 +438,13 @@ module.exports = { 'no-restricted-syntax': ['error', { selector: 'ImportDeclaration[source.value=/^@uppy\\x2F[a-z-0-9]+\\x2F/]:not([source.value=/^@uppy\\x2Futils\\x2F/]):not([source.value=/\\.(js|css)$/])', 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', + }, + { + selector: 'ImportDeclaration[source.value=/^@uppy\\x2F[a-z-0-9]+\\x2Fsrc\\x2F/]', + message: 'Importing from "src/" is not allowed. Import from root or from "lib/" if you must.', }], 'import/extensions': ['error', 'ignorePackages'], 'import/prefer-default-export': 'off', diff --git a/.github/workflows/bundlers.yml b/.github/workflows/bundlers.yml index 8f96efd6de..b66982ae38 100644 --- a/.github/workflows/bundlers.yml +++ b/.github/workflows/bundlers.yml @@ -136,10 +136,26 @@ jobs: run: npm i --save-dev webpack-cli webpack@${{matrix.bundler-version}} - run: npx webpack --version - name: Create Webpack config file - run: - echo 'export default - {mode:"production",target:"web",entry:"./lib/index.js"}' > - webpack.config.js + run: | + echo 'export default { + mode: "production", + target: "web", + entry: "./lib/index.js", + resolve: { + fallback: { + fs: false, + path: false, + stream: false, + util: false, + assert: false, + constants: false, + crypto: false, + http: false, + https: false, + url: false + } + } + }' > webpack.config.js - name: Bundle run: npx webpack diff --git a/.github/workflows/companion-deploy.yml b/.github/workflows/companion-deploy.yml index debc6b18a5..9ba9973b87 100644 --- a/.github/workflows/companion-deploy.yml +++ b/.github/workflows/companion-deploy.yml @@ -49,13 +49,13 @@ jobs: uses: actions/checkout@v4 - name: Docker meta id: docker_meta - uses: docker/metadata-action@8e5442c4ef9f78752691e2d8f8d19755c6f78e81 # v5.5.1 + uses: docker/metadata-action@369eb591f429131d6889c46b94e711f089e6ca96 # v5.6.1 with: images: transloadit/companion tags: | type=edge type=raw,value=latest,enable=false - - uses: docker/setup-qemu-action@49b3bc8e6bdd4a60e6116a5414239cba5943d3cf # v3.2.0 + - uses: docker/setup-qemu-action@53851d14592bedcffcf25ea515637cff71ef929a # v3.3.0 - uses: docker/setup-buildx-action@v3 - name: Log in to DockerHub uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0 @@ -63,7 +63,7 @@ jobs: username: ${{secrets.DOCKER_USERNAME}} password: ${{secrets.DOCKER_PASSWORD}} - name: Build and push - uses: docker/build-push-action@4f58ea79222b3b9dc2c8bbdd6debcef730109a75 # v6.9.0 + uses: docker/build-push-action@67a2d409c0a876cbe6b11854e3e25193efe4e62d # v6.12.0 with: push: true context: . diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7aa5390f84..d35def6be5 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -143,7 +143,7 @@ jobs: uses: actions/checkout@v4 - name: Docker meta id: docker_meta - uses: docker/metadata-action@8e5442c4ef9f78752691e2d8f8d19755c6f78e81 # v5.5.1 + uses: docker/metadata-action@369eb591f429131d6889c46b94e711f089e6ca96 # v5.6.1 with: images: transloadit/companion tags: | @@ -151,7 +151,7 @@ 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@49b3bc8e6bdd4a60e6116a5414239cba5943d3cf # v3.2.0 + - uses: docker/setup-qemu-action@53851d14592bedcffcf25ea515637cff71ef929a # v3.3.0 - uses: docker/setup-buildx-action@v3 - name: Log in to DockerHub uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0 @@ -159,7 +159,7 @@ jobs: username: ${{secrets.DOCKER_USERNAME}} password: ${{secrets.DOCKER_PASSWORD}} - name: Build and push - uses: docker/build-push-action@4f58ea79222b3b9dc2c8bbdd6debcef730109a75 # v6.9.0 + uses: docker/build-push-action@67a2d409c0a876cbe6b11854e3e25193efe4e62d # v6.12.0 with: push: true context: . diff --git a/BUNDLE-README.md b/BUNDLE-README.md index 53a9bf7460..a40861799e 100644 --- a/BUNDLE-README.md +++ b/BUNDLE-README.md @@ -2,7 +2,7 @@ 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. Note that the recommended way to use Uppy is to install it with yarn/npm and use diff --git a/CHANGELOG.md b/CHANGELOG.md index da3c2d30e0..ad09abe29e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,159 @@ Please add your entries in this format: In the current stage we aim to release a new version at least every month. +## 4.13.1 + +Released: 2025-01-22 + +| Package | Version | Package | Version | +| --------------- | ------- | --------------- | ------- | +| @uppy/aws-s3 | 4.2.3 | @uppy/tus | 4.2.2 | +| @uppy/companion | 5.5.1 | uppy | 4.13.1 | + +- @uppy/tus: fix resumeFromPreviousUpload race condition (Merlijn Vos / #5616) +- @uppy/aws-s3: Fixed default shouldUseMultipart (Mika Laitinen / #5613) +- meta: build(deps): bump docker/build-push-action from 6.11.0 to 6.12.0 (dependabot[bot] / #5611) +- @uppy/aws-s3: remove console.error (Mikael Finstad / #5607) +- @uppy/companion: unify http error responses (Mikael Finstad / #5595) + + +## 4.13.0 + +Released: 2025-01-15 + +| Package | Version | Package | Version | +| --------------- | ------- | --------------- | ------- | +| @uppy/aws-s3 | 4.2.2 | @uppy/unsplash | 4.3.2 | +| @uppy/companion | 5.5.0 | uppy | 4.13.0 | + +- @uppy/aws-s3: always set S3 meta to UppyFile & include key (Merlijn Vos / #5602) +- @uppy/companion: fix forcePathStyle boolean conversion (Mikael Finstad / #5308) +- meta: Fix Webpack CI (Merlijn Vos / #5604) +- @uppy/aws-s3: allow uploads to fail/succeed independently (Merlijn Vos / #5603) +- meta: Add types for css files (Merlijn Vos / #5591) +- @uppy/unsplash: make utmSource optional (Merlijn Vos / #5601) +- meta: build(deps): bump docker/setup-qemu-action from 3.2.0 to 3.3.0 (dependabot[bot] / #5599) +- meta: build(deps): bump docker/build-push-action from 6.10.0 to 6.11.0 (dependabot[bot] / #5600) +- @uppy/companion: add COMPANION_TUS_DEFERRED_UPLOAD_LENGTH (Dominik Schmidt / #5561) + + +## 4.12.2 + +Released: 2025-01-09 + +| Package | Version | Package | Version | +| -------------------------- | ------- | -------------------------- | ------- | +| @uppy/audio | 2.1.1 | @uppy/instagram | 4.2.1 | +| @uppy/aws-s3 | 4.2.1 | @uppy/onedrive | 4.2.2 | +| @uppy/box | 3.2.1 | @uppy/progress-bar | 4.2.1 | +| @uppy/companion-client | 4.4.1 | @uppy/provider-views | 4.4.1 | +| @uppy/compressor | 2.2.1 | @uppy/react | 4.2.1 | +| @uppy/core | 4.4.1 | @uppy/remote-sources | 2.3.1 | +| @uppy/dashboard | 4.3.1 | @uppy/screen-capture | 4.2.1 | +| @uppy/drag-drop | 4.1.1 | @uppy/status-bar | 4.1.1 | +| @uppy/drop-target | 3.1.1 | @uppy/thumbnail-generator | 4.1.1 | +| @uppy/dropbox | 4.2.1 | @uppy/transloadit | 4.2.1 | +| @uppy/facebook | 4.2.1 | @uppy/tus | 4.2.1 | +| @uppy/file-input | 4.1.1 | @uppy/unsplash | 4.3.1 | +| @uppy/form | 4.1.1 | @uppy/url | 4.2.1 | +| @uppy/golden-retriever | 4.1.1 | @uppy/vue | 2.1.1 | +| @uppy/google-drive | 4.3.1 | @uppy/webcam | 4.1.1 | +| @uppy/google-drive-picker | 0.3.2 | @uppy/webdav | 0.3.1 | +| @uppy/google-photos | 0.5.1 | @uppy/xhr-upload | 4.3.2 | +| @uppy/google-photos-picker | 0.3.2 | @uppy/zoom | 3.2.1 | +| @uppy/image-editor | 3.3.1 | uppy | 4.12.2 | +| @uppy/informer | 4.2.1 | | | + +- @uppy/provider-views: Import types consistently from @uppy/core (Merlijn Vos / #5589) +- @uppy/status-bar: fix double upload progress (Mikael Finstad / #5587) +- @uppy/provider-views: fix incorrect import (Merlijn Vos / #5588) + + +## 4.12.1 + +Released: 2025-01-08 + +| Package | Version | Package | Version | +| --------------- | ------- | --------------- | ------- | +| @uppy/companion | 5.4.1 | uppy | 4.12.1 | + +- @uppy/companion: upgrade express & express-session (Merlijn Vos / #5582) + + +## 4.12.0 + +Released: 2025-01-08 + +| Package | Version | Package | Version | +| -------------------------- | ------- | -------------------------- | ------- | +| @uppy/google-drive-picker | 0.3.1 | @uppy/unsplash | 4.3.0 | +| @uppy/google-photos-picker | 0.3.1 | @uppy/utils | 6.1.1 | +| @uppy/onedrive | 4.2.1 | @uppy/xhr-upload | 4.3.1 | +| @uppy/provider-views | 4.4.0 | uppy | 4.12.0 | +| @uppy/svelte | 4.3.0 | | | + +- @uppy/unsplash,@uppy/provider-views: add utmSource option (Merlijn Vos / #5580) +- @uppy/xhr-upload: allow custom error message in onAfterResponse (Merlijn Vos / #5578) +- @uppy/onedrive: fix AsyncStore import (Merlijn Vos / #5579) +- @uppy/google-drive-picker,@uppy/google-photos-picker: Fix Google Picker plugins locale (Merlijn Vos / #5575) + + +## 4.11.0 + +Released: 2025-01-06 + +| Package | Version | Package | Version | +| -------------------------- | ------- | -------------------------- | ------- | +| @uppy/audio | 2.1.0 | @uppy/onedrive | 4.2.0 | +| @uppy/aws-s3 | 4.2.0 | @uppy/progress-bar | 4.2.0 | +| @uppy/box | 3.2.0 | @uppy/provider-views | 4.3.0 | +| @uppy/companion-client | 4.4.0 | @uppy/react | 4.2.0 | +| @uppy/compressor | 2.2.0 | @uppy/remote-sources | 2.3.0 | +| @uppy/core | 4.4.0 | @uppy/screen-capture | 4.2.0 | +| @uppy/dashboard | 4.3.0 | @uppy/status-bar | 4.1.0 | +| @uppy/drag-drop | 4.1.0 | @uppy/store-default | 4.2.0 | +| @uppy/drop-target | 3.1.0 | @uppy/svelte | 4.2.0 | +| @uppy/dropbox | 4.2.0 | @uppy/thumbnail-generator | 4.1.0 | +| @uppy/facebook | 4.2.0 | @uppy/transloadit | 4.2.0 | +| @uppy/file-input | 4.1.0 | @uppy/tus | 4.2.0 | +| @uppy/form | 4.1.0 | @uppy/unsplash | 4.2.0 | +| @uppy/golden-retriever | 4.1.0 | @uppy/url | 4.2.0 | +| @uppy/google-drive | 4.3.0 | @uppy/utils | 6.1.0 | +| @uppy/google-drive-picker | 0.3.0 | @uppy/vue | 2.1.0 | +| @uppy/google-photos | 0.5.0 | @uppy/webcam | 4.1.0 | +| @uppy/google-photos-picker | 0.3.0 | @uppy/webdav | 0.3.0 | +| @uppy/image-editor | 3.3.0 | @uppy/xhr-upload | 4.3.0 | +| @uppy/informer | 4.2.0 | @uppy/zoom | 3.2.0 | +| @uppy/instagram | 4.2.0 | uppy | 4.11.0 | +| @uppy/locales | 4.5.0 | | | + +- meta: build(deps): bump docker/metadata-action from 5.5.1 to 5.6.1 (dependabot[bot] / #5525) +- examples,@uppy/svelte: build(deps-dev): bump @sveltejs/kit from 2.5.17 to 2.8.3 (dependabot[bot] / #5526) +- meta: build(deps): bump docker/build-push-action from 6.9.0 to 6.10.0 (dependabot[bot] / #5531) +- meta: build(deps): bump elliptic from 6.5.7 to 6.6.0 (dependabot[bot] / #5498) +- @uppy/utils: Use .js(x) for all imports instead .ts(x) (Merlijn Vos / #5573) +- @uppy/angular,@uppy/audio,@uppy/aws-s3,@uppy/box,@uppy/companion-client,@uppy/compressor,@uppy/core,@uppy/dashboard,@uppy/drag-drop,@uppy/drop-target,@uppy/dropbox,@uppy/facebook,@uppy/file-input,@uppy/form,@uppy/golden-retriever,@uppy/google-drive-picker,@uppy/google-drive,@uppy/google-photos-picker,@uppy/google-photos,@uppy/image-editor,@uppy/informer,@uppy/instagram,@uppy/locales,@uppy/onedrive,@uppy/progress-bar,@uppy/provider-views,@uppy/react,@uppy/remote-sources,@uppy/screen-capture,@uppy/status-bar,@uppy/thumbnail-generator,@uppy/transloadit,@uppy/tus,@uppy/unsplash,@uppy/url,@uppy/vue,@uppy/webcam,@uppy/webdav,@uppy/xhr-upload,@uppy/zoom: Remove "paths" from all tsconfig's (Merlijn Vos / #5572) +- @uppy/tus: fix onBeforeRequest type (Dominik Schmidt / #5566) + + +## 4.10.0 + +Released: 2025-01-06 + +| Package | Version | Package | Version | +| -------------------- | ------- | -------------------- | ------- | +| @uppy/companion | 5.4.0 | @uppy/store-redux | 4.0.2 | +| @uppy/core | 4.3.2 | @uppy/url | 4.1.3 | +| @uppy/dashboard | 4.2.0 | @uppy/webdav | 0.2.0 | +| @uppy/provider-views | 4.2.1 | uppy | 4.10.0 | +| @uppy/react | 4.1.0 | | | + +- @uppy/react: allow React 19 as peer dependency (Shubs / #5556) +- @uppy/webdav: add plugin icon (Merlijn Vos / #5555) +- @uppy/companion: pass fetched origins to window.postMessage() (Merlijn Vos / #5529) +- @uppy/core,@uppy/dashboard,@uppy/provider-views,@uppy/store-redux,@uppy/url: build(deps): bump nanoid from 5.0.7 to 5.0.9 (dependabot[bot] / #5544) + + ## 4.9.0 Released: 2024-12-17 diff --git a/README.md b/README.md index fe16d46b10..d1ba288f80 100644 --- a/README.md +++ b/README.md @@ -87,7 +87,7 @@ npm install @uppy/core @uppy/dashboard @uppy/tus ``` Add CSS -[uppy.min.css](https://releases.transloadit.com/uppy/v4.9.0/uppy.min.css), +[uppy.min.css](https://releases.transloadit.com/uppy/v4.13.1/uppy.min.css), either to your HTML page’s `` or include in JS, if your bundler of choice supports it. @@ -101,7 +101,7 @@ CDN. In that case `Uppy` will attach itself to the global `window.Uppy` object. ```html @@ -112,7 +112,7 @@ CDN. In that case `Uppy` will attach itself to the global `window.Uppy` object. Uppy, Dashboard, Tus, - } from 'https://releases.transloadit.com/uppy/v4.9.0/uppy.min.mjs' + } from 'https://releases.transloadit.com/uppy/v4.13.1/uppy.min.mjs' const uppy = new Uppy() uppy.use(Dashboard, { target: '#files-drag-drop' }) @@ -297,10 +297,10 @@ Use Uppy in your project? - - - - + + + + @@ -315,56 +315,57 @@ Use Uppy in your project? - - - - + + + + - - - - - - - - + + + + + + + + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + +
arturigoto-bus-stopkvzaduh95ifedapoolarewajuMurderlon
hedgerhmifinqstAJvanLoongithub-actions[bot]lakesare
dependabot[bot]kiloreuxsamuelayosadovnychyirichardwillarsajkachnic
zcallanYukeshShrjankooliverpoolBotzmcallistertyler
mokutsu-courseradschmidtDJWassinkmrbatistataoqftimodwhit
hedgerhmifinqstAJvanLoongithub-actions[bot]dependabot[bot]
lakesarekiloreuxsamuelayosadovnychyirichardwillarsajkachnic
zcallanYukeshShrjankooliverpoolBotzdschmidt
mcallistertylermokutsu-courseraDJWassinkmrbatistataoqftimodwhit
tuoxianspeltocieartim-kosMikeKovarikAcconutpauln
toadkickerdominicedenap--tranvansangLiviaMedeirosbertho-zero
juliangruberHawxyelenalapegavboultonmejiaejstanislav-cervenak
command-tabcraig-jenningsdavekissdenysdesignethanwillisfrobinsonj
paescujrichmeijrichartkeilmsandmartiuslimMartin005
mskeltonmactavishzlafedogrockerjedwoodjasonbosco
ghasrfakhrigeertclerxrefoSxDxrobwilson1scherroman
rossngrartGNURubtcgjraulibanezluarmr
eman8519pedantic-gitPzocoppadmavilasomphillipalexanderpmusaraj
pedrofsplnetoTashowstajstrayersjauld
ghasrfakhrigeertclerxSxDxrobwilson1scherromanrossng
rartGNURubfortunto2netdownreforaulibanez
luarmreman8519pedantic-gitPzocoppadmavilasomphillipalexander
pmusarajpedrofsTashowstajstrayersjauld
ssan93steverobamaituquigebowaptikSpazzMarticus
szhscebotari66sergei-zelinskysebasegovia01sdebackerRattone
samuelcolburnsalimi-myfortunto2boudraMitchell8210achmiral
ken-kuromilannakummkopinskymhulethrshmauricioribeiro
matthewhartstongemjesuelemattfikmateuscruzmasum-ulumasaok
martin-brennanmarcusforsbergmarcosthejewpatricklindsaypascalwengerterParsaArvanehPA
cryptic022Ozodbek1405leftdevelnil1511coreprocessnicojones
trungcva10a6tnnaveed-ahmadnadeemcpleasespammelatermarton-laszlo-attilanavruzm
mogzolshahimcltmnafeesnetdownmosi-khamaddy-jo
djshubsszhscebotari66sergei-zelinskysebasegovia01sdebacker
Rattonesamuelcolburnsalimi-myplnetoboudraMitchell8210
achmiralken-kuromilannakumtvt-mikamkopinskymhulet
hrshmauricioribeiromatthewhartstongemjesuelemattfikmateuscruz
masum-ulumasaokmartin-brennanmarcusforsbergpatricklindsaypascalwengerter
ParsaArvanehPAcryptic022Ozodbek1405leftdevelnil1511coreprocess
nicojonestrungcva10a6tnnaveed-ahmadnadeemcpleasespammelatermarton-laszlo-attila
navruzmmogzolshahimcltmnafeesmosi-khamaddy-jo
mdxiaohumagumbojx-zyfkode-ninjasontixyoujur-ng
johnmanjiro13jyoungbloodgreen-mikegaelicwinterfrancklfingul
elliotsayesdzcpydkisicwillycamargoJimmyLvzanzlender
elliotsayesdzcpydkisiccraigcbrunnerJimmyLvzanzlender
olitomasyoann-hellopretvedran555tusharjkhuntthanhthotstduhpf
slawexxx44rtaiebrmoura-92rlebosserhymesluntta
phil714ordagoodselsevierninesaltneuronet77weston-sankey-mark43
dwnstenagyvstiigvalentinoliviallybodryi
tyler-dot-earthtrivikrtanadeautop-mastertvaliasektomekp
tomsaleebaWIStudenttmaierTiarhaitwarlopcraigcbrunner
tomsaleebaWIStudenttmaierTiarhaitwarloptcgj
codehero7386christianwengertcgoinglovecanvasbhc0b41avalla
argghalfatvagreene-courseraaduh95-test-accountzefyxsartoshi-foot-dao
zackbloomzlawson-utzachconneryafkariYehudaKremerxhocquet
ardeoisCommanderRootczjcbush06Aarbelcfra
cspranceprattcmpsubvertallchrischarlybillaudCretezychao
cellvinchungcartfiskcyuchardin1bryanjswiftbedgerotto
functinoeliOcsyoldarefbautistaemuellEdgarSantiago93
sweetrojeetissDennisKofflardhoangsvitdavilima6akizor
KaminskiDaniellCantabarmrboomerdanilatdanschalowdanmichaelo
CruaiersercraigamitporttekacsDogfaloalirezahi
aalepisalexnjasmt3ahmadissaadritasharmaAdrrei
adityapatadiaadamvigneaultajh-sradamdottvabannachaaron-russell
superhawk610ajschmidt8wbaaronQuorafindbducharmeazizk
kaiserinnazeembaayhankesiciogluavneetmalhotraThe-Flashatsawin
ash-jc-allenapuyouarthurdennerAbourasstyndriaandychongyz
andrii-bodnarsuperandrew213radarherekidonngkevin-west-10xkergekacsa
firesharkstudioskaspermeinematykaroljveltenmellow-fellowjmontoyaa
jcalonsojbelejjszobodyjorgeepcjondewoojonathanarbely
jsanchez034Jokcyjohnmadairishendywebmperrandoonhate
marc-mabeLucklj521lucax88xlucaperretombrlouim
dolphinigleleomelzerleods92galli-leodvirylarowlan
leaanthonyhoangbitslabohkip81kyleparisielkebabIanVS
huydodHussainAlkhalifahHughbertDhiromi2424giacomocerquoneroenschg
gjungbgeoffapplefordgabiganamfuadscodesdtrucsferdiusa
fgallinariGkleinerevaepexaEnricoSottileelliotdickisonprofsmallpine
theJoeBizJmalesjessica-courseravithjanwiltsjanklimo
jamestiotiojcjmccleanJbithellJakubHaladejjakemcallistergaejabong
JacobMGEvansmazorussGreenJimmyintenziveItsOnlyBinaryNaxYo
willycamargosercraigardeoisCommanderRootczjcbush06
Aarbelcfracspranceprattcmpsubvertallchrischarlybillaud
Cretezychaocellvinchungcartfiskcyuchardin1
bryanjswiftbedgerottoelkebabeliOcsyoldarefbautista
emuellEdgarSantiago93sweetrojeetissDennisKofflardhoangsvit
davilima6akizorKaminskiDaniellCantabarmrboomerdanilat
danschalowdanmichaeloCruaierfunctinoamitporttekacs
Dogfaloalirezahiaalepisalexnjasmt3ahmadissa
adritasharmaAdrreiadityapatadiaadamvigneaultajh-sradamdottv
abannachaaron-russellsuperhawk610ajschmidt8wbaaronQuorafind
bducharmeazizkkaiserinnazeembaayhankesiciogluavneetmalhotra
The-Flashatsawinash-jc-allenapuyouarthurdennerAbourass
tyndriaandychongyzandrii-bodnarsuperandrew213radarherekidonng
kevin-west-10xkergekacsafiresharkstudioskaspermeinematykaroljvelten
mellow-fellowjmontoyaajcalonsojbelejjszobodyjorgeepc
jondewoojonathanarbelyjsanchez034Jokcyjohnmadairmarcosthejew
mperrandoonhatemarc-mabeLucklj521lucax88xlucaperret
ombrlouimdolphinigleleomelzerleods92galli-leo
dvirylarowlanleaanthonyhoangbitslabohkip81kyleparisi
ishendywebIanVShuydodHussainAlkhalifahHughbertDhiromi2424
giacomocerquoneroenschggjungbgeoffapplefordgabiganamfuadscodes
dtrucsferdiusafgallinariGkleinerevaepexaEnricoSottile
elliotdickisonprofsmallpinetheJoeBizJmalesjessica-courseravith
janwiltsjanklimojamestiotiojcjmccleanJbithellJakubHaladej
jakemcallistergaejabongJacobMGEvansmazorussGreenJimmyintenzive
ItsOnlyBinaryNaxYo
diff --git a/bin/build-css.js b/bin/build-css.js index ad1460382c..d780ddc091 100644 --- a/bin/build-css.js +++ b/bin/build-css.js @@ -73,6 +73,7 @@ async function compileCSS () { } await mkdir(outdir, { recursive: true }) await writeFile(outfile, postcssResult.css) + await writeFile(path.join(outdir, 'style.d.css.ts'), 'export {}\n') console.info( chalk.green('✓ Built Uppy CSS:'), chalk.magenta(path.relative(cwd, outfile)), @@ -85,6 +86,7 @@ async function compileCSS () { console.warn(warn.toString()) }) await writeFile(outfile.replace(/\.css$/, '.min.css'), minifiedResult.css) + await writeFile(path.join(outdir, 'style.min.d.css.ts'), 'export {}\n') console.info( chalk.green('✓ Minified Bundle CSS:'), chalk.magenta(path.relative(cwd, outfile).replace(/\.css$/, '.min.css')), diff --git a/examples/cdn-example/index.html b/examples/cdn-example/index.html index e8061fc009..9ff3abd770 100644 --- a/examples/cdn-example/index.html +++ b/examples/cdn-example/index.html @@ -5,7 +5,7 @@ @@ -19,7 +19,7 @@ Dashboard, Webcam, Tus, - } from 'https://releases.transloadit.com/uppy/v4.9.0/uppy.min.mjs' + } from 'https://releases.transloadit.com/uppy/v4.13.1/uppy.min.mjs' const uppy = new Uppy({ debug: true, autoProceed: false }) .use(Dashboard, { trigger: '#uppyModalOpener' }) diff --git a/examples/custom-provider/server/index.cjs b/examples/custom-provider/server/index.cjs index fb9dc91ab7..e7f8538b73 100644 --- a/examples/custom-provider/server/index.cjs +++ b/examples/custom-provider/server/index.cjs @@ -71,7 +71,7 @@ app.use((req, res) => { // handle server errors app.use((err, req, res) => { console.error('\x1b[31m', err.stack, '\x1b[0m') - res.status(err.status || 500).json({ message: err.message, error: err }) + res.status(500).json({ message: err.message, error: err }) }) uppy.socket(app.listen(3020), uppyOptions) diff --git a/examples/svelte-example/package.json b/examples/svelte-example/package.json index b19338ccc9..036743d2d6 100644 --- a/examples/svelte-example/package.json +++ b/examples/svelte-example/package.json @@ -12,7 +12,7 @@ }, "devDependencies": { "@sveltejs/adapter-static": "^3.0.1", - "@sveltejs/kit": "^2.0.0", + "@sveltejs/kit": "^2.8.3", "@sveltejs/vite-plugin-svelte": "^3.0.0", "@types/formidable": "^3", "npm-run-all": "^4.1.5", diff --git a/examples/uppy-with-companion/client/index.html b/examples/uppy-with-companion/client/index.html index 99c6168678..78a88ae83a 100644 --- a/examples/uppy-with-companion/client/index.html +++ b/examples/uppy-with-companion/client/index.html @@ -5,7 +5,7 @@ @@ -19,7 +19,7 @@ Instagram, GoogleDrive, Tus, - } from 'https://releases.transloadit.com/uppy/v4.9.0/uppy.min.mjs' + } from 'https://releases.transloadit.com/uppy/v4.13.1/uppy.min.mjs' const uppy = new Uppy({ debug: true, autoProceed: false }) .use(Dashboard, { trigger: '#uppyModalOpener' }) diff --git a/examples/uppy-with-companion/server/index.js b/examples/uppy-with-companion/server/index.js index 204fc4b27a..ed85fa3f79 100644 --- a/examples/uppy-with-companion/server/index.js +++ b/examples/uppy-with-companion/server/index.js @@ -64,7 +64,7 @@ app.use((req, res) => { // handle server errors app.use((err, req, res) => { console.error('\x1b[31m', err.stack, '\x1b[0m') - res.status(err.status || 500).json({ message: err.message, error: err }) + res.status(500).json({ message: err.message, error: err }) }) companion.socket(app.listen(3020)) diff --git a/packages/@uppy/angular/tsconfig.json b/packages/@uppy/angular/tsconfig.json index 82405cd2ca..eae21ced29 100644 --- a/packages/@uppy/angular/tsconfig.json +++ b/packages/@uppy/angular/tsconfig.json @@ -2,15 +2,13 @@ { "compileOnSave": false, "compilerOptions": { - "paths": { - "@uppy/angular": ["dist/uppy/angular"], - }, "baseUrl": "./", "outDir": "./dist/out-tsc", "forceConsistentCasingInFileNames": true, "strict": true, "noImplicitOverride": true, "noPropertyAccessFromIndexSignature": true, + "useUnknownInCatchVariables": false, "noImplicitReturns": true, "noFallthroughCasesInSwitch": true, "sourceMap": true, diff --git a/packages/@uppy/audio/CHANGELOG.md b/packages/@uppy/audio/CHANGELOG.md index 9f1adfef9d..3e6b1a4d50 100644 --- a/packages/@uppy/audio/CHANGELOG.md +++ b/packages/@uppy/audio/CHANGELOG.md @@ -1,5 +1,12 @@ # @uppy/audio +## 2.1.0 + +Released: 2025-01-06 +Included in: Uppy v4.11.0 + +- @uppy/angular,@uppy/audio,@uppy/aws-s3,@uppy/box,@uppy/companion-client,@uppy/compressor,@uppy/core,@uppy/dashboard,@uppy/drag-drop,@uppy/drop-target,@uppy/dropbox,@uppy/facebook,@uppy/file-input,@uppy/form,@uppy/golden-retriever,@uppy/google-drive-picker,@uppy/google-drive,@uppy/google-photos-picker,@uppy/google-photos,@uppy/image-editor,@uppy/informer,@uppy/instagram,@uppy/locales,@uppy/onedrive,@uppy/progress-bar,@uppy/provider-views,@uppy/react,@uppy/remote-sources,@uppy/screen-capture,@uppy/status-bar,@uppy/thumbnail-generator,@uppy/transloadit,@uppy/tus,@uppy/unsplash,@uppy/url,@uppy/vue,@uppy/webcam,@uppy/webdav,@uppy/xhr-upload,@uppy/zoom: Remove "paths" from all tsconfig's (Merlijn Vos / #5572) + ## 2.0.2 Released: 2024-12-05 diff --git a/packages/@uppy/audio/package.json b/packages/@uppy/audio/package.json index 1482e8db13..f6c2f15a5e 100644 --- a/packages/@uppy/audio/package.json +++ b/packages/@uppy/audio/package.json @@ -1,7 +1,7 @@ { "name": "@uppy/audio", "description": "Uppy plugin that records audio using the device’s microphone.", - "version": "2.0.2", + "version": "2.1.1", "license": "MIT", "main": "lib/index.js", "style": "dist/style.min.css", diff --git a/packages/@uppy/audio/src/Audio.tsx b/packages/@uppy/audio/src/Audio.tsx index c3822e9a58..1428e7eca2 100644 --- a/packages/@uppy/audio/src/Audio.tsx +++ b/packages/@uppy/audio/src/Audio.tsx @@ -1,18 +1,19 @@ import { h } from 'preact' -import { UIPlugin, type UIPluginOptions } from '@uppy/core' +import { UIPlugin } from '@uppy/core' import type { + Uppy, + UIPluginOptions, Body, Meta, MinimalRequiredUppyFile, -} from '@uppy/utils/lib/UppyFile' -import type { Uppy } from '@uppy/core/lib/Uppy.js' +} from '@uppy/core' import getFileTypeExtension from '@uppy/utils/lib/getFileTypeExtension' -import supportsMediaRecorder from './supportsMediaRecorder.ts' -import RecordingScreen from './RecordingScreen.tsx' -import PermissionsScreen from './PermissionsScreen.tsx' -import locale from './locale.ts' +import supportsMediaRecorder from './supportsMediaRecorder.js' +import RecordingScreen from './RecordingScreen.jsx' +import PermissionsScreen from './PermissionsScreen.jsx' +import locale from './locale.js' // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore We don't want TS to generate types for the package.json import packageJson from '../package.json' diff --git a/packages/@uppy/audio/src/RecordingLength.tsx b/packages/@uppy/audio/src/RecordingLength.tsx index 73098a6298..cde1e6760a 100644 --- a/packages/@uppy/audio/src/RecordingLength.tsx +++ b/packages/@uppy/audio/src/RecordingLength.tsx @@ -1,6 +1,6 @@ import { h } from 'preact' import type { I18n } from '@uppy/utils/lib/Translator' -import formatSeconds from './formatSeconds.ts' +import formatSeconds from './formatSeconds.js' interface RecordingLengthProps { recordingLengthSeconds: number diff --git a/packages/@uppy/audio/src/RecordingScreen.tsx b/packages/@uppy/audio/src/RecordingScreen.tsx index 4e1513b8aa..dd2ecc9085 100644 --- a/packages/@uppy/audio/src/RecordingScreen.tsx +++ b/packages/@uppy/audio/src/RecordingScreen.tsx @@ -2,14 +2,14 @@ import { h } from 'preact' import { useEffect, useRef } from 'preact/hooks' import type { I18n } from '@uppy/utils/lib/Translator' -import RecordButton from './RecordButton.tsx' -import RecordingLength from './RecordingLength.tsx' +import RecordButton from './RecordButton.jsx' +import RecordingLength from './RecordingLength.jsx' import AudioSourceSelect, { type AudioSourceSelectProps, -} from './AudioSourceSelect.tsx' -import AudioOscilloscope from './audio-oscilloscope/index.ts' -import SubmitButton from './SubmitButton.tsx' -import DiscardButton from './DiscardButton.tsx' +} from './AudioSourceSelect.jsx' +import AudioOscilloscope from './audio-oscilloscope/index.js' +import SubmitButton from './SubmitButton.jsx' +import DiscardButton from './DiscardButton.jsx' interface RecordingScreenProps extends AudioSourceSelectProps { stream: MediaStream | null | undefined diff --git a/packages/@uppy/audio/src/formatSeconds.test.ts b/packages/@uppy/audio/src/formatSeconds.test.ts index 6e5c746611..9ddcc35cfc 100644 --- a/packages/@uppy/audio/src/formatSeconds.test.ts +++ b/packages/@uppy/audio/src/formatSeconds.test.ts @@ -1,5 +1,5 @@ import { describe, expect, it } from 'vitest' -import formatSeconds from './formatSeconds.ts' +import formatSeconds from './formatSeconds.js' describe('formatSeconds', () => { it("should return a value of '0:43' when an argument of 43 seconds is supplied", () => { diff --git a/packages/@uppy/audio/src/index.ts b/packages/@uppy/audio/src/index.ts index 178ea5b00d..dcc93c6646 100644 --- a/packages/@uppy/audio/src/index.ts +++ b/packages/@uppy/audio/src/index.ts @@ -1,2 +1,2 @@ -export { default } from './Audio.tsx' -export type { AudioOptions } from './Audio.tsx' +export { default } from './Audio.jsx' +export type { AudioOptions } from './Audio.jsx' diff --git a/packages/@uppy/audio/src/supportsMediaRecorder.test.ts b/packages/@uppy/audio/src/supportsMediaRecorder.test.ts index 8c1e12919e..04c0fcaf4b 100644 --- a/packages/@uppy/audio/src/supportsMediaRecorder.test.ts +++ b/packages/@uppy/audio/src/supportsMediaRecorder.test.ts @@ -1,6 +1,6 @@ /* eslint-disable max-classes-per-file, compat/compat */ import { describe, expect, it } from 'vitest' -import supportsMediaRecorder from './supportsMediaRecorder.ts' +import supportsMediaRecorder from './supportsMediaRecorder.js' describe('supportsMediaRecorder', () => { it('should return true if MediaRecorder is supported', () => { diff --git a/packages/@uppy/audio/tsconfig.build.json b/packages/@uppy/audio/tsconfig.build.json index 8d9ed22fa5..bbf30b5b43 100644 --- a/packages/@uppy/audio/tsconfig.build.json +++ b/packages/@uppy/audio/tsconfig.build.json @@ -2,11 +2,6 @@ "extends": "../../../tsconfig.shared", "compilerOptions": { "outDir": "./lib", - "paths": { - "@uppy/utils/lib/*": ["../utils/src/*"], - "@uppy/core": ["../core/src/index.js"], - "@uppy/core/lib/*": ["../core/src/*"] - }, "resolveJsonModule": false, "rootDir": "./src" }, diff --git a/packages/@uppy/audio/tsconfig.json b/packages/@uppy/audio/tsconfig.json index a76c3b714a..47ece599c6 100644 --- a/packages/@uppy/audio/tsconfig.json +++ b/packages/@uppy/audio/tsconfig.json @@ -3,11 +3,6 @@ "compilerOptions": { "emitDeclarationOnly": false, "noEmit": true, - "paths": { - "@uppy/utils/lib/*": ["../utils/src/*"], - "@uppy/core": ["../core/src/index.js"], - "@uppy/core/lib/*": ["../core/src/*"], - }, }, "include": ["./package.json", "./src/**/*.*"], "references": [ diff --git a/packages/@uppy/aws-s3/CHANGELOG.md b/packages/@uppy/aws-s3/CHANGELOG.md index ed8fea8f52..54c5b46aae 100644 --- a/packages/@uppy/aws-s3/CHANGELOG.md +++ b/packages/@uppy/aws-s3/CHANGELOG.md @@ -1,5 +1,28 @@ # @uppy/aws-s3 +## 4.2.3 + +Released: 2025-01-22 +Included in: Uppy v4.13.1 + +- @uppy/aws-s3: Fixed default shouldUseMultipart (Mika Laitinen / #5613) +- @uppy/aws-s3: remove console.error (Mikael Finstad / #5607) + +## 4.2.2 + +Released: 2025-01-15 +Included in: Uppy v4.13.0 + +- @uppy/aws-s3: always set S3 meta to UppyFile & include key (Merlijn Vos / #5602) +- @uppy/aws-s3: allow uploads to fail/succeed independently (Merlijn Vos / #5603) + +## 4.2.0 + +Released: 2025-01-06 +Included in: Uppy v4.11.0 + +- @uppy/angular,@uppy/audio,@uppy/aws-s3,@uppy/box,@uppy/companion-client,@uppy/compressor,@uppy/core,@uppy/dashboard,@uppy/drag-drop,@uppy/drop-target,@uppy/dropbox,@uppy/facebook,@uppy/file-input,@uppy/form,@uppy/golden-retriever,@uppy/google-drive-picker,@uppy/google-drive,@uppy/google-photos-picker,@uppy/google-photos,@uppy/image-editor,@uppy/informer,@uppy/instagram,@uppy/locales,@uppy/onedrive,@uppy/progress-bar,@uppy/provider-views,@uppy/react,@uppy/remote-sources,@uppy/screen-capture,@uppy/status-bar,@uppy/thumbnail-generator,@uppy/transloadit,@uppy/tus,@uppy/unsplash,@uppy/url,@uppy/vue,@uppy/webcam,@uppy/webdav,@uppy/xhr-upload,@uppy/zoom: Remove "paths" from all tsconfig's (Merlijn Vos / #5572) + ## 4.1.3 Released: 2024-12-05 diff --git a/packages/@uppy/aws-s3/package.json b/packages/@uppy/aws-s3/package.json index 1e3488dd1a..2b01e5c7b8 100644 --- a/packages/@uppy/aws-s3/package.json +++ b/packages/@uppy/aws-s3/package.json @@ -1,7 +1,7 @@ { "name": "@uppy/aws-s3", "description": "Upload to Amazon S3 with Uppy", - "version": "4.1.3", + "version": "4.2.3", "license": "MIT", "main": "lib/index.js", "type": "module", diff --git a/packages/@uppy/aws-s3/src/HTTPCommunicationQueue.ts b/packages/@uppy/aws-s3/src/HTTPCommunicationQueue.ts index c015633ad9..76c62c0acf 100644 --- a/packages/@uppy/aws-s3/src/HTTPCommunicationQueue.ts +++ b/packages/@uppy/aws-s3/src/HTTPCommunicationQueue.ts @@ -1,13 +1,13 @@ -import type { Meta, Body, UppyFile } from '@uppy/utils/lib/UppyFile' +import type { Meta, Body, UppyFile } from '@uppy/core' import type { RateLimitedQueue, WrapPromiseFunctionType, } from '@uppy/utils/lib/RateLimitedQueue' -import { pausingUploadReason, type Chunk } from './MultipartUploader.ts' -import type AwsS3Multipart from './index.ts' -import { throwIfAborted } from './utils.ts' -import type { UploadPartBytesResult, UploadResult } from './utils.ts' -import type { AwsS3MultipartOptions, uploadPartBytes } from './index.ts' +import { pausingUploadReason, type Chunk } from './MultipartUploader.js' +import type AwsS3Multipart from './index.js' +import { throwIfAborted } from './utils.js' +import type { UploadPartBytesResult, UploadResult } from './utils.js' +import type { AwsS3MultipartOptions, uploadPartBytes } from './index.js' function removeMetadataFromURL(urlString: string) { const urlObject = new URL(urlString) @@ -276,15 +276,18 @@ export class HTTPCommunicationQueue { signal, }).abortOn(signal)) as unknown as B // todo this doesn't make sense - // location will be missing from result if CORS is not correctly set up on the bucket. - return 'location' in result ? result : ( - { - // todo `url` is not really the final location URL of the resulting file, it's just the base URL of the bucket - // https://github.com/transloadit/uppy/issues/5388 - location: removeMetadataFromURL(url), - ...result, - } - ) + // Note: `fields.key` is not returned by old Companion versions. + // See https://github.com/transloadit/uppy/pull/5602 + const key = fields?.key + this.#setS3MultipartState(file, { key: key! }) + + return { + ...result, + location: + (result.location as string | undefined) ?? removeMetadataFromURL(url), + bucket: fields?.bucket, + key, + } } async uploadFile( @@ -393,7 +396,8 @@ export class HTTPCommunicationQueue { try { signature = await this.#fetchSignature(this.#getFile(file), { - uploadId, + // Always defined for multipart uploads + uploadId: uploadId!, key, partNumber, body: chunkData, diff --git a/packages/@uppy/aws-s3/src/MultipartUploader.ts b/packages/@uppy/aws-s3/src/MultipartUploader.ts index 6f5397a7fd..c32b9d5efb 100644 --- a/packages/@uppy/aws-s3/src/MultipartUploader.ts +++ b/packages/@uppy/aws-s3/src/MultipartUploader.ts @@ -1,7 +1,7 @@ import type { Uppy } from '@uppy/core' import { AbortController } from '@uppy/utils/lib/AbortController' import type { Meta, Body, UppyFile } from '@uppy/utils/lib/UppyFile' -import type { HTTPCommunicationQueue } from './HTTPCommunicationQueue.ts' +import type { HTTPCommunicationQueue } from './HTTPCommunicationQueue.js' const MB = 1024 * 1024 @@ -16,7 +16,7 @@ interface MultipartUploaderOptions { file: UppyFile log: Uppy['log'] - uploadId: string + uploadId?: string key: string } diff --git a/packages/@uppy/aws-s3/src/createSignedURL.test.ts b/packages/@uppy/aws-s3/src/createSignedURL.test.ts index 65000414da..a02fb54c2e 100644 --- a/packages/@uppy/aws-s3/src/createSignedURL.test.ts +++ b/packages/@uppy/aws-s3/src/createSignedURL.test.ts @@ -6,7 +6,7 @@ import { PutObjectCommand, } from '@aws-sdk/client-s3' import { getSignedUrl } from '@aws-sdk/s3-request-presigner' -import createSignedURL from './createSignedURL.ts' +import createSignedURL from './createSignedURL.js' const bucketName = 'some-bucket.with.dots' const s3ClientOptions = { diff --git a/packages/@uppy/aws-s3/src/index.test.ts b/packages/@uppy/aws-s3/src/index.test.ts index afe1c1eda4..7faf2cfae6 100644 --- a/packages/@uppy/aws-s3/src/index.test.ts +++ b/packages/@uppy/aws-s3/src/index.test.ts @@ -2,8 +2,11 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' import 'whatwg-fetch' import nock from 'nock' -import Core from '@uppy/core' -import AwsS3Multipart, { type AwsBody } from './index.ts' +import Core, { type UppyFile } from '@uppy/core' +import AwsS3Multipart, { + type AwsBody, + type AwsS3MultipartOptions, +} from './index.js' const KB = 1024 const MB = KB * KB @@ -21,6 +24,92 @@ describe('AwsS3Multipart', () => { expect(pluginNames).toContain('AwsS3Multipart') }) + describe('defaultOptions', () => { + let opts: Partial> + + beforeEach(() => { + const core = new Core().use(AwsS3Multipart) + const awsS3Multipart = core.getPlugin('AwsS3Multipart') as any + opts = awsS3Multipart.opts + }) + + it('allowedMetaFields is true', () => { + expect(opts.allowedMetaFields).toBe(true) + }) + + it('limit is 6', () => { + expect(opts.limit).toBe(6) + }) + + it('getTemporarySecurityCredentials is false', () => { + expect(opts.getTemporarySecurityCredentials).toBe(false) + }) + + describe('shouldUseMultipart', () => { + const MULTIPART_THRESHOLD = 100 * MB + + let shouldUseMultipart: (file: UppyFile) => boolean + + beforeEach(() => { + shouldUseMultipart = opts.shouldUseMultipart as ( + file: UppyFile, + ) => boolean + }) + + const createFile = (size: number): UppyFile => ({ + size, + data: new Blob(), + extension: '', + id: '', + isRemote: false, + isGhost: false, + meta: undefined, + progress: { + percentage: 0, + bytesUploaded: 0, + bytesTotal: size, + uploadComplete: false, + uploadStarted: 0, + }, + type: '', + }) + + it('returns true for files larger than 100MB', () => { + const file = createFile(MULTIPART_THRESHOLD + 1) + expect(shouldUseMultipart(file)).toBe(true) + }) + + it('returns false for files exactly 100MB', () => { + const file = createFile(MULTIPART_THRESHOLD) + expect(shouldUseMultipart(file)).toBe(false) + }) + + it('returns false for files smaller than 100MB', () => { + const file = createFile(MULTIPART_THRESHOLD - 1) + expect(shouldUseMultipart(file)).toBe(false) + }) + + it('returns true for large files (~70GB)', () => { + const file = createFile(70 * 1024 * MB) + expect(shouldUseMultipart(file)).toBe(true) + }) + + it('returns true for very large files (~400GB)', () => { + const file = createFile(400 * 1024 * MB) + expect(shouldUseMultipart(file)).toBe(true) + }) + + it('returns false for files with size 0', () => { + const file = createFile(0) + expect(shouldUseMultipart(file)).toBe(false) + }) + }) + + it('retryDelays is [0, 1000, 3000, 5000]', () => { + expect(opts.retryDelays).toEqual([0, 1000, 3000, 5000]) + }) + }) + describe('companionUrl assertion', () => { it('Throws an error for main functions if configured without companionUrl', () => { const core = new Core().use(AwsS3Multipart) @@ -50,7 +139,10 @@ describe('AwsS3Multipart', () => { getUploadParameters: () => ({ method: 'POST', url: 'https://bucket.s3.us-east-2.amazonaws.com/', - fields: {}, + fields: { + key: 'file', + bucket: 'https://bucket.s3.us-east-2.amazonaws.com/', + }, }), }) const scope = nock( @@ -89,6 +181,8 @@ describe('AwsS3Multipart', () => { ETag: 'test', etag: 'test', location: 'http://example.com', + key: 'file', + bucket: 'https://bucket.s3.us-east-2.amazonaws.com/', }, status: 200, uploadURL: 'http://example.com', @@ -239,7 +333,7 @@ describe('AwsS3Multipart', () => { const signPart = vi.fn(async (file, { partNumber }) => { return { - url: `https://bucket.s3.us-east-2.amazonaws.com/test/upload/multitest.dat?partNumber=${partNumber}&uploadId=6aeb1980f3fc7ce0b5454d25b71992&X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=AKIATEST%2F20210729%2Fus-east-2%2Fs3%2Faws4_request&X-Amz-Date=20210729T014044Z&X-Amz-Expires=600&X-Amz-SignedHeaders=host&X-Amz-Signature=test`, + url: `https://bucket.s3.us-east-2.amazonaws.com/test/upload/${file.name}?partNumber=${partNumber}&uploadId=6aeb1980f3fc7ce0b5454d25b71992&X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=AKIATEST%2F20210729%2Fus-east-2%2Fs3%2Faws4_request&X-Amz-Date=20210729T014044Z&X-Amz-Expires=600&X-Amz-SignedHeaders=host&X-Amz-Signature=test`, } }) @@ -286,34 +380,61 @@ describe('AwsS3Multipart', () => { const core = new Core().use(AwsS3Multipart, { shouldUseMultipart: true, retryDelays: [10], - createMultipartUpload, + createMultipartUpload: vi.fn((file) => ({ + uploadId: '6aeb1980f3fc7ce0b5454d25b71992', + key: `test/upload/${file.name}`, + })), completeMultipartUpload: vi.fn(async () => ({ location: 'test' })), abortMultipartUpload: vi.fn(), signPart, - uploadPartBytes: uploadPartBytes.mockImplementation(() => + uploadPartBytes: uploadPartBytes.mockImplementation((options) => { + if (options.signature.url.includes('succeed.dat')) { + return new Promise((resolve) => { + // delay until after multitest.dat has failed. + setTimeout(() => resolve({ status: 200 }), 100) + }) + } // eslint-disable-next-line prefer-promise-reject-errors - Promise.reject({ source: { status: 500 } }), - ), + return Promise.reject({ source: { status: 500 } }) + }), listParts: undefined as any, }) - const awsS3Multipart = core.getPlugin('AwsS3Multipart')! const fileSize = 5 * MB + 1 * MB - const mock = vi.fn() - core.on('upload-error', mock) + const awsS3Multipart = core.getPlugin('AwsS3Multipart')! + const uploadErrorMock = vi.fn() + const uploadSuccessMock = vi.fn() + core.on('upload-error', uploadErrorMock) + core.on('upload-success', uploadSuccessMock) core.addFile({ source: 'vi', - name: 'multitest.dat', + name: 'fail.dat', type: 'application/octet-stream', data: new File([new Uint8Array(fileSize)], '', { type: 'application/octet-stream', }), }) - await expect(core.upload()).rejects.toEqual({ source: { status: 500 } }) + core.addFile({ + source: 'vi', + name: 'succeed.dat', + type: 'application/octet-stream', + data: new File([new Uint8Array(fileSize)], '', { + type: 'application/octet-stream', + }), + }) - expect(awsS3Multipart.opts.uploadPartBytes.mock.calls.length).toEqual(3) - expect(mock.mock.calls.length).toEqual(1) + try { + const results = await core.upload() + expect(results!.successful!.length).toEqual(1) + expect(results!.failed!.length).toEqual(1) + } catch { + // Catch Promise.all reject + } + + expect(awsS3Multipart.opts.uploadPartBytes.mock.calls.length).toEqual(5) + expect(uploadErrorMock.mock.calls.length).toEqual(1) + expect(uploadSuccessMock.mock.calls.length).toEqual(1) // This fails for me becuase upload returned early. }) }) diff --git a/packages/@uppy/aws-s3/src/index.ts b/packages/@uppy/aws-s3/src/index.ts index 8892f4c278..3f7f0fcbe9 100644 --- a/packages/@uppy/aws-s3/src/index.ts +++ b/packages/@uppy/aws-s3/src/index.ts @@ -1,11 +1,12 @@ -import BasePlugin, { +import { type DefinePluginOpts, type PluginOpts, -} from '@uppy/core/lib/BasePlugin.js' + Uppy, + BasePlugin, +} from '@uppy/core' import { RequestClient } from '@uppy/companion-client' import type { RequestOptions } from '@uppy/utils/lib/CompanionClientProvider' import type { Body, Meta, UppyFile } from '@uppy/utils/lib/UppyFile' -import type { Uppy } from '@uppy/core' import EventManager from '@uppy/core/lib/EventManager.js' import { RateLimitedQueue } from '@uppy/utils/lib/RateLimitedQueue' import { @@ -14,16 +15,16 @@ import { } from '@uppy/utils/lib/fileFilters' import { createAbortError } from '@uppy/utils/lib/AbortController' import getAllowedMetaFields from '@uppy/utils/lib/getAllowedMetaFields' -import MultipartUploader from './MultipartUploader.ts' -import { throwIfAborted } from './utils.ts' +import MultipartUploader from './MultipartUploader.js' +import { throwIfAborted } from './utils.js' import type { UploadResult, UploadResultWithSignal, MultipartUploadResultWithSignal, UploadPartBytesResult, -} from './utils.ts' -import createSignedURL from './createSignedURL.ts' -import { HTTPCommunicationQueue } from './HTTPCommunicationQueue.ts' +} from './utils.js' +import createSignedURL from './createSignedURL.js' +import { HTTPCommunicationQueue } from './HTTPCommunicationQueue.js' // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore We don't want TS to generate types for the package.json import packageJson from '../package.json' @@ -283,14 +284,12 @@ const defaultOptions = { allowedMetaFields: true, limit: 6, getTemporarySecurityCredentials: false as any, - // eslint-disable-next-line no-bitwise shouldUseMultipart: ((file: UppyFile) => - // eslint-disable-next-line no-bitwise - (file.size! >> 10) >> 10 > 100) as any as true, + (file.size || 0) > 100 * 1024 * 1024) as any as true, retryDelays: [0, 1000, 3000, 5000], } satisfies Partial> -export type { AwsBody } from './utils.ts' +export type { AwsBody } from './utils.js' export default class AwsS3Multipart< M extends Meta, @@ -509,7 +508,7 @@ export default class AwsS3Multipart< return this.#client .get< AwsS3Part[] - >(`s3/multipart/${encodeURIComponent(uploadId)}?key=${filename}`, { signal }) + >(`s3/multipart/${encodeURIComponent(uploadId!)}?key=${filename}`, { signal }) .then(assertServerError) } @@ -523,7 +522,7 @@ export default class AwsS3Multipart< throwIfAborted(signal) const filename = encodeURIComponent(key) - const uploadIdEnc = encodeURIComponent(uploadId) + const uploadIdEnc = encodeURIComponent(uploadId!) return this.#client .post( `s3/multipart/${uploadIdEnc}/complete?key=${filename}`, @@ -632,7 +631,7 @@ export default class AwsS3Multipart< this.#assertHost('abortMultipartUpload') const filename = encodeURIComponent(key) - const uploadIdEnc = encodeURIComponent(uploadId) + const uploadIdEnc = encodeURIComponent(uploadId!) return this.#client .delete(`s3/multipart/${uploadIdEnc}?key=${filename}`, undefined, { signal, @@ -985,7 +984,7 @@ export default class AwsS3Multipart< return this.#uploadLocalFile(file) }) - const upload = await Promise.all(promises) + const upload = await Promise.allSettled(promises) // After the upload is done, another upload may happen with only local files. // We reset the capability so that the next upload can use resumable uploads. this.#setResumableUploadsCapability(true) diff --git a/packages/@uppy/aws-s3/src/utils.ts b/packages/@uppy/aws-s3/src/utils.ts index 278ca6054f..924e448e94 100644 --- a/packages/@uppy/aws-s3/src/utils.ts +++ b/packages/@uppy/aws-s3/src/utils.ts @@ -1,7 +1,7 @@ import { createAbortError } from '@uppy/utils/lib/AbortController' import type { Body } from '@uppy/utils/lib/UppyFile' -import type { AwsS3Part } from './index.ts' +import type { AwsS3Part } from './index.js' export function throwIfAborted(signal?: AbortSignal | null): void { if (signal?.aborted) { @@ -11,7 +11,7 @@ export function throwIfAborted(signal?: AbortSignal | null): void { } } -export type UploadResult = { key: string; uploadId: string } +export type UploadResult = { key: string; uploadId?: string; bucket?: string } export type UploadResultWithSignal = UploadResult & { signal?: AbortSignal } export type MultipartUploadResult = UploadResult & { parts: AwsS3Part[] } export type MultipartUploadResultWithSignal = MultipartUploadResult & { @@ -25,4 +25,6 @@ export type UploadPartBytesResult = { export interface AwsBody extends Body { location: string + key: string + bucket: string } diff --git a/packages/@uppy/aws-s3/tsconfig.build.json b/packages/@uppy/aws-s3/tsconfig.build.json index b61a0f40cb..bd96ae4f3c 100644 --- a/packages/@uppy/aws-s3/tsconfig.build.json +++ b/packages/@uppy/aws-s3/tsconfig.build.json @@ -2,13 +2,6 @@ "extends": "../../../tsconfig.shared", "compilerOptions": { "outDir": "./lib", - "paths": { - "@uppy/companion-client": ["../companion-client/src/index.js"], - "@uppy/companion-client/lib/*": ["../companion-client/src/*"], - "@uppy/utils/lib/*": ["../utils/src/*"], - "@uppy/core": ["../core/src/index.js"], - "@uppy/core/lib/*": ["../core/src/*"] - }, "resolveJsonModule": false, "rootDir": "./src" }, diff --git a/packages/@uppy/aws-s3/tsconfig.json b/packages/@uppy/aws-s3/tsconfig.json index f43408fa18..2355b5c43d 100644 --- a/packages/@uppy/aws-s3/tsconfig.json +++ b/packages/@uppy/aws-s3/tsconfig.json @@ -3,13 +3,6 @@ "compilerOptions": { "emitDeclarationOnly": false, "noEmit": true, - "paths": { - "@uppy/companion-client": ["../companion-client/src/index.js"], - "@uppy/companion-client/lib/*": ["../companion-client/src/*"], - "@uppy/utils/lib/*": ["../utils/src/*"], - "@uppy/core": ["../core/src/index.js"], - "@uppy/core/lib/*": ["../core/src/*"], - }, }, "include": ["./package.json", "./src/**/*.*"], "references": [ diff --git a/packages/@uppy/box/CHANGELOG.md b/packages/@uppy/box/CHANGELOG.md index b8a859813b..f36a0c20e5 100644 --- a/packages/@uppy/box/CHANGELOG.md +++ b/packages/@uppy/box/CHANGELOG.md @@ -1,5 +1,12 @@ # @uppy/box +## 3.2.0 + +Released: 2025-01-06 +Included in: Uppy v4.11.0 + +- @uppy/angular,@uppy/audio,@uppy/aws-s3,@uppy/box,@uppy/companion-client,@uppy/compressor,@uppy/core,@uppy/dashboard,@uppy/drag-drop,@uppy/drop-target,@uppy/dropbox,@uppy/facebook,@uppy/file-input,@uppy/form,@uppy/golden-retriever,@uppy/google-drive-picker,@uppy/google-drive,@uppy/google-photos-picker,@uppy/google-photos,@uppy/image-editor,@uppy/informer,@uppy/instagram,@uppy/locales,@uppy/onedrive,@uppy/progress-bar,@uppy/provider-views,@uppy/react,@uppy/remote-sources,@uppy/screen-capture,@uppy/status-bar,@uppy/thumbnail-generator,@uppy/transloadit,@uppy/tus,@uppy/unsplash,@uppy/url,@uppy/vue,@uppy/webcam,@uppy/webdav,@uppy/xhr-upload,@uppy/zoom: Remove "paths" from all tsconfig's (Merlijn Vos / #5572) + ## 3.1.2 Released: 2024-12-05 diff --git a/packages/@uppy/box/package.json b/packages/@uppy/box/package.json index 9b3bb3a4d1..6d94d1c921 100644 --- a/packages/@uppy/box/package.json +++ b/packages/@uppy/box/package.json @@ -1,7 +1,7 @@ { "name": "@uppy/box", "description": "Import files from Box, into Uppy.", - "version": "3.1.2", + "version": "3.2.1", "license": "MIT", "main": "lib/index.js", "type": "module", diff --git a/packages/@uppy/box/src/Box.tsx b/packages/@uppy/box/src/Box.tsx index e004aff38b..3171f269e9 100644 --- a/packages/@uppy/box/src/Box.tsx +++ b/packages/@uppy/box/src/Box.tsx @@ -8,13 +8,15 @@ import { UIPlugin, Uppy } from '@uppy/core' import { ProviderViews } from '@uppy/provider-views' import { h, type ComponentChild } from 'preact' -import type { UppyFile, Body, Meta } from '@uppy/utils/lib/UppyFile' import type { + UppyFile, + Body, + Meta, AsyncStore, UnknownProviderPlugin, UnknownProviderPluginState, -} from '@uppy/core/lib/Uppy.js' -import locale from './locale.ts' +} from '@uppy/core' +import locale from './locale.js' // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore We don't want TS to generate types for the package.json import packageJson from '../package.json' diff --git a/packages/@uppy/box/src/index.ts b/packages/@uppy/box/src/index.ts index 60192cdf13..466dbe9bcc 100644 --- a/packages/@uppy/box/src/index.ts +++ b/packages/@uppy/box/src/index.ts @@ -1,2 +1,2 @@ -export { default } from './Box.tsx' -export type { BoxOptions } from './Box.tsx' +export { default } from './Box.jsx' +export type { BoxOptions } from './Box.jsx' diff --git a/packages/@uppy/box/tsconfig.build.json b/packages/@uppy/box/tsconfig.build.json index 0b2f94bc10..82e187bca0 100644 --- a/packages/@uppy/box/tsconfig.build.json +++ b/packages/@uppy/box/tsconfig.build.json @@ -2,15 +2,6 @@ "extends": "../../../tsconfig.shared", "compilerOptions": { "outDir": "./lib", - "paths": { - "@uppy/companion-client": ["../companion-client/src/index.js"], - "@uppy/companion-client/lib/*": ["../companion-client/src/*"], - "@uppy/provider-views": ["../provider-views/src/index.js"], - "@uppy/provider-views/lib/*": ["../provider-views/src/*"], - "@uppy/utils/lib/*": ["../utils/src/*"], - "@uppy/core": ["../core/src/index.js"], - "@uppy/core/lib/*": ["../core/src/*"] - }, "resolveJsonModule": false, "rootDir": "./src" }, diff --git a/packages/@uppy/box/tsconfig.json b/packages/@uppy/box/tsconfig.json index e5220fb5ab..b90847da71 100644 --- a/packages/@uppy/box/tsconfig.json +++ b/packages/@uppy/box/tsconfig.json @@ -3,15 +3,6 @@ "compilerOptions": { "emitDeclarationOnly": false, "noEmit": true, - "paths": { - "@uppy/companion-client": ["../companion-client/src/index.js"], - "@uppy/companion-client/lib/*": ["../companion-client/src/*"], - "@uppy/provider-views": ["../provider-views/src/index.js"], - "@uppy/provider-views/lib/*": ["../provider-views/src/*"], - "@uppy/utils/lib/*": ["../utils/src/*"], - "@uppy/core": ["../core/src/index.js"], - "@uppy/core/lib/*": ["../core/src/*"], - }, }, "include": ["./package.json", "./src/**/*.*"], "references": [ diff --git a/packages/@uppy/companion-client/CHANGELOG.md b/packages/@uppy/companion-client/CHANGELOG.md index 304dd6ef92..648bc91cb9 100644 --- a/packages/@uppy/companion-client/CHANGELOG.md +++ b/packages/@uppy/companion-client/CHANGELOG.md @@ -1,5 +1,12 @@ # @uppy/companion-client +## 4.4.0 + +Released: 2025-01-06 +Included in: Uppy v4.11.0 + +- @uppy/angular,@uppy/audio,@uppy/aws-s3,@uppy/box,@uppy/companion-client,@uppy/compressor,@uppy/core,@uppy/dashboard,@uppy/drag-drop,@uppy/drop-target,@uppy/dropbox,@uppy/facebook,@uppy/file-input,@uppy/form,@uppy/golden-retriever,@uppy/google-drive-picker,@uppy/google-drive,@uppy/google-photos-picker,@uppy/google-photos,@uppy/image-editor,@uppy/informer,@uppy/instagram,@uppy/locales,@uppy/onedrive,@uppy/progress-bar,@uppy/provider-views,@uppy/react,@uppy/remote-sources,@uppy/screen-capture,@uppy/status-bar,@uppy/thumbnail-generator,@uppy/transloadit,@uppy/tus,@uppy/unsplash,@uppy/url,@uppy/vue,@uppy/webcam,@uppy/webdav,@uppy/xhr-upload,@uppy/zoom: Remove "paths" from all tsconfig's (Merlijn Vos / #5572) + ## 4.2.0 Released: 2024-12-05 diff --git a/packages/@uppy/companion-client/package.json b/packages/@uppy/companion-client/package.json index 1e6b248fb8..62ae4897ae 100644 --- a/packages/@uppy/companion-client/package.json +++ b/packages/@uppy/companion-client/package.json @@ -1,7 +1,7 @@ { "name": "@uppy/companion-client", "description": "Client library for communication with Companion. Intended for use in Uppy plugins.", - "version": "4.3.0", + "version": "4.4.1", "license": "MIT", "main": "lib/index.js", "type": "module", diff --git a/packages/@uppy/companion-client/src/CompanionPluginOptions.ts b/packages/@uppy/companion-client/src/CompanionPluginOptions.ts index a923952e75..decfdecabb 100644 --- a/packages/@uppy/companion-client/src/CompanionPluginOptions.ts +++ b/packages/@uppy/companion-client/src/CompanionPluginOptions.ts @@ -1,5 +1,4 @@ -import type { UIPluginOptions } from '@uppy/core' -import type { AsyncStore } from '@uppy/core/lib/Uppy.js' +import type { UIPluginOptions, AsyncStore } from '@uppy/core' export interface CompanionPluginOptions extends UIPluginOptions { storage?: AsyncStore diff --git a/packages/@uppy/companion-client/src/Provider.ts b/packages/@uppy/companion-client/src/Provider.ts index 2aff9879d2..3a716c3df4 100644 --- a/packages/@uppy/companion-client/src/Provider.ts +++ b/packages/@uppy/companion-client/src/Provider.ts @@ -1,14 +1,17 @@ -import type { Uppy } from '@uppy/core' -import type { Body, Meta } from '@uppy/utils/lib/UppyFile' -import type { PluginOpts } from '@uppy/core/lib/BasePlugin.js' +import type { + Uppy, + Body, + Meta, + PluginOpts, + UnknownProviderPlugin, +} from '@uppy/core' import type { RequestOptions, CompanionClientProvider, } from '@uppy/utils/lib/CompanionClientProvider' -import type { UnknownProviderPlugin } from '@uppy/core/lib/Uppy.js' -import RequestClient, { authErrorStatusCode } from './RequestClient.ts' -import type { CompanionPluginOptions } from './index.ts' -import { isOriginAllowed } from './getAllowedHosts.ts' +import RequestClient, { authErrorStatusCode } from './RequestClient.js' +import type { CompanionPluginOptions } from './index.js' +import { isOriginAllowed } from './getAllowedHosts.js' export interface Opts extends PluginOpts, CompanionPluginOptions { pluginId: string diff --git a/packages/@uppy/companion-client/src/RequestClient.test.ts b/packages/@uppy/companion-client/src/RequestClient.test.ts index 2277387c4e..f7dd1fe9a0 100644 --- a/packages/@uppy/companion-client/src/RequestClient.test.ts +++ b/packages/@uppy/companion-client/src/RequestClient.test.ts @@ -1,5 +1,5 @@ import { describe, it, expect } from 'vitest' -import RequestClient from './RequestClient.ts' +import RequestClient from './RequestClient.js' describe('RequestClient', () => { it('has a hostname without trailing slash', () => { diff --git a/packages/@uppy/companion-client/src/RequestClient.ts b/packages/@uppy/companion-client/src/RequestClient.ts index d8f3702e64..4ac1199fe5 100644 --- a/packages/@uppy/companion-client/src/RequestClient.ts +++ b/packages/@uppy/companion-client/src/RequestClient.ts @@ -9,7 +9,7 @@ import getSocketHost from '@uppy/utils/lib/getSocketHost' import type Uppy from '@uppy/core' import type { UppyFile, Meta, Body } from '@uppy/utils/lib/UppyFile' import type { RequestOptions } from '@uppy/utils/lib/CompanionClientProvider' -import AuthError from './AuthError.ts' +import AuthError from './AuthError.js' // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore We don't want TS to generate types for the package.json import packageJson from '../package.json' diff --git a/packages/@uppy/companion-client/src/SearchProvider.ts b/packages/@uppy/companion-client/src/SearchProvider.ts index b0c83b5fdd..7a9b266c72 100644 --- a/packages/@uppy/companion-client/src/SearchProvider.ts +++ b/packages/@uppy/companion-client/src/SearchProvider.ts @@ -1,7 +1,6 @@ -import type { Body, Meta } from '@uppy/utils/lib/UppyFile' -import type { Uppy } from '@uppy/core' +import type { Body, Meta, Uppy } from '@uppy/core' import type { CompanionClientSearchProvider } from '@uppy/utils/lib/CompanionClientProvider' -import RequestClient, { type Opts } from './RequestClient.ts' +import RequestClient, { type Opts } from './RequestClient.js' const getName = (id: string): string => { return id diff --git a/packages/@uppy/companion-client/src/getAllowedHosts.test.ts b/packages/@uppy/companion-client/src/getAllowedHosts.test.ts index 92dd634524..a58893a058 100644 --- a/packages/@uppy/companion-client/src/getAllowedHosts.test.ts +++ b/packages/@uppy/companion-client/src/getAllowedHosts.test.ts @@ -1,5 +1,5 @@ import { describe, it, expect } from 'vitest' -import getAllowedHosts, { isOriginAllowed } from './getAllowedHosts.ts' +import getAllowedHosts, { isOriginAllowed } from './getAllowedHosts.js' describe('getAllowedHosts', () => { it('can convert companionAllowedHosts', () => { diff --git a/packages/@uppy/companion-client/src/index.ts b/packages/@uppy/companion-client/src/index.ts index 9d5e7413e1..7a22cdea1d 100644 --- a/packages/@uppy/companion-client/src/index.ts +++ b/packages/@uppy/companion-client/src/index.ts @@ -2,12 +2,12 @@ * Manages communications with Companion */ -export { default as RequestClient } from './RequestClient.ts' -export { default as Provider } from './Provider.ts' -export { default as SearchProvider } from './SearchProvider.ts' +export { default as RequestClient } from './RequestClient.js' +export { default as Provider } from './Provider.js' +export { default as SearchProvider } from './SearchProvider.js' -export { default as getAllowedHosts } from './getAllowedHosts.ts' +export { default as getAllowedHosts } from './getAllowedHosts.js' -export * as tokenStorage from './tokenStorage.ts' +export * as tokenStorage from './tokenStorage.js' -export type { CompanionPluginOptions } from './CompanionPluginOptions.ts' +export type { CompanionPluginOptions } from './CompanionPluginOptions.js' diff --git a/packages/@uppy/companion-client/tsconfig.build.json b/packages/@uppy/companion-client/tsconfig.build.json index 8d9ed22fa5..bbf30b5b43 100644 --- a/packages/@uppy/companion-client/tsconfig.build.json +++ b/packages/@uppy/companion-client/tsconfig.build.json @@ -2,11 +2,6 @@ "extends": "../../../tsconfig.shared", "compilerOptions": { "outDir": "./lib", - "paths": { - "@uppy/utils/lib/*": ["../utils/src/*"], - "@uppy/core": ["../core/src/index.js"], - "@uppy/core/lib/*": ["../core/src/*"] - }, "resolveJsonModule": false, "rootDir": "./src" }, diff --git a/packages/@uppy/companion-client/tsconfig.json b/packages/@uppy/companion-client/tsconfig.json index a76c3b714a..47ece599c6 100644 --- a/packages/@uppy/companion-client/tsconfig.json +++ b/packages/@uppy/companion-client/tsconfig.json @@ -3,11 +3,6 @@ "compilerOptions": { "emitDeclarationOnly": false, "noEmit": true, - "paths": { - "@uppy/utils/lib/*": ["../utils/src/*"], - "@uppy/core": ["../core/src/index.js"], - "@uppy/core/lib/*": ["../core/src/*"], - }, }, "include": ["./package.json", "./src/**/*.*"], "references": [ diff --git a/packages/@uppy/companion/CHANGELOG.md b/packages/@uppy/companion/CHANGELOG.md index 1472a68a8b..adf4aa6d1c 100644 --- a/packages/@uppy/companion/CHANGELOG.md +++ b/packages/@uppy/companion/CHANGELOG.md @@ -1,5 +1,34 @@ # @uppy/companion +## 5.5.1 + +Released: 2025-01-22 +Included in: Uppy v4.13.1 + +- @uppy/companion: unify http error responses (Mikael Finstad / #5595) + +## 5.5.0 + +Released: 2025-01-15 +Included in: Uppy v4.13.0 + +- @uppy/companion: fix forcePathStyle boolean conversion (Mikael Finstad / #5308) +- @uppy/companion: add COMPANION_TUS_DEFERRED_UPLOAD_LENGTH (Dominik Schmidt / #5561) + +## 5.4.1 + +Released: 2025-01-08 +Included in: Uppy v4.12.1 + +- @uppy/companion: upgrade express & express-session (Merlijn Vos / #5582) + +## 5.4.0 + +Released: 2025-01-06 +Included in: Uppy v4.10.0 + +- @uppy/companion: pass fetched origins to window.postMessage() (Merlijn Vos / #5529) + ## 5.2.0 Released: 2024-12-05 diff --git a/packages/@uppy/companion/KUBERNETES.md b/packages/@uppy/companion/KUBERNETES.md index b9c908bb3a..5b148a4780 100644 --- a/packages/@uppy/companion/KUBERNETES.md +++ b/packages/@uppy/companion/KUBERNETES.md @@ -28,6 +28,7 @@ data: COMPANION_DOMAINS: 'sub1.domain.com,sub2.domain.com,sub3.domain.com' COMPANION_PROTOCOL: 'YOUR SERVER PROTOCOL' COMPANION_STREAMING_UPLOAD: true + COMPANION_TUS_DEFERRED_UPLOAD_LENGTH: true COMPANION_REDIS_URL: redis://:superSecretPassword@uppy-redis.uppy.svc.cluster.local:6379 COMPANION_SECRET: 'shh!Issa Secret!' COMPANION_PREAUTH_SECRET: 'another secret' diff --git a/packages/@uppy/companion/env_example b/packages/@uppy/companion/env_example index 08b3e0acf1..b166facda9 100644 --- a/packages/@uppy/companion/env_example +++ b/packages/@uppy/companion/env_example @@ -5,6 +5,7 @@ COMPANION_SELF_ENDPOINT=uppy.xxxx.com COMPANION_HIDE_METRICS=false COMPANION_HIDE_WELCOME=false COMPANION_STREAMING_UPLOAD=true +COMPANION_TUS_DEFERRED_UPLOAD_LENGTH=true COMPANION_PROTOCOL=https COMPANION_DATADIR=/mnt/uppy-server-data diff --git a/packages/@uppy/companion/package.json b/packages/@uppy/companion/package.json index 68a500b6ef..37b987bb52 100644 --- a/packages/@uppy/companion/package.json +++ b/packages/@uppy/companion/package.json @@ -1,6 +1,6 @@ { "name": "@uppy/companion", - "version": "5.3.0", + "version": "5.5.1", "description": "OAuth helper and remote fetcher for Uppy's (https://uppy.io) extensible file upload widget with support for drag&drop, resumable uploads, previews, restrictions, file processing/encoding, remote providers like Dropbox and Google Drive, S3 and more :dog:", "main": "lib/companion.js", "types": "lib/companion.d.ts", @@ -41,10 +41,10 @@ "cors": "^2.8.5", "escape-goat": "3.0.0", "escape-string-regexp": "4.0.0", - "express": "4.19.2", + "express": "4.21.2", "express-interceptor": "1.2.0", "express-prom-bundle": "7.0.0", - "express-session": "1.18.0", + "express-session": "1.18.1", "fast-safe-stringify": "^2.1.1", "got": "^13.0.0", "grant": "5.4.22", diff --git a/packages/@uppy/companion/src/server/Uploader.js b/packages/@uppy/companion/src/server/Uploader.js index 9c2e3dd64b..9f8014549d 100644 --- a/packages/@uppy/companion/src/server/Uploader.js +++ b/packages/@uppy/companion/src/server/Uploader.js @@ -509,9 +509,7 @@ class Uploader { const tusOptions = { endpoint: this.options.endpoint, uploadUrl: this.options.uploadUrl, - uploadLengthDeferred: !isFileStream, retryDelays: [0, 1000, 3000, 5000], - uploadSize: isFileStream ? this.size : undefined, chunkSize, headers: headerSanitize(this.options.headers), addRequestId: true, @@ -553,6 +551,16 @@ class Uploader { }, } + if (this.options.companionOptions.tusDeferredUploadLength && !isFileStream) { + tusOptions.uploadLengthDeferred = true + } else { + if (!this.size) { + reject(new Error('tusDeferredUploadLength needs to be enabled if no file size is provided by the provider')) + } + tusOptions.uploadLengthDeferred = false + tusOptions.uploadSize = this.size + } + this.tus = new tus.Upload(stream, tusOptions) this.tus.start() diff --git a/packages/@uppy/companion/src/server/controllers/get.js b/packages/@uppy/companion/src/server/controllers/get.js index 6364399967..75406f33c1 100644 --- a/packages/@uppy/companion/src/server/controllers/get.js +++ b/packages/@uppy/companion/src/server/controllers/get.js @@ -1,5 +1,7 @@ const logger = require('../logger') const { startDownUpload } = require('../helpers/upload') +const { respondWithError } = require('../provider/error') + async function get (req, res) { const { id } = req.params @@ -17,6 +19,7 @@ async function get (req, res) { await startDownUpload({ req, res, getSize, download }) } catch (err) { logger.error(err, 'controller.get.error', req.id) + if (respondWithError(err, res)) return res.status(500).json({ message: 'Failed to download file' }) } } diff --git a/packages/@uppy/companion/src/server/controllers/googlePicker.js b/packages/@uppy/companion/src/server/controllers/googlePicker.js index 4b3dd051ee..b08d66a605 100644 --- a/packages/@uppy/companion/src/server/controllers/googlePicker.js +++ b/packages/@uppy/companion/src/server/controllers/googlePicker.js @@ -7,6 +7,7 @@ const { getURLMeta } = require('../helpers/request') const logger = require('../logger') const { downloadURL } = require('../download') const { getGoogleFileSize, streamGoogleFile } = require('../provider/google/drive'); +const { respondWithError } = require('../provider/error') const getAuthHeader = (token) => ({ authorization: `Bearer ${token}` }); @@ -49,7 +50,8 @@ const get = async (req, res) => { await startDownUpload({ req, res, getSize, download }) } catch (err) { logger.error(err, 'controller.googlePicker.error', req.id) - res.status(err.status || 500).json({ message: 'failed to fetch Google Picker URL' }) + if (respondWithError(err, res)) return + res.status(500).json({ message: 'failed to fetch Google Picker URL' }) } } diff --git a/packages/@uppy/companion/src/server/controllers/s3.js b/packages/@uppy/companion/src/server/controllers/s3.js index a084de2cbe..19a91796c7 100644 --- a/packages/@uppy/companion/src/server/controllers/s3.js +++ b/packages/@uppy/companion/src/server/controllers/s3.js @@ -135,6 +135,7 @@ module.exports = function s3 (config) { res.json({ key: data.Key, uploadId: data.UploadId, + bucket: data.Bucket }) }, next) } @@ -360,6 +361,8 @@ module.exports = function s3 (config) { })).then(data => { res.json({ location: data.Location, + key: data.Key, + bucket: data.Bucket }) }, next) } diff --git a/packages/@uppy/companion/src/server/controllers/url.js b/packages/@uppy/companion/src/server/controllers/url.js index 838d659ee7..99b1e96667 100644 --- a/packages/@uppy/companion/src/server/controllers/url.js +++ b/packages/@uppy/companion/src/server/controllers/url.js @@ -5,6 +5,7 @@ const { downloadURL } = require('../download') const { validateURL } = require('../helpers/request') const { getURLMeta } = require('../helpers/request') const logger = require('../logger') +const { respondWithError } = require('../provider/error') /** * @callback downloadCallback @@ -24,14 +25,16 @@ const meta = async (req, res) => { const { allowLocalUrls } = req.companion.options if (!validateURL(req.body.url, allowLocalUrls)) { logger.debug('Invalid request body detected. Exiting url meta handler.', null, req.id) - return res.status(400).json({ error: 'Invalid request body' }) + res.status(400).json({ error: 'Invalid request body' }) + return } const urlMeta = await getURLMeta(req.body.url, allowLocalUrls) - return res.json(urlMeta) + res.json(urlMeta) } catch (err) { logger.error(err, 'controller.url.meta.error', req.id) - return res.status(err.status || 500).json({ message: 'failed to fetch URL metadata' }) + if (respondWithError(err, res)) return + res.status(500).json({ message: 'failed to fetch URL metadata' }) } } @@ -62,7 +65,8 @@ const get = async (req, res) => { await startDownUpload({ req, res, getSize, download }) } catch (err) { logger.error(err, 'controller.url.error', req.id) - res.status(err.status || 500).json({ message: 'failed to fetch URL' }) + if (respondWithError(err, res)) return + res.status(500).json({ message: 'failed to fetch URL' }) } } diff --git a/packages/@uppy/companion/src/server/helpers/upload.js b/packages/@uppy/companion/src/server/helpers/upload.js index b628634eeb..b508c52dff 100644 --- a/packages/@uppy/companion/src/server/helpers/upload.js +++ b/packages/@uppy/companion/src/server/helpers/upload.js @@ -1,51 +1,38 @@ const Uploader = require('../Uploader') const logger = require('../logger') -const { respondWithError } = require('../provider/error') async function startDownUpload({ req, res, getSize, download }) { - try { - logger.debug('Starting download stream.', null, req.id) - const { stream, size: maybeSize } = await download() + logger.debug('Starting download stream.', null, req.id) + const { stream, size: maybeSize } = await download() - let size - // if the provider already knows the size, we can use that - if (typeof maybeSize === 'number' && !Number.isNaN(maybeSize) && maybeSize > 0) { - size = maybeSize - } - // if not we need to get the size - if (size == null) { - size = await getSize() - } - const { clientSocketConnectTimeout } = req.companion.options - - logger.debug('Instantiating uploader.', null, req.id) - const uploader = new Uploader(Uploader.reqToOptions(req, size)) - - // "Forking" off the upload operation to background, so we can return the http request: - ; (async () => { - // wait till the client has connected to the socket, before starting - // the download, so that the client can receive all download/upload progress. - logger.debug('Waiting for socket connection before beginning remote download/upload.', null, req.id) - await uploader.awaitReady(clientSocketConnectTimeout) - logger.debug('Socket connection received. Starting remote download/upload.', null, req.id) + let size + // if the provider already knows the size, we can use that + if (typeof maybeSize === 'number' && !Number.isNaN(maybeSize) && maybeSize > 0) { + size = maybeSize + } + // if not we need to get the size + if (size == null) { + size = await getSize() + } + const { clientSocketConnectTimeout } = req.companion.options - await uploader.tryUploadStream(stream, req) - })().catch((err) => logger.error(err)) + logger.debug('Instantiating uploader.', null, req.id) + const uploader = new Uploader(Uploader.reqToOptions(req, size)) - // Respond the request - // NOTE: the Uploader will continue running after the http request is responded - res.status(200).json({ token: uploader.token }) - } catch (err) { - if (err.name === 'ValidationError') { - logger.debug(err.message, 'uploader.validator.fail') - res.status(400).json({ message: err.message }) - return - } + // "Forking" off the upload operation to background, so we can return the http request: + ; (async () => { + // wait till the client has connected to the socket, before starting + // the download, so that the client can receive all download/upload progress. + logger.debug('Waiting for socket connection before beginning remote download/upload.', null, req.id) + await uploader.awaitReady(clientSocketConnectTimeout) + logger.debug('Socket connection received. Starting remote download/upload.', null, req.id) - if (respondWithError(err, res)) return + await uploader.tryUploadStream(stream, req) + })().catch((err) => logger.error(err)) - throw err - } + // Respond the request + // NOTE: the Uploader will continue running after the http request is responded + res.status(200).json({ token: uploader.token }) } module.exports = { startDownUpload } diff --git a/packages/@uppy/companion/src/server/helpers/utils.js b/packages/@uppy/companion/src/server/helpers/utils.js index 4578f0d224..26fb46c330 100644 --- a/packages/@uppy/companion/src/server/helpers/utils.js +++ b/packages/@uppy/companion/src/server/helpers/utils.js @@ -148,6 +148,9 @@ module.exports.decrypt = (encrypted, secret) => { module.exports.defaultGetKey = ({ filename }) => `${crypto.randomUUID()}-${filename}` +/** + * Our own HttpError in cases where we can't use `got`'s `HTTPError` + */ class HttpError extends Error { statusCode @@ -176,7 +179,7 @@ module.exports.prepareStream = async (stream) => new Promise((resolve, reject) = }) .on('error', (err) => { // In this case the error object is not a normal GOT HTTPError where json is already parsed, - // we create our own HttpError error for this case + // we use our own HttpError error for this scenario. if (typeof err.response?.body === 'string' && typeof err.response?.statusCode === 'number') { let responseJson try { diff --git a/packages/@uppy/companion/src/server/provider/error.js b/packages/@uppy/companion/src/server/provider/error.js index efb4a53381..1f76212bff 100644 --- a/packages/@uppy/companion/src/server/provider/error.js +++ b/packages/@uppy/companion/src/server/provider/error.js @@ -30,6 +30,8 @@ class ProviderUserError extends ProviderApiError { /** * AuthError is error returned when an adapter encounters * an authorization error while communication with its corresponding provider + * this signals to the client that the access token is invalid and needs to be + * refreshed or the user needs to re-authenticate */ class ProviderAuthError extends ProviderApiError { constructor() { @@ -39,10 +41,27 @@ class ProviderAuthError extends ProviderApiError { } } +function parseHttpError(err) { + if (err?.name === 'HTTPError') { + return { + statusCode: err.response?.statusCode, + body: err.response?.body, + } + } + if (err?.name === 'HttpError') { + return { + statusCode: err.statusCode, + body: err.responseJson, + } + } + return undefined +} + /** * Convert an error instance to an http response if possible * * @param {Error | ProviderApiError} err the error instance to convert to an http json response + * @returns {object | undefined} an object with a code and json field if the error can be converted to a response */ function errorToResponse(err) { // @ts-ignore @@ -50,6 +69,10 @@ function errorToResponse(err) { return { code: 401, json: { message: err.message } } } + if (err?.name === 'ValidationError') { + return { code: 400, json: { message: err.message } } + } + if (err?.name === 'ProviderUserError') { // @ts-ignore return { code: 400, json: err.json } @@ -74,6 +97,12 @@ function errorToResponse(err) { } } + const httpError = parseHttpError(err) + if (httpError) { + // We proxy the response purely for ease of debugging + return { code: 500, json: { statusCode: httpError.statusCode, body: httpError.body } } + } + return undefined } @@ -86,4 +115,4 @@ function respondWithError(err, res) { return false } -module.exports = { ProviderAuthError, ProviderApiError, ProviderUserError, respondWithError } +module.exports = { ProviderAuthError, ProviderApiError, ProviderUserError, respondWithError, parseHttpError } diff --git a/packages/@uppy/companion/src/server/provider/providerErrors.js b/packages/@uppy/companion/src/server/provider/providerErrors.js index 2497efff63..621fec9209 100644 --- a/packages/@uppy/companion/src/server/provider/providerErrors.js +++ b/packages/@uppy/companion/src/server/provider/providerErrors.js @@ -1,5 +1,5 @@ const logger = require('../logger') -const { ProviderApiError, ProviderUserError, ProviderAuthError } = require('./error') +const { ProviderApiError, ProviderUserError, ProviderAuthError, parseHttpError } = require('./error') /** * @@ -37,18 +37,11 @@ async function withProviderErrorHandling({ try { return await fn() } catch (err) { - let statusCode - let body + const httpError = parseHttpError(err) - if (err?.name === 'HTTPError') { - statusCode = err.response?.statusCode - body = err.response?.body - } else if (err?.name === 'HttpError') { - statusCode = err.statusCode - body = err.responseJson - } - - if (statusCode != null) { + // Wrap all HTTP errors according to the provider's desired error handling + if (httpError) { + const { statusCode, body } = httpError let knownErr if (isAuthError({ statusCode, body })) { knownErr = new ProviderAuthError() @@ -62,8 +55,8 @@ async function withProviderErrorHandling({ throw knownErr } + // non HTTP errors will be passed through logger.error(err, tag) - throw err } } @@ -81,4 +74,4 @@ async function withGoogleErrorHandling (providerName, tag, fn) { }) } -module.exports = { withProviderErrorHandling, withGoogleErrorHandling } +module.exports = { withProviderErrorHandling, withGoogleErrorHandling, parseHttpError } diff --git a/packages/@uppy/companion/src/server/s3-client.js b/packages/@uppy/companion/src/server/s3-client.js index 74717d2383..f70a38c9d2 100644 --- a/packages/@uppy/companion/src/server/s3-client.js +++ b/packages/@uppy/companion/src/server/s3-client.js @@ -29,7 +29,7 @@ module.exports = (companionOptions, createPresignedPostMode = false) => { /** @type {import('@aws-sdk/client-s3').S3ClientConfig} */ let s3ClientOptions = { region: s3.region, - forcePathStyle: Boolean(s3.forcePathStyle) + forcePathStyle: s3.forcePathStyle } if (s3.useAccelerateEndpoint) { diff --git a/packages/@uppy/companion/src/standalone/helper.js b/packages/@uppy/companion/src/standalone/helper.js index 57494dadb8..4db99e03e7 100644 --- a/packages/@uppy/companion/src/standalone/helper.js +++ b/packages/@uppy/companion/src/standalone/helper.js @@ -183,6 +183,7 @@ const getConfigFromEnv = () => { // cookieDomain is kind of a hack to support distributed systems. This should be improved but we never got so far. cookieDomain: process.env.COMPANION_COOKIE_DOMAIN, streamingUpload: process.env.COMPANION_STREAMING_UPLOAD ? process.env.COMPANION_STREAMING_UPLOAD === 'true' : undefined, + tusDeferredUploadLength: process.env.COMPANION_TUS_DEFERRED_UPLOAD_LENGTH ? process.env.COMPANION_TUS_DEFERRED_UPLOAD_LENGTH === 'true' : true, maxFileSize: process.env.COMPANION_MAX_FILE_SIZE ? parseInt(process.env.COMPANION_MAX_FILE_SIZE, 10) : undefined, chunkSize: process.env.COMPANION_CHUNK_SIZE ? parseInt(process.env.COMPANION_CHUNK_SIZE, 10) : undefined, clientSocketConnectTimeout: process.env.COMPANION_CLIENT_SOCKET_CONNECT_TIMEOUT diff --git a/packages/@uppy/companion/src/standalone/index.js b/packages/@uppy/companion/src/standalone/index.js index fefaf64f8e..5afa2f2fde 100644 --- a/packages/@uppy/companion/src/standalone/index.js +++ b/packages/@uppy/companion/src/standalone/index.js @@ -182,10 +182,10 @@ module.exports = function server(inputCompanionOptions) { } else { logger.error(err, 'root.error', req.id) } - res.status(err.status || 500).json({ message: 'Something went wrong', requestId: req.id }) + res.status(500).json({ message: 'Something went wrong', requestId: req.id }) } else { logger.error(err, 'root.error', req.id) - res.status(err.status || 500).json({ message: err.message, error: err, requestId: req.id }) + res.status(500).json({ message: err.message, error: err, requestId: req.id }) } }) diff --git a/packages/@uppy/companion/test/mockserver.js b/packages/@uppy/companion/test/mockserver.js index 9ee1779e96..329e4d2d2f 100644 --- a/packages/@uppy/companion/test/mockserver.js +++ b/packages/@uppy/companion/test/mockserver.js @@ -12,6 +12,7 @@ const defaultEnv = { COMPANION_HIDE_WELCOME: 'false', COMPANION_STREAMING_UPLOAD: 'true', + COMPANION_TUS_DEFERRED_UPLOAD_LENGTH: 'true', COMPANION_ALLOW_LOCAL_URLS: 'false', COMPANION_PROTOCOL: 'http', diff --git a/packages/@uppy/compressor/CHANGELOG.md b/packages/@uppy/compressor/CHANGELOG.md index b2ac4d83e7..8837dbf4e2 100644 --- a/packages/@uppy/compressor/CHANGELOG.md +++ b/packages/@uppy/compressor/CHANGELOG.md @@ -1,5 +1,12 @@ # @uppy/compressor +## 2.2.0 + +Released: 2025-01-06 +Included in: Uppy v4.11.0 + +- @uppy/angular,@uppy/audio,@uppy/aws-s3,@uppy/box,@uppy/companion-client,@uppy/compressor,@uppy/core,@uppy/dashboard,@uppy/drag-drop,@uppy/drop-target,@uppy/dropbox,@uppy/facebook,@uppy/file-input,@uppy/form,@uppy/golden-retriever,@uppy/google-drive-picker,@uppy/google-drive,@uppy/google-photos-picker,@uppy/google-photos,@uppy/image-editor,@uppy/informer,@uppy/instagram,@uppy/locales,@uppy/onedrive,@uppy/progress-bar,@uppy/provider-views,@uppy/react,@uppy/remote-sources,@uppy/screen-capture,@uppy/status-bar,@uppy/thumbnail-generator,@uppy/transloadit,@uppy/tus,@uppy/unsplash,@uppy/url,@uppy/vue,@uppy/webcam,@uppy/webdav,@uppy/xhr-upload,@uppy/zoom: Remove "paths" from all tsconfig's (Merlijn Vos / #5572) + ## 2.1.1 Released: 2024-12-05 diff --git a/packages/@uppy/compressor/package.json b/packages/@uppy/compressor/package.json index b4eb67dfd4..002952ff7c 100644 --- a/packages/@uppy/compressor/package.json +++ b/packages/@uppy/compressor/package.json @@ -1,7 +1,7 @@ { "name": "@uppy/compressor", "description": "Uppy plugin that compresses images before upload, saving up to 60% in size", - "version": "2.1.1", + "version": "2.2.1", "license": "MIT", "main": "lib/index.js", "style": "dist/style.min.css", diff --git a/packages/@uppy/compressor/src/index.test.ts b/packages/@uppy/compressor/src/index.test.ts index 9eff543c13..91fbac5fbb 100644 --- a/packages/@uppy/compressor/src/index.test.ts +++ b/packages/@uppy/compressor/src/index.test.ts @@ -3,7 +3,7 @@ import Core from '@uppy/core' import getFileNameAndExtension from '@uppy/utils/lib/getFileNameAndExtension' import fs from 'node:fs' import path from 'node:path' -import CompressorPlugin from './index.ts' +import CompressorPlugin from './index.js' // Compressor uses browser canvas API, so need to mock compress() // @ts-expect-error mocked diff --git a/packages/@uppy/compressor/src/index.ts b/packages/@uppy/compressor/src/index.ts index c57fea1664..2e7d2d87be 100644 --- a/packages/@uppy/compressor/src/index.ts +++ b/packages/@uppy/compressor/src/index.ts @@ -7,9 +7,9 @@ import prettierBytes from '@transloadit/prettier-bytes' import CompressorJS from 'compressorjs' import type { Body, Meta, UppyFile } from '@uppy/utils/lib/UppyFile' -import type { DefinePluginOpts, PluginOpts } from '@uppy/core/lib/BasePlugin.js' +import type { DefinePluginOpts, PluginOpts } from '@uppy/core' -import locale from './locale.ts' +import locale from './locale.js' declare module '@uppy/core' { export interface UppyEventMap { diff --git a/packages/@uppy/compressor/tsconfig.build.json b/packages/@uppy/compressor/tsconfig.build.json index 8d9ed22fa5..bbf30b5b43 100644 --- a/packages/@uppy/compressor/tsconfig.build.json +++ b/packages/@uppy/compressor/tsconfig.build.json @@ -2,11 +2,6 @@ "extends": "../../../tsconfig.shared", "compilerOptions": { "outDir": "./lib", - "paths": { - "@uppy/utils/lib/*": ["../utils/src/*"], - "@uppy/core": ["../core/src/index.js"], - "@uppy/core/lib/*": ["../core/src/*"] - }, "resolveJsonModule": false, "rootDir": "./src" }, diff --git a/packages/@uppy/compressor/tsconfig.json b/packages/@uppy/compressor/tsconfig.json index a76c3b714a..47ece599c6 100644 --- a/packages/@uppy/compressor/tsconfig.json +++ b/packages/@uppy/compressor/tsconfig.json @@ -3,11 +3,6 @@ "compilerOptions": { "emitDeclarationOnly": false, "noEmit": true, - "paths": { - "@uppy/utils/lib/*": ["../utils/src/*"], - "@uppy/core": ["../core/src/index.js"], - "@uppy/core/lib/*": ["../core/src/*"], - }, }, "include": ["./package.json", "./src/**/*.*"], "references": [ diff --git a/packages/@uppy/core/CHANGELOG.md b/packages/@uppy/core/CHANGELOG.md index e067fc3783..fe5fcb3678 100644 --- a/packages/@uppy/core/CHANGELOG.md +++ b/packages/@uppy/core/CHANGELOG.md @@ -1,5 +1,19 @@ # @uppy/core +## 4.4.0 + +Released: 2025-01-06 +Included in: Uppy v4.11.0 + +- @uppy/angular,@uppy/audio,@uppy/aws-s3,@uppy/box,@uppy/companion-client,@uppy/compressor,@uppy/core,@uppy/dashboard,@uppy/drag-drop,@uppy/drop-target,@uppy/dropbox,@uppy/facebook,@uppy/file-input,@uppy/form,@uppy/golden-retriever,@uppy/google-drive-picker,@uppy/google-drive,@uppy/google-photos-picker,@uppy/google-photos,@uppy/image-editor,@uppy/informer,@uppy/instagram,@uppy/locales,@uppy/onedrive,@uppy/progress-bar,@uppy/provider-views,@uppy/react,@uppy/remote-sources,@uppy/screen-capture,@uppy/status-bar,@uppy/thumbnail-generator,@uppy/transloadit,@uppy/tus,@uppy/unsplash,@uppy/url,@uppy/vue,@uppy/webcam,@uppy/webdav,@uppy/xhr-upload,@uppy/zoom: Remove "paths" from all tsconfig's (Merlijn Vos / #5572) + +## 4.3.2 + +Released: 2025-01-06 +Included in: Uppy v4.10.0 + +- @uppy/core,@uppy/dashboard,@uppy/provider-views,@uppy/store-redux,@uppy/url: build(deps): bump nanoid from 5.0.7 to 5.0.9 (dependabot[bot] / #5544) + ## 4.3.1 Released: 2024-12-17 diff --git a/packages/@uppy/core/package.json b/packages/@uppy/core/package.json index 0d97331297..3d77730240 100644 --- a/packages/@uppy/core/package.json +++ b/packages/@uppy/core/package.json @@ -1,7 +1,7 @@ { "name": "@uppy/core", "description": "Core module for the 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": "4.3.1", + "version": "4.4.1", "license": "MIT", "main": "lib/index.js", "style": "dist/style.min.css", diff --git a/packages/@uppy/core/src/BasePlugin.ts b/packages/@uppy/core/src/BasePlugin.ts index 8713e6ee49..708865be80 100644 --- a/packages/@uppy/core/src/BasePlugin.ts +++ b/packages/@uppy/core/src/BasePlugin.ts @@ -16,7 +16,7 @@ import type { OptionalPluralizeLocale, } from '@uppy/utils/lib/Translator' import type { Body, Meta } from '@uppy/utils/lib/UppyFile' -import type { State, UnknownPlugin, Uppy } from './Uppy.ts' +import type { State, UnknownPlugin, Uppy } from './Uppy.js' export type PluginOpts = { locale?: Locale diff --git a/packages/@uppy/core/src/EventManager.ts b/packages/@uppy/core/src/EventManager.ts index 529c38fe62..bb556a9cfe 100644 --- a/packages/@uppy/core/src/EventManager.ts +++ b/packages/@uppy/core/src/EventManager.ts @@ -1,5 +1,5 @@ import type { Meta, Body, UppyFile } from '@uppy/utils/lib/UppyFile' -import type { Uppy, UppyEventMap, _UppyEventMap } from './Uppy.ts' +import type { Uppy, UppyEventMap, _UppyEventMap } from './Uppy.js' /** * Create a wrapper around an event emitter with a `remove` method to remove diff --git a/packages/@uppy/core/src/Restricter.ts b/packages/@uppy/core/src/Restricter.ts index 09c8622a20..a0a490890a 100644 --- a/packages/@uppy/core/src/Restricter.ts +++ b/packages/@uppy/core/src/Restricter.ts @@ -5,7 +5,7 @@ import prettierBytes from '@transloadit/prettier-bytes' import match from 'mime-match' import type { Body, Meta, UppyFile } from '@uppy/utils/lib/UppyFile' import type { I18n } from '@uppy/utils/lib/Translator' -import type { State, NonNullableUppyOptions } from './Uppy.ts' +import type { State, NonNullableUppyOptions } from './Uppy.js' export type Restrictions = { maxFileSize: number | null diff --git a/packages/@uppy/core/src/UIPlugin.test.ts b/packages/@uppy/core/src/UIPlugin.test.ts index 1efd66ebc8..fe6ccdd3df 100644 --- a/packages/@uppy/core/src/UIPlugin.test.ts +++ b/packages/@uppy/core/src/UIPlugin.test.ts @@ -1,6 +1,6 @@ import { describe, expect, it } from 'vitest' -import UIPlugin from './UIPlugin.ts' -import Core from './index.ts' +import UIPlugin from './UIPlugin.js' +import Core from './index.js' describe('UIPlugin', () => { describe('getPluginState', () => { diff --git a/packages/@uppy/core/src/UIPlugin.ts b/packages/@uppy/core/src/UIPlugin.ts index 7aa3614e0f..b6be19d097 100644 --- a/packages/@uppy/core/src/UIPlugin.ts +++ b/packages/@uppy/core/src/UIPlugin.ts @@ -4,9 +4,9 @@ import findDOMElement from '@uppy/utils/lib/findDOMElement' import getTextDirection from '@uppy/utils/lib/getTextDirection' import type { Body, Meta } from '@uppy/utils/lib/UppyFile' -import BasePlugin from './BasePlugin.ts' -import type { PluginOpts } from './BasePlugin.ts' -import type { State } from './Uppy.ts' +import BasePlugin from './BasePlugin.js' +import type { PluginOpts } from './BasePlugin.js' +import type { State } from './Uppy.js' /** * Defer a frequent call to the microtask queue. diff --git a/packages/@uppy/core/src/Uppy.test.ts b/packages/@uppy/core/src/Uppy.test.ts index cb6b985a84..86815dba6f 100644 --- a/packages/@uppy/core/src/Uppy.test.ts +++ b/packages/@uppy/core/src/Uppy.test.ts @@ -6,23 +6,23 @@ import assert from 'node:assert' import fs from 'node:fs' import path from 'node:path' import prettierBytes from '@transloadit/prettier-bytes' -import type { Body, Meta } from '@uppy/utils/lib/UppyFile' +import type { Body, Meta } from '@uppy/core' import type { Locale } from '@uppy/utils/lib/Translator' -import Core from './index.ts' -import UIPlugin from './UIPlugin.ts' +import Core from './index.js' +import UIPlugin from './UIPlugin.js' import BasePlugin, { type DefinePluginOpts, type PluginOpts, -} from './BasePlugin.ts' -import { debugLogger } from './loggers.ts' -import AcquirerPlugin1 from './mocks/acquirerPlugin1.ts' -import AcquirerPlugin2 from './mocks/acquirerPlugin2.ts' -import InvalidPlugin from './mocks/invalidPlugin.ts' -import InvalidPluginWithoutId from './mocks/invalidPluginWithoutId.ts' -import InvalidPluginWithoutType from './mocks/invalidPluginWithoutType.ts' +} from './BasePlugin.js' +import { debugLogger } from './loggers.js' +import AcquirerPlugin1 from './mocks/acquirerPlugin1.js' +import AcquirerPlugin2 from './mocks/acquirerPlugin2.js' +import InvalidPlugin from './mocks/invalidPlugin.js' +import InvalidPluginWithoutId from './mocks/invalidPluginWithoutId.js' +import InvalidPluginWithoutType from './mocks/invalidPluginWithoutType.js' // @ts-expect-error trying to import a file from outside the package import DeepFrozenStore from '../../../../e2e/cypress/fixtures/DeepFrozenStore.mjs' -import type { State } from './Uppy.ts' +import type { State } from './Uppy.js' const sampleImage = fs.readFileSync( // eslint-disable-next-line no-restricted-globals diff --git a/packages/@uppy/core/src/Uppy.ts b/packages/@uppy/core/src/Uppy.ts index 09367bc1af..3627de3eda 100644 --- a/packages/@uppy/core/src/Uppy.ts +++ b/packages/@uppy/core/src/Uppy.ts @@ -32,21 +32,21 @@ import type { I18n, OptionalPluralizeLocale, } from '@uppy/utils/lib/Translator' -import supportsUploadProgress from './supportsUploadProgress.ts' -import getFileName from './getFileName.ts' -import { justErrorsLogger, debugLogger } from './loggers.ts' +import supportsUploadProgress from './supportsUploadProgress.js' +import getFileName from './getFileName.js' +import { justErrorsLogger, debugLogger } from './loggers.js' import { Restricter, defaultOptions as defaultRestrictionOptions, RestrictionError, -} from './Restricter.ts' +} from './Restricter.js' // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore We don't want TS to generate types for the package.json import packageJson from '../package.json' -import locale from './locale.ts' +import locale from './locale.js' -import type BasePlugin from './BasePlugin.ts' -import type { Restrictions, ValidateableFile } from './Restricter.ts' +import type BasePlugin from './BasePlugin.js' +import type { Restrictions, ValidateableFile } from './Restricter.js' type Processor = ( fileIDs: string[], diff --git a/packages/@uppy/core/src/index.ts b/packages/@uppy/core/src/index.ts index 358dea36ea..1e860537e4 100644 --- a/packages/@uppy/core/src/index.ts +++ b/packages/@uppy/core/src/index.ts @@ -1,20 +1,37 @@ -export { default } from './Uppy.ts' -export { - default as Uppy, - type State, - type UnknownPlugin, - type UnknownProviderPlugin, - type UnknownSearchProviderPlugin, - type UploadResult, - type UppyEventMap, - type UppyOptions, -} from './Uppy.ts' -export { default as UIPlugin } from './UIPlugin.ts' -export { default as BasePlugin } from './BasePlugin.ts' -export { debugLogger } from './loggers.ts' +export { default, default as Uppy } from './Uppy.js' +export type { + State, + BaseProviderPlugin, + PartialTree, + PartialTreeFile, + PartialTreeFolder, + PartialTreeFolderNode, + PartialTreeFolderRoot, + PartialTreeId, + UnknownPlugin, + UnknownProviderPlugin, + UnknownProviderPluginState, + UnknownSearchProviderPlugin, + UnknownSearchProviderPluginState, + UploadResult, + UppyEventMap, + UppyOptions, + AsyncStore, +} from './Uppy.js' -export type { Store } from '@uppy/store-default' +export { default as UIPlugin } from './UIPlugin.js' +export type { UIPluginOptions } from './UIPlugin.js' + +export { default as BasePlugin } from './BasePlugin.js' +export type { DefinePluginOpts, PluginOpts } from './BasePlugin.js' -export type { UIPluginOptions } from './UIPlugin.ts' +export { debugLogger } from './loggers.js' + +export type { Store } from '@uppy/store-default' -export type { UppyFile, Meta, Body } from '@uppy/utils/lib/UppyFile' +export type { + UppyFile, + MinimalRequiredUppyFile, + Meta, + Body, +} from '@uppy/utils/lib/UppyFile' diff --git a/packages/@uppy/core/src/mocks/acquirerPlugin1.ts b/packages/@uppy/core/src/mocks/acquirerPlugin1.ts index 0f3516690d..9ff80f0e62 100644 --- a/packages/@uppy/core/src/mocks/acquirerPlugin1.ts +++ b/packages/@uppy/core/src/mocks/acquirerPlugin1.ts @@ -1,6 +1,6 @@ import { vi } from 'vitest' // eslint-disable-line import/no-extraneous-dependencies -import UIPlugin from '../UIPlugin.ts' -import type Uppy from '../Uppy.ts' +import UIPlugin from '../UIPlugin.js' +import type Uppy from '../Uppy.js' type mock = ReturnType diff --git a/packages/@uppy/core/src/mocks/acquirerPlugin2.ts b/packages/@uppy/core/src/mocks/acquirerPlugin2.ts index 9d2290b69d..54c9f56e33 100644 --- a/packages/@uppy/core/src/mocks/acquirerPlugin2.ts +++ b/packages/@uppy/core/src/mocks/acquirerPlugin2.ts @@ -1,6 +1,6 @@ import { vi } from 'vitest' // eslint-disable-line import/no-extraneous-dependencies -import UIPlugin from '../UIPlugin.ts' -import type Uppy from '../Uppy.ts' +import UIPlugin from '../UIPlugin.js' +import type Uppy from '../Uppy.js' type mock = ReturnType diff --git a/packages/@uppy/core/src/mocks/invalidPluginWithoutId.ts b/packages/@uppy/core/src/mocks/invalidPluginWithoutId.ts index d2c02e30dc..75e1f3b52c 100644 --- a/packages/@uppy/core/src/mocks/invalidPluginWithoutId.ts +++ b/packages/@uppy/core/src/mocks/invalidPluginWithoutId.ts @@ -1,5 +1,5 @@ -import UIPlugin from '../UIPlugin.ts' -import type Uppy from '../Uppy.ts' +import UIPlugin from '../UIPlugin.js' +import type Uppy from '../Uppy.js' export default class InvalidPluginWithoutName extends UIPlugin { public type: string diff --git a/packages/@uppy/core/src/mocks/invalidPluginWithoutType.ts b/packages/@uppy/core/src/mocks/invalidPluginWithoutType.ts index 4baeb573c9..19f404eb66 100644 --- a/packages/@uppy/core/src/mocks/invalidPluginWithoutType.ts +++ b/packages/@uppy/core/src/mocks/invalidPluginWithoutType.ts @@ -1,5 +1,5 @@ -import UIPlugin from '../UIPlugin.ts' -import type Uppy from '../Uppy.ts' +import UIPlugin from '../UIPlugin.js' +import type Uppy from '../Uppy.js' export default class InvalidPluginWithoutType extends UIPlugin { public id: string diff --git a/packages/@uppy/core/src/supportsUploadProgress.test.ts b/packages/@uppy/core/src/supportsUploadProgress.test.ts index 6dc2f8f478..7bb10151a8 100644 --- a/packages/@uppy/core/src/supportsUploadProgress.test.ts +++ b/packages/@uppy/core/src/supportsUploadProgress.test.ts @@ -1,5 +1,5 @@ import { describe, expect, it } from 'vitest' -import supportsUploadProgress from './supportsUploadProgress.ts' +import supportsUploadProgress from './supportsUploadProgress.js' describe('supportsUploadProgress', () => { it('returns true in working browsers', () => { diff --git a/packages/@uppy/core/src/types.test.ts b/packages/@uppy/core/src/types.test.ts index 1a03591d02..bb906e78b5 100644 --- a/packages/@uppy/core/src/types.test.ts +++ b/packages/@uppy/core/src/types.test.ts @@ -1,8 +1,8 @@ import { expectTypeOf, test } from 'vitest' import type { Body, InternalMetadata, Meta } from '@uppy/utils/lib/UppyFile' -import Uppy, { type UnknownPlugin } from './Uppy.ts' -import UIPlugin, { type UIPluginOptions } from './UIPlugin.ts' +import Uppy, { type UnknownPlugin } from './Uppy.js' +import UIPlugin, { type UIPluginOptions } from './UIPlugin.js' interface Opts extends UIPluginOptions { foo: string diff --git a/packages/@uppy/core/tsconfig.build.json b/packages/@uppy/core/tsconfig.build.json index 349b88d0f1..1a780f2c3d 100644 --- a/packages/@uppy/core/tsconfig.build.json +++ b/packages/@uppy/core/tsconfig.build.json @@ -3,12 +3,7 @@ "compilerOptions": { "outDir": "./lib", "rootDir": "./src", - "resolveJsonModule": false, - "paths": { - "@uppy/store-default": ["../store-default/src/index.js"], - "@uppy/store-default/lib/*": ["../store-default/src/*"], - "@uppy/utils/lib/*": ["../utils/src/*"] - } + "resolveJsonModule": false }, "include": ["./src/**/*.*"], "exclude": ["./src/**/*.test.ts"], diff --git a/packages/@uppy/core/tsconfig.json b/packages/@uppy/core/tsconfig.json index e5d13ad812..5e81a7a296 100644 --- a/packages/@uppy/core/tsconfig.json +++ b/packages/@uppy/core/tsconfig.json @@ -3,11 +3,6 @@ "compilerOptions": { "emitDeclarationOnly": false, "noEmit": true, - "paths": { - "@uppy/store-default": ["../store-default/src/index.js"], - "@uppy/store-default/lib/*": ["../store-default/src/*"], - "@uppy/utils/lib/*": ["../utils/src/*"], - }, }, "include": ["./package.json", "./src/**/*.*"], "references": [ diff --git a/packages/@uppy/dashboard/CHANGELOG.md b/packages/@uppy/dashboard/CHANGELOG.md index 463e40df14..02335b4810 100644 --- a/packages/@uppy/dashboard/CHANGELOG.md +++ b/packages/@uppy/dashboard/CHANGELOG.md @@ -1,5 +1,19 @@ # @uppy/dashboard +## 4.3.0 + +Released: 2025-01-06 +Included in: Uppy v4.11.0 + +- @uppy/angular,@uppy/audio,@uppy/aws-s3,@uppy/box,@uppy/companion-client,@uppy/compressor,@uppy/core,@uppy/dashboard,@uppy/drag-drop,@uppy/drop-target,@uppy/dropbox,@uppy/facebook,@uppy/file-input,@uppy/form,@uppy/golden-retriever,@uppy/google-drive-picker,@uppy/google-drive,@uppy/google-photos-picker,@uppy/google-photos,@uppy/image-editor,@uppy/informer,@uppy/instagram,@uppy/locales,@uppy/onedrive,@uppy/progress-bar,@uppy/provider-views,@uppy/react,@uppy/remote-sources,@uppy/screen-capture,@uppy/status-bar,@uppy/thumbnail-generator,@uppy/transloadit,@uppy/tus,@uppy/unsplash,@uppy/url,@uppy/vue,@uppy/webcam,@uppy/webdav,@uppy/xhr-upload,@uppy/zoom: Remove "paths" from all tsconfig's (Merlijn Vos / #5572) + +## 4.2.0 + +Released: 2025-01-06 +Included in: Uppy v4.10.0 + +- @uppy/core,@uppy/dashboard,@uppy/provider-views,@uppy/store-redux,@uppy/url: build(deps): bump nanoid from 5.0.7 to 5.0.9 (dependabot[bot] / #5544) + ## 4.1.3 Released: 2024-12-05 diff --git a/packages/@uppy/dashboard/package.json b/packages/@uppy/dashboard/package.json index a476aceec3..641b67ad87 100644 --- a/packages/@uppy/dashboard/package.json +++ b/packages/@uppy/dashboard/package.json @@ -1,7 +1,7 @@ { "name": "@uppy/dashboard", "description": "Universal UI plugin for Uppy.", - "version": "4.1.3", + "version": "4.3.1", "license": "MIT", "main": "lib/index.js", "style": "dist/style.min.css", diff --git a/packages/@uppy/dashboard/src/Dashboard.tsx b/packages/@uppy/dashboard/src/Dashboard.tsx index dc9a7f5768..644f5c2cd6 100644 --- a/packages/@uppy/dashboard/src/Dashboard.tsx +++ b/packages/@uppy/dashboard/src/Dashboard.tsx @@ -1,14 +1,16 @@ -import { - UIPlugin, - type UIPluginOptions, - type UnknownPlugin, - type Uppy, - type UploadResult, - type State, -} from '@uppy/core' import type { ComponentChild, VNode } from 'preact' -import type { DefinePluginOpts } from '@uppy/core/lib/BasePlugin.js' -import type { Body, Meta, UppyFile } from '@uppy/utils/lib/UppyFile' +import { UIPlugin } from '@uppy/core' +import type { + Body, + Meta, + UppyFile, + UIPluginOptions, + UnknownPlugin, + Uppy, + UploadResult, + State, + DefinePluginOpts, +} from '@uppy/core' import StatusBar from '@uppy/status-bar' import Informer from '@uppy/informer' import ThumbnailGenerator from '@uppy/thumbnail-generator' @@ -20,14 +22,14 @@ import { defaultPickerIcon } from '@uppy/provider-views' import type { TargetedEvent } from 'preact/compat' import { nanoid } from 'nanoid/non-secure' import memoizeOne from 'memoize-one' -import * as trapFocus from './utils/trapFocus.ts' -import createSuperFocus from './utils/createSuperFocus.ts' -import DashboardUI from './components/Dashboard.tsx' +import * as trapFocus from './utils/trapFocus.js' +import createSuperFocus from './utils/createSuperFocus.js' +import DashboardUI from './components/Dashboard.jsx' // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore We don't want TS to generate types for the package.json import packageJson from '../package.json' -import locale from './locale.ts' +import locale from './locale.js' type GenericEventCallback = () => void export type DashboardFileEditStartCallback = ( diff --git a/packages/@uppy/dashboard/src/components/AddFilesPanel.tsx b/packages/@uppy/dashboard/src/components/AddFilesPanel.tsx index f0faea74af..9b85dd63f5 100644 --- a/packages/@uppy/dashboard/src/components/AddFilesPanel.tsx +++ b/packages/@uppy/dashboard/src/components/AddFilesPanel.tsx @@ -1,7 +1,7 @@ /* eslint-disable react/destructuring-assignment */ import { h } from 'preact' import classNames from 'classnames' -import AddFiles from './AddFiles.tsx' +import AddFiles from './AddFiles.jsx' type $TSFixMe = any diff --git a/packages/@uppy/dashboard/src/components/Dashboard.tsx b/packages/@uppy/dashboard/src/components/Dashboard.tsx index 36d185e3f9..4caa2936a1 100644 --- a/packages/@uppy/dashboard/src/components/Dashboard.tsx +++ b/packages/@uppy/dashboard/src/components/Dashboard.tsx @@ -2,19 +2,26 @@ import { h } from 'preact' import classNames from 'classnames' import isDragDropSupported from '@uppy/utils/lib/isDragDropSupported' -import type { Body, Meta, UppyFile } from '@uppy/utils/lib/UppyFile' -import type { State, UIPlugin, UIPluginOptions, Uppy } from '@uppy/core' +import type { + Body, + Meta, + UppyFile, + State, + UIPlugin, + UIPluginOptions, + Uppy, +} from '@uppy/core' import type { I18n } from '@uppy/utils/lib/Translator' import type Translator from '@uppy/utils/lib/Translator' import type { TargetedEvent } from 'preact/compat' -import FileList from './FileList.tsx' -import AddFiles from './AddFiles.tsx' -import AddFilesPanel from './AddFilesPanel.tsx' -import PickerPanelContent from './PickerPanelContent.tsx' -import EditorPanel from './EditorPanel.tsx' -import PanelTopBar from './PickerPanelTopBar.tsx' -import FileCard from './FileCard/index.tsx' -import Slide from './Slide.tsx' +import FileList from './FileList.jsx' +import AddFiles from './AddFiles.jsx' +import AddFilesPanel from './AddFilesPanel.jsx' +import PickerPanelContent from './PickerPanelContent.jsx' +import EditorPanel from './EditorPanel.jsx' +import PanelTopBar from './PickerPanelTopBar.jsx' +import FileCard from './FileCard/index.jsx' +import Slide from './Slide.jsx' import type { DashboardState, TargetWithRender } from '../Dashboard' // http://dev.edenspiekermann.com/2016/02/11/introducing-accessible-modal-dialog diff --git a/packages/@uppy/dashboard/src/components/FileCard/index.tsx b/packages/@uppy/dashboard/src/components/FileCard/index.tsx index 49dbb85de2..8bb890db00 100644 --- a/packages/@uppy/dashboard/src/components/FileCard/index.tsx +++ b/packages/@uppy/dashboard/src/components/FileCard/index.tsx @@ -2,10 +2,10 @@ import { h } from 'preact' import { useEffect, useState, useCallback } from 'preact/hooks' import classNames from 'classnames' import { nanoid } from 'nanoid/non-secure' -import getFileTypeIcon from '../../utils/getFileTypeIcon.tsx' -import ignoreEvent from '../../utils/ignoreEvent.ts' -import FilePreview from '../FilePreview.tsx' -import RenderMetaFields from './RenderMetaFields.tsx' +import getFileTypeIcon from '../../utils/getFileTypeIcon.jsx' +import ignoreEvent from '../../utils/ignoreEvent.js' +import FilePreview from '../FilePreview.jsx' +import RenderMetaFields from './RenderMetaFields.jsx' type $TSFixMe = any diff --git a/packages/@uppy/dashboard/src/components/FileItem/Buttons/index.tsx b/packages/@uppy/dashboard/src/components/FileItem/Buttons/index.tsx index 53b0d32b56..d7d6fbd3f0 100644 --- a/packages/@uppy/dashboard/src/components/FileItem/Buttons/index.tsx +++ b/packages/@uppy/dashboard/src/components/FileItem/Buttons/index.tsx @@ -1,9 +1,9 @@ import { h } from 'preact' -import type { Body, Meta, UppyFile } from '@uppy/utils/lib/UppyFile' +import type { Body, Meta, UppyFile } from '@uppy/core' import type Uppy from '@uppy/core' import type { I18n } from '@uppy/utils/lib/Translator' -import copyToClipboard from '../../../utils/copyToClipboard.ts' -import type { DashboardState } from '../../../Dashboard.ts' +import copyToClipboard from '../../../utils/copyToClipboard.js' +import type { DashboardState } from '../../../Dashboard.js' type $TSFixMe = any diff --git a/packages/@uppy/dashboard/src/components/FileItem/FileInfo/index.tsx b/packages/@uppy/dashboard/src/components/FileItem/FileInfo/index.tsx index 555f2364c0..3def4903e3 100644 --- a/packages/@uppy/dashboard/src/components/FileItem/FileInfo/index.tsx +++ b/packages/@uppy/dashboard/src/components/FileItem/FileInfo/index.tsx @@ -4,8 +4,8 @@ import prettierBytes from '@transloadit/prettier-bytes' import truncateString from '@uppy/utils/lib/truncateString' import type { I18n } from '@uppy/utils/lib/Translator' import type { UppyFile } from '@uppy/core' -import MetaErrorMessage from '../MetaErrorMessage.tsx' -import type { DashboardState } from '../../../Dashboard.ts' +import MetaErrorMessage from '../MetaErrorMessage.jsx' +import type { DashboardState } from '../../../Dashboard.js' const renderFileName = (props: { file: UppyFile diff --git a/packages/@uppy/dashboard/src/components/FileItem/FilePreviewAndLink/index.tsx b/packages/@uppy/dashboard/src/components/FileItem/FilePreviewAndLink/index.tsx index e2bf22c867..d7709c2a0d 100644 --- a/packages/@uppy/dashboard/src/components/FileItem/FilePreviewAndLink/index.tsx +++ b/packages/@uppy/dashboard/src/components/FileItem/FilePreviewAndLink/index.tsx @@ -1,7 +1,7 @@ import { h } from 'preact' -import FilePreview from '../../FilePreview.tsx' -import MetaErrorMessage from '../MetaErrorMessage.tsx' -import getFileTypeIcon from '../../../utils/getFileTypeIcon.tsx' +import FilePreview from '../../FilePreview.jsx' +import MetaErrorMessage from '../MetaErrorMessage.jsx' +import getFileTypeIcon from '../../../utils/getFileTypeIcon.jsx' type $TSFixMe = any diff --git a/packages/@uppy/dashboard/src/components/FileItem/FileProgress/index.tsx b/packages/@uppy/dashboard/src/components/FileItem/FileProgress/index.tsx index 1147d7a9d8..f3cc2566c2 100644 --- a/packages/@uppy/dashboard/src/components/FileItem/FileProgress/index.tsx +++ b/packages/@uppy/dashboard/src/components/FileItem/FileProgress/index.tsx @@ -1,8 +1,7 @@ /* eslint-disable react/no-unused-prop-types */ /* eslint-disable react/destructuring-assignment */ -import type { State, Uppy, UppyFile } from '@uppy/core' +import type { Body, Meta, State, Uppy, UppyFile } from '@uppy/core' import type { I18n } from '@uppy/utils/lib/Translator' -import type { Body, Meta } from '@uppy/utils/lib/UppyFile' import { h, type ComponentChild } from 'preact' interface Props { diff --git a/packages/@uppy/dashboard/src/components/FileItem/index.tsx b/packages/@uppy/dashboard/src/components/FileItem/index.tsx index ab284fd19b..86246fd474 100644 --- a/packages/@uppy/dashboard/src/components/FileItem/index.tsx +++ b/packages/@uppy/dashboard/src/components/FileItem/index.tsx @@ -2,15 +2,14 @@ import { h, Component, type ComponentChild } from 'preact' import classNames from 'classnames' import { shallowEqualObjects } from 'shallow-equal' -import type { UppyFile, Body, Meta } from '@uppy/utils/lib/UppyFile' +import type { UppyFile, Body, Meta, State } from '@uppy/core' import type { I18n } from '@uppy/utils/lib/Translator' import type Uppy from '@uppy/core' -import type { State } from '@uppy/core' -import FilePreviewAndLink from './FilePreviewAndLink/index.tsx' -import FileProgress from './FileProgress/index.tsx' -import FileInfo from './FileInfo/index.tsx' -import Buttons from './Buttons/index.tsx' -import type { DashboardState } from '../../Dashboard.ts' +import FilePreviewAndLink from './FilePreviewAndLink/index.jsx' +import FileProgress from './FileProgress/index.jsx' +import FileInfo from './FileInfo/index.jsx' +import Buttons from './Buttons/index.jsx' +import type { DashboardState } from '../../Dashboard.js' type Props = { file: UppyFile diff --git a/packages/@uppy/dashboard/src/components/FileList.tsx b/packages/@uppy/dashboard/src/components/FileList.tsx index 2f6c34bd49..8c8fdba147 100644 --- a/packages/@uppy/dashboard/src/components/FileList.tsx +++ b/packages/@uppy/dashboard/src/components/FileList.tsx @@ -3,11 +3,10 @@ import { useMemo } from 'preact/hooks' // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore untyped import VirtualList from '@uppy/utils/lib/VirtualList' -import type { UppyFile, Uppy, State } from '@uppy/core' +import type { UppyFile, Uppy, State, Body, Meta } from '@uppy/core' import type { I18n } from '@uppy/utils/lib/Translator' -import type { Body, Meta } from '@uppy/utils/lib/UppyFile' -import FileItem from './FileItem/index.tsx' -import type { DashboardState } from '../Dashboard.ts' +import FileItem from './FileItem/index.jsx' +import type { DashboardState } from '../Dashboard.js' type FileListProps = { id: string diff --git a/packages/@uppy/dashboard/src/components/FilePreview.tsx b/packages/@uppy/dashboard/src/components/FilePreview.tsx index 84043cc336..8efd15b0b8 100644 --- a/packages/@uppy/dashboard/src/components/FilePreview.tsx +++ b/packages/@uppy/dashboard/src/components/FilePreview.tsx @@ -1,5 +1,5 @@ import { h } from 'preact' -import getFileTypeIcon from '../utils/getFileTypeIcon.tsx' +import getFileTypeIcon from '../utils/getFileTypeIcon.jsx' type $TSFixMe = any diff --git a/packages/@uppy/dashboard/src/components/PickerPanelContent.tsx b/packages/@uppy/dashboard/src/components/PickerPanelContent.tsx index 7a795ec9f1..0944002a67 100644 --- a/packages/@uppy/dashboard/src/components/PickerPanelContent.tsx +++ b/packages/@uppy/dashboard/src/components/PickerPanelContent.tsx @@ -1,7 +1,7 @@ import { h } from 'preact' import classNames from 'classnames' import { useRef } from 'preact/hooks' -import ignoreEvent from '../utils/ignoreEvent.ts' +import ignoreEvent from '../utils/ignoreEvent.js' type $TSFixMe = any diff --git a/packages/@uppy/dashboard/src/components/PickerPanelTopBar.tsx b/packages/@uppy/dashboard/src/components/PickerPanelTopBar.tsx index f00d1fb7a0..02a19abf61 100644 --- a/packages/@uppy/dashboard/src/components/PickerPanelTopBar.tsx +++ b/packages/@uppy/dashboard/src/components/PickerPanelTopBar.tsx @@ -1,4 +1,4 @@ -import type { UppyFile } from '@uppy/utils/lib/UppyFile' +import type { UppyFile } from '@uppy/core' import { h } from 'preact' type $TSFixMe = any diff --git a/packages/@uppy/dashboard/src/index.test.ts b/packages/@uppy/dashboard/src/index.test.ts index 07693700f7..6a3b28fbb6 100644 --- a/packages/@uppy/dashboard/src/index.test.ts +++ b/packages/@uppy/dashboard/src/index.test.ts @@ -11,7 +11,7 @@ import WebcamPlugin from '@uppy/webcam' import Url from '@uppy/url' import resizeObserverPolyfill from 'resize-observer-polyfill' -import DashboardPlugin from './index.ts' +import DashboardPlugin from './index.js' type $TSFixMe = any diff --git a/packages/@uppy/dashboard/src/index.ts b/packages/@uppy/dashboard/src/index.ts index 9f28d9d36c..a0dda11bbd 100644 --- a/packages/@uppy/dashboard/src/index.ts +++ b/packages/@uppy/dashboard/src/index.ts @@ -1,2 +1,2 @@ -export { default } from './Dashboard.tsx' -export type { DashboardOptions } from './Dashboard.tsx' +export { default } from './Dashboard.jsx' +export type { DashboardOptions } from './Dashboard.jsx' diff --git a/packages/@uppy/dashboard/src/utils/copyToClipboard.test.ts b/packages/@uppy/dashboard/src/utils/copyToClipboard.test.ts index df8e9d9a5e..328ee49588 100644 --- a/packages/@uppy/dashboard/src/utils/copyToClipboard.test.ts +++ b/packages/@uppy/dashboard/src/utils/copyToClipboard.test.ts @@ -1,5 +1,5 @@ import { describe, it, expect } from 'vitest' -import copyToClipboard from './copyToClipboard.ts' +import copyToClipboard from './copyToClipboard.js' describe('copyToClipboard', () => { it.skip('should copy the specified text to the clipboard', () => { diff --git a/packages/@uppy/dashboard/src/utils/createSuperFocus.test.ts b/packages/@uppy/dashboard/src/utils/createSuperFocus.test.ts index 1230dbf471..f30f1bc22d 100644 --- a/packages/@uppy/dashboard/src/utils/createSuperFocus.test.ts +++ b/packages/@uppy/dashboard/src/utils/createSuperFocus.test.ts @@ -1,5 +1,5 @@ import { describe, it, expect } from 'vitest' -import createSuperFocus from './createSuperFocus.ts' +import createSuperFocus from './createSuperFocus.js' describe('createSuperFocus', () => { // superFocus.cancel() is used in dashboard diff --git a/packages/@uppy/dashboard/src/utils/createSuperFocus.ts b/packages/@uppy/dashboard/src/utils/createSuperFocus.ts index 9ea865748c..3ae7f08753 100644 --- a/packages/@uppy/dashboard/src/utils/createSuperFocus.ts +++ b/packages/@uppy/dashboard/src/utils/createSuperFocus.ts @@ -2,7 +2,7 @@ import debounce from 'lodash/debounce.js' // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore untyped import FOCUSABLE_ELEMENTS from '@uppy/utils/lib/FOCUSABLE_ELEMENTS' -import getActiveOverlayEl from './getActiveOverlayEl.ts' +import getActiveOverlayEl from './getActiveOverlayEl.js' type $TSFixMe = any diff --git a/packages/@uppy/dashboard/src/utils/trapFocus.ts b/packages/@uppy/dashboard/src/utils/trapFocus.ts index 84248498c0..bbe24aab8f 100644 --- a/packages/@uppy/dashboard/src/utils/trapFocus.ts +++ b/packages/@uppy/dashboard/src/utils/trapFocus.ts @@ -2,7 +2,7 @@ import toArray from '@uppy/utils/lib/toArray' // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore untyped import FOCUSABLE_ELEMENTS from '@uppy/utils/lib/FOCUSABLE_ELEMENTS' -import getActiveOverlayEl from './getActiveOverlayEl.ts' +import getActiveOverlayEl from './getActiveOverlayEl.js' type $TSFixMe = any diff --git a/packages/@uppy/dashboard/tsconfig.build.json b/packages/@uppy/dashboard/tsconfig.build.json index 5fde2c8b54..4e7253b386 100644 --- a/packages/@uppy/dashboard/tsconfig.build.json +++ b/packages/@uppy/dashboard/tsconfig.build.json @@ -2,25 +2,6 @@ "extends": "../../../tsconfig.shared", "compilerOptions": { "outDir": "./lib", - "paths": { - "@uppy/informer": ["../informer/src/index.js"], - "@uppy/informer/lib/*": ["../informer/src/*"], - "@uppy/provider-views": ["../provider-views/src/index.js"], - "@uppy/provider-views/lib/*": ["../provider-views/src/*"], - "@uppy/status-bar": ["../status-bar/src/index.js"], - "@uppy/status-bar/lib/*": ["../status-bar/src/*"], - "@uppy/thumbnail-generator": ["../thumbnail-generator/src/index.js"], - "@uppy/thumbnail-generator/lib/*": ["../thumbnail-generator/src/*"], - "@uppy/utils/lib/*": ["../utils/src/*"], - "@uppy/core": ["../core/src/index.js"], - "@uppy/core/lib/*": ["../core/src/*"], - "@uppy/google-drive": ["../google-drive/src/index.js"], - "@uppy/google-drive/lib/*": ["../google-drive/src/*"], - "@uppy/url": ["../url/src/index.js"], - "@uppy/url/lib/*": ["../url/src/*"], - "@uppy/webcam": ["../webcam/src/index.js"], - "@uppy/webcam/lib/*": ["../webcam/src/*"] - }, "resolveJsonModule": false, "rootDir": "./src" }, diff --git a/packages/@uppy/dashboard/tsconfig.json b/packages/@uppy/dashboard/tsconfig.json index 46cc2296b0..22f32fe820 100644 --- a/packages/@uppy/dashboard/tsconfig.json +++ b/packages/@uppy/dashboard/tsconfig.json @@ -3,25 +3,6 @@ "compilerOptions": { "emitDeclarationOnly": false, "noEmit": true, - "paths": { - "@uppy/informer": ["../informer/src/index.js"], - "@uppy/informer/lib/*": ["../informer/src/*"], - "@uppy/provider-views": ["../provider-views/src/index.js"], - "@uppy/provider-views/lib/*": ["../provider-views/src/*"], - "@uppy/status-bar": ["../status-bar/src/index.js"], - "@uppy/status-bar/lib/*": ["../status-bar/src/*"], - "@uppy/thumbnail-generator": ["../thumbnail-generator/src/index.js"], - "@uppy/thumbnail-generator/lib/*": ["../thumbnail-generator/src/*"], - "@uppy/utils/lib/*": ["../utils/src/*"], - "@uppy/core": ["../core/src/index.js"], - "@uppy/core/lib/*": ["../core/src/*"], - "@uppy/google-drive": ["../google-drive/src/index.js"], - "@uppy/google-drive/lib/*": ["../google-drive/src/*"], - "@uppy/url": ["../url/src/index.js"], - "@uppy/url/lib/*": ["../url/src/*"], - "@uppy/webcam": ["../webcam/src/index.js"], - "@uppy/webcam/lib/*": ["../webcam/src/*"], - }, }, "include": ["./package.json", "./src/**/*.*"], "references": [ diff --git a/packages/@uppy/drag-drop/CHANGELOG.md b/packages/@uppy/drag-drop/CHANGELOG.md index 30e2bdd531..d9cafc800d 100644 --- a/packages/@uppy/drag-drop/CHANGELOG.md +++ b/packages/@uppy/drag-drop/CHANGELOG.md @@ -1,5 +1,12 @@ # @uppy/drag-drop +## 4.1.0 + +Released: 2025-01-06 +Included in: Uppy v4.11.0 + +- @uppy/angular,@uppy/audio,@uppy/aws-s3,@uppy/box,@uppy/companion-client,@uppy/compressor,@uppy/core,@uppy/dashboard,@uppy/drag-drop,@uppy/drop-target,@uppy/dropbox,@uppy/facebook,@uppy/file-input,@uppy/form,@uppy/golden-retriever,@uppy/google-drive-picker,@uppy/google-drive,@uppy/google-photos-picker,@uppy/google-photos,@uppy/image-editor,@uppy/informer,@uppy/instagram,@uppy/locales,@uppy/onedrive,@uppy/progress-bar,@uppy/provider-views,@uppy/react,@uppy/remote-sources,@uppy/screen-capture,@uppy/status-bar,@uppy/thumbnail-generator,@uppy/transloadit,@uppy/tus,@uppy/unsplash,@uppy/url,@uppy/vue,@uppy/webcam,@uppy/webdav,@uppy/xhr-upload,@uppy/zoom: Remove "paths" from all tsconfig's (Merlijn Vos / #5572) + ## 4.0.5 Released: 2024-12-05 diff --git a/packages/@uppy/drag-drop/package.json b/packages/@uppy/drag-drop/package.json index 68bb724c40..890b8e25bd 100644 --- a/packages/@uppy/drag-drop/package.json +++ b/packages/@uppy/drag-drop/package.json @@ -1,7 +1,7 @@ { "name": "@uppy/drag-drop", "description": "Droppable zone UI for Uppy. Drag and drop files into it to upload.", - "version": "4.0.5", + "version": "4.1.1", "license": "MIT", "main": "lib/index.js", "style": "dist/style.min.css", diff --git a/packages/@uppy/drag-drop/src/DragDrop.tsx b/packages/@uppy/drag-drop/src/DragDrop.tsx index cfdc95b7ae..2b2c9ab6b0 100644 --- a/packages/@uppy/drag-drop/src/DragDrop.tsx +++ b/packages/@uppy/drag-drop/src/DragDrop.tsx @@ -1,7 +1,11 @@ -import { UIPlugin, type Uppy } from '@uppy/core' -import type { DefinePluginOpts } from '@uppy/core/lib/BasePlugin.js' -import type { UIPluginOptions } from '@uppy/core/lib/UIPlugin.js' -import type { Body, Meta } from '@uppy/utils/lib/UppyFile' +import { UIPlugin } from '@uppy/core' +import type { + UIPluginOptions, + Uppy, + DefinePluginOpts, + Body, + Meta, +} from '@uppy/core' import type { TargetedEvent } from 'preact/compat' import toArray from '@uppy/utils/lib/toArray' import isDragDropSupported from '@uppy/utils/lib/isDragDropSupported' @@ -11,7 +15,7 @@ import { h, type ComponentChild } from 'preact' // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore We don't want TS to generate types for the package.json import packageJson from '../package.json' -import locale from './locale.ts' +import locale from './locale.js' export interface DragDropOptions extends UIPluginOptions { inputName?: string diff --git a/packages/@uppy/drag-drop/src/index.ts b/packages/@uppy/drag-drop/src/index.ts index ff2edbdd5d..f2e89e2414 100644 --- a/packages/@uppy/drag-drop/src/index.ts +++ b/packages/@uppy/drag-drop/src/index.ts @@ -1,2 +1,2 @@ -export { default } from './DragDrop.tsx' -export type { DragDropOptions } from './DragDrop.tsx' +export { default } from './DragDrop.jsx' +export type { DragDropOptions } from './DragDrop.jsx' diff --git a/packages/@uppy/drag-drop/tsconfig.build.json b/packages/@uppy/drag-drop/tsconfig.build.json index 8d9ed22fa5..bbf30b5b43 100644 --- a/packages/@uppy/drag-drop/tsconfig.build.json +++ b/packages/@uppy/drag-drop/tsconfig.build.json @@ -2,11 +2,6 @@ "extends": "../../../tsconfig.shared", "compilerOptions": { "outDir": "./lib", - "paths": { - "@uppy/utils/lib/*": ["../utils/src/*"], - "@uppy/core": ["../core/src/index.js"], - "@uppy/core/lib/*": ["../core/src/*"] - }, "resolveJsonModule": false, "rootDir": "./src" }, diff --git a/packages/@uppy/drag-drop/tsconfig.json b/packages/@uppy/drag-drop/tsconfig.json index a76c3b714a..47ece599c6 100644 --- a/packages/@uppy/drag-drop/tsconfig.json +++ b/packages/@uppy/drag-drop/tsconfig.json @@ -3,11 +3,6 @@ "compilerOptions": { "emitDeclarationOnly": false, "noEmit": true, - "paths": { - "@uppy/utils/lib/*": ["../utils/src/*"], - "@uppy/core": ["../core/src/index.js"], - "@uppy/core/lib/*": ["../core/src/*"], - }, }, "include": ["./package.json", "./src/**/*.*"], "references": [ diff --git a/packages/@uppy/drop-target/CHANGELOG.md b/packages/@uppy/drop-target/CHANGELOG.md index 5ba83e80fe..dcac4d86b4 100644 --- a/packages/@uppy/drop-target/CHANGELOG.md +++ b/packages/@uppy/drop-target/CHANGELOG.md @@ -1,5 +1,12 @@ # @uppy/drop-target +## 3.1.0 + +Released: 2025-01-06 +Included in: Uppy v4.11.0 + +- @uppy/angular,@uppy/audio,@uppy/aws-s3,@uppy/box,@uppy/companion-client,@uppy/compressor,@uppy/core,@uppy/dashboard,@uppy/drag-drop,@uppy/drop-target,@uppy/dropbox,@uppy/facebook,@uppy/file-input,@uppy/form,@uppy/golden-retriever,@uppy/google-drive-picker,@uppy/google-drive,@uppy/google-photos-picker,@uppy/google-photos,@uppy/image-editor,@uppy/informer,@uppy/instagram,@uppy/locales,@uppy/onedrive,@uppy/progress-bar,@uppy/provider-views,@uppy/react,@uppy/remote-sources,@uppy/screen-capture,@uppy/status-bar,@uppy/thumbnail-generator,@uppy/transloadit,@uppy/tus,@uppy/unsplash,@uppy/url,@uppy/vue,@uppy/webcam,@uppy/webdav,@uppy/xhr-upload,@uppy/zoom: Remove "paths" from all tsconfig's (Merlijn Vos / #5572) + ## 3.0.2 Released: 2024-12-05 diff --git a/packages/@uppy/drop-target/package.json b/packages/@uppy/drop-target/package.json index b9780cdd1c..d96c149470 100644 --- a/packages/@uppy/drop-target/package.json +++ b/packages/@uppy/drop-target/package.json @@ -1,7 +1,7 @@ { "name": "@uppy/drop-target", "description": "Lets your users drag and drop files on a DOM element", - "version": "3.0.2", + "version": "3.1.1", "license": "MIT", "main": "lib/index.js", "type": "module", diff --git a/packages/@uppy/drop-target/src/index.ts b/packages/@uppy/drop-target/src/index.ts index 6f3067fb7a..b66e1ac512 100644 --- a/packages/@uppy/drop-target/src/index.ts +++ b/packages/@uppy/drop-target/src/index.ts @@ -1,7 +1,5 @@ -import type { Body, Meta } from '@uppy/utils/lib/UppyFile' -import type { Uppy } from '@uppy/core/lib/Uppy.js' -import type { DefinePluginOpts, PluginOpts } from '@uppy/core/lib/BasePlugin.js' -import BasePlugin from '@uppy/core/lib/BasePlugin.js' +import type { Uppy, Body, Meta, DefinePluginOpts, PluginOpts } from '@uppy/core' +import { BasePlugin } from '@uppy/core' import getDroppedFiles from '@uppy/utils/lib/getDroppedFiles' import toArray from '@uppy/utils/lib/toArray' // eslint-disable-next-line @typescript-eslint/ban-ts-comment diff --git a/packages/@uppy/drop-target/tsconfig.build.json b/packages/@uppy/drop-target/tsconfig.build.json index 8d9ed22fa5..bbf30b5b43 100644 --- a/packages/@uppy/drop-target/tsconfig.build.json +++ b/packages/@uppy/drop-target/tsconfig.build.json @@ -2,11 +2,6 @@ "extends": "../../../tsconfig.shared", "compilerOptions": { "outDir": "./lib", - "paths": { - "@uppy/utils/lib/*": ["../utils/src/*"], - "@uppy/core": ["../core/src/index.js"], - "@uppy/core/lib/*": ["../core/src/*"] - }, "resolveJsonModule": false, "rootDir": "./src" }, diff --git a/packages/@uppy/drop-target/tsconfig.json b/packages/@uppy/drop-target/tsconfig.json index a76c3b714a..47ece599c6 100644 --- a/packages/@uppy/drop-target/tsconfig.json +++ b/packages/@uppy/drop-target/tsconfig.json @@ -3,11 +3,6 @@ "compilerOptions": { "emitDeclarationOnly": false, "noEmit": true, - "paths": { - "@uppy/utils/lib/*": ["../utils/src/*"], - "@uppy/core": ["../core/src/index.js"], - "@uppy/core/lib/*": ["../core/src/*"], - }, }, "include": ["./package.json", "./src/**/*.*"], "references": [ diff --git a/packages/@uppy/dropbox/CHANGELOG.md b/packages/@uppy/dropbox/CHANGELOG.md index e74ea33f67..d915eec740 100644 --- a/packages/@uppy/dropbox/CHANGELOG.md +++ b/packages/@uppy/dropbox/CHANGELOG.md @@ -1,5 +1,12 @@ # @uppy/dropbox +## 4.2.0 + +Released: 2025-01-06 +Included in: Uppy v4.11.0 + +- @uppy/angular,@uppy/audio,@uppy/aws-s3,@uppy/box,@uppy/companion-client,@uppy/compressor,@uppy/core,@uppy/dashboard,@uppy/drag-drop,@uppy/drop-target,@uppy/dropbox,@uppy/facebook,@uppy/file-input,@uppy/form,@uppy/golden-retriever,@uppy/google-drive-picker,@uppy/google-drive,@uppy/google-photos-picker,@uppy/google-photos,@uppy/image-editor,@uppy/informer,@uppy/instagram,@uppy/locales,@uppy/onedrive,@uppy/progress-bar,@uppy/provider-views,@uppy/react,@uppy/remote-sources,@uppy/screen-capture,@uppy/status-bar,@uppy/thumbnail-generator,@uppy/transloadit,@uppy/tus,@uppy/unsplash,@uppy/url,@uppy/vue,@uppy/webcam,@uppy/webdav,@uppy/xhr-upload,@uppy/zoom: Remove "paths" from all tsconfig's (Merlijn Vos / #5572) + ## 4.1.2 Released: 2024-12-05 diff --git a/packages/@uppy/dropbox/package.json b/packages/@uppy/dropbox/package.json index aa9bb34f42..90d01bab27 100644 --- a/packages/@uppy/dropbox/package.json +++ b/packages/@uppy/dropbox/package.json @@ -1,7 +1,7 @@ { "name": "@uppy/dropbox", "description": "Import files from Dropbox, into Uppy.", - "version": "4.1.2", + "version": "4.2.1", "license": "MIT", "main": "lib/index.js", "type": "module", diff --git a/packages/@uppy/dropbox/src/Dropbox.tsx b/packages/@uppy/dropbox/src/Dropbox.tsx index e94c9000c5..f57a47b931 100644 --- a/packages/@uppy/dropbox/src/Dropbox.tsx +++ b/packages/@uppy/dropbox/src/Dropbox.tsx @@ -8,13 +8,15 @@ import { UIPlugin, Uppy } from '@uppy/core' import { ProviderViews } from '@uppy/provider-views' import { h, type ComponentChild } from 'preact' -import type { UppyFile, Body, Meta } from '@uppy/utils/lib/UppyFile' import type { + UppyFile, + Body, + Meta, AsyncStore, UnknownProviderPlugin, UnknownProviderPluginState, -} from '@uppy/core/lib/Uppy.js' -import locale from './locale.ts' +} from '@uppy/core' +import locale from './locale.js' // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore We don't want TS to generate types for the package.json import packageJson from '../package.json' diff --git a/packages/@uppy/dropbox/src/index.ts b/packages/@uppy/dropbox/src/index.ts index cabbf5f31f..563c0047a4 100644 --- a/packages/@uppy/dropbox/src/index.ts +++ b/packages/@uppy/dropbox/src/index.ts @@ -1,2 +1,2 @@ -export { default } from './Dropbox.tsx' -export type { DropboxOptions } from './Dropbox.tsx' +export { default } from './Dropbox.jsx' +export type { DropboxOptions } from './Dropbox.jsx' diff --git a/packages/@uppy/dropbox/tsconfig.build.json b/packages/@uppy/dropbox/tsconfig.build.json index 0b2f94bc10..82e187bca0 100644 --- a/packages/@uppy/dropbox/tsconfig.build.json +++ b/packages/@uppy/dropbox/tsconfig.build.json @@ -2,15 +2,6 @@ "extends": "../../../tsconfig.shared", "compilerOptions": { "outDir": "./lib", - "paths": { - "@uppy/companion-client": ["../companion-client/src/index.js"], - "@uppy/companion-client/lib/*": ["../companion-client/src/*"], - "@uppy/provider-views": ["../provider-views/src/index.js"], - "@uppy/provider-views/lib/*": ["../provider-views/src/*"], - "@uppy/utils/lib/*": ["../utils/src/*"], - "@uppy/core": ["../core/src/index.js"], - "@uppy/core/lib/*": ["../core/src/*"] - }, "resolveJsonModule": false, "rootDir": "./src" }, diff --git a/packages/@uppy/dropbox/tsconfig.json b/packages/@uppy/dropbox/tsconfig.json index e5220fb5ab..b90847da71 100644 --- a/packages/@uppy/dropbox/tsconfig.json +++ b/packages/@uppy/dropbox/tsconfig.json @@ -3,15 +3,6 @@ "compilerOptions": { "emitDeclarationOnly": false, "noEmit": true, - "paths": { - "@uppy/companion-client": ["../companion-client/src/index.js"], - "@uppy/companion-client/lib/*": ["../companion-client/src/*"], - "@uppy/provider-views": ["../provider-views/src/index.js"], - "@uppy/provider-views/lib/*": ["../provider-views/src/*"], - "@uppy/utils/lib/*": ["../utils/src/*"], - "@uppy/core": ["../core/src/index.js"], - "@uppy/core/lib/*": ["../core/src/*"], - }, }, "include": ["./package.json", "./src/**/*.*"], "references": [ diff --git a/packages/@uppy/facebook/CHANGELOG.md b/packages/@uppy/facebook/CHANGELOG.md index 55befd3913..b883156bc3 100644 --- a/packages/@uppy/facebook/CHANGELOG.md +++ b/packages/@uppy/facebook/CHANGELOG.md @@ -1,5 +1,12 @@ # @uppy/facebook +## 4.2.0 + +Released: 2025-01-06 +Included in: Uppy v4.11.0 + +- @uppy/angular,@uppy/audio,@uppy/aws-s3,@uppy/box,@uppy/companion-client,@uppy/compressor,@uppy/core,@uppy/dashboard,@uppy/drag-drop,@uppy/drop-target,@uppy/dropbox,@uppy/facebook,@uppy/file-input,@uppy/form,@uppy/golden-retriever,@uppy/google-drive-picker,@uppy/google-drive,@uppy/google-photos-picker,@uppy/google-photos,@uppy/image-editor,@uppy/informer,@uppy/instagram,@uppy/locales,@uppy/onedrive,@uppy/progress-bar,@uppy/provider-views,@uppy/react,@uppy/remote-sources,@uppy/screen-capture,@uppy/status-bar,@uppy/thumbnail-generator,@uppy/transloadit,@uppy/tus,@uppy/unsplash,@uppy/url,@uppy/vue,@uppy/webcam,@uppy/webdav,@uppy/xhr-upload,@uppy/zoom: Remove "paths" from all tsconfig's (Merlijn Vos / #5572) + ## 4.1.2 Released: 2024-12-05 diff --git a/packages/@uppy/facebook/package.json b/packages/@uppy/facebook/package.json index 57e323513a..0dabcfc5a1 100644 --- a/packages/@uppy/facebook/package.json +++ b/packages/@uppy/facebook/package.json @@ -1,7 +1,7 @@ { "name": "@uppy/facebook", "description": "Import files from Facebook, into Uppy.", - "version": "4.1.2", + "version": "4.2.1", "license": "MIT", "main": "lib/index.js", "type": "module", diff --git a/packages/@uppy/facebook/src/Facebook.tsx b/packages/@uppy/facebook/src/Facebook.tsx index 41f388e825..3b47327916 100644 --- a/packages/@uppy/facebook/src/Facebook.tsx +++ b/packages/@uppy/facebook/src/Facebook.tsx @@ -8,13 +8,15 @@ import { UIPlugin, Uppy } from '@uppy/core' import { ProviderViews } from '@uppy/provider-views' import { h, type ComponentChild } from 'preact' -import type { UppyFile, Body, Meta } from '@uppy/utils/lib/UppyFile' import type { + UppyFile, + Body, + Meta, AsyncStore, UnknownProviderPlugin, UnknownProviderPluginState, -} from '@uppy/core/lib/Uppy.js' -import locale from './locale.ts' +} from '@uppy/core' +import locale from './locale.js' // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore We don't want TS to generate types for the package.json import packageJson from '../package.json' diff --git a/packages/@uppy/facebook/src/index.ts b/packages/@uppy/facebook/src/index.ts index 0d5614e9ab..4984d641d2 100644 --- a/packages/@uppy/facebook/src/index.ts +++ b/packages/@uppy/facebook/src/index.ts @@ -1,2 +1,2 @@ -export { default } from './Facebook.tsx' -export type { FacebookOptions } from './Facebook.tsx' +export { default } from './Facebook.jsx' +export type { FacebookOptions } from './Facebook.jsx' diff --git a/packages/@uppy/facebook/tsconfig.build.json b/packages/@uppy/facebook/tsconfig.build.json index 0b2f94bc10..82e187bca0 100644 --- a/packages/@uppy/facebook/tsconfig.build.json +++ b/packages/@uppy/facebook/tsconfig.build.json @@ -2,15 +2,6 @@ "extends": "../../../tsconfig.shared", "compilerOptions": { "outDir": "./lib", - "paths": { - "@uppy/companion-client": ["../companion-client/src/index.js"], - "@uppy/companion-client/lib/*": ["../companion-client/src/*"], - "@uppy/provider-views": ["../provider-views/src/index.js"], - "@uppy/provider-views/lib/*": ["../provider-views/src/*"], - "@uppy/utils/lib/*": ["../utils/src/*"], - "@uppy/core": ["../core/src/index.js"], - "@uppy/core/lib/*": ["../core/src/*"] - }, "resolveJsonModule": false, "rootDir": "./src" }, diff --git a/packages/@uppy/facebook/tsconfig.json b/packages/@uppy/facebook/tsconfig.json index e5220fb5ab..b90847da71 100644 --- a/packages/@uppy/facebook/tsconfig.json +++ b/packages/@uppy/facebook/tsconfig.json @@ -3,15 +3,6 @@ "compilerOptions": { "emitDeclarationOnly": false, "noEmit": true, - "paths": { - "@uppy/companion-client": ["../companion-client/src/index.js"], - "@uppy/companion-client/lib/*": ["../companion-client/src/*"], - "@uppy/provider-views": ["../provider-views/src/index.js"], - "@uppy/provider-views/lib/*": ["../provider-views/src/*"], - "@uppy/utils/lib/*": ["../utils/src/*"], - "@uppy/core": ["../core/src/index.js"], - "@uppy/core/lib/*": ["../core/src/*"], - }, }, "include": ["./package.json", "./src/**/*.*"], "references": [ diff --git a/packages/@uppy/file-input/CHANGELOG.md b/packages/@uppy/file-input/CHANGELOG.md index 8f7086f90d..e5af1ea9ca 100644 --- a/packages/@uppy/file-input/CHANGELOG.md +++ b/packages/@uppy/file-input/CHANGELOG.md @@ -1,5 +1,12 @@ # @uppy/file-input +## 4.1.0 + +Released: 2025-01-06 +Included in: Uppy v4.11.0 + +- @uppy/angular,@uppy/audio,@uppy/aws-s3,@uppy/box,@uppy/companion-client,@uppy/compressor,@uppy/core,@uppy/dashboard,@uppy/drag-drop,@uppy/drop-target,@uppy/dropbox,@uppy/facebook,@uppy/file-input,@uppy/form,@uppy/golden-retriever,@uppy/google-drive-picker,@uppy/google-drive,@uppy/google-photos-picker,@uppy/google-photos,@uppy/image-editor,@uppy/informer,@uppy/instagram,@uppy/locales,@uppy/onedrive,@uppy/progress-bar,@uppy/provider-views,@uppy/react,@uppy/remote-sources,@uppy/screen-capture,@uppy/status-bar,@uppy/thumbnail-generator,@uppy/transloadit,@uppy/tus,@uppy/unsplash,@uppy/url,@uppy/vue,@uppy/webcam,@uppy/webdav,@uppy/xhr-upload,@uppy/zoom: Remove "paths" from all tsconfig's (Merlijn Vos / #5572) + ## 4.0.4 Released: 2024-12-05 diff --git a/packages/@uppy/file-input/package.json b/packages/@uppy/file-input/package.json index 441f91859e..4357a6d432 100644 --- a/packages/@uppy/file-input/package.json +++ b/packages/@uppy/file-input/package.json @@ -1,7 +1,7 @@ { "name": "@uppy/file-input", "description": "Simple UI of a file input button that works with Uppy right out of the box", - "version": "4.0.4", + "version": "4.1.1", "license": "MIT", "main": "lib/index.js", "style": "dist/style.min.css", diff --git a/packages/@uppy/file-input/src/FileInput.tsx b/packages/@uppy/file-input/src/FileInput.tsx index e952fd6ba2..e36987da4b 100644 --- a/packages/@uppy/file-input/src/FileInput.tsx +++ b/packages/@uppy/file-input/src/FileInput.tsx @@ -1,14 +1,19 @@ import { h, type ComponentChild } from 'preact' -import { UIPlugin, Uppy, type UIPluginOptions } from '@uppy/core' +import { UIPlugin } from '@uppy/core' +import type { + Uppy, + UIPluginOptions, + Body, + Meta, + DefinePluginOpts, +} from '@uppy/core' import toArray from '@uppy/utils/lib/toArray' -import type { Body, Meta } from '@uppy/utils/lib/UppyFile' -import type { DefinePluginOpts } from '@uppy/core/lib/BasePlugin.js' import type { TargetedEvent } from 'preact/compat' // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore We don't want TS to generate types for the package.json import packageJson from '../package.json' -import locale from './locale.ts' +import locale from './locale.js' export interface FileInputOptions extends UIPluginOptions { pretty?: boolean diff --git a/packages/@uppy/file-input/src/index.ts b/packages/@uppy/file-input/src/index.ts index 58b0f100a9..9dea6a7160 100644 --- a/packages/@uppy/file-input/src/index.ts +++ b/packages/@uppy/file-input/src/index.ts @@ -1,2 +1,2 @@ -export { default } from './FileInput.tsx' -export type { FileInputOptions } from './FileInput.tsx' +export { default } from './FileInput.jsx' +export type { FileInputOptions } from './FileInput.jsx' diff --git a/packages/@uppy/file-input/tsconfig.build.json b/packages/@uppy/file-input/tsconfig.build.json index 8d9ed22fa5..bbf30b5b43 100644 --- a/packages/@uppy/file-input/tsconfig.build.json +++ b/packages/@uppy/file-input/tsconfig.build.json @@ -2,11 +2,6 @@ "extends": "../../../tsconfig.shared", "compilerOptions": { "outDir": "./lib", - "paths": { - "@uppy/utils/lib/*": ["../utils/src/*"], - "@uppy/core": ["../core/src/index.js"], - "@uppy/core/lib/*": ["../core/src/*"] - }, "resolveJsonModule": false, "rootDir": "./src" }, diff --git a/packages/@uppy/file-input/tsconfig.json b/packages/@uppy/file-input/tsconfig.json index a76c3b714a..47ece599c6 100644 --- a/packages/@uppy/file-input/tsconfig.json +++ b/packages/@uppy/file-input/tsconfig.json @@ -3,11 +3,6 @@ "compilerOptions": { "emitDeclarationOnly": false, "noEmit": true, - "paths": { - "@uppy/utils/lib/*": ["../utils/src/*"], - "@uppy/core": ["../core/src/index.js"], - "@uppy/core/lib/*": ["../core/src/*"], - }, }, "include": ["./package.json", "./src/**/*.*"], "references": [ diff --git a/packages/@uppy/form/CHANGELOG.md b/packages/@uppy/form/CHANGELOG.md index 9c73349cc5..2d2c7614a0 100644 --- a/packages/@uppy/form/CHANGELOG.md +++ b/packages/@uppy/form/CHANGELOG.md @@ -1,5 +1,12 @@ # @uppy/form +## 4.1.0 + +Released: 2025-01-06 +Included in: Uppy v4.11.0 + +- @uppy/angular,@uppy/audio,@uppy/aws-s3,@uppy/box,@uppy/companion-client,@uppy/compressor,@uppy/core,@uppy/dashboard,@uppy/drag-drop,@uppy/drop-target,@uppy/dropbox,@uppy/facebook,@uppy/file-input,@uppy/form,@uppy/golden-retriever,@uppy/google-drive-picker,@uppy/google-drive,@uppy/google-photos-picker,@uppy/google-photos,@uppy/image-editor,@uppy/informer,@uppy/instagram,@uppy/locales,@uppy/onedrive,@uppy/progress-bar,@uppy/provider-views,@uppy/react,@uppy/remote-sources,@uppy/screen-capture,@uppy/status-bar,@uppy/thumbnail-generator,@uppy/transloadit,@uppy/tus,@uppy/unsplash,@uppy/url,@uppy/vue,@uppy/webcam,@uppy/webdav,@uppy/xhr-upload,@uppy/zoom: Remove "paths" from all tsconfig's (Merlijn Vos / #5572) + ## 4.0.2 Released: 2024-12-05 diff --git a/packages/@uppy/form/package.json b/packages/@uppy/form/package.json index 94beedf57a..82ff5e8fcf 100644 --- a/packages/@uppy/form/package.json +++ b/packages/@uppy/form/package.json @@ -1,7 +1,7 @@ { "name": "@uppy/form", "description": "Connect Uppy to an existing HTML
.", - "version": "4.0.2", + "version": "4.1.1", "license": "MIT", "main": "lib/index.js", "type": "module", diff --git a/packages/@uppy/form/src/index.ts b/packages/@uppy/form/src/index.ts index 3c541866e2..6d4cb0541c 100644 --- a/packages/@uppy/form/src/index.ts +++ b/packages/@uppy/form/src/index.ts @@ -1,4 +1,12 @@ -import BasePlugin, { type DefinePluginOpts } from '@uppy/core/lib/BasePlugin.js' +import { BasePlugin } from '@uppy/core' +import type { + DefinePluginOpts, + UIPluginOptions, + Uppy, + UppyEventMap, + Body, + Meta, +} from '@uppy/core' import findDOMElement from '@uppy/utils/lib/findDOMElement' import toArray from '@uppy/utils/lib/toArray' @@ -6,8 +14,6 @@ import toArray from '@uppy/utils/lib/toArray' // @ts-ignore untyped import getFormData from 'get-form-data' -import type { UIPluginOptions, Uppy, UppyEventMap } from '@uppy/core' -import type { Body, Meta } from '@uppy/utils/lib/UppyFile' // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore We don't want TS to generate types for the package.json import packageJson from '../package.json' diff --git a/packages/@uppy/form/tsconfig.build.json b/packages/@uppy/form/tsconfig.build.json index 8d9ed22fa5..bbf30b5b43 100644 --- a/packages/@uppy/form/tsconfig.build.json +++ b/packages/@uppy/form/tsconfig.build.json @@ -2,11 +2,6 @@ "extends": "../../../tsconfig.shared", "compilerOptions": { "outDir": "./lib", - "paths": { - "@uppy/utils/lib/*": ["../utils/src/*"], - "@uppy/core": ["../core/src/index.js"], - "@uppy/core/lib/*": ["../core/src/*"] - }, "resolveJsonModule": false, "rootDir": "./src" }, diff --git a/packages/@uppy/form/tsconfig.json b/packages/@uppy/form/tsconfig.json index a76c3b714a..47ece599c6 100644 --- a/packages/@uppy/form/tsconfig.json +++ b/packages/@uppy/form/tsconfig.json @@ -3,11 +3,6 @@ "compilerOptions": { "emitDeclarationOnly": false, "noEmit": true, - "paths": { - "@uppy/utils/lib/*": ["../utils/src/*"], - "@uppy/core": ["../core/src/index.js"], - "@uppy/core/lib/*": ["../core/src/*"], - }, }, "include": ["./package.json", "./src/**/*.*"], "references": [ diff --git a/packages/@uppy/golden-retriever/CHANGELOG.md b/packages/@uppy/golden-retriever/CHANGELOG.md index ef706f57bb..a5a23295e7 100644 --- a/packages/@uppy/golden-retriever/CHANGELOG.md +++ b/packages/@uppy/golden-retriever/CHANGELOG.md @@ -1,5 +1,12 @@ # @uppy/golden-retriever +## 4.1.0 + +Released: 2025-01-06 +Included in: Uppy v4.11.0 + +- @uppy/angular,@uppy/audio,@uppy/aws-s3,@uppy/box,@uppy/companion-client,@uppy/compressor,@uppy/core,@uppy/dashboard,@uppy/drag-drop,@uppy/drop-target,@uppy/dropbox,@uppy/facebook,@uppy/file-input,@uppy/form,@uppy/golden-retriever,@uppy/google-drive-picker,@uppy/google-drive,@uppy/google-photos-picker,@uppy/google-photos,@uppy/image-editor,@uppy/informer,@uppy/instagram,@uppy/locales,@uppy/onedrive,@uppy/progress-bar,@uppy/provider-views,@uppy/react,@uppy/remote-sources,@uppy/screen-capture,@uppy/status-bar,@uppy/thumbnail-generator,@uppy/transloadit,@uppy/tus,@uppy/unsplash,@uppy/url,@uppy/vue,@uppy/webcam,@uppy/webdav,@uppy/xhr-upload,@uppy/zoom: Remove "paths" from all tsconfig's (Merlijn Vos / #5572) + ## 4.0.2 Released: 2024-12-05 diff --git a/packages/@uppy/golden-retriever/package.json b/packages/@uppy/golden-retriever/package.json index 07764a7e99..3f615f8ed6 100644 --- a/packages/@uppy/golden-retriever/package.json +++ b/packages/@uppy/golden-retriever/package.json @@ -1,7 +1,7 @@ { "name": "@uppy/golden-retriever", "description": "The GoldenRetriever Uppy plugin saves selected files in browser cache to seamlessly resume uploding after browser crash or accidentally closed tab", - "version": "4.0.2", + "version": "4.1.1", "license": "MIT", "main": "lib/index.js", "type": "module", diff --git a/packages/@uppy/golden-retriever/src/MetaDataStore.ts b/packages/@uppy/golden-retriever/src/MetaDataStore.ts index 5435964e45..2f80084c0b 100644 --- a/packages/@uppy/golden-retriever/src/MetaDataStore.ts +++ b/packages/@uppy/golden-retriever/src/MetaDataStore.ts @@ -1,5 +1,4 @@ -import type { State as UppyState } from '@uppy/core' -import type { Meta, Body } from '@uppy/utils/lib/UppyFile' +import type { State as UppyState, Meta, Body } from '@uppy/core' export type StoredState = { expires: number diff --git a/packages/@uppy/golden-retriever/src/cleanup.ts b/packages/@uppy/golden-retriever/src/cleanup.ts index fc17e2f962..3c3b101ff1 100644 --- a/packages/@uppy/golden-retriever/src/cleanup.ts +++ b/packages/@uppy/golden-retriever/src/cleanup.ts @@ -1,5 +1,5 @@ -import IndexedDBStore from './IndexedDBStore.ts' -import MetaDataStore from './MetaDataStore.ts' +import IndexedDBStore from './IndexedDBStore.js' +import MetaDataStore from './MetaDataStore.js' /** * Clean old blobs without needing to import all of Uppy. diff --git a/packages/@uppy/golden-retriever/src/index.ts b/packages/@uppy/golden-retriever/src/index.ts index acea945de5..cd279cd199 100644 --- a/packages/@uppy/golden-retriever/src/index.ts +++ b/packages/@uppy/golden-retriever/src/index.ts @@ -1,14 +1,19 @@ import throttle from 'lodash/throttle.js' -import BasePlugin from '@uppy/core/lib/BasePlugin.js' -import type { PluginOpts, DefinePluginOpts } from '@uppy/core/lib/BasePlugin.js' -import type { Body, Meta, UppyFile } from '@uppy/utils/lib/UppyFile' -import type Uppy from '@uppy/core' -import type { UploadResult } from '@uppy/core' +import { BasePlugin } from '@uppy/core' +import type { + Body, + Meta, + UppyFile, + Uppy, + UploadResult, + PluginOpts, + DefinePluginOpts, +} from '@uppy/core' import ServiceWorkerStore, { type ServiceWorkerStoredFile, -} from './ServiceWorkerStore.ts' -import IndexedDBStore from './IndexedDBStore.ts' -import MetaDataStore from './MetaDataStore.ts' +} from './ServiceWorkerStore.js' +import IndexedDBStore from './IndexedDBStore.js' +import MetaDataStore from './MetaDataStore.js' // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore We don't want TS to generate types for the package.json diff --git a/packages/@uppy/golden-retriever/tsconfig.build.json b/packages/@uppy/golden-retriever/tsconfig.build.json index 8d9ed22fa5..bbf30b5b43 100644 --- a/packages/@uppy/golden-retriever/tsconfig.build.json +++ b/packages/@uppy/golden-retriever/tsconfig.build.json @@ -2,11 +2,6 @@ "extends": "../../../tsconfig.shared", "compilerOptions": { "outDir": "./lib", - "paths": { - "@uppy/utils/lib/*": ["../utils/src/*"], - "@uppy/core": ["../core/src/index.js"], - "@uppy/core/lib/*": ["../core/src/*"] - }, "resolveJsonModule": false, "rootDir": "./src" }, diff --git a/packages/@uppy/golden-retriever/tsconfig.json b/packages/@uppy/golden-retriever/tsconfig.json index a76c3b714a..47ece599c6 100644 --- a/packages/@uppy/golden-retriever/tsconfig.json +++ b/packages/@uppy/golden-retriever/tsconfig.json @@ -3,11 +3,6 @@ "compilerOptions": { "emitDeclarationOnly": false, "noEmit": true, - "paths": { - "@uppy/utils/lib/*": ["../utils/src/*"], - "@uppy/core": ["../core/src/index.js"], - "@uppy/core/lib/*": ["../core/src/*"], - }, }, "include": ["./package.json", "./src/**/*.*"], "references": [ diff --git a/packages/@uppy/google-drive-picker/CHANGELOG.md b/packages/@uppy/google-drive-picker/CHANGELOG.md index c017907e9f..ff50e3a1e4 100644 --- a/packages/@uppy/google-drive-picker/CHANGELOG.md +++ b/packages/@uppy/google-drive-picker/CHANGELOG.md @@ -1,5 +1,19 @@ # @uppy/google-drive-picker +## 0.3.1 + +Released: 2025-01-08 +Included in: Uppy v4.12.0 + +- @uppy/google-drive-picker,@uppy/google-photos-picker: Fix Google Picker plugins locale (Merlijn Vos / #5575) + +## 0.3.0 + +Released: 2025-01-06 +Included in: Uppy v4.11.0 + +- @uppy/angular,@uppy/audio,@uppy/aws-s3,@uppy/box,@uppy/companion-client,@uppy/compressor,@uppy/core,@uppy/dashboard,@uppy/drag-drop,@uppy/drop-target,@uppy/dropbox,@uppy/facebook,@uppy/file-input,@uppy/form,@uppy/golden-retriever,@uppy/google-drive-picker,@uppy/google-drive,@uppy/google-photos-picker,@uppy/google-photos,@uppy/image-editor,@uppy/informer,@uppy/instagram,@uppy/locales,@uppy/onedrive,@uppy/progress-bar,@uppy/provider-views,@uppy/react,@uppy/remote-sources,@uppy/screen-capture,@uppy/status-bar,@uppy/thumbnail-generator,@uppy/transloadit,@uppy/tus,@uppy/unsplash,@uppy/url,@uppy/vue,@uppy/webcam,@uppy/webdav,@uppy/xhr-upload,@uppy/zoom: Remove "paths" from all tsconfig's (Merlijn Vos / #5572) + ## 0.2.1 Released: 2024-12-17 diff --git a/packages/@uppy/google-drive-picker/package.json b/packages/@uppy/google-drive-picker/package.json index ffe14e9419..e4212ecfb3 100644 --- a/packages/@uppy/google-drive-picker/package.json +++ b/packages/@uppy/google-drive-picker/package.json @@ -1,7 +1,7 @@ { "name": "@uppy/google-drive-picker", "description": "The Google Drive Picker plugin for Uppy lets users import files from their Google Drive account", - "version": "0.2.1", + "version": "0.3.2", "license": "MIT", "main": "lib/index.js", "type": "module", diff --git a/packages/@uppy/google-drive-picker/src/GoogleDrivePicker.tsx b/packages/@uppy/google-drive-picker/src/GoogleDrivePicker.tsx index af9eda47e7..cc3b51945c 100644 --- a/packages/@uppy/google-drive-picker/src/GoogleDrivePicker.tsx +++ b/packages/@uppy/google-drive-picker/src/GoogleDrivePicker.tsx @@ -9,13 +9,12 @@ import { } from '@uppy/companion-client' import type { PickedItem } from '@uppy/provider-views/lib/GooglePicker/googlePicker.js' -import type { Body, Meta } from '@uppy/utils/lib/UppyFile' -import type { AsyncStore, BaseProviderPlugin } from '@uppy/core/lib/Uppy.js' +import type { Body, Meta, AsyncStore, BaseProviderPlugin } from '@uppy/core' // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore We don't want TS to generate types for the package.json import packageJson from '../package.json' -import locale from './locale.ts' +import locale from './locale.js' export type GoogleDrivePickerOptions = CompanionPluginOptions & { clientId: string @@ -44,6 +43,7 @@ export default class GoogleDrivePicker this.id = this.opts.id || 'GoogleDrivePicker' this.storage = this.opts.storage || tokenStorage + this.defaultLocale = locale this.i18nInit() this.title = this.i18n('pluginNameGoogleDrive') diff --git a/packages/@uppy/google-drive-picker/src/index.ts b/packages/@uppy/google-drive-picker/src/index.ts index b4f53a6d4e..2c9b1495bb 100644 --- a/packages/@uppy/google-drive-picker/src/index.ts +++ b/packages/@uppy/google-drive-picker/src/index.ts @@ -1 +1 @@ -export { default } from './GoogleDrivePicker.tsx' +export { default } from './GoogleDrivePicker.jsx' diff --git a/packages/@uppy/google-drive-picker/tsconfig.build.json b/packages/@uppy/google-drive-picker/tsconfig.build.json index 99aaf378de..7c3cc957c4 100644 --- a/packages/@uppy/google-drive-picker/tsconfig.build.json +++ b/packages/@uppy/google-drive-picker/tsconfig.build.json @@ -3,15 +3,6 @@ "compilerOptions": { "noImplicitAny": false, "outDir": "./lib", - "paths": { - "@uppy/companion-client": ["../companion-client/src/index.js"], - "@uppy/companion-client/lib/*": ["../companion-client/src/*"], - "@uppy/provider-views": ["../provider-views/src/index.js"], - "@uppy/provider-views/lib/*": ["../provider-views/src/*"], - "@uppy/utils/lib/*": ["../utils/src/*"], - "@uppy/core": ["../core/src/index.js"], - "@uppy/core/lib/*": ["../core/src/*"] - }, "resolveJsonModule": false, "rootDir": "./src", "skipLibCheck": true diff --git a/packages/@uppy/google-drive-picker/tsconfig.json b/packages/@uppy/google-drive-picker/tsconfig.json index e5220fb5ab..b90847da71 100644 --- a/packages/@uppy/google-drive-picker/tsconfig.json +++ b/packages/@uppy/google-drive-picker/tsconfig.json @@ -3,15 +3,6 @@ "compilerOptions": { "emitDeclarationOnly": false, "noEmit": true, - "paths": { - "@uppy/companion-client": ["../companion-client/src/index.js"], - "@uppy/companion-client/lib/*": ["../companion-client/src/*"], - "@uppy/provider-views": ["../provider-views/src/index.js"], - "@uppy/provider-views/lib/*": ["../provider-views/src/*"], - "@uppy/utils/lib/*": ["../utils/src/*"], - "@uppy/core": ["../core/src/index.js"], - "@uppy/core/lib/*": ["../core/src/*"], - }, }, "include": ["./package.json", "./src/**/*.*"], "references": [ diff --git a/packages/@uppy/google-drive/CHANGELOG.md b/packages/@uppy/google-drive/CHANGELOG.md index 3255005468..ae6c42cfb3 100644 --- a/packages/@uppy/google-drive/CHANGELOG.md +++ b/packages/@uppy/google-drive/CHANGELOG.md @@ -1,5 +1,12 @@ # @uppy/google-drive +## 4.3.0 + +Released: 2025-01-06 +Included in: Uppy v4.11.0 + +- @uppy/angular,@uppy/audio,@uppy/aws-s3,@uppy/box,@uppy/companion-client,@uppy/compressor,@uppy/core,@uppy/dashboard,@uppy/drag-drop,@uppy/drop-target,@uppy/dropbox,@uppy/facebook,@uppy/file-input,@uppy/form,@uppy/golden-retriever,@uppy/google-drive-picker,@uppy/google-drive,@uppy/google-photos-picker,@uppy/google-photos,@uppy/image-editor,@uppy/informer,@uppy/instagram,@uppy/locales,@uppy/onedrive,@uppy/progress-bar,@uppy/provider-views,@uppy/react,@uppy/remote-sources,@uppy/screen-capture,@uppy/status-bar,@uppy/thumbnail-generator,@uppy/transloadit,@uppy/tus,@uppy/unsplash,@uppy/url,@uppy/vue,@uppy/webcam,@uppy/webdav,@uppy/xhr-upload,@uppy/zoom: Remove "paths" from all tsconfig's (Merlijn Vos / #5572) + ## 4.2.0 Released: 2024-12-05 diff --git a/packages/@uppy/google-drive/package.json b/packages/@uppy/google-drive/package.json index 11af9abab5..b6bdb416bf 100644 --- a/packages/@uppy/google-drive/package.json +++ b/packages/@uppy/google-drive/package.json @@ -1,7 +1,7 @@ { "name": "@uppy/google-drive", "description": "The Google Drive plugin for Uppy lets users import files from their Google Drive account", - "version": "4.2.0", + "version": "4.3.1", "license": "MIT", "main": "lib/index.js", "type": "module", diff --git a/packages/@uppy/google-drive/src/DriveProviderViews.ts b/packages/@uppy/google-drive/src/DriveProviderViews.ts index 3ea16e5da3..ca060b9e94 100644 --- a/packages/@uppy/google-drive/src/DriveProviderViews.ts +++ b/packages/@uppy/google-drive/src/DriveProviderViews.ts @@ -1,9 +1,10 @@ import type { PartialTreeFile, PartialTreeFolderNode, -} from '@uppy/core/lib/Uppy.js' + Body, + Meta, +} from '@uppy/core' import { ProviderViews } from '@uppy/provider-views' -import type { Body, Meta } from '@uppy/utils/lib/UppyFile' export default class DriveProviderViews< M extends Meta, diff --git a/packages/@uppy/google-drive/src/GoogleDrive.tsx b/packages/@uppy/google-drive/src/GoogleDrive.tsx index 8c902bdd98..9ed1b065d5 100644 --- a/packages/@uppy/google-drive/src/GoogleDrive.tsx +++ b/packages/@uppy/google-drive/src/GoogleDrive.tsx @@ -8,14 +8,16 @@ import { UIPlugin, Uppy } from '@uppy/core' import { ProviderViews } from '@uppy/provider-views' import { h, type ComponentChild } from 'preact' -import type { UppyFile, Body, Meta } from '@uppy/utils/lib/UppyFile' import type { + UppyFile, + Body, + Meta, AsyncStore, UnknownProviderPlugin, UnknownProviderPluginState, -} from '@uppy/core/lib/Uppy.js' -import DriveProviderViews from './DriveProviderViews.ts' -import locale from './locale.ts' +} from '@uppy/core' +import DriveProviderViews from './DriveProviderViews.js' +import locale from './locale.js' // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore We don't want TS to generate types for the package.json import packageJson from '../package.json' diff --git a/packages/@uppy/google-drive/src/index.ts b/packages/@uppy/google-drive/src/index.ts index 29eebdb0df..5ba47c744f 100644 --- a/packages/@uppy/google-drive/src/index.ts +++ b/packages/@uppy/google-drive/src/index.ts @@ -1,2 +1,2 @@ -export { default } from './GoogleDrive.tsx' -export type { GoogleDriveOptions } from './GoogleDrive.tsx' +export { default } from './GoogleDrive.jsx' +export type { GoogleDriveOptions } from './GoogleDrive.jsx' diff --git a/packages/@uppy/google-drive/tsconfig.build.json b/packages/@uppy/google-drive/tsconfig.build.json index 0b2f94bc10..82e187bca0 100644 --- a/packages/@uppy/google-drive/tsconfig.build.json +++ b/packages/@uppy/google-drive/tsconfig.build.json @@ -2,15 +2,6 @@ "extends": "../../../tsconfig.shared", "compilerOptions": { "outDir": "./lib", - "paths": { - "@uppy/companion-client": ["../companion-client/src/index.js"], - "@uppy/companion-client/lib/*": ["../companion-client/src/*"], - "@uppy/provider-views": ["../provider-views/src/index.js"], - "@uppy/provider-views/lib/*": ["../provider-views/src/*"], - "@uppy/utils/lib/*": ["../utils/src/*"], - "@uppy/core": ["../core/src/index.js"], - "@uppy/core/lib/*": ["../core/src/*"] - }, "resolveJsonModule": false, "rootDir": "./src" }, diff --git a/packages/@uppy/google-drive/tsconfig.json b/packages/@uppy/google-drive/tsconfig.json index e5220fb5ab..b90847da71 100644 --- a/packages/@uppy/google-drive/tsconfig.json +++ b/packages/@uppy/google-drive/tsconfig.json @@ -3,15 +3,6 @@ "compilerOptions": { "emitDeclarationOnly": false, "noEmit": true, - "paths": { - "@uppy/companion-client": ["../companion-client/src/index.js"], - "@uppy/companion-client/lib/*": ["../companion-client/src/*"], - "@uppy/provider-views": ["../provider-views/src/index.js"], - "@uppy/provider-views/lib/*": ["../provider-views/src/*"], - "@uppy/utils/lib/*": ["../utils/src/*"], - "@uppy/core": ["../core/src/index.js"], - "@uppy/core/lib/*": ["../core/src/*"], - }, }, "include": ["./package.json", "./src/**/*.*"], "references": [ diff --git a/packages/@uppy/google-photos-picker/CHANGELOG.md b/packages/@uppy/google-photos-picker/CHANGELOG.md index 3776296c0d..028c9d92ab 100644 --- a/packages/@uppy/google-photos-picker/CHANGELOG.md +++ b/packages/@uppy/google-photos-picker/CHANGELOG.md @@ -1,5 +1,19 @@ # @uppy/google-photos-picker +## 0.3.1 + +Released: 2025-01-08 +Included in: Uppy v4.12.0 + +- @uppy/google-drive-picker,@uppy/google-photos-picker: Fix Google Picker plugins locale (Merlijn Vos / #5575) + +## 0.3.0 + +Released: 2025-01-06 +Included in: Uppy v4.11.0 + +- @uppy/angular,@uppy/audio,@uppy/aws-s3,@uppy/box,@uppy/companion-client,@uppy/compressor,@uppy/core,@uppy/dashboard,@uppy/drag-drop,@uppy/drop-target,@uppy/dropbox,@uppy/facebook,@uppy/file-input,@uppy/form,@uppy/golden-retriever,@uppy/google-drive-picker,@uppy/google-drive,@uppy/google-photos-picker,@uppy/google-photos,@uppy/image-editor,@uppy/informer,@uppy/instagram,@uppy/locales,@uppy/onedrive,@uppy/progress-bar,@uppy/provider-views,@uppy/react,@uppy/remote-sources,@uppy/screen-capture,@uppy/status-bar,@uppy/thumbnail-generator,@uppy/transloadit,@uppy/tus,@uppy/unsplash,@uppy/url,@uppy/vue,@uppy/webcam,@uppy/webdav,@uppy/xhr-upload,@uppy/zoom: Remove "paths" from all tsconfig's (Merlijn Vos / #5572) + ## 0.2.1 Released: 2024-12-17 diff --git a/packages/@uppy/google-photos-picker/package.json b/packages/@uppy/google-photos-picker/package.json index 0cc7504504..280535cf39 100644 --- a/packages/@uppy/google-photos-picker/package.json +++ b/packages/@uppy/google-photos-picker/package.json @@ -1,7 +1,7 @@ { "name": "@uppy/google-photos-picker", "description": "The Google Photos Picker plugin for Uppy lets users import files from their Google Photos account", - "version": "0.2.1", + "version": "0.3.2", "license": "MIT", "main": "lib/index.js", "type": "module", diff --git a/packages/@uppy/google-photos-picker/src/GooglePhotosPicker.tsx b/packages/@uppy/google-photos-picker/src/GooglePhotosPicker.tsx index ba7ebe2856..e859285af4 100644 --- a/packages/@uppy/google-photos-picker/src/GooglePhotosPicker.tsx +++ b/packages/@uppy/google-photos-picker/src/GooglePhotosPicker.tsx @@ -9,13 +9,12 @@ import { } from '@uppy/companion-client' import type { PickedItem } from '@uppy/provider-views/lib/GooglePicker/googlePicker.js' -import type { Body, Meta } from '@uppy/utils/lib/UppyFile' -import type { AsyncStore, BaseProviderPlugin } from '@uppy/core/lib/Uppy.js' +import type { Body, Meta, AsyncStore, BaseProviderPlugin } from '@uppy/core' // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore We don't want TS to generate types for the package.json import packageJson from '../package.json' -import locale from './locale.ts' +import locale from './locale.js' export type GooglePhotosPickerOptions = CompanionPluginOptions & { clientId: string @@ -42,6 +41,7 @@ export default class GooglePhotosPicker this.id = this.opts.id || 'GooglePhotosPicker' this.storage = this.opts.storage || tokenStorage + this.defaultLocale = locale this.i18nInit() this.title = this.i18n('pluginNameGooglePhotos') diff --git a/packages/@uppy/google-photos-picker/src/index.ts b/packages/@uppy/google-photos-picker/src/index.ts index 7d64a7cb5e..97684c2cbb 100644 --- a/packages/@uppy/google-photos-picker/src/index.ts +++ b/packages/@uppy/google-photos-picker/src/index.ts @@ -1 +1 @@ -export { default } from './GooglePhotosPicker.tsx' +export { default } from './GooglePhotosPicker.jsx' diff --git a/packages/@uppy/google-photos-picker/tsconfig.build.json b/packages/@uppy/google-photos-picker/tsconfig.build.json index 99aaf378de..7c3cc957c4 100644 --- a/packages/@uppy/google-photos-picker/tsconfig.build.json +++ b/packages/@uppy/google-photos-picker/tsconfig.build.json @@ -3,15 +3,6 @@ "compilerOptions": { "noImplicitAny": false, "outDir": "./lib", - "paths": { - "@uppy/companion-client": ["../companion-client/src/index.js"], - "@uppy/companion-client/lib/*": ["../companion-client/src/*"], - "@uppy/provider-views": ["../provider-views/src/index.js"], - "@uppy/provider-views/lib/*": ["../provider-views/src/*"], - "@uppy/utils/lib/*": ["../utils/src/*"], - "@uppy/core": ["../core/src/index.js"], - "@uppy/core/lib/*": ["../core/src/*"] - }, "resolveJsonModule": false, "rootDir": "./src", "skipLibCheck": true diff --git a/packages/@uppy/google-photos-picker/tsconfig.json b/packages/@uppy/google-photos-picker/tsconfig.json index e5220fb5ab..b90847da71 100644 --- a/packages/@uppy/google-photos-picker/tsconfig.json +++ b/packages/@uppy/google-photos-picker/tsconfig.json @@ -3,15 +3,6 @@ "compilerOptions": { "emitDeclarationOnly": false, "noEmit": true, - "paths": { - "@uppy/companion-client": ["../companion-client/src/index.js"], - "@uppy/companion-client/lib/*": ["../companion-client/src/*"], - "@uppy/provider-views": ["../provider-views/src/index.js"], - "@uppy/provider-views/lib/*": ["../provider-views/src/*"], - "@uppy/utils/lib/*": ["../utils/src/*"], - "@uppy/core": ["../core/src/index.js"], - "@uppy/core/lib/*": ["../core/src/*"], - }, }, "include": ["./package.json", "./src/**/*.*"], "references": [ diff --git a/packages/@uppy/google-photos/CHANGELOG.md b/packages/@uppy/google-photos/CHANGELOG.md index 9cb4a6d66f..a9c6446813 100644 --- a/packages/@uppy/google-photos/CHANGELOG.md +++ b/packages/@uppy/google-photos/CHANGELOG.md @@ -1,5 +1,12 @@ # @uppy/google-photos +## 0.5.0 + +Released: 2025-01-06 +Included in: Uppy v4.11.0 + +- @uppy/angular,@uppy/audio,@uppy/aws-s3,@uppy/box,@uppy/companion-client,@uppy/compressor,@uppy/core,@uppy/dashboard,@uppy/drag-drop,@uppy/drop-target,@uppy/dropbox,@uppy/facebook,@uppy/file-input,@uppy/form,@uppy/golden-retriever,@uppy/google-drive-picker,@uppy/google-drive,@uppy/google-photos-picker,@uppy/google-photos,@uppy/image-editor,@uppy/informer,@uppy/instagram,@uppy/locales,@uppy/onedrive,@uppy/progress-bar,@uppy/provider-views,@uppy/react,@uppy/remote-sources,@uppy/screen-capture,@uppy/status-bar,@uppy/thumbnail-generator,@uppy/transloadit,@uppy/tus,@uppy/unsplash,@uppy/url,@uppy/vue,@uppy/webcam,@uppy/webdav,@uppy/xhr-upload,@uppy/zoom: Remove "paths" from all tsconfig's (Merlijn Vos / #5572) + ## 0.4.0 Released: 2024-12-05 diff --git a/packages/@uppy/google-photos/package.json b/packages/@uppy/google-photos/package.json index b471ce3a31..3a96f76e3d 100644 --- a/packages/@uppy/google-photos/package.json +++ b/packages/@uppy/google-photos/package.json @@ -1,7 +1,7 @@ { "name": "@uppy/google-photos", "description": "The Google Photos plugin for Uppy lets users import photos from their Google Photos account", - "version": "0.4.0", + "version": "0.5.1", "license": "MIT", "main": "lib/index.js", "type": "module", diff --git a/packages/@uppy/google-photos/src/GooglePhotos.tsx b/packages/@uppy/google-photos/src/GooglePhotos.tsx index 248f7e5ac1..3933428493 100644 --- a/packages/@uppy/google-photos/src/GooglePhotos.tsx +++ b/packages/@uppy/google-photos/src/GooglePhotos.tsx @@ -8,17 +8,19 @@ import { } from '@uppy/companion-client' import { h, type ComponentChild } from 'preact' -import type { UppyFile, Body, Meta } from '@uppy/utils/lib/UppyFile' import type { + UppyFile, + Body, + Meta, AsyncStore, UnknownProviderPlugin, UnknownProviderPluginState, -} from '@uppy/core/lib/Uppy.js' +} from '@uppy/core' // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore We don't want TS to generate types for the package.json import packageJson from '../package.json' -import locale from './locale.ts' +import locale from './locale.js' export type GooglePhotosOptions = CompanionPluginOptions diff --git a/packages/@uppy/google-photos/src/index.ts b/packages/@uppy/google-photos/src/index.ts index d511fae8c1..8220ac9bf3 100644 --- a/packages/@uppy/google-photos/src/index.ts +++ b/packages/@uppy/google-photos/src/index.ts @@ -1,2 +1,2 @@ -export { default } from './GooglePhotos.tsx' -export type { GooglePhotosOptions } from './GooglePhotos.tsx' +export { default } from './GooglePhotos.jsx' +export type { GooglePhotosOptions } from './GooglePhotos.jsx' diff --git a/packages/@uppy/google-photos/tsconfig.build.json b/packages/@uppy/google-photos/tsconfig.build.json index 0b2f94bc10..82e187bca0 100644 --- a/packages/@uppy/google-photos/tsconfig.build.json +++ b/packages/@uppy/google-photos/tsconfig.build.json @@ -2,15 +2,6 @@ "extends": "../../../tsconfig.shared", "compilerOptions": { "outDir": "./lib", - "paths": { - "@uppy/companion-client": ["../companion-client/src/index.js"], - "@uppy/companion-client/lib/*": ["../companion-client/src/*"], - "@uppy/provider-views": ["../provider-views/src/index.js"], - "@uppy/provider-views/lib/*": ["../provider-views/src/*"], - "@uppy/utils/lib/*": ["../utils/src/*"], - "@uppy/core": ["../core/src/index.js"], - "@uppy/core/lib/*": ["../core/src/*"] - }, "resolveJsonModule": false, "rootDir": "./src" }, diff --git a/packages/@uppy/google-photos/tsconfig.json b/packages/@uppy/google-photos/tsconfig.json index e5220fb5ab..b90847da71 100644 --- a/packages/@uppy/google-photos/tsconfig.json +++ b/packages/@uppy/google-photos/tsconfig.json @@ -3,15 +3,6 @@ "compilerOptions": { "emitDeclarationOnly": false, "noEmit": true, - "paths": { - "@uppy/companion-client": ["../companion-client/src/index.js"], - "@uppy/companion-client/lib/*": ["../companion-client/src/*"], - "@uppy/provider-views": ["../provider-views/src/index.js"], - "@uppy/provider-views/lib/*": ["../provider-views/src/*"], - "@uppy/utils/lib/*": ["../utils/src/*"], - "@uppy/core": ["../core/src/index.js"], - "@uppy/core/lib/*": ["../core/src/*"], - }, }, "include": ["./package.json", "./src/**/*.*"], "references": [ diff --git a/packages/@uppy/image-editor/CHANGELOG.md b/packages/@uppy/image-editor/CHANGELOG.md index 7ed7676338..c81b67e439 100644 --- a/packages/@uppy/image-editor/CHANGELOG.md +++ b/packages/@uppy/image-editor/CHANGELOG.md @@ -1,5 +1,12 @@ # @uppy/image-editor +## 3.3.0 + +Released: 2025-01-06 +Included in: Uppy v4.11.0 + +- @uppy/angular,@uppy/audio,@uppy/aws-s3,@uppy/box,@uppy/companion-client,@uppy/compressor,@uppy/core,@uppy/dashboard,@uppy/drag-drop,@uppy/drop-target,@uppy/dropbox,@uppy/facebook,@uppy/file-input,@uppy/form,@uppy/golden-retriever,@uppy/google-drive-picker,@uppy/google-drive,@uppy/google-photos-picker,@uppy/google-photos,@uppy/image-editor,@uppy/informer,@uppy/instagram,@uppy/locales,@uppy/onedrive,@uppy/progress-bar,@uppy/provider-views,@uppy/react,@uppy/remote-sources,@uppy/screen-capture,@uppy/status-bar,@uppy/thumbnail-generator,@uppy/transloadit,@uppy/tus,@uppy/unsplash,@uppy/url,@uppy/vue,@uppy/webcam,@uppy/webdav,@uppy/xhr-upload,@uppy/zoom: Remove "paths" from all tsconfig's (Merlijn Vos / #5572) + ## 3.2.1 Released: 2024-12-05 diff --git a/packages/@uppy/image-editor/package.json b/packages/@uppy/image-editor/package.json index d789d379fa..ee8c6a88ed 100644 --- a/packages/@uppy/image-editor/package.json +++ b/packages/@uppy/image-editor/package.json @@ -1,7 +1,7 @@ { "name": "@uppy/image-editor", "description": "Image editor and cropping UI", - "version": "3.2.1", + "version": "3.3.1", "license": "MIT", "main": "lib/index.js", "style": "dist/style.min.css", diff --git a/packages/@uppy/image-editor/src/Editor.tsx b/packages/@uppy/image-editor/src/Editor.tsx index 9164d88e00..b2e84cf2f1 100644 --- a/packages/@uppy/image-editor/src/Editor.tsx +++ b/packages/@uppy/image-editor/src/Editor.tsx @@ -1,13 +1,13 @@ /* eslint-disable jsx-a11y/label-has-associated-control */ import Cropper from 'cropperjs' import { h, Component } from 'preact' -import type { Meta, Body, UppyFile } from '@uppy/utils/lib/UppyFile' +import type { Meta, Body, UppyFile } from '@uppy/core' import type { I18n } from '@uppy/utils/lib/Translator' -import getCanvasDataThatFitsPerfectlyIntoContainer from './utils/getCanvasDataThatFitsPerfectlyIntoContainer.ts' -import getScaleFactorThatRemovesDarkCorners from './utils/getScaleFactorThatRemovesDarkCorners.ts' -import limitCropboxMovementOnMove from './utils/limitCropboxMovementOnMove.ts' -import limitCropboxMovementOnResize from './utils/limitCropboxMovementOnResize.ts' -import type ImageEditor from './ImageEditor.ts' +import getCanvasDataThatFitsPerfectlyIntoContainer from './utils/getCanvasDataThatFitsPerfectlyIntoContainer.js' +import getScaleFactorThatRemovesDarkCorners from './utils/getScaleFactorThatRemovesDarkCorners.js' +import limitCropboxMovementOnMove from './utils/limitCropboxMovementOnMove.js' +import limitCropboxMovementOnResize from './utils/limitCropboxMovementOnResize.js' +import type ImageEditor from './ImageEditor.js' type Props = { currentImage: UppyFile diff --git a/packages/@uppy/image-editor/src/ImageEditor.tsx b/packages/@uppy/image-editor/src/ImageEditor.tsx index ea896a380d..1f896ef398 100644 --- a/packages/@uppy/image-editor/src/ImageEditor.tsx +++ b/packages/@uppy/image-editor/src/ImageEditor.tsx @@ -1,14 +1,20 @@ -import { UIPlugin, type UIPluginOptions, type Uppy } from '@uppy/core' -import type { DefinePluginOpts } from '@uppy/core/lib/BasePlugin.js' +import { UIPlugin } from '@uppy/core' +import type { + UIPluginOptions, + Uppy, + DefinePluginOpts, + Meta, + Body, + UppyFile, +} from '@uppy/core' import type Cropper from 'cropperjs' import { h } from 'preact' -import type { Meta, Body, UppyFile } from '@uppy/utils/lib/UppyFile' -import Editor from './Editor.tsx' +import Editor from './Editor.jsx' // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore We don't want TS to generate types for the package.json import packageJson from '../package.json' -import locale from './locale.ts' +import locale from './locale.js' declare global { namespace preact { diff --git a/packages/@uppy/image-editor/src/index.ts b/packages/@uppy/image-editor/src/index.ts index c30fd39721..a8a529be22 100644 --- a/packages/@uppy/image-editor/src/index.ts +++ b/packages/@uppy/image-editor/src/index.ts @@ -1,2 +1,2 @@ -export { default } from './ImageEditor.tsx' -export type { Opts as ImageEditorOptions } from './ImageEditor.tsx' +export { default } from './ImageEditor.jsx' +export type { Opts as ImageEditorOptions } from './ImageEditor.jsx' diff --git a/packages/@uppy/image-editor/tsconfig.build.json b/packages/@uppy/image-editor/tsconfig.build.json index 8d9ed22fa5..bbf30b5b43 100644 --- a/packages/@uppy/image-editor/tsconfig.build.json +++ b/packages/@uppy/image-editor/tsconfig.build.json @@ -2,11 +2,6 @@ "extends": "../../../tsconfig.shared", "compilerOptions": { "outDir": "./lib", - "paths": { - "@uppy/utils/lib/*": ["../utils/src/*"], - "@uppy/core": ["../core/src/index.js"], - "@uppy/core/lib/*": ["../core/src/*"] - }, "resolveJsonModule": false, "rootDir": "./src" }, diff --git a/packages/@uppy/image-editor/tsconfig.json b/packages/@uppy/image-editor/tsconfig.json index 96370efb37..47ece599c6 100644 --- a/packages/@uppy/image-editor/tsconfig.json +++ b/packages/@uppy/image-editor/tsconfig.json @@ -3,11 +3,6 @@ "compilerOptions": { "emitDeclarationOnly": false, "noEmit": true, - "paths": { - "@uppy/utils/lib/*": ["../utils/src/*"], - "@uppy/core": ["../core/src/"], - "@uppy/core/lib/*": ["../core/src/*"], - }, }, "include": ["./package.json", "./src/**/*.*"], "references": [ diff --git a/packages/@uppy/informer/CHANGELOG.md b/packages/@uppy/informer/CHANGELOG.md index 9fc398cd89..af516f94cb 100644 --- a/packages/@uppy/informer/CHANGELOG.md +++ b/packages/@uppy/informer/CHANGELOG.md @@ -1,5 +1,12 @@ # @uppy/informer +## 4.2.0 + +Released: 2025-01-06 +Included in: Uppy v4.11.0 + +- @uppy/angular,@uppy/audio,@uppy/aws-s3,@uppy/box,@uppy/companion-client,@uppy/compressor,@uppy/core,@uppy/dashboard,@uppy/drag-drop,@uppy/drop-target,@uppy/dropbox,@uppy/facebook,@uppy/file-input,@uppy/form,@uppy/golden-retriever,@uppy/google-drive-picker,@uppy/google-drive,@uppy/google-photos-picker,@uppy/google-photos,@uppy/image-editor,@uppy/informer,@uppy/instagram,@uppy/locales,@uppy/onedrive,@uppy/progress-bar,@uppy/provider-views,@uppy/react,@uppy/remote-sources,@uppy/screen-capture,@uppy/status-bar,@uppy/thumbnail-generator,@uppy/transloadit,@uppy/tus,@uppy/unsplash,@uppy/url,@uppy/vue,@uppy/webcam,@uppy/webdav,@uppy/xhr-upload,@uppy/zoom: Remove "paths" from all tsconfig's (Merlijn Vos / #5572) + ## 4.1.2 Released: 2024-12-05 diff --git a/packages/@uppy/informer/package.json b/packages/@uppy/informer/package.json index 703e20c067..f2c4b828c1 100644 --- a/packages/@uppy/informer/package.json +++ b/packages/@uppy/informer/package.json @@ -1,7 +1,7 @@ { "name": "@uppy/informer", "description": "A notification and error pop-up bar for Uppy.", - "version": "4.1.2", + "version": "4.2.1", "license": "MIT", "main": "lib/index.js", "style": "dist/style.min.css", diff --git a/packages/@uppy/informer/src/Informer.tsx b/packages/@uppy/informer/src/Informer.tsx index f198a97cf8..cfb49d1599 100644 --- a/packages/@uppy/informer/src/Informer.tsx +++ b/packages/@uppy/informer/src/Informer.tsx @@ -2,10 +2,9 @@ /* eslint-disable jsx-a11y/click-events-have-key-events */ import { h, type ComponentChild } from 'preact' import { UIPlugin } from '@uppy/core' -import type { State, UIPluginOptions, Uppy } from '@uppy/core' -import type { Body, Meta } from '@uppy/utils/lib/UppyFile' -import FadeIn from './FadeIn.tsx' -import TransitionGroup from './TransitionGroup.ts' +import type { State, UIPluginOptions, Uppy, Body, Meta } from '@uppy/core' +import FadeIn from './FadeIn.jsx' +import TransitionGroup from './TransitionGroup.js' // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore We don't want TS to generate types for the package.json diff --git a/packages/@uppy/informer/src/index.ts b/packages/@uppy/informer/src/index.ts index 8a1b4b634b..ea8cecb8d4 100644 --- a/packages/@uppy/informer/src/index.ts +++ b/packages/@uppy/informer/src/index.ts @@ -1,2 +1,2 @@ -export { default } from './Informer.tsx' -export type { InformerOptions } from './Informer.tsx' +export { default } from './Informer.jsx' +export type { InformerOptions } from './Informer.jsx' diff --git a/packages/@uppy/informer/tsconfig.build.json b/packages/@uppy/informer/tsconfig.build.json index 8d9ed22fa5..bbf30b5b43 100644 --- a/packages/@uppy/informer/tsconfig.build.json +++ b/packages/@uppy/informer/tsconfig.build.json @@ -2,11 +2,6 @@ "extends": "../../../tsconfig.shared", "compilerOptions": { "outDir": "./lib", - "paths": { - "@uppy/utils/lib/*": ["../utils/src/*"], - "@uppy/core": ["../core/src/index.js"], - "@uppy/core/lib/*": ["../core/src/*"] - }, "resolveJsonModule": false, "rootDir": "./src" }, diff --git a/packages/@uppy/informer/tsconfig.json b/packages/@uppy/informer/tsconfig.json index a76c3b714a..47ece599c6 100644 --- a/packages/@uppy/informer/tsconfig.json +++ b/packages/@uppy/informer/tsconfig.json @@ -3,11 +3,6 @@ "compilerOptions": { "emitDeclarationOnly": false, "noEmit": true, - "paths": { - "@uppy/utils/lib/*": ["../utils/src/*"], - "@uppy/core": ["../core/src/index.js"], - "@uppy/core/lib/*": ["../core/src/*"], - }, }, "include": ["./package.json", "./src/**/*.*"], "references": [ diff --git a/packages/@uppy/instagram/CHANGELOG.md b/packages/@uppy/instagram/CHANGELOG.md index 7dbf8287e4..48a74d11d3 100644 --- a/packages/@uppy/instagram/CHANGELOG.md +++ b/packages/@uppy/instagram/CHANGELOG.md @@ -1,5 +1,12 @@ # @uppy/instagram +## 4.2.0 + +Released: 2025-01-06 +Included in: Uppy v4.11.0 + +- @uppy/angular,@uppy/audio,@uppy/aws-s3,@uppy/box,@uppy/companion-client,@uppy/compressor,@uppy/core,@uppy/dashboard,@uppy/drag-drop,@uppy/drop-target,@uppy/dropbox,@uppy/facebook,@uppy/file-input,@uppy/form,@uppy/golden-retriever,@uppy/google-drive-picker,@uppy/google-drive,@uppy/google-photos-picker,@uppy/google-photos,@uppy/image-editor,@uppy/informer,@uppy/instagram,@uppy/locales,@uppy/onedrive,@uppy/progress-bar,@uppy/provider-views,@uppy/react,@uppy/remote-sources,@uppy/screen-capture,@uppy/status-bar,@uppy/thumbnail-generator,@uppy/transloadit,@uppy/tus,@uppy/unsplash,@uppy/url,@uppy/vue,@uppy/webcam,@uppy/webdav,@uppy/xhr-upload,@uppy/zoom: Remove "paths" from all tsconfig's (Merlijn Vos / #5572) + ## 4.1.2 Released: 2024-12-05 diff --git a/packages/@uppy/instagram/package.json b/packages/@uppy/instagram/package.json index 5a7e705687..039bf06327 100644 --- a/packages/@uppy/instagram/package.json +++ b/packages/@uppy/instagram/package.json @@ -1,7 +1,7 @@ { "name": "@uppy/instagram", "description": "Import photos and videos from Instagram, into Uppy.", - "version": "4.1.2", + "version": "4.2.1", "license": "MIT", "main": "lib/index.js", "type": "module", diff --git a/packages/@uppy/instagram/src/Instagram.tsx b/packages/@uppy/instagram/src/Instagram.tsx index c0cd987d17..b3175832ce 100644 --- a/packages/@uppy/instagram/src/Instagram.tsx +++ b/packages/@uppy/instagram/src/Instagram.tsx @@ -8,13 +8,15 @@ import { UIPlugin, Uppy } from '@uppy/core' import { ProviderViews } from '@uppy/provider-views' import { h, type ComponentChild } from 'preact' -import type { UppyFile, Body, Meta } from '@uppy/utils/lib/UppyFile' import type { + UppyFile, + Body, + Meta, AsyncStore, UnknownProviderPlugin, UnknownProviderPluginState, -} from '@uppy/core/lib/Uppy.js' -import locale from './locale.ts' +} from '@uppy/core' +import locale from './locale.js' // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore We don't want TS to generate types for the package.json import packageJson from '../package.json' diff --git a/packages/@uppy/instagram/src/index.ts b/packages/@uppy/instagram/src/index.ts index 55b55b3302..a9a56fefe6 100644 --- a/packages/@uppy/instagram/src/index.ts +++ b/packages/@uppy/instagram/src/index.ts @@ -1,2 +1,2 @@ -export { default } from './Instagram.tsx' -export type { InstagramOptions } from './Instagram.tsx' +export { default } from './Instagram.jsx' +export type { InstagramOptions } from './Instagram.jsx' diff --git a/packages/@uppy/instagram/tsconfig.build.json b/packages/@uppy/instagram/tsconfig.build.json index 0b2f94bc10..82e187bca0 100644 --- a/packages/@uppy/instagram/tsconfig.build.json +++ b/packages/@uppy/instagram/tsconfig.build.json @@ -2,15 +2,6 @@ "extends": "../../../tsconfig.shared", "compilerOptions": { "outDir": "./lib", - "paths": { - "@uppy/companion-client": ["../companion-client/src/index.js"], - "@uppy/companion-client/lib/*": ["../companion-client/src/*"], - "@uppy/provider-views": ["../provider-views/src/index.js"], - "@uppy/provider-views/lib/*": ["../provider-views/src/*"], - "@uppy/utils/lib/*": ["../utils/src/*"], - "@uppy/core": ["../core/src/index.js"], - "@uppy/core/lib/*": ["../core/src/*"] - }, "resolveJsonModule": false, "rootDir": "./src" }, diff --git a/packages/@uppy/instagram/tsconfig.json b/packages/@uppy/instagram/tsconfig.json index e5220fb5ab..b90847da71 100644 --- a/packages/@uppy/instagram/tsconfig.json +++ b/packages/@uppy/instagram/tsconfig.json @@ -3,15 +3,6 @@ "compilerOptions": { "emitDeclarationOnly": false, "noEmit": true, - "paths": { - "@uppy/companion-client": ["../companion-client/src/index.js"], - "@uppy/companion-client/lib/*": ["../companion-client/src/*"], - "@uppy/provider-views": ["../provider-views/src/index.js"], - "@uppy/provider-views/lib/*": ["../provider-views/src/*"], - "@uppy/utils/lib/*": ["../utils/src/*"], - "@uppy/core": ["../core/src/index.js"], - "@uppy/core/lib/*": ["../core/src/*"], - }, }, "include": ["./package.json", "./src/**/*.*"], "references": [ diff --git a/packages/@uppy/locales/CHANGELOG.md b/packages/@uppy/locales/CHANGELOG.md index 66751366c9..7d3141bd83 100644 --- a/packages/@uppy/locales/CHANGELOG.md +++ b/packages/@uppy/locales/CHANGELOG.md @@ -1,5 +1,12 @@ # @uppy/locales +## 4.5.0 + +Released: 2025-01-06 +Included in: Uppy v4.11.0 + +- @uppy/angular,@uppy/audio,@uppy/aws-s3,@uppy/box,@uppy/companion-client,@uppy/compressor,@uppy/core,@uppy/dashboard,@uppy/drag-drop,@uppy/drop-target,@uppy/dropbox,@uppy/facebook,@uppy/file-input,@uppy/form,@uppy/golden-retriever,@uppy/google-drive-picker,@uppy/google-drive,@uppy/google-photos-picker,@uppy/google-photos,@uppy/image-editor,@uppy/informer,@uppy/instagram,@uppy/locales,@uppy/onedrive,@uppy/progress-bar,@uppy/provider-views,@uppy/react,@uppy/remote-sources,@uppy/screen-capture,@uppy/status-bar,@uppy/thumbnail-generator,@uppy/transloadit,@uppy/tus,@uppy/unsplash,@uppy/url,@uppy/vue,@uppy/webcam,@uppy/webdav,@uppy/xhr-upload,@uppy/zoom: Remove "paths" from all tsconfig's (Merlijn Vos / #5572) + ## 4.4.0 Released: 2024-12-17 diff --git a/packages/@uppy/locales/package.json b/packages/@uppy/locales/package.json index 684279f6a4..2bae270111 100644 --- a/packages/@uppy/locales/package.json +++ b/packages/@uppy/locales/package.json @@ -1,7 +1,7 @@ { "name": "@uppy/locales", "description": "Uppy language packs", - "version": "4.4.0", + "version": "4.5.0", "license": "MIT", "type": "module", "keywords": [ diff --git a/packages/@uppy/locales/tsconfig.build.json b/packages/@uppy/locales/tsconfig.build.json index 5d9441fd2f..87d88ebef3 100644 --- a/packages/@uppy/locales/tsconfig.build.json +++ b/packages/@uppy/locales/tsconfig.build.json @@ -2,10 +2,7 @@ "extends": "../../../tsconfig.shared", "compilerOptions": { "outDir": "./lib", - "rootDir": "./src", - "paths": { - "@uppy/utils/lib/*": ["../utils/src/*"] - } + "rootDir": "./src" }, "include": ["./src/**/*.*"], "references": [ diff --git a/packages/@uppy/locales/tsconfig.json b/packages/@uppy/locales/tsconfig.json index ce1879aac4..16bd68ed99 100644 --- a/packages/@uppy/locales/tsconfig.json +++ b/packages/@uppy/locales/tsconfig.json @@ -2,9 +2,6 @@ "extends": "../../../tsconfig.shared", "compilerOptions": { "emitDeclarationOnly": false, - "paths": { - "@uppy/utils/lib/*": ["../utils/src/*"], - }, "noEmit": true, }, "include": ["./package.json", "./src/**/*.*"], diff --git a/packages/@uppy/onedrive/CHANGELOG.md b/packages/@uppy/onedrive/CHANGELOG.md index 2b635fbad8..15100d727c 100644 --- a/packages/@uppy/onedrive/CHANGELOG.md +++ b/packages/@uppy/onedrive/CHANGELOG.md @@ -1,5 +1,19 @@ # @uppy/onedrive +## 4.2.1 + +Released: 2025-01-08 +Included in: Uppy v4.12.0 + +- @uppy/onedrive: fix AsyncStore import (Merlijn Vos / #5579) + +## 4.2.0 + +Released: 2025-01-06 +Included in: Uppy v4.11.0 + +- @uppy/angular,@uppy/audio,@uppy/aws-s3,@uppy/box,@uppy/companion-client,@uppy/compressor,@uppy/core,@uppy/dashboard,@uppy/drag-drop,@uppy/drop-target,@uppy/dropbox,@uppy/facebook,@uppy/file-input,@uppy/form,@uppy/golden-retriever,@uppy/google-drive-picker,@uppy/google-drive,@uppy/google-photos-picker,@uppy/google-photos,@uppy/image-editor,@uppy/informer,@uppy/instagram,@uppy/locales,@uppy/onedrive,@uppy/progress-bar,@uppy/provider-views,@uppy/react,@uppy/remote-sources,@uppy/screen-capture,@uppy/status-bar,@uppy/thumbnail-generator,@uppy/transloadit,@uppy/tus,@uppy/unsplash,@uppy/url,@uppy/vue,@uppy/webcam,@uppy/webdav,@uppy/xhr-upload,@uppy/zoom: Remove "paths" from all tsconfig's (Merlijn Vos / #5572) + ## 4.1.2 Released: 2024-12-05 diff --git a/packages/@uppy/onedrive/package.json b/packages/@uppy/onedrive/package.json index 8965f9235c..83347e9497 100644 --- a/packages/@uppy/onedrive/package.json +++ b/packages/@uppy/onedrive/package.json @@ -1,7 +1,7 @@ { "name": "@uppy/onedrive", "description": "Import files from OneDrive, into Uppy.", - "version": "4.1.2", + "version": "4.2.2", "license": "MIT", "main": "lib/index.js", "type": "module", diff --git a/packages/@uppy/onedrive/src/OneDrive.tsx b/packages/@uppy/onedrive/src/OneDrive.tsx index bdfcfe2763..f224899e20 100644 --- a/packages/@uppy/onedrive/src/OneDrive.tsx +++ b/packages/@uppy/onedrive/src/OneDrive.tsx @@ -8,13 +8,15 @@ import { UIPlugin, Uppy } from '@uppy/core' import { ProviderViews } from '@uppy/provider-views' import { h, type ComponentChild } from 'preact' -import type { AsyncStore } from '@uppy/core/src/Uppy.js' -import type { UppyFile, Body, Meta } from '@uppy/utils/lib/UppyFile' import type { + UppyFile, + Body, + Meta, + AsyncStore, UnknownProviderPlugin, UnknownProviderPluginState, -} from '@uppy/core/lib/Uppy.js' -import locale from './locale.ts' +} from '@uppy/core' +import locale from './locale.js' // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore We don't want TS to generate types for the package.json import packageJson from '../package.json' diff --git a/packages/@uppy/onedrive/src/index.ts b/packages/@uppy/onedrive/src/index.ts index 65ee4feddb..1da85640f3 100644 --- a/packages/@uppy/onedrive/src/index.ts +++ b/packages/@uppy/onedrive/src/index.ts @@ -1,2 +1,2 @@ -export { default } from './OneDrive.tsx' -export type { OneDriveOptions } from './OneDrive.tsx' +export { default } from './OneDrive.jsx' +export type { OneDriveOptions } from './OneDrive.jsx' diff --git a/packages/@uppy/onedrive/tsconfig.build.json b/packages/@uppy/onedrive/tsconfig.build.json index 0b2f94bc10..82e187bca0 100644 --- a/packages/@uppy/onedrive/tsconfig.build.json +++ b/packages/@uppy/onedrive/tsconfig.build.json @@ -2,15 +2,6 @@ "extends": "../../../tsconfig.shared", "compilerOptions": { "outDir": "./lib", - "paths": { - "@uppy/companion-client": ["../companion-client/src/index.js"], - "@uppy/companion-client/lib/*": ["../companion-client/src/*"], - "@uppy/provider-views": ["../provider-views/src/index.js"], - "@uppy/provider-views/lib/*": ["../provider-views/src/*"], - "@uppy/utils/lib/*": ["../utils/src/*"], - "@uppy/core": ["../core/src/index.js"], - "@uppy/core/lib/*": ["../core/src/*"] - }, "resolveJsonModule": false, "rootDir": "./src" }, diff --git a/packages/@uppy/onedrive/tsconfig.json b/packages/@uppy/onedrive/tsconfig.json index e5220fb5ab..b90847da71 100644 --- a/packages/@uppy/onedrive/tsconfig.json +++ b/packages/@uppy/onedrive/tsconfig.json @@ -3,15 +3,6 @@ "compilerOptions": { "emitDeclarationOnly": false, "noEmit": true, - "paths": { - "@uppy/companion-client": ["../companion-client/src/index.js"], - "@uppy/companion-client/lib/*": ["../companion-client/src/*"], - "@uppy/provider-views": ["../provider-views/src/index.js"], - "@uppy/provider-views/lib/*": ["../provider-views/src/*"], - "@uppy/utils/lib/*": ["../utils/src/*"], - "@uppy/core": ["../core/src/index.js"], - "@uppy/core/lib/*": ["../core/src/*"], - }, }, "include": ["./package.json", "./src/**/*.*"], "references": [ diff --git a/packages/@uppy/progress-bar/CHANGELOG.md b/packages/@uppy/progress-bar/CHANGELOG.md index 69aa5b66de..2be968e055 100644 --- a/packages/@uppy/progress-bar/CHANGELOG.md +++ b/packages/@uppy/progress-bar/CHANGELOG.md @@ -1,5 +1,12 @@ # @uppy/progress-bar +## 4.2.0 + +Released: 2025-01-06 +Included in: Uppy v4.11.0 + +- @uppy/angular,@uppy/audio,@uppy/aws-s3,@uppy/box,@uppy/companion-client,@uppy/compressor,@uppy/core,@uppy/dashboard,@uppy/drag-drop,@uppy/drop-target,@uppy/dropbox,@uppy/facebook,@uppy/file-input,@uppy/form,@uppy/golden-retriever,@uppy/google-drive-picker,@uppy/google-drive,@uppy/google-photos-picker,@uppy/google-photos,@uppy/image-editor,@uppy/informer,@uppy/instagram,@uppy/locales,@uppy/onedrive,@uppy/progress-bar,@uppy/provider-views,@uppy/react,@uppy/remote-sources,@uppy/screen-capture,@uppy/status-bar,@uppy/thumbnail-generator,@uppy/transloadit,@uppy/tus,@uppy/unsplash,@uppy/url,@uppy/vue,@uppy/webcam,@uppy/webdav,@uppy/xhr-upload,@uppy/zoom: Remove "paths" from all tsconfig's (Merlijn Vos / #5572) + ## 4.0.2 Released: 2024-12-05 diff --git a/packages/@uppy/progress-bar/package.json b/packages/@uppy/progress-bar/package.json index f1a833b043..4ec4192940 100644 --- a/packages/@uppy/progress-bar/package.json +++ b/packages/@uppy/progress-bar/package.json @@ -1,7 +1,7 @@ { "name": "@uppy/progress-bar", "description": "A progress bar UI for Uppy", - "version": "4.1.0", + "version": "4.2.1", "license": "MIT", "main": "lib/index.js", "style": "dist/style.min.css", diff --git a/packages/@uppy/progress-bar/src/ProgressBar.tsx b/packages/@uppy/progress-bar/src/ProgressBar.tsx index 42a2036ca7..d48a6c3626 100644 --- a/packages/@uppy/progress-bar/src/ProgressBar.tsx +++ b/packages/@uppy/progress-bar/src/ProgressBar.tsx @@ -1,8 +1,13 @@ import { h, type ComponentChild } from 'preact' -import { UIPlugin, type UIPluginOptions } from '@uppy/core' -import type { Uppy, State } from '@uppy/core/lib/Uppy.js' -import type { Body, Meta } from '@uppy/utils/lib/UppyFile' -import type { DefinePluginOpts } from '@uppy/core/lib/BasePlugin.js' +import { UIPlugin } from '@uppy/core' +import type { + Uppy, + State, + UIPluginOptions, + Body, + Meta, + DefinePluginOpts, +} from '@uppy/core' // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore We don't want TS to generate types for the package.json diff --git a/packages/@uppy/progress-bar/src/index.ts b/packages/@uppy/progress-bar/src/index.ts index e102c83588..748c4c93cf 100644 --- a/packages/@uppy/progress-bar/src/index.ts +++ b/packages/@uppy/progress-bar/src/index.ts @@ -1,3 +1,3 @@ -export { default } from './ProgressBar.tsx' +export { default } from './ProgressBar.jsx' -export type { ProgressBarOptions } from './ProgressBar.tsx' +export type { ProgressBarOptions } from './ProgressBar.jsx' diff --git a/packages/@uppy/progress-bar/tsconfig.build.json b/packages/@uppy/progress-bar/tsconfig.build.json index 8d9ed22fa5..bbf30b5b43 100644 --- a/packages/@uppy/progress-bar/tsconfig.build.json +++ b/packages/@uppy/progress-bar/tsconfig.build.json @@ -2,11 +2,6 @@ "extends": "../../../tsconfig.shared", "compilerOptions": { "outDir": "./lib", - "paths": { - "@uppy/utils/lib/*": ["../utils/src/*"], - "@uppy/core": ["../core/src/index.js"], - "@uppy/core/lib/*": ["../core/src/*"] - }, "resolveJsonModule": false, "rootDir": "./src" }, diff --git a/packages/@uppy/progress-bar/tsconfig.json b/packages/@uppy/progress-bar/tsconfig.json index a76c3b714a..47ece599c6 100644 --- a/packages/@uppy/progress-bar/tsconfig.json +++ b/packages/@uppy/progress-bar/tsconfig.json @@ -3,11 +3,6 @@ "compilerOptions": { "emitDeclarationOnly": false, "noEmit": true, - "paths": { - "@uppy/utils/lib/*": ["../utils/src/*"], - "@uppy/core": ["../core/src/index.js"], - "@uppy/core/lib/*": ["../core/src/*"], - }, }, "include": ["./package.json", "./src/**/*.*"], "references": [ diff --git a/packages/@uppy/provider-views/CHANGELOG.md b/packages/@uppy/provider-views/CHANGELOG.md index dfe30cac58..068fa7b4fb 100644 --- a/packages/@uppy/provider-views/CHANGELOG.md +++ b/packages/@uppy/provider-views/CHANGELOG.md @@ -1,5 +1,34 @@ # @uppy/provider-views +## 4.4.1 + +Released: 2025-01-09 +Included in: Uppy v4.12.2 + +- @uppy/provider-views: Import types consistently from @uppy/core (Merlijn Vos / #5589) +- @uppy/provider-views: fix incorrect import (Merlijn Vos / #5588) + +## 4.4.0 + +Released: 2025-01-08 +Included in: Uppy v4.12.0 + +- @uppy/unsplash,@uppy/provider-views: add utmSource option (Merlijn Vos / #5580) + +## 4.3.0 + +Released: 2025-01-06 +Included in: Uppy v4.11.0 + +- @uppy/angular,@uppy/audio,@uppy/aws-s3,@uppy/box,@uppy/companion-client,@uppy/compressor,@uppy/core,@uppy/dashboard,@uppy/drag-drop,@uppy/drop-target,@uppy/dropbox,@uppy/facebook,@uppy/file-input,@uppy/form,@uppy/golden-retriever,@uppy/google-drive-picker,@uppy/google-drive,@uppy/google-photos-picker,@uppy/google-photos,@uppy/image-editor,@uppy/informer,@uppy/instagram,@uppy/locales,@uppy/onedrive,@uppy/progress-bar,@uppy/provider-views,@uppy/react,@uppy/remote-sources,@uppy/screen-capture,@uppy/status-bar,@uppy/thumbnail-generator,@uppy/transloadit,@uppy/tus,@uppy/unsplash,@uppy/url,@uppy/vue,@uppy/webcam,@uppy/webdav,@uppy/xhr-upload,@uppy/zoom: Remove "paths" from all tsconfig's (Merlijn Vos / #5572) + +## 4.2.1 + +Released: 2025-01-06 +Included in: Uppy v4.10.0 + +- @uppy/core,@uppy/dashboard,@uppy/provider-views,@uppy/store-redux,@uppy/url: build(deps): bump nanoid from 5.0.7 to 5.0.9 (dependabot[bot] / #5544) + ## 4.1.0 Released: 2024-12-05 diff --git a/packages/@uppy/provider-views/package.json b/packages/@uppy/provider-views/package.json index 810e450cbd..5455420da6 100644 --- a/packages/@uppy/provider-views/package.json +++ b/packages/@uppy/provider-views/package.json @@ -1,7 +1,7 @@ { "name": "@uppy/provider-views", "description": "View library for Uppy remote provider plugins.", - "version": "4.2.0", + "version": "4.4.1", "license": "MIT", "main": "lib/index.js", "style": "dist/style.min.css", diff --git a/packages/@uppy/provider-views/src/Breadcrumbs.tsx b/packages/@uppy/provider-views/src/Breadcrumbs.tsx index 621033da3c..3e0d4c6d83 100644 --- a/packages/@uppy/provider-views/src/Breadcrumbs.tsx +++ b/packages/@uppy/provider-views/src/Breadcrumbs.tsx @@ -1,7 +1,6 @@ -import type { PartialTreeFolder } from '@uppy/core/lib/Uppy.js' +import type { PartialTreeFolder, Body, Meta } from '@uppy/core' import { h, Fragment } from 'preact' -import type { Body, Meta } from '@uppy/utils/lib/UppyFile' -import type ProviderView from './ProviderView/index.ts' +import type ProviderView from './ProviderView/index.js' type BreadcrumbsProps = { openFolder: ProviderView['openFolder'] diff --git a/packages/@uppy/provider-views/src/Browser.tsx b/packages/@uppy/provider-views/src/Browser.tsx index fde01159c4..926dc99884 100644 --- a/packages/@uppy/provider-views/src/Browser.tsx +++ b/packages/@uppy/provider-views/src/Browser.tsx @@ -3,15 +3,16 @@ import { h } from 'preact' // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore untyped import VirtualList from '@uppy/utils/lib/VirtualList' -import type { Body, Meta } from '@uppy/utils/lib/UppyFile' -import type { I18n } from '@uppy/utils/lib/Translator' import type { + Body, + Meta, PartialTreeFile, PartialTreeFolderNode, -} from '@uppy/core/lib/Uppy.js' +} from '@uppy/core' +import type { I18n } from '@uppy/utils/lib/Translator' import { useEffect, useState } from 'preact/hooks' -import Item from './Item/index.tsx' -import ProviderView from './ProviderView/ProviderView.tsx' +import Item from './Item/index.jsx' +import ProviderView from './ProviderView/ProviderView.jsx' type BrowserProps = { displayedPartialTree: (PartialTreeFile | PartialTreeFolderNode)[] @@ -24,6 +25,7 @@ type BrowserProps = { openFolder: ProviderView['openFolder'] noResultsLabel: string virtualList: boolean + utmSource: string } function Browser(props: BrowserProps) { @@ -38,6 +40,7 @@ function Browser(props: BrowserProps) { openFolder, noResultsLabel, virtualList, + utmSource, } = props const [isShiftKeyPressed, setIsShiftKeyPressed] = useState(false) @@ -88,6 +91,7 @@ function Browser(props: BrowserProps) { i18n={i18n} openFolder={openFolder} file={item} + utmSource={utmSource} /> ) diff --git a/packages/@uppy/provider-views/src/FooterActions.tsx b/packages/@uppy/provider-views/src/FooterActions.tsx index db73fdd266..3b8155c7d3 100644 --- a/packages/@uppy/provider-views/src/FooterActions.tsx +++ b/packages/@uppy/provider-views/src/FooterActions.tsx @@ -1,11 +1,10 @@ import { h } from 'preact' import type { I18n } from '@uppy/utils/lib/Translator' -import type { Meta, Body } from '@uppy/utils/lib/UppyFile' +import type { Meta, Body, PartialTree } from '@uppy/core' import classNames from 'classnames' -import type { PartialTree } from '@uppy/core/lib/Uppy.js' import { useMemo } from 'preact/hooks' -import getNumberOfSelectedFiles from './utils/PartialTreeUtils/getNumberOfSelectedFiles.ts' -import ProviderView from './ProviderView/ProviderView.tsx' +import getNumberOfSelectedFiles from './utils/PartialTreeUtils/getNumberOfSelectedFiles.js' +import ProviderView from './ProviderView/ProviderView.jsx' export default function FooterActions({ cancelSelection, diff --git a/packages/@uppy/provider-views/src/GooglePicker/GooglePickerView.tsx b/packages/@uppy/provider-views/src/GooglePicker/GooglePickerView.tsx index 798ac34208..139e0296b0 100644 --- a/packages/@uppy/provider-views/src/GooglePicker/GooglePickerView.tsx +++ b/packages/@uppy/provider-views/src/GooglePicker/GooglePickerView.tsx @@ -1,8 +1,7 @@ import { h } from 'preact' import { useCallback, useEffect, useRef, useState } from 'preact/hooks' -import type { Uppy } from '@uppy/core' -import type { AsyncStore } from '@uppy/core/lib/Uppy.js' +import type { Uppy, AsyncStore } from '@uppy/core' import { authorize, diff --git a/packages/@uppy/provider-views/src/Item/components/GridItem.tsx b/packages/@uppy/provider-views/src/Item/components/GridItem.tsx index e2593fbb62..858b26e815 100644 --- a/packages/@uppy/provider-views/src/Item/components/GridItem.tsx +++ b/packages/@uppy/provider-views/src/Item/components/GridItem.tsx @@ -1,9 +1,6 @@ import { h } from 'preact' -import type { - PartialTreeFile, - PartialTreeFolderNode, -} from '@uppy/core/lib/Uppy.js' -import ItemIcon from './ItemIcon.tsx' +import type { PartialTreeFile, PartialTreeFolderNode } from '@uppy/core' +import ItemIcon from './ItemIcon.jsx' type GridItemProps = { file: PartialTreeFile | PartialTreeFolderNode diff --git a/packages/@uppy/provider-views/src/Item/components/ListItem.tsx b/packages/@uppy/provider-views/src/Item/components/ListItem.tsx index 8c7fc03297..0f0058457c 100644 --- a/packages/@uppy/provider-views/src/Item/components/ListItem.tsx +++ b/packages/@uppy/provider-views/src/Item/components/ListItem.tsx @@ -2,9 +2,9 @@ import type { PartialTreeFile, PartialTreeFolderNode, PartialTreeId, -} from '@uppy/core/lib/Uppy.js' +} from '@uppy/core' import { h } from 'preact' -import ItemIcon from './ItemIcon.tsx' +import ItemIcon from './ItemIcon.jsx' // if folder: // + checkbox (selects all files from folder) diff --git a/packages/@uppy/provider-views/src/Item/index.tsx b/packages/@uppy/provider-views/src/Item/index.tsx index 879e8a24a6..5a2d22c1ba 100644 --- a/packages/@uppy/provider-views/src/Item/index.tsx +++ b/packages/@uppy/provider-views/src/Item/index.tsx @@ -7,9 +7,9 @@ import type { PartialTreeFile, PartialTreeFolderNode, PartialTreeId, -} from '@uppy/core/lib/Uppy.js' -import GridItem from './components/GridItem.tsx' -import ListItem from './components/ListItem.tsx' +} from '@uppy/core' +import GridItem from './components/GridItem.jsx' +import ListItem from './components/ListItem.jsx' type ItemProps = { file: PartialTreeFile | PartialTreeFolderNode @@ -18,10 +18,19 @@ type ItemProps = { viewType: string showTitles: boolean i18n: I18n + utmSource: string } export default function Item(props: ItemProps): h.JSX.Element { - const { viewType, toggleCheckbox, showTitles, i18n, openFolder, file } = props + const { + viewType, + toggleCheckbox, + showTitles, + i18n, + openFolder, + file, + utmSource, + } = props const restrictionError = file.type === 'folder' ? null : file.restrictionError const isDisabled = !!restrictionError && file.status !== 'checked' @@ -30,6 +39,7 @@ export default function Item(props: ItemProps): h.JSX.Element { file, openFolder, toggleCheckbox, + utmSource, i18n, viewType, @@ -54,7 +64,7 @@ export default function Item(props: ItemProps): h.JSX.Element { return ( = { loading: boolean | string diff --git a/packages/@uppy/provider-views/src/ProviderView/Header.tsx b/packages/@uppy/provider-views/src/ProviderView/Header.tsx index 3184e44497..61e3fe9582 100644 --- a/packages/@uppy/provider-views/src/ProviderView/Header.tsx +++ b/packages/@uppy/provider-views/src/ProviderView/Header.tsx @@ -1,12 +1,11 @@ /* eslint-disable react/destructuring-assignment */ import { h } from 'preact' import type { I18n } from '@uppy/utils/lib/Translator' -import type { Body, Meta } from '@uppy/utils/lib/UppyFile' -import type { PartialTreeFolder } from '@uppy/core/lib/Uppy.js' +import type { Body, Meta, PartialTreeFolder } from '@uppy/core' import classNames from 'classnames' -import User from './User.tsx' -import Breadcrumbs from '../Breadcrumbs.tsx' -import type ProviderView from './ProviderView.ts' +import User from './User.jsx' +import Breadcrumbs from '../Breadcrumbs.jsx' +import type ProviderView from './ProviderView.js' type HeaderProps = { showBreadcrumbs: boolean diff --git a/packages/@uppy/provider-views/src/ProviderView/ProviderView.tsx b/packages/@uppy/provider-views/src/ProviderView/ProviderView.tsx index dba9e2fb76..fbcbd720d7 100644 --- a/packages/@uppy/provider-views/src/ProviderView/ProviderView.tsx +++ b/packages/@uppy/provider-views/src/ProviderView/ProviderView.tsx @@ -7,29 +7,30 @@ import type { UnknownProviderPluginState, PartialTreeId, PartialTree, -} from '@uppy/core/lib/Uppy.js' -import type { Body, Meta } from '@uppy/utils/lib/UppyFile' + Body, + Meta, +} from '@uppy/core' import type { CompanionFile } from '@uppy/utils/lib/CompanionFile' import classNames from 'classnames' import type { ValidateableFile } from '@uppy/core/lib/Restricter.js' import remoteFileObjToLocal from '@uppy/utils/lib/remoteFileObjToLocal' import type { I18n } from '@uppy/utils/lib/Translator' -import AuthView from './AuthView.tsx' -import Header from './Header.tsx' -import Browser from '../Browser.tsx' +import AuthView from './AuthView.jsx' +import Header from './Header.jsx' +import Browser from '../Browser.jsx' // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore We don't want TS to generate types for the package.json import packageJson from '../../package.json' -import PartialTreeUtils from '../utils/PartialTreeUtils/index.ts' -import shouldHandleScroll from '../utils/shouldHandleScroll.ts' -import handleError from '../utils/handleError.ts' -import getClickedRange from '../utils/getClickedRange.ts' -import SearchInput from '../SearchInput.tsx' -import FooterActions from '../FooterActions.tsx' -import addFiles from '../utils/addFiles.ts' -import getCheckedFilesWithPaths from '../utils/PartialTreeUtils/getCheckedFilesWithPaths.ts' -import getBreadcrumbs from '../utils/PartialTreeUtils/getBreadcrumbs.ts' +import PartialTreeUtils from '../utils/PartialTreeUtils/index.js' +import shouldHandleScroll from '../utils/shouldHandleScroll.js' +import handleError from '../utils/handleError.js' +import getClickedRange from '../utils/getClickedRange.js' +import SearchInput from '../SearchInput.jsx' +import FooterActions from '../FooterActions.jsx' +import addFiles from '../utils/addFiles.js' +import getCheckedFilesWithPaths from '../utils/PartialTreeUtils/getCheckedFilesWithPaths.js' +import getBreadcrumbs from '../utils/PartialTreeUtils/getBreadcrumbs.js' export function defaultPickerIcon(): h.JSX.Element { return ( @@ -488,6 +489,7 @@ export default class ProviderView { showTitles={opts.showTitles} i18n={this.plugin.uppy.i18n} isLoading={loading} + utmSource="Companion" /> = Pick, K> & Omit - interface Opts { provider: UnknownSearchProviderPlugin['provider'] - viewType: 'list' | 'grid' | 'unsplash' - showTitles: boolean - showFilter: boolean + viewType?: 'list' | 'grid' | 'unsplash' + showTitles?: boolean + showFilter?: boolean + utmSource?: string } -type PassedOpts = Optional< - Opts, - 'viewType' | 'showTitles' | 'showFilter' -> -type DefaultOpts = Omit, 'provider'> -type RenderOpts = Omit< - PassedOpts, - 'provider' -> + +type RenderOpts = Omit, 'provider'> type Res = { items: CompanionFile[] @@ -66,6 +60,13 @@ type Res = { searchedFor: string } +const defaultOptions = { + viewType: 'grid' as const, + showTitles: true, + showFilter: true, + utmSource: 'Companion', +} + /** * SearchProviderView, used for Unsplash and future image search providers. * Extends generic View, shared with regular providers like Google Drive and Instagram. @@ -77,23 +78,15 @@ export default class SearchProviderView { provider: UnknownSearchProviderPlugin['provider'] - opts: Opts + opts: DefinePluginOpts, keyof typeof defaultOptions> isHandlingScroll: boolean = false lastCheckbox: string | null = null - constructor( - plugin: UnknownSearchProviderPlugin, - opts: PassedOpts, - ) { + constructor(plugin: UnknownSearchProviderPlugin, opts: Opts) { this.plugin = plugin this.provider = opts.provider - const defaultOptions: DefaultOpts = { - viewType: 'grid', - showTitles: true, - showFilter: true, - } this.opts = { ...defaultOptions, ...opts } this.setSearchString = this.setSearchString.bind(this) @@ -286,7 +279,7 @@ export default class SearchProviderView { const { isInputMode, searchString, loading, partialTree } = this.plugin.getPluginState() const { i18n } = this.plugin.uppy - const opts: Opts = { ...this.opts, ...viewOptions } + const opts = { ...this.opts, ...viewOptions } if (isInputMode) { return ( @@ -334,6 +327,7 @@ export default class SearchProviderView { isLoading={loading} i18n={i18n} virtualList={false} + utmSource={this.opts.utmSource} /> ({ type: 'root', diff --git a/packages/@uppy/provider-views/src/utils/PartialTreeUtils/index.ts b/packages/@uppy/provider-views/src/utils/PartialTreeUtils/index.ts index 75af88923f..de3adb1648 100644 --- a/packages/@uppy/provider-views/src/utils/PartialTreeUtils/index.ts +++ b/packages/@uppy/provider-views/src/utils/PartialTreeUtils/index.ts @@ -1,7 +1,7 @@ -import afterOpenFolder from './afterOpenFolder.ts' -import afterScrollFolder from './afterScrollFolder.ts' -import afterToggleCheckbox from './afterToggleCheckbox.ts' -import afterFill from './afterFill.ts' +import afterOpenFolder from './afterOpenFolder.js' +import afterScrollFolder from './afterScrollFolder.js' +import afterToggleCheckbox from './afterToggleCheckbox.js' +import afterFill from './afterFill.js' export default { afterOpenFolder, diff --git a/packages/@uppy/provider-views/src/utils/PartialTreeUtils/shallowClone.ts b/packages/@uppy/provider-views/src/utils/PartialTreeUtils/shallowClone.ts index fa61ed586c..a68cdbf3cf 100644 --- a/packages/@uppy/provider-views/src/utils/PartialTreeUtils/shallowClone.ts +++ b/packages/@uppy/provider-views/src/utils/PartialTreeUtils/shallowClone.ts @@ -1,4 +1,4 @@ -import type { PartialTree } from '@uppy/core/lib/Uppy.js' +import type { PartialTree } from '@uppy/core' /** * One-level copying is sufficient as mutations within our `partialTree` are limited to properties diff --git a/packages/@uppy/provider-views/src/utils/addFiles.ts b/packages/@uppy/provider-views/src/utils/addFiles.ts index f5b4939451..19390fded8 100644 --- a/packages/@uppy/provider-views/src/utils/addFiles.ts +++ b/packages/@uppy/provider-views/src/utils/addFiles.ts @@ -6,7 +6,7 @@ import type { import type { CompanionFile } from '@uppy/utils/lib/CompanionFile' import type { Meta, Body, TagFile } from '@uppy/utils/lib/UppyFile' import { getSafeFileId } from '@uppy/utils/lib/generateFileID' -import getTagFile from './getTagFile.ts' +import getTagFile from './getTagFile.js' const addFiles = ( companionFiles: CompanionFile[], diff --git a/packages/@uppy/provider-views/src/utils/getClickedRange.ts b/packages/@uppy/provider-views/src/utils/getClickedRange.ts index 637885f0fa..71d8c6eac9 100644 --- a/packages/@uppy/provider-views/src/utils/getClickedRange.ts +++ b/packages/@uppy/provider-views/src/utils/getClickedRange.ts @@ -1,7 +1,4 @@ -import type { - PartialTreeFile, - PartialTreeFolderNode, -} from '@uppy/core/lib/Uppy.js' +import type { PartialTreeFile, PartialTreeFolderNode } from '@uppy/core' // Shift-clicking selects a single consecutive list of items // starting at the previous click. diff --git a/packages/@uppy/provider-views/tsconfig.build.json b/packages/@uppy/provider-views/tsconfig.build.json index 8d9ed22fa5..bbf30b5b43 100644 --- a/packages/@uppy/provider-views/tsconfig.build.json +++ b/packages/@uppy/provider-views/tsconfig.build.json @@ -2,11 +2,6 @@ "extends": "../../../tsconfig.shared", "compilerOptions": { "outDir": "./lib", - "paths": { - "@uppy/utils/lib/*": ["../utils/src/*"], - "@uppy/core": ["../core/src/index.js"], - "@uppy/core/lib/*": ["../core/src/*"] - }, "resolveJsonModule": false, "rootDir": "./src" }, diff --git a/packages/@uppy/provider-views/tsconfig.json b/packages/@uppy/provider-views/tsconfig.json index 8a0f38c687..99697d18bb 100644 --- a/packages/@uppy/provider-views/tsconfig.json +++ b/packages/@uppy/provider-views/tsconfig.json @@ -3,11 +3,6 @@ "compilerOptions": { "emitDeclarationOnly": false, "noEmit": true, - "paths": { - "@uppy/utils/lib/*": ["../utils/src/*"], - "@uppy/core": ["../core/src/index.js"], - "@uppy/core/lib/*": ["../core/src/*"], - }, "types": ["google.accounts", "google.picker", "gapi"], }, "include": ["./package.json", "./src/**/*.*"], diff --git a/packages/@uppy/react/CHANGELOG.md b/packages/@uppy/react/CHANGELOG.md index c70355745e..98f6f617e0 100644 --- a/packages/@uppy/react/CHANGELOG.md +++ b/packages/@uppy/react/CHANGELOG.md @@ -1,5 +1,19 @@ # @uppy/react +## 4.2.0 + +Released: 2025-01-06 +Included in: Uppy v4.11.0 + +- @uppy/angular,@uppy/audio,@uppy/aws-s3,@uppy/box,@uppy/companion-client,@uppy/compressor,@uppy/core,@uppy/dashboard,@uppy/drag-drop,@uppy/drop-target,@uppy/dropbox,@uppy/facebook,@uppy/file-input,@uppy/form,@uppy/golden-retriever,@uppy/google-drive-picker,@uppy/google-drive,@uppy/google-photos-picker,@uppy/google-photos,@uppy/image-editor,@uppy/informer,@uppy/instagram,@uppy/locales,@uppy/onedrive,@uppy/progress-bar,@uppy/provider-views,@uppy/react,@uppy/remote-sources,@uppy/screen-capture,@uppy/status-bar,@uppy/thumbnail-generator,@uppy/transloadit,@uppy/tus,@uppy/unsplash,@uppy/url,@uppy/vue,@uppy/webcam,@uppy/webdav,@uppy/xhr-upload,@uppy/zoom: Remove "paths" from all tsconfig's (Merlijn Vos / #5572) + +## 4.1.0 + +Released: 2025-01-06 +Included in: Uppy v4.10.0 + +- @uppy/react: allow React 19 as peer dependency (Shubs / #5556) + ## 4.0.4 Released: 2024-12-05 diff --git a/packages/@uppy/react/package.json b/packages/@uppy/react/package.json index 772b18656f..f588496f23 100644 --- a/packages/@uppy/react/package.json +++ b/packages/@uppy/react/package.json @@ -1,7 +1,7 @@ { "name": "@uppy/react", "description": "React component wrappers around Uppy's official UI plugins.", - "version": "4.0.4", + "version": "4.2.1", "license": "MIT", "main": "lib/index.js", "type": "module", diff --git a/packages/@uppy/react/src/Dashboard.ts b/packages/@uppy/react/src/Dashboard.ts index c4769b0f6a..2c164a66e2 100644 --- a/packages/@uppy/react/src/Dashboard.ts +++ b/packages/@uppy/react/src/Dashboard.ts @@ -1,11 +1,10 @@ import { createElement as h, Component } from 'react' import type React from 'react' -import type { UnknownPlugin, Uppy } from '@uppy/core' +import type { UnknownPlugin, Uppy, Body, Meta } from '@uppy/core' import DashboardPlugin from '@uppy/dashboard' -import type { Body, Meta } from '@uppy/utils/lib/UppyFile' import type { DashboardOptions } from '@uppy/dashboard' -import getHTMLProps from './getHTMLProps.ts' -import nonHtmlPropsHaveChanged from './nonHtmlPropsHaveChanged.ts' +import getHTMLProps from './getHTMLProps.js' +import nonHtmlPropsHaveChanged from './nonHtmlPropsHaveChanged.js' type DashboardInlineOptions = Omit< DashboardOptions & { inline: true }, diff --git a/packages/@uppy/react/src/DashboardModal.ts b/packages/@uppy/react/src/DashboardModal.ts index 00c744406c..c623f21cf3 100644 --- a/packages/@uppy/react/src/DashboardModal.ts +++ b/packages/@uppy/react/src/DashboardModal.ts @@ -1,10 +1,9 @@ import { createElement as h, Component } from 'react' import type React from 'react' import DashboardPlugin, { type DashboardOptions } from '@uppy/dashboard' -import type { Body, Meta } from '@uppy/utils/lib/UppyFile' -import type { Uppy } from '@uppy/core' -import getHTMLProps from './getHTMLProps.ts' -import nonHtmlPropsHaveChanged from './nonHtmlPropsHaveChanged.ts' +import type { Body, Meta, Uppy } from '@uppy/core' +import getHTMLProps from './getHTMLProps.js' +import nonHtmlPropsHaveChanged from './nonHtmlPropsHaveChanged.js' type DashboardInlineOptions = Omit< DashboardOptions & { inline: false }, diff --git a/packages/@uppy/react/src/DragDrop.ts b/packages/@uppy/react/src/DragDrop.ts index 968c21e701..5c6dce8673 100644 --- a/packages/@uppy/react/src/DragDrop.ts +++ b/packages/@uppy/react/src/DragDrop.ts @@ -1,9 +1,8 @@ import { createElement as h, Component } from 'react' -import type { UnknownPlugin, Uppy } from '@uppy/core' +import type { UnknownPlugin, Uppy, Body, Meta } from '@uppy/core' import DragDropPlugin, { type DragDropOptions } from '@uppy/drag-drop' -import type { Body, Meta } from '@uppy/utils/lib/UppyFile' -import getHTMLProps from './getHTMLProps.ts' -import nonHtmlPropsHaveChanged from './nonHtmlPropsHaveChanged.ts' +import getHTMLProps from './getHTMLProps.js' +import nonHtmlPropsHaveChanged from './nonHtmlPropsHaveChanged.js' interface DragDropProps extends DragDropOptions { diff --git a/packages/@uppy/react/src/FileInput.ts b/packages/@uppy/react/src/FileInput.ts index 740c389f3e..6885b9123a 100644 --- a/packages/@uppy/react/src/FileInput.ts +++ b/packages/@uppy/react/src/FileInput.ts @@ -1,7 +1,12 @@ import { createElement as h, Component } from 'react' -import type { UIPluginOptions, UnknownPlugin, Uppy } from '@uppy/core' +import type { + UIPluginOptions, + UnknownPlugin, + Uppy, + Body, + Meta, +} from '@uppy/core' import FileInputPlugin from '@uppy/file-input' -import type { Body, Meta } from '@uppy/utils/lib/UppyFile' import type { Locale } from '@uppy/utils/lib/Translator' interface FileInputProps diff --git a/packages/@uppy/react/src/ProgressBar.ts b/packages/@uppy/react/src/ProgressBar.ts index e66023718f..e3ae8b8cb1 100644 --- a/packages/@uppy/react/src/ProgressBar.ts +++ b/packages/@uppy/react/src/ProgressBar.ts @@ -1,9 +1,8 @@ import { createElement as h, Component } from 'react' -import type { UnknownPlugin, Uppy } from '@uppy/core' +import type { UnknownPlugin, Uppy, Body, Meta } from '@uppy/core' import ProgressBarPlugin, { type ProgressBarOptions } from '@uppy/progress-bar' -import type { Body, Meta } from '@uppy/utils/lib/UppyFile' -import getHTMLProps from './getHTMLProps.ts' -import nonHtmlPropsHaveChanged from './nonHtmlPropsHaveChanged.ts' +import getHTMLProps from './getHTMLProps.js' +import nonHtmlPropsHaveChanged from './nonHtmlPropsHaveChanged.js' interface ProgressBarProps extends ProgressBarOptions { diff --git a/packages/@uppy/react/src/StatusBar.ts b/packages/@uppy/react/src/StatusBar.ts index c5e3fb9c39..8319d20dee 100644 --- a/packages/@uppy/react/src/StatusBar.ts +++ b/packages/@uppy/react/src/StatusBar.ts @@ -1,9 +1,8 @@ import { createElement as h, Component } from 'react' -import type { UnknownPlugin, Uppy } from '@uppy/core' +import type { UnknownPlugin, Uppy, Body, Meta } from '@uppy/core' import StatusBarPlugin, { type StatusBarOptions } from '@uppy/status-bar' -import type { Body, Meta } from '@uppy/utils/lib/UppyFile' -import getHTMLProps from './getHTMLProps.ts' -import nonHtmlPropsHaveChanged from './nonHtmlPropsHaveChanged.ts' +import getHTMLProps from './getHTMLProps.js' +import nonHtmlPropsHaveChanged from './nonHtmlPropsHaveChanged.js' interface StatusBarProps extends StatusBarOptions { diff --git a/packages/@uppy/react/src/getHTMLProps.ts b/packages/@uppy/react/src/getHTMLProps.ts index 54af2d7577..9af6b6a09b 100644 --- a/packages/@uppy/react/src/getHTMLProps.ts +++ b/packages/@uppy/react/src/getHTMLProps.ts @@ -1,5 +1,5 @@ // List taken from React.HTMLAttributes supported properties: -// https://unpkg.com/@types/react@17.0.22/index.d.ts:1821 +// https://unpkg.com/@types/react@17.0.22/index.d.js:1821 const reactSupportedHtmlAttr = [ // React-specific Attributes 'defaultChecked', diff --git a/packages/@uppy/react/src/index.ts b/packages/@uppy/react/src/index.ts index 818c8db46f..bea50afd88 100644 --- a/packages/@uppy/react/src/index.ts +++ b/packages/@uppy/react/src/index.ts @@ -1,8 +1,8 @@ -export { default as Dashboard } from './Dashboard.ts' -export { default as DashboardModal } from './DashboardModal.ts' -export { default as DragDrop } from './DragDrop.ts' -export { default as ProgressBar } from './ProgressBar.ts' -export { default as StatusBar } from './StatusBar.ts' -export { default as FileInput } from './FileInput.ts' -export { default as useUppyState } from './useUppyState.ts' -export { default as useUppyEvent } from './useUppyEvent.ts' +export { default as Dashboard } from './Dashboard.js' +export { default as DashboardModal } from './DashboardModal.js' +export { default as DragDrop } from './DragDrop.js' +export { default as ProgressBar } from './ProgressBar.js' +export { default as StatusBar } from './StatusBar.js' +export { default as FileInput } from './FileInput.js' +export { default as useUppyState } from './useUppyState.js' +export { default as useUppyEvent } from './useUppyEvent.js' diff --git a/packages/@uppy/react/src/nonHtmlPropsHaveChanged.ts b/packages/@uppy/react/src/nonHtmlPropsHaveChanged.ts index 86e12cf885..87afecb349 100644 --- a/packages/@uppy/react/src/nonHtmlPropsHaveChanged.ts +++ b/packages/@uppy/react/src/nonHtmlPropsHaveChanged.ts @@ -1,4 +1,4 @@ -import getHTMLProps from './getHTMLProps.ts' +import getHTMLProps from './getHTMLProps.js' export default function nonHtmlPropsHaveChanged< T extends Record, diff --git a/packages/@uppy/react/src/useUppyEvent.test.ts b/packages/@uppy/react/src/useUppyEvent.test.ts index 44656c1e0b..3dc299fe00 100644 --- a/packages/@uppy/react/src/useUppyEvent.test.ts +++ b/packages/@uppy/react/src/useUppyEvent.test.ts @@ -5,7 +5,7 @@ import { renderHook, act } from '@testing-library/react' import Uppy from '@uppy/core' import type { Meta, UppyFile } from '@uppy/utils/lib/UppyFile' -import { useUppyEvent } from './index.ts' +import { useUppyEvent } from './index.js' describe('useUppyEvent', () => { it('should return and update value with the correct type', () => { diff --git a/packages/@uppy/react/src/useUppyEvent.ts b/packages/@uppy/react/src/useUppyEvent.ts index 54f23a95c4..4e1ae26489 100644 --- a/packages/@uppy/react/src/useUppyEvent.ts +++ b/packages/@uppy/react/src/useUppyEvent.ts @@ -1,5 +1,4 @@ -import type { Uppy, UppyEventMap } from '@uppy/core' -import type { Meta, Body } from '@uppy/utils/lib/UppyFile' +import type { Meta, Body, Uppy, UppyEventMap } from '@uppy/core' import { useEffect, useState } from 'react' type EventResults< diff --git a/packages/@uppy/react/src/useUppyState.test.tsx b/packages/@uppy/react/src/useUppyState.test.tsx index 7a8d376319..81d4ef3b06 100644 --- a/packages/@uppy/react/src/useUppyState.test.tsx +++ b/packages/@uppy/react/src/useUppyState.test.tsx @@ -5,7 +5,7 @@ import { describe, expect, expectTypeOf, it } from 'vitest' import { renderHook, render, act } from '@testing-library/react' import Uppy from '@uppy/core' -import useUppyState from './useUppyState.ts' +import useUppyState from './useUppyState.js' describe('useUppyState', () => { it('should return and update value with the correct type', () => { diff --git a/packages/@uppy/react/src/useUppyState.ts b/packages/@uppy/react/src/useUppyState.ts index b811e89a77..f22c8d7d14 100644 --- a/packages/@uppy/react/src/useUppyState.ts +++ b/packages/@uppy/react/src/useUppyState.ts @@ -1,5 +1,4 @@ -import type { Uppy, State } from '@uppy/core' -import type { Body, Meta } from '@uppy/utils/lib/UppyFile' +import type { Uppy, State, Body, Meta } from '@uppy/core' import { useMemo, useCallback } from 'react' import { useSyncExternalStoreWithSelector } from 'use-sync-external-store/with-selector.js' diff --git a/packages/@uppy/react/tsconfig.build.json b/packages/@uppy/react/tsconfig.build.json index 8a2ff2f64e..6eb2612c73 100644 --- a/packages/@uppy/react/tsconfig.build.json +++ b/packages/@uppy/react/tsconfig.build.json @@ -4,21 +4,6 @@ "outDir": "./lib", "jsxImportSource": "react", "jsx": "react-jsx", - "paths": { - "@uppy/utils/lib/*": ["../utils/src/*"], - "@uppy/core": ["../core/src/index.js"], - "@uppy/core/lib/*": ["../core/src/*"], - "@uppy/dashboard": ["../dashboard/src/index.js"], - "@uppy/dashboard/lib/*": ["../dashboard/src/*"], - "@uppy/drag-drop": ["../drag-drop/src/index.js"], - "@uppy/drag-drop/lib/*": ["../drag-drop/src/*"], - "@uppy/file-input": ["../file-input/src/index.js"], - "@uppy/file-input/lib/*": ["../file-input/src/*"], - "@uppy/progress-bar": ["../progress-bar/src/index.js"], - "@uppy/progress-bar/lib/*": ["../progress-bar/src/*"], - "@uppy/status-bar": ["../status-bar/src/index.js"], - "@uppy/status-bar/lib/*": ["../status-bar/src/*"] - }, "resolveJsonModule": false, "rootDir": "./src" }, diff --git a/packages/@uppy/react/tsconfig.json b/packages/@uppy/react/tsconfig.json index 9c3fc403c0..02a3cc5f44 100644 --- a/packages/@uppy/react/tsconfig.json +++ b/packages/@uppy/react/tsconfig.json @@ -5,21 +5,6 @@ "noEmit": true, "jsxImportSource": "react", "jsx": "react-jsx", - "paths": { - "@uppy/utils/lib/*": ["../utils/src/*"], - "@uppy/core": ["../core/src/index.js"], - "@uppy/core/lib/*": ["../core/src/*"], - "@uppy/dashboard": ["../dashboard/src/index.js"], - "@uppy/dashboard/lib/*": ["../dashboard/src/*"], - "@uppy/drag-drop": ["../drag-drop/src/index.js"], - "@uppy/drag-drop/lib/*": ["../drag-drop/src/*"], - "@uppy/file-input": ["../file-input/src/index.js"], - "@uppy/file-input/lib/*": ["../file-input/src/*"], - "@uppy/progress-bar": ["../progress-bar/src/index.js"], - "@uppy/progress-bar/lib/*": ["../progress-bar/src/*"], - "@uppy/status-bar": ["../status-bar/src/index.js"], - "@uppy/status-bar/lib/*": ["../status-bar/src/*"], - }, }, "include": ["./package.json", "./src/**/*.*"], "references": [ diff --git a/packages/@uppy/remote-sources/CHANGELOG.md b/packages/@uppy/remote-sources/CHANGELOG.md index 5bbd5c7de0..07c952924a 100644 --- a/packages/@uppy/remote-sources/CHANGELOG.md +++ b/packages/@uppy/remote-sources/CHANGELOG.md @@ -1,5 +1,12 @@ # @uppy/remote-sources +## 2.3.0 + +Released: 2025-01-06 +Included in: Uppy v4.11.0 + +- @uppy/angular,@uppy/audio,@uppy/aws-s3,@uppy/box,@uppy/companion-client,@uppy/compressor,@uppy/core,@uppy/dashboard,@uppy/drag-drop,@uppy/drop-target,@uppy/dropbox,@uppy/facebook,@uppy/file-input,@uppy/form,@uppy/golden-retriever,@uppy/google-drive-picker,@uppy/google-drive,@uppy/google-photos-picker,@uppy/google-photos,@uppy/image-editor,@uppy/informer,@uppy/instagram,@uppy/locales,@uppy/onedrive,@uppy/progress-bar,@uppy/provider-views,@uppy/react,@uppy/remote-sources,@uppy/screen-capture,@uppy/status-bar,@uppy/thumbnail-generator,@uppy/transloadit,@uppy/tus,@uppy/unsplash,@uppy/url,@uppy/vue,@uppy/webcam,@uppy/webdav,@uppy/xhr-upload,@uppy/zoom: Remove "paths" from all tsconfig's (Merlijn Vos / #5572) + ## 2.2.1 Released: 2024-12-05 diff --git a/packages/@uppy/remote-sources/package.json b/packages/@uppy/remote-sources/package.json index 001ce1ca82..62ec53b782 100644 --- a/packages/@uppy/remote-sources/package.json +++ b/packages/@uppy/remote-sources/package.json @@ -1,7 +1,7 @@ { "name": "@uppy/remote-sources", "description": "Uppy plugin that includes all remote sources that Uppy+Companion offer, like Instagram, Google Drive, Dropox, Box, Unsplash, Url etc", - "version": "2.2.1", + "version": "2.3.1", "license": "MIT", "main": "lib/index.js", "type": "module", diff --git a/packages/@uppy/remote-sources/src/index.test.ts b/packages/@uppy/remote-sources/src/index.test.ts index 09f2f09374..0faec72626 100644 --- a/packages/@uppy/remote-sources/src/index.test.ts +++ b/packages/@uppy/remote-sources/src/index.test.ts @@ -2,7 +2,7 @@ import { afterAll, beforeAll, describe, expect, it } from 'vitest' import resizeObserverPolyfill from 'resize-observer-polyfill' import Core from '@uppy/core' import Dashboard from '@uppy/dashboard' -import RemoteSources from './index.ts' +import RemoteSources from './index.js' describe('RemoteSources', () => { beforeAll(() => { diff --git a/packages/@uppy/remote-sources/src/index.ts b/packages/@uppy/remote-sources/src/index.ts index 460e6123ef..c7ec1d8674 100644 --- a/packages/@uppy/remote-sources/src/index.ts +++ b/packages/@uppy/remote-sources/src/index.ts @@ -1,4 +1,11 @@ -import { BasePlugin, Uppy, type UnknownProviderPlugin } from '@uppy/core' +import { BasePlugin } from '@uppy/core' +import type { + Uppy, + UnknownProviderPlugin, + DefinePluginOpts, + Body, + Meta, +} from '@uppy/core' import Dropbox from '@uppy/dropbox' import GoogleDrive from '@uppy/google-drive' import GooglePhotos from '@uppy/google-photos' @@ -10,8 +17,6 @@ import Unsplash from '@uppy/unsplash' import Url from '@uppy/url' import Zoom from '@uppy/zoom' -import type { DefinePluginOpts } from '@uppy/core/lib/BasePlugin.js' -import type { Body, Meta } from '@uppy/utils/lib/UppyFile' import type { CompanionPluginOptions } from '@uppy/companion-client' // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore We don't want TS to generate types for the package.json diff --git a/packages/@uppy/remote-sources/tsconfig.build.json b/packages/@uppy/remote-sources/tsconfig.build.json index fc59cd4bf2..d073046335 100644 --- a/packages/@uppy/remote-sources/tsconfig.build.json +++ b/packages/@uppy/remote-sources/tsconfig.build.json @@ -2,32 +2,6 @@ "extends": "../../../tsconfig.shared", "compilerOptions": { "outDir": "./lib", - "paths": { - "@uppy/box": ["../box/src/index.js"], - "@uppy/box/lib/*": ["../box/src/*"], - "@uppy/dashboard": ["../dashboard/src/index.js"], - "@uppy/dashboard/lib/*": ["../dashboard/src/*"], - "@uppy/dropbox": ["../dropbox/src/index.js"], - "@uppy/dropbox/lib/*": ["../dropbox/src/*"], - "@uppy/facebook": ["../facebook/src/index.js"], - "@uppy/facebook/lib/*": ["../facebook/src/*"], - "@uppy/google-drive": ["../google-drive/src/index.js"], - "@uppy/google-drive/lib/*": ["../google-drive/src/*"], - "@uppy/google-photos": ["../google-photos/src/index.js"], - "@uppy/google-photos/lib/*": ["../google-photos/src/*"], - "@uppy/instagram": ["../instagram/src/index.js"], - "@uppy/instagram/lib/*": ["../instagram/src/*"], - "@uppy/onedrive": ["../onedrive/src/index.js"], - "@uppy/onedrive/lib/*": ["../onedrive/src/*"], - "@uppy/unsplash": ["../unsplash/src/index.js"], - "@uppy/unsplash/lib/*": ["../unsplash/src/*"], - "@uppy/url": ["../url/src/index.js"], - "@uppy/url/lib/*": ["../url/src/*"], - "@uppy/zoom": ["../zoom/src/index.js"], - "@uppy/zoom/lib/*": ["../zoom/src/*"], - "@uppy/core": ["../core/src/index.js"], - "@uppy/core/lib/*": ["../core/src/*"] - }, "resolveJsonModule": false, "rootDir": "./src" }, diff --git a/packages/@uppy/remote-sources/tsconfig.json b/packages/@uppy/remote-sources/tsconfig.json index 73052cf39c..820a89b917 100644 --- a/packages/@uppy/remote-sources/tsconfig.json +++ b/packages/@uppy/remote-sources/tsconfig.json @@ -3,32 +3,6 @@ "compilerOptions": { "emitDeclarationOnly": false, "noEmit": true, - "paths": { - "@uppy/box": ["../box/src/index.js"], - "@uppy/box/lib/*": ["../box/src/*"], - "@uppy/dashboard": ["../dashboard/src/index.js"], - "@uppy/dashboard/lib/*": ["../dashboard/src/*"], - "@uppy/dropbox": ["../dropbox/src/index.js"], - "@uppy/dropbox/lib/*": ["../dropbox/src/*"], - "@uppy/facebook": ["../facebook/src/index.js"], - "@uppy/facebook/lib/*": ["../facebook/src/*"], - "@uppy/google-drive": ["../google-drive/src/index.js"], - "@uppy/google-drive/lib/*": ["../google-drive/src/*"], - "@uppy/google-photos": ["../google-photos/src/index.js"], - "@uppy/google-photos/lib/*": ["../google-photos/src/*"], - "@uppy/instagram": ["../instagram/src/index.js"], - "@uppy/instagram/lib/*": ["../instagram/src/*"], - "@uppy/onedrive": ["../onedrive/src/index.js"], - "@uppy/onedrive/lib/*": ["../onedrive/src/*"], - "@uppy/unsplash": ["../unsplash/src/index.js"], - "@uppy/unsplash/lib/*": ["../unsplash/src/*"], - "@uppy/url": ["../url/src/index.js"], - "@uppy/url/lib/*": ["../url/src/*"], - "@uppy/zoom": ["../zoom/src/index.js"], - "@uppy/zoom/lib/*": ["../zoom/src/*"], - "@uppy/core": ["../core/src/index.js"], - "@uppy/core/lib/*": ["../core/src/*"], - }, }, "include": ["./package.json", "./src/**/*.*"], "references": [ diff --git a/packages/@uppy/screen-capture/CHANGELOG.md b/packages/@uppy/screen-capture/CHANGELOG.md index 0bc7fc32e5..690495eeb9 100644 --- a/packages/@uppy/screen-capture/CHANGELOG.md +++ b/packages/@uppy/screen-capture/CHANGELOG.md @@ -1,5 +1,12 @@ # @uppy/screen-capture +## 4.2.0 + +Released: 2025-01-06 +Included in: Uppy v4.11.0 + +- @uppy/angular,@uppy/audio,@uppy/aws-s3,@uppy/box,@uppy/companion-client,@uppy/compressor,@uppy/core,@uppy/dashboard,@uppy/drag-drop,@uppy/drop-target,@uppy/dropbox,@uppy/facebook,@uppy/file-input,@uppy/form,@uppy/golden-retriever,@uppy/google-drive-picker,@uppy/google-drive,@uppy/google-photos-picker,@uppy/google-photos,@uppy/image-editor,@uppy/informer,@uppy/instagram,@uppy/locales,@uppy/onedrive,@uppy/progress-bar,@uppy/provider-views,@uppy/react,@uppy/remote-sources,@uppy/screen-capture,@uppy/status-bar,@uppy/thumbnail-generator,@uppy/transloadit,@uppy/tus,@uppy/unsplash,@uppy/url,@uppy/vue,@uppy/webcam,@uppy/webdav,@uppy/xhr-upload,@uppy/zoom: Remove "paths" from all tsconfig's (Merlijn Vos / #5572) + ## 4.1.2 Released: 2024-12-05 diff --git a/packages/@uppy/screen-capture/package.json b/packages/@uppy/screen-capture/package.json index 751826d9d5..84e39c70e1 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": "4.1.2", + "version": "4.2.1", "license": "MIT", "main": "lib/index.js", "style": "dist/style.min.css", diff --git a/packages/@uppy/screen-capture/src/RecorderScreen.tsx b/packages/@uppy/screen-capture/src/RecorderScreen.tsx index a4f178e850..924c7a1b5e 100644 --- a/packages/@uppy/screen-capture/src/RecorderScreen.tsx +++ b/packages/@uppy/screen-capture/src/RecorderScreen.tsx @@ -1,12 +1,12 @@ /* eslint-disable react/jsx-props-no-spreading */ import { h, Component, type ComponentChild } from 'preact' -import type { Body, Meta } from '@uppy/utils/lib/UppyFile' -import RecordButton from './RecordButton.tsx' -import SubmitButton from './SubmitButton.tsx' -import StopWatch from './StopWatch.tsx' -import StreamStatus from './StreamStatus.tsx' +import type { Body, Meta } from '@uppy/core' +import RecordButton from './RecordButton.jsx' +import SubmitButton from './SubmitButton.jsx' +import StopWatch from './StopWatch.jsx' +import StreamStatus from './StreamStatus.jsx' -import ScreenCapture, { type ScreenCaptureState } from './ScreenCapture.tsx' +import ScreenCapture, { type ScreenCaptureState } from './ScreenCapture.jsx' type RecorderScreenProps = { onStartRecording: ScreenCapture['startRecording'] diff --git a/packages/@uppy/screen-capture/src/ScreenCapture.tsx b/packages/@uppy/screen-capture/src/ScreenCapture.tsx index 7414bed088..22ab7f93fe 100644 --- a/packages/@uppy/screen-capture/src/ScreenCapture.tsx +++ b/packages/@uppy/screen-capture/src/ScreenCapture.tsx @@ -1,15 +1,20 @@ import { h, type ComponentChild } from 'preact' -import { UIPlugin, Uppy, type UIPluginOptions } from '@uppy/core' +import { UIPlugin } from '@uppy/core' +import type { + Uppy, + UIPluginOptions, + DefinePluginOpts, + Body, + Meta, +} from '@uppy/core' import getFileTypeExtension from '@uppy/utils/lib/getFileTypeExtension' -import type { DefinePluginOpts } from '@uppy/core/lib/BasePlugin.js' -import type { Body, Meta } from '@uppy/utils/lib/UppyFile' -import ScreenRecIcon from './ScreenRecIcon.tsx' -import RecorderScreen from './RecorderScreen.tsx' +import ScreenRecIcon from './ScreenRecIcon.jsx' +import RecorderScreen from './RecorderScreen.jsx' // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore We don't want TS to generate types for the package.json import packageJson from '../package.json' -import locale from './locale.ts' +import locale from './locale.js' // Check if screen capturing is supported. // mediaDevices is supprted on mobile Safari, getDisplayMedia is not diff --git a/packages/@uppy/screen-capture/src/index.ts b/packages/@uppy/screen-capture/src/index.ts index 60ff953d37..84fc694c32 100644 --- a/packages/@uppy/screen-capture/src/index.ts +++ b/packages/@uppy/screen-capture/src/index.ts @@ -1,2 +1,2 @@ -export { default } from './ScreenCapture.tsx' -export type { ScreenCaptureOptions } from './ScreenCapture.tsx' +export { default } from './ScreenCapture.jsx' +export type { ScreenCaptureOptions } from './ScreenCapture.jsx' diff --git a/packages/@uppy/screen-capture/tsconfig.build.json b/packages/@uppy/screen-capture/tsconfig.build.json index 8d9ed22fa5..bbf30b5b43 100644 --- a/packages/@uppy/screen-capture/tsconfig.build.json +++ b/packages/@uppy/screen-capture/tsconfig.build.json @@ -2,11 +2,6 @@ "extends": "../../../tsconfig.shared", "compilerOptions": { "outDir": "./lib", - "paths": { - "@uppy/utils/lib/*": ["../utils/src/*"], - "@uppy/core": ["../core/src/index.js"], - "@uppy/core/lib/*": ["../core/src/*"] - }, "resolveJsonModule": false, "rootDir": "./src" }, diff --git a/packages/@uppy/screen-capture/tsconfig.json b/packages/@uppy/screen-capture/tsconfig.json index a76c3b714a..47ece599c6 100644 --- a/packages/@uppy/screen-capture/tsconfig.json +++ b/packages/@uppy/screen-capture/tsconfig.json @@ -3,11 +3,6 @@ "compilerOptions": { "emitDeclarationOnly": false, "noEmit": true, - "paths": { - "@uppy/utils/lib/*": ["../utils/src/*"], - "@uppy/core": ["../core/src/index.js"], - "@uppy/core/lib/*": ["../core/src/*"], - }, }, "include": ["./package.json", "./src/**/*.*"], "references": [ diff --git a/packages/@uppy/status-bar/CHANGELOG.md b/packages/@uppy/status-bar/CHANGELOG.md index 7731598a6b..e4a2ae9af8 100644 --- a/packages/@uppy/status-bar/CHANGELOG.md +++ b/packages/@uppy/status-bar/CHANGELOG.md @@ -1,5 +1,19 @@ # @uppy/status-bar +## 4.1.1 + +Released: 2025-01-09 +Included in: Uppy v4.12.2 + +- @uppy/status-bar: fix double upload progress (Mikael Finstad / #5587) + +## 4.1.0 + +Released: 2025-01-06 +Included in: Uppy v4.11.0 + +- @uppy/angular,@uppy/audio,@uppy/aws-s3,@uppy/box,@uppy/companion-client,@uppy/compressor,@uppy/core,@uppy/dashboard,@uppy/drag-drop,@uppy/drop-target,@uppy/dropbox,@uppy/facebook,@uppy/file-input,@uppy/form,@uppy/golden-retriever,@uppy/google-drive-picker,@uppy/google-drive,@uppy/google-photos-picker,@uppy/google-photos,@uppy/image-editor,@uppy/informer,@uppy/instagram,@uppy/locales,@uppy/onedrive,@uppy/progress-bar,@uppy/provider-views,@uppy/react,@uppy/remote-sources,@uppy/screen-capture,@uppy/status-bar,@uppy/thumbnail-generator,@uppy/transloadit,@uppy/tus,@uppy/unsplash,@uppy/url,@uppy/vue,@uppy/webcam,@uppy/webdav,@uppy/xhr-upload,@uppy/zoom: Remove "paths" from all tsconfig's (Merlijn Vos / #5572) + ## 4.0.6 Released: 2024-12-17 diff --git a/packages/@uppy/status-bar/package.json b/packages/@uppy/status-bar/package.json index 89d2b380b3..8f41530408 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": "4.0.6", + "version": "4.1.1", "license": "MIT", "main": "lib/index.js", "style": "dist/style.min.css", diff --git a/packages/@uppy/status-bar/src/Components.tsx b/packages/@uppy/status-bar/src/Components.tsx index 747e7c74a1..41e56b20d9 100644 --- a/packages/@uppy/status-bar/src/Components.tsx +++ b/packages/@uppy/status-bar/src/Components.tsx @@ -1,5 +1,4 @@ -import type { Body, Meta } from '@uppy/utils/lib/UppyFile' -import type { State, Uppy } from '@uppy/core/lib/Uppy.js' +import type { Body, Meta, State, Uppy } from '@uppy/core' import type { FileProcessingInfo } from '@uppy/utils/lib/FileProgress' import type { I18n } from '@uppy/utils/lib/Translator' import { h } from 'preact' @@ -7,7 +6,7 @@ import classNames from 'classnames' import prettierBytes from '@transloadit/prettier-bytes' import prettyETA from '@uppy/utils/lib/prettyETA' -import statusBarStates from './StatusBarStates.ts' +import statusBarStates from './StatusBarStates.js' const DOT = `\u00B7` const renderDot = (): string => ` ${DOT} ` diff --git a/packages/@uppy/status-bar/src/StatusBar.tsx b/packages/@uppy/status-bar/src/StatusBar.tsx index 2027abcd06..5113450f08 100644 --- a/packages/@uppy/status-bar/src/StatusBar.tsx +++ b/packages/@uppy/status-bar/src/StatusBar.tsx @@ -1,17 +1,22 @@ import type { ComponentChild } from 'preact' -import type { Body, Meta, UppyFile } from '@uppy/utils/lib/UppyFile' -import type { Uppy, State } from '@uppy/core/lib/Uppy.js' -import type { DefinePluginOpts } from '@uppy/core/lib/BasePlugin.js' +import type { + Body, + Meta, + UppyFile, + DefinePluginOpts, + Uppy, + State, +} from '@uppy/core' import { UIPlugin } from '@uppy/core' import emaFilter from '@uppy/utils/lib/emaFilter' import getTextDirection from '@uppy/utils/lib/getTextDirection' -import statusBarStates from './StatusBarStates.ts' -import StatusBarUI, { type StatusBarUIProps } from './StatusBarUI.tsx' +import statusBarStates from './StatusBarStates.js' +import StatusBarUI, { type StatusBarUIProps } from './StatusBarUI.jsx' // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore We don't want TS to generate types for the package.json import packageJson from '../package.json' -import locale from './locale.ts' -import type { StatusBarOptions } from './StatusBarOptions.ts' +import locale from './locale.js' +import type { StatusBarOptions } from './StatusBarOptions.js' const speedFilterHalfLife = 2000 const ETAFilterHalfLife = 2000 @@ -197,13 +202,13 @@ export default class StatusBar extends UIPlugin< totalSize! += file.progress.bytesTotal || 0 totalUploadedSize += file.progress.bytesUploaded || 0 }) + } else { + // however uploaded size we will always have + startedFiles.forEach((file) => { + totalUploadedSize += file.progress.bytesUploaded || 0 + }) } - // however uploaded size we will always have - startedFiles.forEach((file) => { - totalUploadedSize += file.progress.bytesUploaded || 0 - }) - const totalETA = this.#computeSmoothETA({ uploaded: totalUploadedSize, total: totalSize, diff --git a/packages/@uppy/status-bar/src/StatusBarOptions.ts b/packages/@uppy/status-bar/src/StatusBarOptions.ts index dcda6b4337..83e157da91 100644 --- a/packages/@uppy/status-bar/src/StatusBarOptions.ts +++ b/packages/@uppy/status-bar/src/StatusBarOptions.ts @@ -1,5 +1,5 @@ import type { UIPluginOptions } from '@uppy/core/lib/UIPlugin.js' -import type StatusBarLocale from './locale.ts' +import type StatusBarLocale from './locale.js' export interface StatusBarOptions extends UIPluginOptions { showProgressDetails?: boolean diff --git a/packages/@uppy/status-bar/src/StatusBarUI.tsx b/packages/@uppy/status-bar/src/StatusBarUI.tsx index cbefede30b..f10b87096f 100644 --- a/packages/@uppy/status-bar/src/StatusBarUI.tsx +++ b/packages/@uppy/status-bar/src/StatusBarUI.tsx @@ -1,10 +1,9 @@ -import type { Body, Meta, UppyFile } from '@uppy/utils/lib/UppyFile' +import type { Body, Meta, UppyFile, Uppy, State } from '@uppy/core' import type { I18n } from '@uppy/utils/lib/Translator' -import type { Uppy, State } from '@uppy/core/lib/Uppy.js' import { h } from 'preact' import classNames from 'classnames' -import statusBarStates from './StatusBarStates.ts' -import calculateProcessingProgress from './calculateProcessingProgress.ts' +import statusBarStates from './StatusBarStates.js' +import calculateProcessingProgress from './calculateProcessingProgress.js' import { UploadBtn, @@ -16,7 +15,7 @@ import { ProgressBarError, ProgressBarUploading, ProgressBarComplete, -} from './Components.tsx' +} from './Components.jsx' const { STATE_ERROR, diff --git a/packages/@uppy/status-bar/src/index.ts b/packages/@uppy/status-bar/src/index.ts index cb2777c496..885bc071fa 100644 --- a/packages/@uppy/status-bar/src/index.ts +++ b/packages/@uppy/status-bar/src/index.ts @@ -1,2 +1,2 @@ -export { default } from './StatusBar.tsx' -export type { StatusBarOptions } from './StatusBarOptions.ts' +export { default } from './StatusBar.jsx' +export type { StatusBarOptions } from './StatusBarOptions.js' diff --git a/packages/@uppy/status-bar/tsconfig.build.json b/packages/@uppy/status-bar/tsconfig.build.json index 9ba78a0df7..a9244870c4 100644 --- a/packages/@uppy/status-bar/tsconfig.build.json +++ b/packages/@uppy/status-bar/tsconfig.build.json @@ -3,12 +3,7 @@ "compilerOptions": { "outDir": "./lib", "rootDir": "./src", - "resolveJsonModule": false, - "paths": { - "@uppy/core": ["../core/src/index.js"], - "@uppy/core/lib/*": ["../core/src/*"], - "@uppy/utils/lib/*": ["../utils/src/*"] - } + "resolveJsonModule": false }, "include": ["./src/**/*.*"], "exclude": ["./src/**/*.test.ts"], diff --git a/packages/@uppy/status-bar/tsconfig.json b/packages/@uppy/status-bar/tsconfig.json index a0e2a37682..47ece599c6 100644 --- a/packages/@uppy/status-bar/tsconfig.json +++ b/packages/@uppy/status-bar/tsconfig.json @@ -2,11 +2,6 @@ "extends": "../../../tsconfig.shared", "compilerOptions": { "emitDeclarationOnly": false, - "paths": { - "@uppy/core": ["../core/src/index.js"], - "@uppy/core/lib/*": ["../core/src/*"], - "@uppy/utils/lib/*": ["../utils/src/*"], - }, "noEmit": true, }, "include": ["./package.json", "./src/**/*.*"], diff --git a/packages/@uppy/store-default/package.json b/packages/@uppy/store-default/package.json index df3f076fd2..2ea865da90 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": "4.1.2", + "version": "4.2.0", "license": "MIT", "main": "lib/index.js", "type": "module", diff --git a/packages/@uppy/store-default/src/index.test.ts b/packages/@uppy/store-default/src/index.test.ts index 05ae9e5d82..7970ab0ece 100644 --- a/packages/@uppy/store-default/src/index.test.ts +++ b/packages/@uppy/store-default/src/index.test.ts @@ -1,6 +1,6 @@ import { describe, expect, it } from 'vitest' import assert from 'node:assert' -import DefaultStore, { type Listener, type GenericState } from './index.ts' +import DefaultStore, { type Listener, type GenericState } from './index.js' describe('DefaultStore', () => { it('cannot be created without new', () => { diff --git a/packages/@uppy/store-redux/CHANGELOG.md b/packages/@uppy/store-redux/CHANGELOG.md index 3d77285e45..fb25b6543a 100644 --- a/packages/@uppy/store-redux/CHANGELOG.md +++ b/packages/@uppy/store-redux/CHANGELOG.md @@ -1,5 +1,12 @@ # @uppy/store-redux +## 4.0.2 + +Released: 2025-01-06 +Included in: Uppy v4.10.0 + +- @uppy/core,@uppy/dashboard,@uppy/provider-views,@uppy/store-redux,@uppy/url: build(deps): bump nanoid from 5.0.7 to 5.0.9 (dependabot[bot] / #5544) + ## 4.0.1 Released: 2024-10-31 diff --git a/packages/@uppy/store-redux/package.json b/packages/@uppy/store-redux/package.json index e42d52d4eb..ca8b7d1591 100644 --- a/packages/@uppy/store-redux/package.json +++ b/packages/@uppy/store-redux/package.json @@ -1,7 +1,7 @@ { "name": "@uppy/store-redux", "description": "Make Uppy use your existing Redux store.", - "version": "4.0.1", + "version": "4.0.2", "license": "MIT", "main": "lib/index.js", "type": "module", diff --git a/packages/@uppy/svelte/CHANGELOG.md b/packages/@uppy/svelte/CHANGELOG.md index d015da4e5e..5c672923ef 100644 --- a/packages/@uppy/svelte/CHANGELOG.md +++ b/packages/@uppy/svelte/CHANGELOG.md @@ -1,5 +1,12 @@ # @uppy/svelte +## 4.2.0 + +Released: 2025-01-06 +Included in: Uppy v4.11.0 + +- examples,@uppy/svelte: build(deps-dev): bump @sveltejs/kit from 2.5.17 to 2.8.3 (dependabot[bot] / #5526) + ## 4.1.1 Released: 2024-10-31 diff --git a/packages/@uppy/svelte/package.json b/packages/@uppy/svelte/package.json index f264d2ead5..979e1691db 100644 --- a/packages/@uppy/svelte/package.json +++ b/packages/@uppy/svelte/package.json @@ -1,6 +1,6 @@ { "name": "@uppy/svelte", - "version": "4.1.1", + "version": "4.3.0", "description": "Uppy plugin that helps integrate Uppy into your Svelte project.", "type": "module", "svelte": "./dist/index.js", @@ -37,7 +37,7 @@ }, "devDependencies": { "@sveltejs/adapter-auto": "^3.0.0", - "@sveltejs/kit": "^2.0.0", + "@sveltejs/kit": "^2.8.3", "@sveltejs/package": "^2.0.0", "@sveltejs/vite-plugin-svelte": "^3.0.0", "svelte": "^4.2.7", diff --git a/packages/@uppy/svelte/tsconfig.json b/packages/@uppy/svelte/tsconfig.json index b8bfd5859b..6ad83ebb3c 100644 --- a/packages/@uppy/svelte/tsconfig.json +++ b/packages/@uppy/svelte/tsconfig.json @@ -5,6 +5,7 @@ "checkJs": true, "esModuleInterop": true, "forceConsistentCasingInFileNames": true, + "useUnknownInCatchVariables": false, "resolveJsonModule": true, "skipLibCheck": true, "sourceMap": true, diff --git a/packages/@uppy/thumbnail-generator/CHANGELOG.md b/packages/@uppy/thumbnail-generator/CHANGELOG.md index e222e79738..d00438bfa4 100644 --- a/packages/@uppy/thumbnail-generator/CHANGELOG.md +++ b/packages/@uppy/thumbnail-generator/CHANGELOG.md @@ -1,5 +1,12 @@ # @uppy/thumbnail-generator +## 4.1.0 + +Released: 2025-01-06 +Included in: Uppy v4.11.0 + +- @uppy/angular,@uppy/audio,@uppy/aws-s3,@uppy/box,@uppy/companion-client,@uppy/compressor,@uppy/core,@uppy/dashboard,@uppy/drag-drop,@uppy/drop-target,@uppy/dropbox,@uppy/facebook,@uppy/file-input,@uppy/form,@uppy/golden-retriever,@uppy/google-drive-picker,@uppy/google-drive,@uppy/google-photos-picker,@uppy/google-photos,@uppy/image-editor,@uppy/informer,@uppy/instagram,@uppy/locales,@uppy/onedrive,@uppy/progress-bar,@uppy/provider-views,@uppy/react,@uppy/remote-sources,@uppy/screen-capture,@uppy/status-bar,@uppy/thumbnail-generator,@uppy/transloadit,@uppy/tus,@uppy/unsplash,@uppy/url,@uppy/vue,@uppy/webcam,@uppy/webdav,@uppy/xhr-upload,@uppy/zoom: Remove "paths" from all tsconfig's (Merlijn Vos / #5572) + ## 4.0.2 Released: 2024-12-05 diff --git a/packages/@uppy/thumbnail-generator/package.json b/packages/@uppy/thumbnail-generator/package.json index 5da64efe5b..fba0b23365 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": "4.0.2", + "version": "4.1.1", "license": "MIT", "main": "lib/index.js", "type": "module", diff --git a/packages/@uppy/thumbnail-generator/src/index.ts b/packages/@uppy/thumbnail-generator/src/index.ts index 45ce9d3499..8b699c125f 100644 --- a/packages/@uppy/thumbnail-generator/src/index.ts +++ b/packages/@uppy/thumbnail-generator/src/index.ts @@ -1,4 +1,5 @@ -import { UIPlugin, Uppy, type UIPluginOptions } from '@uppy/core' +import { UIPlugin } from '@uppy/core' +import type { Uppy, UIPluginOptions, DefinePluginOpts } from '@uppy/core' import dataURItoBlob from '@uppy/utils/lib/dataURItoBlob' import isObjectURL from '@uppy/utils/lib/isObjectURL' import isPreviewSupported from '@uppy/utils/lib/isPreviewSupported' @@ -6,9 +7,8 @@ import isPreviewSupported from '@uppy/utils/lib/isPreviewSupported' // @ts-ignore untyped import { rotation } from 'exifr/dist/mini.esm.mjs' -import type { DefinePluginOpts } from '@uppy/core/lib/BasePlugin.js' import type { Body, Meta, UppyFile } from '@uppy/utils/lib/UppyFile' -import locale from './locale.ts' +import locale from './locale.js' // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore We don't want TS to generate types for the package.json import packageJson from '../package.json' diff --git a/packages/@uppy/thumbnail-generator/tsconfig.build.json b/packages/@uppy/thumbnail-generator/tsconfig.build.json index 8d9ed22fa5..bbf30b5b43 100644 --- a/packages/@uppy/thumbnail-generator/tsconfig.build.json +++ b/packages/@uppy/thumbnail-generator/tsconfig.build.json @@ -2,11 +2,6 @@ "extends": "../../../tsconfig.shared", "compilerOptions": { "outDir": "./lib", - "paths": { - "@uppy/utils/lib/*": ["../utils/src/*"], - "@uppy/core": ["../core/src/index.js"], - "@uppy/core/lib/*": ["../core/src/*"] - }, "resolveJsonModule": false, "rootDir": "./src" }, diff --git a/packages/@uppy/thumbnail-generator/tsconfig.json b/packages/@uppy/thumbnail-generator/tsconfig.json index a76c3b714a..47ece599c6 100644 --- a/packages/@uppy/thumbnail-generator/tsconfig.json +++ b/packages/@uppy/thumbnail-generator/tsconfig.json @@ -3,11 +3,6 @@ "compilerOptions": { "emitDeclarationOnly": false, "noEmit": true, - "paths": { - "@uppy/utils/lib/*": ["../utils/src/*"], - "@uppy/core": ["../core/src/index.js"], - "@uppy/core/lib/*": ["../core/src/*"], - }, }, "include": ["./package.json", "./src/**/*.*"], "references": [ diff --git a/packages/@uppy/transloadit/CHANGELOG.md b/packages/@uppy/transloadit/CHANGELOG.md index 117d49842c..72de6d956d 100644 --- a/packages/@uppy/transloadit/CHANGELOG.md +++ b/packages/@uppy/transloadit/CHANGELOG.md @@ -1,5 +1,12 @@ # @uppy/transloadit +## 4.2.0 + +Released: 2025-01-06 +Included in: Uppy v4.11.0 + +- @uppy/angular,@uppy/audio,@uppy/aws-s3,@uppy/box,@uppy/companion-client,@uppy/compressor,@uppy/core,@uppy/dashboard,@uppy/drag-drop,@uppy/drop-target,@uppy/dropbox,@uppy/facebook,@uppy/file-input,@uppy/form,@uppy/golden-retriever,@uppy/google-drive-picker,@uppy/google-drive,@uppy/google-photos-picker,@uppy/google-photos,@uppy/image-editor,@uppy/informer,@uppy/instagram,@uppy/locales,@uppy/onedrive,@uppy/progress-bar,@uppy/provider-views,@uppy/react,@uppy/remote-sources,@uppy/screen-capture,@uppy/status-bar,@uppy/thumbnail-generator,@uppy/transloadit,@uppy/tus,@uppy/unsplash,@uppy/url,@uppy/vue,@uppy/webcam,@uppy/webdav,@uppy/xhr-upload,@uppy/zoom: Remove "paths" from all tsconfig's (Merlijn Vos / #5572) + ## 4.1.4 Released: 2024-12-05 diff --git a/packages/@uppy/transloadit/package.json b/packages/@uppy/transloadit/package.json index 9ea79a7cbf..509342c67d 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": "4.1.4", + "version": "4.2.1", "license": "MIT", "main": "lib/index.js", "type": "module", diff --git a/packages/@uppy/transloadit/src/Assembly.ts b/packages/@uppy/transloadit/src/Assembly.ts index 9ec009273f..7676ace25a 100644 --- a/packages/@uppy/transloadit/src/Assembly.ts +++ b/packages/@uppy/transloadit/src/Assembly.ts @@ -8,7 +8,7 @@ import type { RateLimitedQueue, WrapPromiseFunctionType, } from '@uppy/utils/lib/RateLimitedQueue' -import type { AssemblyResponse } from './index.ts' +import type { AssemblyResponse } from './index.js' const ASSEMBLY_UPLOADING = 'ASSEMBLY_UPLOADING' const ASSEMBLY_EXECUTING = 'ASSEMBLY_EXECUTING' diff --git a/packages/@uppy/transloadit/src/AssemblyWatcher.ts b/packages/@uppy/transloadit/src/AssemblyWatcher.ts index a179ab02b2..72682d314f 100644 --- a/packages/@uppy/transloadit/src/AssemblyWatcher.ts +++ b/packages/@uppy/transloadit/src/AssemblyWatcher.ts @@ -1,7 +1,6 @@ -import type { Uppy } from '@uppy/core' -import type { Body, Meta } from '@uppy/utils/lib/UppyFile' +import type { Uppy, Body, Meta } from '@uppy/core' import Emitter from 'component-emitter' -import type { AssemblyResponse } from './index.ts' +import type { AssemblyResponse } from './index.js' /** * Track completion of multiple assemblies. diff --git a/packages/@uppy/transloadit/src/Client.ts b/packages/@uppy/transloadit/src/Client.ts index cde4d06191..abc6be7a72 100644 --- a/packages/@uppy/transloadit/src/Client.ts +++ b/packages/@uppy/transloadit/src/Client.ts @@ -7,7 +7,7 @@ import fetchWithNetworkError from '@uppy/utils/lib/fetchWithNetworkError' import type { AssemblyResponse, OptionsWithRestructuredFields, -} from './index.ts' +} from './index.js' const ASSEMBLIES_ENDPOINT = '/assemblies' diff --git a/packages/@uppy/transloadit/src/index.ts b/packages/@uppy/transloadit/src/index.ts index d9bdccd73a..20ad36f64a 100644 --- a/packages/@uppy/transloadit/src/index.ts +++ b/packages/@uppy/transloadit/src/index.ts @@ -1,16 +1,21 @@ import hasProperty from '@uppy/utils/lib/hasProperty' import ErrorWithCause from '@uppy/utils/lib/ErrorWithCause' import { RateLimitedQueue } from '@uppy/utils/lib/RateLimitedQueue' -import BasePlugin from '@uppy/core/lib/BasePlugin.js' -import type { DefinePluginOpts, PluginOpts } from '@uppy/core/lib/BasePlugin.js' import Tus, { type TusDetailedError, type TusOpts } from '@uppy/tus' -import type { Body, Meta, UppyFile } from '@uppy/utils/lib/UppyFile' -import type { Uppy } from '@uppy/core' -import Assembly from './Assembly.ts' -import Client, { AssemblyError } from './Client.ts' -import AssemblyWatcher from './AssemblyWatcher.ts' - -import locale from './locale.ts' +import { BasePlugin } from '@uppy/core' +import type { + DefinePluginOpts, + PluginOpts, + Uppy, + Body, + Meta, + UppyFile, +} from '@uppy/core' +import Assembly from './Assembly.js' +import Client, { AssemblyError } from './Client.js' +import AssemblyWatcher from './AssemblyWatcher.js' + +import locale from './locale.js' // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore We don't want TS to generate types for the package.json import packageJson from '../package.json' diff --git a/packages/@uppy/transloadit/tsconfig.build.json b/packages/@uppy/transloadit/tsconfig.build.json index 22ec6d6556..6a67b5c391 100644 --- a/packages/@uppy/transloadit/tsconfig.build.json +++ b/packages/@uppy/transloadit/tsconfig.build.json @@ -2,17 +2,6 @@ "extends": "../../../tsconfig.shared", "compilerOptions": { "outDir": "./lib", - "paths": { - "@uppy/companion-client": ["../companion-client/src/index.js"], - "@uppy/companion-client/lib/*": ["../companion-client/src/*"], - "@uppy/provider-views": ["../provider-views/src/index.js"], - "@uppy/provider-views/lib/*": ["../provider-views/src/*"], - "@uppy/tus": ["../tus/src/index.js"], - "@uppy/tus/lib/*": ["../tus/src/*"], - "@uppy/utils/lib/*": ["../utils/src/*"], - "@uppy/core": ["../core/src/index.js"], - "@uppy/core/lib/*": ["../core/src/*"] - }, "resolveJsonModule": false, "rootDir": "./src" }, diff --git a/packages/@uppy/transloadit/tsconfig.json b/packages/@uppy/transloadit/tsconfig.json index 3ca996af9b..744b41e5bd 100644 --- a/packages/@uppy/transloadit/tsconfig.json +++ b/packages/@uppy/transloadit/tsconfig.json @@ -3,17 +3,6 @@ "compilerOptions": { "emitDeclarationOnly": false, "noEmit": true, - "paths": { - "@uppy/companion-client": ["../companion-client/src/index.js"], - "@uppy/companion-client/lib/*": ["../companion-client/src/*"], - "@uppy/provider-views": ["../provider-views/src/index.js"], - "@uppy/provider-views/lib/*": ["../provider-views/src/*"], - "@uppy/tus": ["../tus/src/index.js"], - "@uppy/tus/lib/*": ["../tus/src/*"], - "@uppy/utils/lib/*": ["../utils/src/*"], - "@uppy/core": ["../core/src/index.js"], - "@uppy/core/lib/*": ["../core/src/*"], - }, }, "include": ["./package.json", "./src/**/*.*"], "references": [ diff --git a/packages/@uppy/tus/CHANGELOG.md b/packages/@uppy/tus/CHANGELOG.md index 6c8174a6a9..5b9df909b0 100644 --- a/packages/@uppy/tus/CHANGELOG.md +++ b/packages/@uppy/tus/CHANGELOG.md @@ -1,5 +1,20 @@ # @uppy/tus +## 4.2.2 + +Released: 2025-01-22 +Included in: Uppy v4.13.1 + +- @uppy/tus: fix resumeFromPreviousUpload race condition (Merlijn Vos / #5616) + +## 4.2.0 + +Released: 2025-01-06 +Included in: Uppy v4.11.0 + +- @uppy/angular,@uppy/audio,@uppy/aws-s3,@uppy/box,@uppy/companion-client,@uppy/compressor,@uppy/core,@uppy/dashboard,@uppy/drag-drop,@uppy/drop-target,@uppy/dropbox,@uppy/facebook,@uppy/file-input,@uppy/form,@uppy/golden-retriever,@uppy/google-drive-picker,@uppy/google-drive,@uppy/google-photos-picker,@uppy/google-photos,@uppy/image-editor,@uppy/informer,@uppy/instagram,@uppy/locales,@uppy/onedrive,@uppy/progress-bar,@uppy/provider-views,@uppy/react,@uppy/remote-sources,@uppy/screen-capture,@uppy/status-bar,@uppy/thumbnail-generator,@uppy/transloadit,@uppy/tus,@uppy/unsplash,@uppy/url,@uppy/vue,@uppy/webcam,@uppy/webdav,@uppy/xhr-upload,@uppy/zoom: Remove "paths" from all tsconfig's (Merlijn Vos / #5572) +- @uppy/tus: fix onBeforeRequest type (Dominik Schmidt / #5566) + ## 4.1.5 Released: 2024-12-05 diff --git a/packages/@uppy/tus/package.json b/packages/@uppy/tus/package.json index 7e7b63dc22..56fce7d061 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": "4.1.5", + "version": "4.2.2", "license": "MIT", "main": "lib/index.js", "type": "module", diff --git a/packages/@uppy/tus/src/index.test.ts b/packages/@uppy/tus/src/index.test.ts index a6759566b8..7bada9fabc 100644 --- a/packages/@uppy/tus/src/index.test.ts +++ b/packages/@uppy/tus/src/index.test.ts @@ -1,6 +1,6 @@ import { describe, expect, expectTypeOf, it } from 'vitest' import Core from '@uppy/core' -import Tus, { type TusBody } from './index.ts' +import Tus, { type TusBody } from './index.js' describe('Tus', () => { it('Throws errors if autoRetry option is true', () => { diff --git a/packages/@uppy/tus/src/index.ts b/packages/@uppy/tus/src/index.ts index 2796c8ab51..d769463736 100644 --- a/packages/@uppy/tus/src/index.ts +++ b/packages/@uppy/tus/src/index.ts @@ -1,7 +1,12 @@ -import BasePlugin, { - type DefinePluginOpts, - type PluginOpts, -} from '@uppy/core/lib/BasePlugin.js' +import { BasePlugin } from '@uppy/core' +import type { + Uppy, + DefinePluginOpts, + PluginOpts, + Meta, + Body, + UppyFile, +} from '@uppy/core' import * as tus from 'tus-js-client' import EventManager from '@uppy/core/lib/EventManager.js' import NetworkError from '@uppy/utils/lib/NetworkError' @@ -14,11 +19,9 @@ import { filterNonFailedFiles, filterFilesToEmitUploadStarted, } from '@uppy/utils/lib/fileFilters' -import type { Meta, Body, UppyFile } from '@uppy/utils/lib/UppyFile' -import type { Uppy } from '@uppy/core' import type { RequestClient } from '@uppy/companion-client' import getAllowedMetaFields from '@uppy/utils/lib/getAllowedMetaFields' -import getFingerprint from './getFingerprint.ts' +import getFingerprint from './getFingerprint.js' // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore We don't want TS to generate types for the package.json @@ -42,7 +45,10 @@ export interface TusOpts | ((file: UppyFile) => Record) limit?: number chunkSize?: number - onBeforeRequest?: (req: tus.HttpRequest, file: UppyFile) => void + onBeforeRequest?: ( + req: tus.HttpRequest, + file: UppyFile, + ) => void | Promise onShouldRetry?: ( err: tus.DetailedError, retryAttempt: number, @@ -466,10 +472,9 @@ export default class Tus extends BasePlugin< ) upload.resumeFromPreviousUpload(previousUpload) } + queuedRequest = this.requests.run(qRequest) }) - queuedRequest = this.requests.run(qRequest) - eventManager.onFileRemove(file.id, (targetFileID) => { queuedRequest.abort() this.resetUploaderReferences(file.id, { abort: !!upload.url }) diff --git a/packages/@uppy/tus/tsconfig.build.json b/packages/@uppy/tus/tsconfig.build.json index b61a0f40cb..bd96ae4f3c 100644 --- a/packages/@uppy/tus/tsconfig.build.json +++ b/packages/@uppy/tus/tsconfig.build.json @@ -2,13 +2,6 @@ "extends": "../../../tsconfig.shared", "compilerOptions": { "outDir": "./lib", - "paths": { - "@uppy/companion-client": ["../companion-client/src/index.js"], - "@uppy/companion-client/lib/*": ["../companion-client/src/*"], - "@uppy/utils/lib/*": ["../utils/src/*"], - "@uppy/core": ["../core/src/index.js"], - "@uppy/core/lib/*": ["../core/src/*"] - }, "resolveJsonModule": false, "rootDir": "./src" }, diff --git a/packages/@uppy/tus/tsconfig.json b/packages/@uppy/tus/tsconfig.json index f43408fa18..2355b5c43d 100644 --- a/packages/@uppy/tus/tsconfig.json +++ b/packages/@uppy/tus/tsconfig.json @@ -3,13 +3,6 @@ "compilerOptions": { "emitDeclarationOnly": false, "noEmit": true, - "paths": { - "@uppy/companion-client": ["../companion-client/src/index.js"], - "@uppy/companion-client/lib/*": ["../companion-client/src/*"], - "@uppy/utils/lib/*": ["../utils/src/*"], - "@uppy/core": ["../core/src/index.js"], - "@uppy/core/lib/*": ["../core/src/*"], - }, }, "include": ["./package.json", "./src/**/*.*"], "references": [ diff --git a/packages/@uppy/unsplash/CHANGELOG.md b/packages/@uppy/unsplash/CHANGELOG.md index 384466dbca..8a43581ef0 100644 --- a/packages/@uppy/unsplash/CHANGELOG.md +++ b/packages/@uppy/unsplash/CHANGELOG.md @@ -1,5 +1,26 @@ # @uppy/unsplash +## 4.3.2 + +Released: 2025-01-15 +Included in: Uppy v4.13.0 + +- @uppy/unsplash: make utmSource optional (Merlijn Vos / #5601) + +## 4.3.0 + +Released: 2025-01-08 +Included in: Uppy v4.12.0 + +- @uppy/unsplash,@uppy/provider-views: add utmSource option (Merlijn Vos / #5580) + +## 4.2.0 + +Released: 2025-01-06 +Included in: Uppy v4.11.0 + +- @uppy/angular,@uppy/audio,@uppy/aws-s3,@uppy/box,@uppy/companion-client,@uppy/compressor,@uppy/core,@uppy/dashboard,@uppy/drag-drop,@uppy/drop-target,@uppy/dropbox,@uppy/facebook,@uppy/file-input,@uppy/form,@uppy/golden-retriever,@uppy/google-drive-picker,@uppy/google-drive,@uppy/google-photos-picker,@uppy/google-photos,@uppy/image-editor,@uppy/informer,@uppy/instagram,@uppy/locales,@uppy/onedrive,@uppy/progress-bar,@uppy/provider-views,@uppy/react,@uppy/remote-sources,@uppy/screen-capture,@uppy/status-bar,@uppy/thumbnail-generator,@uppy/transloadit,@uppy/tus,@uppy/unsplash,@uppy/url,@uppy/vue,@uppy/webcam,@uppy/webdav,@uppy/xhr-upload,@uppy/zoom: Remove "paths" from all tsconfig's (Merlijn Vos / #5572) + ## 4.1.2 Released: 2024-12-05 diff --git a/packages/@uppy/unsplash/package.json b/packages/@uppy/unsplash/package.json index f22c8376a9..4ba803a71f 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": "4.1.2", + "version": "4.3.2", "license": "MIT", "main": "lib/index.js", "type": "module", diff --git a/packages/@uppy/unsplash/src/Unsplash.tsx b/packages/@uppy/unsplash/src/Unsplash.tsx index a91dfcc1f3..4e3b72897e 100644 --- a/packages/@uppy/unsplash/src/Unsplash.tsx +++ b/packages/@uppy/unsplash/src/Unsplash.tsx @@ -8,18 +8,20 @@ import { UIPlugin, Uppy } from '@uppy/core' import { SearchProviderViews } from '@uppy/provider-views' import { h, type ComponentChild } from 'preact' -import type { UppyFile, Body, Meta } from '@uppy/utils/lib/UppyFile' import type { + UppyFile, + Body, + Meta, AsyncStore, UnknownSearchProviderPlugin, UnknownSearchProviderPluginState, -} from '@uppy/core/lib/Uppy.js' -import locale from './locale.ts' +} from '@uppy/core' +import locale from './locale.js' // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore We don't want TS to generate types for the package.json import packageJson from '../package.json' -export type UnsplashOptions = CompanionPluginOptions +export type UnsplashOptions = { utmSource?: string } & CompanionPluginOptions export default class Unsplash extends UIPlugin @@ -91,6 +93,7 @@ export default class Unsplash provider: this.provider, viewType: 'unsplash', showFilter: true, + utmSource: this.opts.utmSource, }) const { target } = this.opts diff --git a/packages/@uppy/unsplash/src/index.ts b/packages/@uppy/unsplash/src/index.ts index 7f3ab2b6dc..27482c8f03 100644 --- a/packages/@uppy/unsplash/src/index.ts +++ b/packages/@uppy/unsplash/src/index.ts @@ -1,2 +1,2 @@ -export { default } from './Unsplash.tsx' -export type { UnsplashOptions } from './Unsplash.tsx' +export { default } from './Unsplash.jsx' +export type { UnsplashOptions } from './Unsplash.jsx' diff --git a/packages/@uppy/unsplash/tsconfig.build.json b/packages/@uppy/unsplash/tsconfig.build.json index 0b2f94bc10..82e187bca0 100644 --- a/packages/@uppy/unsplash/tsconfig.build.json +++ b/packages/@uppy/unsplash/tsconfig.build.json @@ -2,15 +2,6 @@ "extends": "../../../tsconfig.shared", "compilerOptions": { "outDir": "./lib", - "paths": { - "@uppy/companion-client": ["../companion-client/src/index.js"], - "@uppy/companion-client/lib/*": ["../companion-client/src/*"], - "@uppy/provider-views": ["../provider-views/src/index.js"], - "@uppy/provider-views/lib/*": ["../provider-views/src/*"], - "@uppy/utils/lib/*": ["../utils/src/*"], - "@uppy/core": ["../core/src/index.js"], - "@uppy/core/lib/*": ["../core/src/*"] - }, "resolveJsonModule": false, "rootDir": "./src" }, diff --git a/packages/@uppy/unsplash/tsconfig.json b/packages/@uppy/unsplash/tsconfig.json index e5220fb5ab..b90847da71 100644 --- a/packages/@uppy/unsplash/tsconfig.json +++ b/packages/@uppy/unsplash/tsconfig.json @@ -3,15 +3,6 @@ "compilerOptions": { "emitDeclarationOnly": false, "noEmit": true, - "paths": { - "@uppy/companion-client": ["../companion-client/src/index.js"], - "@uppy/companion-client/lib/*": ["../companion-client/src/*"], - "@uppy/provider-views": ["../provider-views/src/index.js"], - "@uppy/provider-views/lib/*": ["../provider-views/src/*"], - "@uppy/utils/lib/*": ["../utils/src/*"], - "@uppy/core": ["../core/src/index.js"], - "@uppy/core/lib/*": ["../core/src/*"], - }, }, "include": ["./package.json", "./src/**/*.*"], "references": [ diff --git a/packages/@uppy/url/CHANGELOG.md b/packages/@uppy/url/CHANGELOG.md index b098d9c464..89ffa563b7 100644 --- a/packages/@uppy/url/CHANGELOG.md +++ b/packages/@uppy/url/CHANGELOG.md @@ -1,5 +1,19 @@ # @uppy/url +## 4.2.0 + +Released: 2025-01-06 +Included in: Uppy v4.11.0 + +- @uppy/angular,@uppy/audio,@uppy/aws-s3,@uppy/box,@uppy/companion-client,@uppy/compressor,@uppy/core,@uppy/dashboard,@uppy/drag-drop,@uppy/drop-target,@uppy/dropbox,@uppy/facebook,@uppy/file-input,@uppy/form,@uppy/golden-retriever,@uppy/google-drive-picker,@uppy/google-drive,@uppy/google-photos-picker,@uppy/google-photos,@uppy/image-editor,@uppy/informer,@uppy/instagram,@uppy/locales,@uppy/onedrive,@uppy/progress-bar,@uppy/provider-views,@uppy/react,@uppy/remote-sources,@uppy/screen-capture,@uppy/status-bar,@uppy/thumbnail-generator,@uppy/transloadit,@uppy/tus,@uppy/unsplash,@uppy/url,@uppy/vue,@uppy/webcam,@uppy/webdav,@uppy/xhr-upload,@uppy/zoom: Remove "paths" from all tsconfig's (Merlijn Vos / #5572) + +## 4.1.3 + +Released: 2025-01-06 +Included in: Uppy v4.10.0 + +- @uppy/core,@uppy/dashboard,@uppy/provider-views,@uppy/store-redux,@uppy/url: build(deps): bump nanoid from 5.0.7 to 5.0.9 (dependabot[bot] / #5544) + ## 4.1.2 Released: 2024-12-05 diff --git a/packages/@uppy/url/package.json b/packages/@uppy/url/package.json index fac49cca0c..9417efb765 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": "4.1.2", + "version": "4.2.1", "license": "MIT", "main": "lib/index.js", "style": "dist/style.min.css", diff --git a/packages/@uppy/url/src/Url.tsx b/packages/@uppy/url/src/Url.tsx index fd46450d0b..1dc8b82fc3 100644 --- a/packages/@uppy/url/src/Url.tsx +++ b/packages/@uppy/url/src/Url.tsx @@ -5,14 +5,15 @@ import { type CompanionPluginOptions, } from '@uppy/companion-client' import toArray from '@uppy/utils/lib/toArray' -import type { TagFile, Meta, Body } from '@uppy/utils/lib/UppyFile' -import UrlUI from './UrlUI.tsx' -import forEachDroppedOrPastedUrl from './utils/forEachDroppedOrPastedUrl.ts' +import type { Meta, Body } from '@uppy/core' +import type { TagFile } from '@uppy/utils/lib/UppyFile' +import UrlUI from './UrlUI.jsx' +import forEachDroppedOrPastedUrl from './utils/forEachDroppedOrPastedUrl.js' // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore We don't want TS to generate types for the package.json import packageJson from '../package.json' -import locale from './locale.ts' +import locale from './locale.js' function UrlIcon() { return ( diff --git a/packages/@uppy/url/src/index.ts b/packages/@uppy/url/src/index.ts index 3d9355dd3a..e6c8836fca 100644 --- a/packages/@uppy/url/src/index.ts +++ b/packages/@uppy/url/src/index.ts @@ -1,2 +1,2 @@ -export { default } from './Url.tsx' -export type { UrlOptions } from './Url.tsx' +export { default } from './Url.jsx' +export type { UrlOptions } from './Url.jsx' diff --git a/packages/@uppy/url/tsconfig.build.json b/packages/@uppy/url/tsconfig.build.json index b61a0f40cb..bd96ae4f3c 100644 --- a/packages/@uppy/url/tsconfig.build.json +++ b/packages/@uppy/url/tsconfig.build.json @@ -2,13 +2,6 @@ "extends": "../../../tsconfig.shared", "compilerOptions": { "outDir": "./lib", - "paths": { - "@uppy/companion-client": ["../companion-client/src/index.js"], - "@uppy/companion-client/lib/*": ["../companion-client/src/*"], - "@uppy/utils/lib/*": ["../utils/src/*"], - "@uppy/core": ["../core/src/index.js"], - "@uppy/core/lib/*": ["../core/src/*"] - }, "resolveJsonModule": false, "rootDir": "./src" }, diff --git a/packages/@uppy/url/tsconfig.json b/packages/@uppy/url/tsconfig.json index f43408fa18..2355b5c43d 100644 --- a/packages/@uppy/url/tsconfig.json +++ b/packages/@uppy/url/tsconfig.json @@ -3,13 +3,6 @@ "compilerOptions": { "emitDeclarationOnly": false, "noEmit": true, - "paths": { - "@uppy/companion-client": ["../companion-client/src/index.js"], - "@uppy/companion-client/lib/*": ["../companion-client/src/*"], - "@uppy/utils/lib/*": ["../utils/src/*"], - "@uppy/core": ["../core/src/index.js"], - "@uppy/core/lib/*": ["../core/src/*"], - }, }, "include": ["./package.json", "./src/**/*.*"], "references": [ diff --git a/packages/@uppy/utils/CHANGELOG.md b/packages/@uppy/utils/CHANGELOG.md index 43a25ea738..f87dc5bbd8 100644 --- a/packages/@uppy/utils/CHANGELOG.md +++ b/packages/@uppy/utils/CHANGELOG.md @@ -1,5 +1,12 @@ # @uppy/utils +## 6.1.0 + +Released: 2025-01-06 +Included in: Uppy v4.11.0 + +- @uppy/utils: Use .js(x) for all imports instead .ts(x) (Merlijn Vos / #5573) + ## 6.0.6 Released: 2024-12-17 diff --git a/packages/@uppy/utils/package.json b/packages/@uppy/utils/package.json index 466c8aea8f..e2c83c9be3 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": "6.0.6", + "version": "6.1.1", "license": "MIT", "type": "module", "keywords": [ diff --git a/packages/@uppy/utils/src/AbortController.test.ts b/packages/@uppy/utils/src/AbortController.test.ts index f807ee27b9..9ae956e585 100644 --- a/packages/@uppy/utils/src/AbortController.test.ts +++ b/packages/@uppy/utils/src/AbortController.test.ts @@ -1,5 +1,5 @@ import { describe, expect, it, vi } from 'vitest' -import { AbortController, AbortSignal } from './AbortController.ts' +import { AbortController, AbortSignal } from './AbortController.js' function flushInstantTimeouts() { return new Promise((resolve) => setTimeout(resolve, 0)) diff --git a/packages/@uppy/utils/src/AbortController.ts b/packages/@uppy/utils/src/AbortController.ts index 361c2bfba2..64d7202067 100644 --- a/packages/@uppy/utils/src/AbortController.ts +++ b/packages/@uppy/utils/src/AbortController.ts @@ -1,4 +1,4 @@ -import hasOwnProperty from './hasProperty.ts' +import hasOwnProperty from './hasProperty.js' /** * Little AbortController proxy module so we can swap out the implementation easily later. */ diff --git a/packages/@uppy/utils/src/CompanionClientProvider.ts b/packages/@uppy/utils/src/CompanionClientProvider.ts index 98877c909d..669736e3de 100644 --- a/packages/@uppy/utils/src/CompanionClientProvider.ts +++ b/packages/@uppy/utils/src/CompanionClientProvider.ts @@ -1,4 +1,4 @@ -import type { CompanionFile } from './CompanionFile.ts' +import type { CompanionFile } from './CompanionFile.js' export type RequestOptions = { method?: string diff --git a/packages/@uppy/utils/src/ErrorWithCause.test.ts b/packages/@uppy/utils/src/ErrorWithCause.test.ts index 4a64fadf4b..20f1913e05 100644 --- a/packages/@uppy/utils/src/ErrorWithCause.test.ts +++ b/packages/@uppy/utils/src/ErrorWithCause.test.ts @@ -1,6 +1,6 @@ import { describe, expect, it } from 'vitest' -import ErrorWithCause from './ErrorWithCause.ts' -import NetworkError from './NetworkError.ts' +import ErrorWithCause from './ErrorWithCause.js' +import NetworkError from './NetworkError.js' describe('ErrorWithCause', () => { it('should support a `{ cause }` option', () => { diff --git a/packages/@uppy/utils/src/ErrorWithCause.ts b/packages/@uppy/utils/src/ErrorWithCause.ts index 31a005b128..97dac72c61 100644 --- a/packages/@uppy/utils/src/ErrorWithCause.ts +++ b/packages/@uppy/utils/src/ErrorWithCause.ts @@ -1,5 +1,5 @@ -import type NetworkError from './NetworkError.ts' -import hasProperty from './hasProperty.ts' +import type NetworkError from './NetworkError.js' +import hasProperty from './hasProperty.js' class ErrorWithCause extends Error { public isNetworkError: boolean diff --git a/packages/@uppy/utils/src/RateLimitedQueue.test.ts b/packages/@uppy/utils/src/RateLimitedQueue.test.ts index 9acdb74f35..56ddd68625 100644 --- a/packages/@uppy/utils/src/RateLimitedQueue.test.ts +++ b/packages/@uppy/utils/src/RateLimitedQueue.test.ts @@ -1,6 +1,6 @@ import { describe, expect, it } from 'vitest' -import { RateLimitedQueue } from './RateLimitedQueue.ts' -import delay from './delay.ts' +import { RateLimitedQueue } from './RateLimitedQueue.js' +import delay from './delay.js' describe('RateLimitedQueue', () => { let pending = 0 diff --git a/packages/@uppy/utils/src/Translator.test.ts b/packages/@uppy/utils/src/Translator.test.ts index e3bb67239c..be8c7a3541 100644 --- a/packages/@uppy/utils/src/Translator.test.ts +++ b/packages/@uppy/utils/src/Translator.test.ts @@ -1,5 +1,5 @@ import { describe, expect, it } from 'vitest' -import Translator, { type Locale } from './Translator.ts' +import Translator, { type Locale } from './Translator.js' const english: Locale<0 | 1> = { strings: { diff --git a/packages/@uppy/utils/src/UppyFile.ts b/packages/@uppy/utils/src/UppyFile.ts index 8867c53306..0e51963585 100644 --- a/packages/@uppy/utils/src/UppyFile.ts +++ b/packages/@uppy/utils/src/UppyFile.ts @@ -1,4 +1,4 @@ -import type { FileProgress } from './FileProgress.ts' +import type { FileProgress } from './FileProgress.js' export type Meta = Record @@ -51,7 +51,7 @@ export type MinimalRequiredUppyFile = Required< Partial< Omit, 'name' | 'data' | 'meta'> // We want to omit the 'meta' from UppyFile because of internal metadata - // (see InternalMetadata in `UppyFile.ts`), as when adding a new file + // (see InternalMetadata in `UppyFile.js`), as when adding a new file // that is not required. > & { meta?: M; data: { size: number | null } } diff --git a/packages/@uppy/utils/src/dataURItoBlob.test.ts b/packages/@uppy/utils/src/dataURItoBlob.test.ts index bafbb64800..95145d1365 100644 --- a/packages/@uppy/utils/src/dataURItoBlob.test.ts +++ b/packages/@uppy/utils/src/dataURItoBlob.test.ts @@ -1,6 +1,6 @@ import { describe, expect, it } from 'vitest' -import dataURItoBlob from './dataURItoBlob.ts' -import sampleImageDataURI from './sampleImageDataURI.ts' +import dataURItoBlob from './dataURItoBlob.js' +import sampleImageDataURI from './sampleImageDataURI.js' describe('dataURItoBlob', () => { it('should convert a data uri to a blob', () => { diff --git a/packages/@uppy/utils/src/dataURItoFile.test.ts b/packages/@uppy/utils/src/dataURItoFile.test.ts index 10e1e2abea..4120267505 100644 --- a/packages/@uppy/utils/src/dataURItoFile.test.ts +++ b/packages/@uppy/utils/src/dataURItoFile.test.ts @@ -1,6 +1,6 @@ import { describe, expect, it } from 'vitest' -import dataURItoFile from './dataURItoFile.ts' -import sampleImageDataURI from './sampleImageDataURI.ts' +import dataURItoFile from './dataURItoFile.js' +import sampleImageDataURI from './sampleImageDataURI.js' describe('dataURItoFile', () => { it('should convert a data uri to a file', () => { diff --git a/packages/@uppy/utils/src/dataURItoFile.ts b/packages/@uppy/utils/src/dataURItoFile.ts index c3ceffa3f9..0d50537445 100644 --- a/packages/@uppy/utils/src/dataURItoFile.ts +++ b/packages/@uppy/utils/src/dataURItoFile.ts @@ -1,4 +1,4 @@ -import dataURItoBlob from './dataURItoBlob.ts' +import dataURItoBlob from './dataURItoBlob.js' export default function dataURItoFile( dataURI: string, diff --git a/packages/@uppy/utils/src/delay.test.ts b/packages/@uppy/utils/src/delay.test.ts index 54cc3cd631..777c1cff61 100644 --- a/packages/@uppy/utils/src/delay.test.ts +++ b/packages/@uppy/utils/src/delay.test.ts @@ -1,6 +1,6 @@ import { describe, expect, it } from 'vitest' -import { AbortController } from './AbortController.ts' -import delay from './delay.ts' +import { AbortController } from './AbortController.js' +import delay from './delay.js' describe('delay', () => { it('should wait for the specified time', async () => { diff --git a/packages/@uppy/utils/src/delay.ts b/packages/@uppy/utils/src/delay.ts index 6e35ee9326..6da80868ea 100644 --- a/packages/@uppy/utils/src/delay.ts +++ b/packages/@uppy/utils/src/delay.ts @@ -1,4 +1,4 @@ -import { createAbortError } from './AbortController.ts' +import { createAbortError } from './AbortController.js' /** * Return a Promise that resolves after `ms` milliseconds. diff --git a/packages/@uppy/utils/src/emaFilter.test.ts b/packages/@uppy/utils/src/emaFilter.test.ts index f9abc631bd..cb477e5875 100644 --- a/packages/@uppy/utils/src/emaFilter.test.ts +++ b/packages/@uppy/utils/src/emaFilter.test.ts @@ -1,5 +1,5 @@ import { describe, expect, it } from 'vitest' -import emaFilter from './emaFilter.ts' +import emaFilter from './emaFilter.js' describe('emaFilter', () => { it('should calculate the exponential average', () => { diff --git a/packages/@uppy/utils/src/fetchWithNetworkError.ts b/packages/@uppy/utils/src/fetchWithNetworkError.ts index bf392ac618..76b25169e9 100644 --- a/packages/@uppy/utils/src/fetchWithNetworkError.ts +++ b/packages/@uppy/utils/src/fetchWithNetworkError.ts @@ -1,4 +1,4 @@ -import NetworkError from './NetworkError.ts' +import NetworkError from './NetworkError.js' /** * Wrapper around window.fetch that throws a NetworkError when appropriate diff --git a/packages/@uppy/utils/src/fetcher.ts b/packages/@uppy/utils/src/fetcher.ts index c600f71552..661ff1bfc2 100644 --- a/packages/@uppy/utils/src/fetcher.ts +++ b/packages/@uppy/utils/src/fetcher.ts @@ -1,5 +1,5 @@ -import NetworkError from './NetworkError.ts' -import ProgressTimeout from './ProgressTimeout.ts' +import NetworkError from './NetworkError.js' +import ProgressTimeout from './ProgressTimeout.js' const noop = (): void => {} @@ -84,6 +84,16 @@ export function fetcher( // eslint-disable-next-line no-async-promise-executor return new Promise(async (resolve, reject) => { const xhr = new XMLHttpRequest() + const onError = (error: Error) => { + if (shouldRetry(xhr) && retryCount < retries) { + setTimeout(() => { + requestWithRetry(retryCount + 1).then(resolve, reject) + }, delay(retryCount)) + } else { + timer.done() + reject(error) + } + } xhr.open(method, url, true) xhr.withCredentials = withCredentials @@ -99,7 +109,15 @@ export function fetcher( }) xhr.onload = async () => { - await onAfterResponse(xhr, retryCount) + try { + await onAfterResponse(xhr, retryCount) + } catch (err) { + // This is important as we need to emit the xhr + // over the upload-error event. + err.request = xhr + onError(err) + return + } if (xhr.status >= 200 && xhr.status < 300) { timer.done() @@ -114,16 +132,7 @@ export function fetcher( } } - xhr.onerror = () => { - if (shouldRetry(xhr) && retryCount < retries) { - setTimeout(() => { - requestWithRetry(retryCount + 1).then(resolve, reject) - }, delay(retryCount)) - } else { - timer.done() - reject(new NetworkError(xhr.statusText, xhr)) - } - } + xhr.onerror = () => onError(new NetworkError(xhr.statusText, xhr)) xhr.upload.onprogress = (event: ProgressEvent) => { timer.progress() diff --git a/packages/@uppy/utils/src/fileFilters.ts b/packages/@uppy/utils/src/fileFilters.ts index 2ffd041e96..415bdef7a3 100644 --- a/packages/@uppy/utils/src/fileFilters.ts +++ b/packages/@uppy/utils/src/fileFilters.ts @@ -1,4 +1,4 @@ -import type { UppyFile } from './UppyFile.ts' +import type { UppyFile } from './UppyFile.js' export function filterNonFailedFiles( files: UppyFile[], diff --git a/packages/@uppy/utils/src/findAllDOMElements.ts b/packages/@uppy/utils/src/findAllDOMElements.ts index 2701bf63b9..f9b0edd857 100644 --- a/packages/@uppy/utils/src/findAllDOMElements.ts +++ b/packages/@uppy/utils/src/findAllDOMElements.ts @@ -1,4 +1,4 @@ -import isDOMElement from './isDOMElement.ts' +import isDOMElement from './isDOMElement.js' function findAllDOMElements( element: T, diff --git a/packages/@uppy/utils/src/findDOMElement.ts b/packages/@uppy/utils/src/findDOMElement.ts index b5c0a3b763..a285f56b07 100644 --- a/packages/@uppy/utils/src/findDOMElement.ts +++ b/packages/@uppy/utils/src/findDOMElement.ts @@ -1,4 +1,4 @@ -import isDOMElement from './isDOMElement.ts' +import isDOMElement from './isDOMElement.js' function findDOMElement( element: T, diff --git a/packages/@uppy/utils/src/generateFileID.ts b/packages/@uppy/utils/src/generateFileID.ts index 115f346995..d6c6448480 100644 --- a/packages/@uppy/utils/src/generateFileID.ts +++ b/packages/@uppy/utils/src/generateFileID.ts @@ -1,5 +1,5 @@ -import type { MinimalRequiredUppyFile, UppyFile } from './UppyFile.ts' -import getFileType from './getFileType.ts' +import type { MinimalRequiredUppyFile, UppyFile } from './UppyFile.js' +import getFileType from './getFileType.js' function encodeCharacter(character: string): string { return character.charCodeAt(0).toString(32) diff --git a/packages/@uppy/utils/src/getAllowedMetaFields.ts b/packages/@uppy/utils/src/getAllowedMetaFields.ts index 423e92307d..ffdd5bf78c 100644 --- a/packages/@uppy/utils/src/getAllowedMetaFields.ts +++ b/packages/@uppy/utils/src/getAllowedMetaFields.ts @@ -1,4 +1,4 @@ -import type { Meta } from './UppyFile.ts' +import type { Meta } from './UppyFile.js' export default function getAllowedMetaFields( fields: string[] | boolean, diff --git a/packages/@uppy/utils/src/getBytesRemaining.test.ts b/packages/@uppy/utils/src/getBytesRemaining.test.ts index f08c560915..cf49c3a501 100644 --- a/packages/@uppy/utils/src/getBytesRemaining.test.ts +++ b/packages/@uppy/utils/src/getBytesRemaining.test.ts @@ -1,5 +1,5 @@ import { describe, expect, it } from 'vitest' -import getBytesRemaining from './getBytesRemaining.ts' +import getBytesRemaining from './getBytesRemaining.js' describe('getBytesRemaining', () => { it('should calculate the bytes remaining given a fileProgress object', () => { diff --git a/packages/@uppy/utils/src/getBytesRemaining.ts b/packages/@uppy/utils/src/getBytesRemaining.ts index 5c21183b04..fdb0e97b18 100644 --- a/packages/@uppy/utils/src/getBytesRemaining.ts +++ b/packages/@uppy/utils/src/getBytesRemaining.ts @@ -1,4 +1,4 @@ -import type { FileProgress } from './FileProgress.ts' +import type { FileProgress } from './FileProgress.js' export default function getBytesRemaining(fileProgress: FileProgress): number { if (fileProgress.bytesTotal == null) return 0 diff --git a/packages/@uppy/utils/src/getDroppedFiles/index.ts b/packages/@uppy/utils/src/getDroppedFiles/index.ts index f3839dd4f8..0d98ad19eb 100644 --- a/packages/@uppy/utils/src/getDroppedFiles/index.ts +++ b/packages/@uppy/utils/src/getDroppedFiles/index.ts @@ -1,5 +1,5 @@ -import webkitGetAsEntryApi from './utils/webkitGetAsEntryApi/index.ts' -import fallbackApi from './utils/fallbackApi.ts' +import webkitGetAsEntryApi from './utils/webkitGetAsEntryApi/index.js' +import fallbackApi from './utils/fallbackApi.js' /** * Returns a promise that resolves to the array of dropped files (if a folder is diff --git a/packages/@uppy/utils/src/getDroppedFiles/utils/fallbackApi.ts b/packages/@uppy/utils/src/getDroppedFiles/utils/fallbackApi.ts index ebbba9d6bf..750ec13e32 100644 --- a/packages/@uppy/utils/src/getDroppedFiles/utils/fallbackApi.ts +++ b/packages/@uppy/utils/src/getDroppedFiles/utils/fallbackApi.ts @@ -1,4 +1,4 @@ -import toArray from '../../toArray.ts' +import toArray from '../../toArray.js' // .files fallback, should be implemented in any browser export default function fallbackApi( diff --git a/packages/@uppy/utils/src/getDroppedFiles/utils/webkitGetAsEntryApi/index.ts b/packages/@uppy/utils/src/getDroppedFiles/utils/webkitGetAsEntryApi/index.ts index aa9e7b0009..ff9a84e23c 100644 --- a/packages/@uppy/utils/src/getDroppedFiles/utils/webkitGetAsEntryApi/index.ts +++ b/packages/@uppy/utils/src/getDroppedFiles/utils/webkitGetAsEntryApi/index.ts @@ -1,4 +1,4 @@ -import getFilesAndDirectoriesFromDirectory from './getFilesAndDirectoriesFromDirectory.ts' +import getFilesAndDirectoriesFromDirectory from './getFilesAndDirectoriesFromDirectory.js' interface FileSystemFileHandle extends FileSystemHandle { getFile(): Promise diff --git a/packages/@uppy/utils/src/getETA.ts b/packages/@uppy/utils/src/getETA.ts index e85416aeec..c0d95024fb 100644 --- a/packages/@uppy/utils/src/getETA.ts +++ b/packages/@uppy/utils/src/getETA.ts @@ -1,6 +1,6 @@ -import getSpeed from './getSpeed.ts' -import getBytesRemaining from './getBytesRemaining.ts' -import type { FileProgress } from './FileProgress.ts' +import getSpeed from './getSpeed.js' +import getBytesRemaining from './getBytesRemaining.js' +import type { FileProgress } from './FileProgress.js' export default function getETA(fileProgress: FileProgress): number { if (!fileProgress.bytesUploaded) return 0 diff --git a/packages/@uppy/utils/src/getFileNameAndExtension.test.ts b/packages/@uppy/utils/src/getFileNameAndExtension.test.ts index d87a0315f1..6821892be8 100644 --- a/packages/@uppy/utils/src/getFileNameAndExtension.test.ts +++ b/packages/@uppy/utils/src/getFileNameAndExtension.test.ts @@ -1,5 +1,5 @@ import { describe, expect, it } from 'vitest' -import getFileNameAndExtension from './getFileNameAndExtension.ts' +import getFileNameAndExtension from './getFileNameAndExtension.js' describe('getFileNameAndExtension', () => { it('should return the filename and extension as an array', () => { diff --git a/packages/@uppy/utils/src/getFileType.test.ts b/packages/@uppy/utils/src/getFileType.test.ts index 2316961b21..ede9ea3198 100644 --- a/packages/@uppy/utils/src/getFileType.test.ts +++ b/packages/@uppy/utils/src/getFileType.test.ts @@ -1,6 +1,6 @@ import { describe, expect, it } from 'vitest' -import getFileType from './getFileType.ts' -import type { UppyFile } from './UppyFile.ts' +import getFileType from './getFileType.js' +import type { UppyFile } from './UppyFile.js' describe('getFileType', () => { it('should trust the filetype if the file comes from a remote source', () => { diff --git a/packages/@uppy/utils/src/getFileType.ts b/packages/@uppy/utils/src/getFileType.ts index 96c44c1dd5..45245c134f 100644 --- a/packages/@uppy/utils/src/getFileType.ts +++ b/packages/@uppy/utils/src/getFileType.ts @@ -1,5 +1,5 @@ -import getFileNameAndExtension from './getFileNameAndExtension.ts' -import mimeTypes from './mimeTypes.ts' +import getFileNameAndExtension from './getFileNameAndExtension.js' +import mimeTypes from './mimeTypes.js' export default function getFileType(file: { type?: string diff --git a/packages/@uppy/utils/src/getFileTypeExtension.test.ts b/packages/@uppy/utils/src/getFileTypeExtension.test.ts index 6326d4a19e..4f44a91310 100644 --- a/packages/@uppy/utils/src/getFileTypeExtension.test.ts +++ b/packages/@uppy/utils/src/getFileTypeExtension.test.ts @@ -1,5 +1,5 @@ import { describe, expect, it } from 'vitest' -import getFileTypeExtension from './getFileTypeExtension.ts' +import getFileTypeExtension from './getFileTypeExtension.js' describe('getFileTypeExtension', () => { it('should return the filetype based on the specified mime type', () => { diff --git a/packages/@uppy/utils/src/getSocketHost.test.ts b/packages/@uppy/utils/src/getSocketHost.test.ts index f0293977b6..dc7131ce9e 100644 --- a/packages/@uppy/utils/src/getSocketHost.test.ts +++ b/packages/@uppy/utils/src/getSocketHost.test.ts @@ -1,5 +1,5 @@ import { describe, expect, it } from 'vitest' -import getSocketHost from './getSocketHost.ts' +import getSocketHost from './getSocketHost.js' describe('getSocketHost', () => { it('should get the host from the specified url', () => { diff --git a/packages/@uppy/utils/src/getSpeed.test.ts b/packages/@uppy/utils/src/getSpeed.test.ts index fed19d5074..0531cd47c3 100644 --- a/packages/@uppy/utils/src/getSpeed.test.ts +++ b/packages/@uppy/utils/src/getSpeed.test.ts @@ -1,5 +1,5 @@ import { describe, expect, it } from 'vitest' -import getSpeed from './getSpeed.ts' +import getSpeed from './getSpeed.js' describe('getSpeed', () => { it('should calculate the speed given a fileProgress object', () => { diff --git a/packages/@uppy/utils/src/getSpeed.ts b/packages/@uppy/utils/src/getSpeed.ts index e04aa0ef41..9520f0f007 100644 --- a/packages/@uppy/utils/src/getSpeed.ts +++ b/packages/@uppy/utils/src/getSpeed.ts @@ -1,4 +1,4 @@ -import type { FileProgress } from './FileProgress.ts' +import type { FileProgress } from './FileProgress.js' export default function getSpeed(fileProgress: FileProgress): number { if (!fileProgress.bytesUploaded) return 0 diff --git a/packages/@uppy/utils/src/isMobileDevice.test.ts b/packages/@uppy/utils/src/isMobileDevice.test.ts index d6ee41914f..d856b1a538 100644 --- a/packages/@uppy/utils/src/isMobileDevice.test.ts +++ b/packages/@uppy/utils/src/isMobileDevice.test.ts @@ -1,5 +1,5 @@ import { describe, expect, it } from 'vitest' -import isMobileDevice from './isMobileDevice.ts' +import isMobileDevice from './isMobileDevice.js' let fakeUserAgent: string | null = null diff --git a/packages/@uppy/utils/src/isNetworkError.test.ts b/packages/@uppy/utils/src/isNetworkError.test.ts index c7715cffd5..bfe755d1a9 100644 --- a/packages/@uppy/utils/src/isNetworkError.test.ts +++ b/packages/@uppy/utils/src/isNetworkError.test.ts @@ -1,5 +1,5 @@ import { describe, expect, it } from 'vitest' -import isNetworkError from './isNetworkError.ts' +import isNetworkError from './isNetworkError.js' describe('isNetworkError', () => { it('should return true if the specified xhr object contains a network error', () => { diff --git a/packages/@uppy/utils/src/isObjectURL.test.ts b/packages/@uppy/utils/src/isObjectURL.test.ts index a911892f84..e48f8bab3c 100644 --- a/packages/@uppy/utils/src/isObjectURL.test.ts +++ b/packages/@uppy/utils/src/isObjectURL.test.ts @@ -1,5 +1,5 @@ import { describe, expect, it } from 'vitest' -import isObjectURL from './isObjectURL.ts' +import isObjectURL from './isObjectURL.js' describe('isObjectURL', () => { it('should return true if the specified url is an object url', () => { diff --git a/packages/@uppy/utils/src/isPreviewSupported.test.ts b/packages/@uppy/utils/src/isPreviewSupported.test.ts index c2c8ee699c..adc8133d47 100644 --- a/packages/@uppy/utils/src/isPreviewSupported.test.ts +++ b/packages/@uppy/utils/src/isPreviewSupported.test.ts @@ -1,5 +1,5 @@ import { describe, expect, it } from 'vitest' -import isPreviewSupported from './isPreviewSupported.ts' +import isPreviewSupported from './isPreviewSupported.js' describe('isPreviewSupported', () => { it('should return true for any filetypes that browsers can preview', () => { diff --git a/packages/@uppy/utils/src/prettyETA.test.ts b/packages/@uppy/utils/src/prettyETA.test.ts index a1b8294426..be99fb26a9 100644 --- a/packages/@uppy/utils/src/prettyETA.test.ts +++ b/packages/@uppy/utils/src/prettyETA.test.ts @@ -1,5 +1,5 @@ import { describe, expect, it } from 'vitest' -import prettyETA from './prettyETA.ts' +import prettyETA from './prettyETA.js' describe('prettyETA', () => { it('should convert the specified number of seconds to a pretty ETA', () => { diff --git a/packages/@uppy/utils/src/prettyETA.ts b/packages/@uppy/utils/src/prettyETA.ts index ea2a77505c..b58d719068 100644 --- a/packages/@uppy/utils/src/prettyETA.ts +++ b/packages/@uppy/utils/src/prettyETA.ts @@ -1,4 +1,4 @@ -import secondsToTime from './secondsToTime.ts' +import secondsToTime from './secondsToTime.js' export default function prettyETA(seconds: number): string { const time = secondsToTime(seconds) diff --git a/packages/@uppy/utils/src/remoteFileObjToLocal.ts b/packages/@uppy/utils/src/remoteFileObjToLocal.ts index fbc03f6c3e..8fed09838a 100644 --- a/packages/@uppy/utils/src/remoteFileObjToLocal.ts +++ b/packages/@uppy/utils/src/remoteFileObjToLocal.ts @@ -1,4 +1,4 @@ -import getFileNameAndExtension from './getFileNameAndExtension.ts' +import getFileNameAndExtension from './getFileNameAndExtension.js' interface ObjectWithMIMEAndName { name?: string diff --git a/packages/@uppy/utils/src/secondsToTime.test.ts b/packages/@uppy/utils/src/secondsToTime.test.ts index 44e21b4b4c..7bc7fa53dc 100644 --- a/packages/@uppy/utils/src/secondsToTime.test.ts +++ b/packages/@uppy/utils/src/secondsToTime.test.ts @@ -1,5 +1,5 @@ import { describe, expect, it } from 'vitest' -import secondsToTime from './secondsToTime.ts' +import secondsToTime from './secondsToTime.js' describe('secondsToTime', () => { it('converts seconds to an { hours, minutes, seconds } object', () => { diff --git a/packages/@uppy/utils/src/toArray.test.ts b/packages/@uppy/utils/src/toArray.test.ts index 541b0fb5e6..e193b8632c 100644 --- a/packages/@uppy/utils/src/toArray.test.ts +++ b/packages/@uppy/utils/src/toArray.test.ts @@ -1,5 +1,5 @@ import { describe, expect, it } from 'vitest' -import toArray from './toArray.ts' +import toArray from './toArray.js' describe('toArray', () => { it('should convert a array-like object into an array', () => { diff --git a/packages/@uppy/utils/src/truncateString.test.ts b/packages/@uppy/utils/src/truncateString.test.ts index 5b881f97ae..24f2839860 100644 --- a/packages/@uppy/utils/src/truncateString.test.ts +++ b/packages/@uppy/utils/src/truncateString.test.ts @@ -1,5 +1,5 @@ import { describe, expect, it } from 'vitest' -import truncateString from './truncateString.ts' +import truncateString from './truncateString.js' describe('truncateString', () => { it('should truncate the string to the length', () => { diff --git a/packages/@uppy/vue/CHANGELOG.md b/packages/@uppy/vue/CHANGELOG.md index d8919a469a..56db56080a 100644 --- a/packages/@uppy/vue/CHANGELOG.md +++ b/packages/@uppy/vue/CHANGELOG.md @@ -1,5 +1,12 @@ # @uppy/vue +## 2.1.0 + +Released: 2025-01-06 +Included in: Uppy v4.11.0 + +- @uppy/angular,@uppy/audio,@uppy/aws-s3,@uppy/box,@uppy/companion-client,@uppy/compressor,@uppy/core,@uppy/dashboard,@uppy/drag-drop,@uppy/drop-target,@uppy/dropbox,@uppy/facebook,@uppy/file-input,@uppy/form,@uppy/golden-retriever,@uppy/google-drive-picker,@uppy/google-drive,@uppy/google-photos-picker,@uppy/google-photos,@uppy/image-editor,@uppy/informer,@uppy/instagram,@uppy/locales,@uppy/onedrive,@uppy/progress-bar,@uppy/provider-views,@uppy/react,@uppy/remote-sources,@uppy/screen-capture,@uppy/status-bar,@uppy/thumbnail-generator,@uppy/transloadit,@uppy/tus,@uppy/unsplash,@uppy/url,@uppy/vue,@uppy/webcam,@uppy/webdav,@uppy/xhr-upload,@uppy/zoom: Remove "paths" from all tsconfig's (Merlijn Vos / #5572) + ## 2.0.3 Released: 2024-12-05 diff --git a/packages/@uppy/vue/package.json b/packages/@uppy/vue/package.json index 7e57f59264..6e0d679670 100644 --- a/packages/@uppy/vue/package.json +++ b/packages/@uppy/vue/package.json @@ -1,6 +1,6 @@ { "name": "@uppy/vue", - "version": "2.0.3", + "version": "2.1.1", "license": "MIT", "type": "module", "main": "lib/index.js", diff --git a/packages/@uppy/vue/src/dashboard-modal.ts b/packages/@uppy/vue/src/dashboard-modal.ts index d1d795e25c..a0df22ce31 100644 --- a/packages/@uppy/vue/src/dashboard-modal.ts +++ b/packages/@uppy/vue/src/dashboard-modal.ts @@ -1,8 +1,8 @@ import { defineComponent, ref, watch, h, type PropType } from 'vue' import DashboardPlugin, { type DashboardOptions } from '@uppy/dashboard' import { Uppy } from '@uppy/core' -import type { Meta, Body } from '@uppy/utils/lib/UppyFile' -import useUppy from './useUppy.ts' +import type { Meta, Body } from '@uppy/core' +import useUppy from './useUppy.js' type DashboardModalOptions = Omit< DashboardOptions & { inline: false }, diff --git a/packages/@uppy/vue/src/dashboard.ts b/packages/@uppy/vue/src/dashboard.ts index f077b73d56..7b5383f760 100644 --- a/packages/@uppy/vue/src/dashboard.ts +++ b/packages/@uppy/vue/src/dashboard.ts @@ -1,8 +1,7 @@ import { defineComponent, ref, h, type PropType } from 'vue' import DashboardPlugin, { type DashboardOptions } from '@uppy/dashboard' -import type { Uppy } from '@uppy/core' -import type { Meta, Body } from '@uppy/utils/lib/UppyFile' -import useUppy from './useUppy.ts' +import type { Uppy, Meta, Body } from '@uppy/core' +import useUppy from './useUppy.js' type DashboardInlineOptions = Omit< DashboardOptions & { inline: true }, diff --git a/packages/@uppy/vue/src/drag-drop.ts b/packages/@uppy/vue/src/drag-drop.ts index 4c51f1a27d..b8689de64f 100644 --- a/packages/@uppy/vue/src/drag-drop.ts +++ b/packages/@uppy/vue/src/drag-drop.ts @@ -1,7 +1,7 @@ import { defineComponent, ref, h, type PropType } from 'vue' import DragDropPlugin, { type DragDropOptions } from '@uppy/drag-drop' import { Uppy } from '@uppy/core' -import useUppy from './useUppy.ts' +import useUppy from './useUppy.js' export default defineComponent({ name: 'DragDrop', diff --git a/packages/@uppy/vue/src/file-input.ts b/packages/@uppy/vue/src/file-input.ts index 007ee11357..2de2331de9 100644 --- a/packages/@uppy/vue/src/file-input.ts +++ b/packages/@uppy/vue/src/file-input.ts @@ -1,7 +1,7 @@ import { defineComponent, ref, h, type PropType } from 'vue' import FileInputPlugin, { type FileInputOptions } from '@uppy/file-input' import { Uppy } from '@uppy/core' -import useUppy from './useUppy.ts' +import useUppy from './useUppy.js' export default defineComponent({ name: 'FileInput', diff --git a/packages/@uppy/vue/src/index.ts b/packages/@uppy/vue/src/index.ts index b1dc0212cc..9123e0c44c 100644 --- a/packages/@uppy/vue/src/index.ts +++ b/packages/@uppy/vue/src/index.ts @@ -1,6 +1,6 @@ -export { default as Dashboard } from './dashboard.ts' -export { default as DashboardModal } from './dashboard-modal.ts' -export { default as DragDrop } from './drag-drop.ts' -export { default as ProgressBar } from './progress-bar.ts' -export { default as StatusBar } from './status-bar.ts' -export { default as FileInput } from './file-input.ts' +export { default as Dashboard } from './dashboard.js' +export { default as DashboardModal } from './dashboard-modal.js' +export { default as DragDrop } from './drag-drop.js' +export { default as ProgressBar } from './progress-bar.js' +export { default as StatusBar } from './status-bar.js' +export { default as FileInput } from './file-input.js' diff --git a/packages/@uppy/vue/src/progress-bar.ts b/packages/@uppy/vue/src/progress-bar.ts index dc919e07b3..6f3f0b2ba8 100644 --- a/packages/@uppy/vue/src/progress-bar.ts +++ b/packages/@uppy/vue/src/progress-bar.ts @@ -1,7 +1,7 @@ import { defineComponent, ref, h, type PropType } from 'vue' import ProgressBarPlugin, { type ProgressBarOptions } from '@uppy/progress-bar' import { Uppy } from '@uppy/core' -import useUppy from './useUppy.ts' +import useUppy from './useUppy.js' export default defineComponent({ name: 'ProgressBar', diff --git a/packages/@uppy/vue/src/status-bar.ts b/packages/@uppy/vue/src/status-bar.ts index 305b27a2b1..68f2c1130b 100644 --- a/packages/@uppy/vue/src/status-bar.ts +++ b/packages/@uppy/vue/src/status-bar.ts @@ -1,7 +1,7 @@ import { defineComponent, ref, h, type PropType } from 'vue' import StatusBarPlugin, { type StatusBarOptions } from '@uppy/status-bar' import { Uppy } from '@uppy/core' -import useUppy from './useUppy.ts' +import useUppy from './useUppy.js' export default defineComponent({ name: 'StatusBar', diff --git a/packages/@uppy/vue/tsconfig.build.json b/packages/@uppy/vue/tsconfig.build.json index ed1857a09e..f2cef03bf8 100644 --- a/packages/@uppy/vue/tsconfig.build.json +++ b/packages/@uppy/vue/tsconfig.build.json @@ -2,20 +2,6 @@ "extends": "../../../tsconfig.shared", "compilerOptions": { "outDir": "./lib", - "paths": { - "@uppy/core": ["../core/src/index.js"], - "@uppy/core/lib/*": ["../core/src/*"], - "@uppy/dashboard": ["../dashboard/src/index.js"], - "@uppy/dashboard/lib/*": ["../dashboard/src/*"], - "@uppy/drag-drop": ["../drag-drop/src/index.js"], - "@uppy/drag-drop/lib/*": ["../drag-drop/src/*"], - "@uppy/file-input": ["../file-input/src/index.js"], - "@uppy/file-input/lib/*": ["../file-input/src/*"], - "@uppy/progress-bar": ["../progress-bar/src/index.js"], - "@uppy/progress-bar/lib/*": ["../progress-bar/src/*"], - "@uppy/status-bar": ["../status-bar/src/index.js"], - "@uppy/status-bar/lib/*": ["../status-bar/src/*"] - }, "resolveJsonModule": false, "rootDir": "./src" }, diff --git a/packages/@uppy/vue/tsconfig.json b/packages/@uppy/vue/tsconfig.json index 22bd040183..9e33b3f4cd 100644 --- a/packages/@uppy/vue/tsconfig.json +++ b/packages/@uppy/vue/tsconfig.json @@ -3,20 +3,6 @@ "compilerOptions": { "emitDeclarationOnly": false, "noEmit": true, - "paths": { - "@uppy/core": ["../core/src/index.js"], - "@uppy/core/lib/*": ["../core/src/*"], - "@uppy/dashboard": ["../dashboard/src/index.js"], - "@uppy/dashboard/lib/*": ["../dashboard/src/*"], - "@uppy/drag-drop": ["../drag-drop/src/index.js"], - "@uppy/drag-drop/lib/*": ["../drag-drop/src/*"], - "@uppy/file-input": ["../file-input/src/index.js"], - "@uppy/file-input/lib/*": ["../file-input/src/*"], - "@uppy/progress-bar": ["../progress-bar/src/index.js"], - "@uppy/progress-bar/lib/*": ["../progress-bar/src/*"], - "@uppy/status-bar": ["../status-bar/src/index.js"], - "@uppy/status-bar/lib/*": ["../status-bar/src/*"], - }, }, "include": ["./package.json", "./src/**/*.*"], "references": [ diff --git a/packages/@uppy/webcam/CHANGELOG.md b/packages/@uppy/webcam/CHANGELOG.md index cbf13c426f..2983e7185e 100644 --- a/packages/@uppy/webcam/CHANGELOG.md +++ b/packages/@uppy/webcam/CHANGELOG.md @@ -1,5 +1,12 @@ # @uppy/webcam +## 4.1.0 + +Released: 2025-01-06 +Included in: Uppy v4.11.0 + +- @uppy/angular,@uppy/audio,@uppy/aws-s3,@uppy/box,@uppy/companion-client,@uppy/compressor,@uppy/core,@uppy/dashboard,@uppy/drag-drop,@uppy/drop-target,@uppy/dropbox,@uppy/facebook,@uppy/file-input,@uppy/form,@uppy/golden-retriever,@uppy/google-drive-picker,@uppy/google-drive,@uppy/google-photos-picker,@uppy/google-photos,@uppy/image-editor,@uppy/informer,@uppy/instagram,@uppy/locales,@uppy/onedrive,@uppy/progress-bar,@uppy/provider-views,@uppy/react,@uppy/remote-sources,@uppy/screen-capture,@uppy/status-bar,@uppy/thumbnail-generator,@uppy/transloadit,@uppy/tus,@uppy/unsplash,@uppy/url,@uppy/vue,@uppy/webcam,@uppy/webdav,@uppy/xhr-upload,@uppy/zoom: Remove "paths" from all tsconfig's (Merlijn Vos / #5572) + ## 4.0.3 Released: 2024-12-05 diff --git a/packages/@uppy/webcam/package.json b/packages/@uppy/webcam/package.json index 52fc9dca4a..1154501894 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": "4.0.3", + "version": "4.1.1", "license": "MIT", "main": "lib/index.js", "style": "dist/style.min.css", diff --git a/packages/@uppy/webcam/src/CameraScreen.tsx b/packages/@uppy/webcam/src/CameraScreen.tsx index 1df4ee2af7..0a96645feb 100644 --- a/packages/@uppy/webcam/src/CameraScreen.tsx +++ b/packages/@uppy/webcam/src/CameraScreen.tsx @@ -2,14 +2,14 @@ import type { I18n } from '@uppy/utils/lib/Translator' import { h, Component, type ComponentChild } from 'preact' import type { HTMLAttributes } from 'preact/compat' -import SnapshotButton from './SnapshotButton.tsx' -import RecordButton from './RecordButton.tsx' -import RecordingLength from './RecordingLength.tsx' +import SnapshotButton from './SnapshotButton.jsx' +import RecordButton from './RecordButton.jsx' +import RecordingLength from './RecordingLength.jsx' import VideoSourceSelect, { type VideoSourceSelectProps, -} from './VideoSourceSelect.tsx' -import SubmitButton from './SubmitButton.tsx' -import DiscardButton from './DiscardButton.tsx' +} from './VideoSourceSelect.jsx' +import SubmitButton from './SubmitButton.jsx' +import DiscardButton from './DiscardButton.jsx' function isModeAvailable(modes: T[], mode: any): mode is T { return modes.includes(mode) diff --git a/packages/@uppy/webcam/src/RecordingLength.tsx b/packages/@uppy/webcam/src/RecordingLength.tsx index f2e44e59e1..af1f116fa7 100644 --- a/packages/@uppy/webcam/src/RecordingLength.tsx +++ b/packages/@uppy/webcam/src/RecordingLength.tsx @@ -1,6 +1,6 @@ import type { I18n } from '@uppy/utils/lib/Translator' import { h } from 'preact' -import formatSeconds from './formatSeconds.ts' +import formatSeconds from './formatSeconds.js' interface RecordingLengthProps { recordingLengthSeconds: number diff --git a/packages/@uppy/webcam/src/SnapshotButton.tsx b/packages/@uppy/webcam/src/SnapshotButton.tsx index c359934620..12d59e870c 100644 --- a/packages/@uppy/webcam/src/SnapshotButton.tsx +++ b/packages/@uppy/webcam/src/SnapshotButton.tsx @@ -1,6 +1,6 @@ import type { I18n } from '@uppy/utils/lib/Translator' import { h } from 'preact' -import CameraIcon from './CameraIcon.tsx' +import CameraIcon from './CameraIcon.jsx' interface SnapshotButtonProps { onSnapshot: () => void diff --git a/packages/@uppy/webcam/src/Webcam.test.ts b/packages/@uppy/webcam/src/Webcam.test.ts index 58a8aeb800..2a95840d3d 100644 --- a/packages/@uppy/webcam/src/Webcam.test.ts +++ b/packages/@uppy/webcam/src/Webcam.test.ts @@ -1,7 +1,7 @@ /* eslint-disable @typescript-eslint/ban-ts-comment */ import { describe, expect, it } from 'vitest' import Uppy from '@uppy/core' -import Webcam from './index.ts' +import Webcam from './index.js' describe('Webcam', () => { describe('_getMediaRecorderOptions', () => { diff --git a/packages/@uppy/webcam/src/Webcam.tsx b/packages/@uppy/webcam/src/Webcam.tsx index 0201dc77bd..104ffaac9e 100644 --- a/packages/@uppy/webcam/src/Webcam.tsx +++ b/packages/@uppy/webcam/src/Webcam.tsx @@ -1,26 +1,27 @@ import { h, type ComponentChild } from 'preact' import { UIPlugin } from '@uppy/core' -import type { Uppy, UIPluginOptions } from '@uppy/core' -import type { DefinePluginOpts } from '@uppy/core/lib/BasePlugin.js' import type { + Uppy, + UIPluginOptions, + DefinePluginOpts, Body, Meta, MinimalRequiredUppyFile, -} from '@uppy/utils/lib/UppyFile' +} from '@uppy/core' import type { PluginTarget } from '@uppy/core/lib/UIPlugin.js' import getFileTypeExtension from '@uppy/utils/lib/getFileTypeExtension' import mimeTypes from '@uppy/utils/lib/mimeTypes' import isMobile from 'is-mobile' import canvasToBlob from '@uppy/utils/lib/canvasToBlob' -import supportsMediaRecorder from './supportsMediaRecorder.ts' -import CameraIcon from './CameraIcon.tsx' -import CameraScreen from './CameraScreen.tsx' -import PermissionsScreen from './PermissionsScreen.tsx' +import supportsMediaRecorder from './supportsMediaRecorder.js' +import CameraIcon from './CameraIcon.jsx' +import CameraScreen from './CameraScreen.jsx' +import PermissionsScreen from './PermissionsScreen.jsx' // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore We don't want TS to generate types for the package.json import packageJson from '../package.json' -import locale from './locale.ts' +import locale from './locale.js' /** * Normalize a MIME type or file extension into a MIME type. diff --git a/packages/@uppy/webcam/src/formatSeconds.test.ts b/packages/@uppy/webcam/src/formatSeconds.test.ts index 6e5c746611..9ddcc35cfc 100644 --- a/packages/@uppy/webcam/src/formatSeconds.test.ts +++ b/packages/@uppy/webcam/src/formatSeconds.test.ts @@ -1,5 +1,5 @@ import { describe, expect, it } from 'vitest' -import formatSeconds from './formatSeconds.ts' +import formatSeconds from './formatSeconds.js' describe('formatSeconds', () => { it("should return a value of '0:43' when an argument of 43 seconds is supplied", () => { diff --git a/packages/@uppy/webcam/src/index.ts b/packages/@uppy/webcam/src/index.ts index 0a8151b553..6fa7cd6950 100644 --- a/packages/@uppy/webcam/src/index.ts +++ b/packages/@uppy/webcam/src/index.ts @@ -1,2 +1,2 @@ -export { default } from './Webcam.tsx' -export type { WebcamOptions } from './Webcam.tsx' +export { default } from './Webcam.jsx' +export type { WebcamOptions } from './Webcam.jsx' diff --git a/packages/@uppy/webcam/src/supportsMediaRecorder.test.ts b/packages/@uppy/webcam/src/supportsMediaRecorder.test.ts index 044f9dc910..a82d2199cf 100644 --- a/packages/@uppy/webcam/src/supportsMediaRecorder.test.ts +++ b/packages/@uppy/webcam/src/supportsMediaRecorder.test.ts @@ -1,6 +1,6 @@ /* eslint-disable max-classes-per-file, class-methods-use-this, @typescript-eslint/ban-ts-comment */ import { describe, expect, it } from 'vitest' -import supportsMediaRecorder from './supportsMediaRecorder.ts' +import supportsMediaRecorder from './supportsMediaRecorder.js' describe('supportsMediaRecorder', () => { it('should return true if MediaRecorder is supported', () => { diff --git a/packages/@uppy/webcam/tsconfig.build.json b/packages/@uppy/webcam/tsconfig.build.json index 8d9ed22fa5..bbf30b5b43 100644 --- a/packages/@uppy/webcam/tsconfig.build.json +++ b/packages/@uppy/webcam/tsconfig.build.json @@ -2,11 +2,6 @@ "extends": "../../../tsconfig.shared", "compilerOptions": { "outDir": "./lib", - "paths": { - "@uppy/utils/lib/*": ["../utils/src/*"], - "@uppy/core": ["../core/src/index.js"], - "@uppy/core/lib/*": ["../core/src/*"] - }, "resolveJsonModule": false, "rootDir": "./src" }, diff --git a/packages/@uppy/webcam/tsconfig.json b/packages/@uppy/webcam/tsconfig.json index a76c3b714a..47ece599c6 100644 --- a/packages/@uppy/webcam/tsconfig.json +++ b/packages/@uppy/webcam/tsconfig.json @@ -3,11 +3,6 @@ "compilerOptions": { "emitDeclarationOnly": false, "noEmit": true, - "paths": { - "@uppy/utils/lib/*": ["../utils/src/*"], - "@uppy/core": ["../core/src/index.js"], - "@uppy/core/lib/*": ["../core/src/*"], - }, }, "include": ["./package.json", "./src/**/*.*"], "references": [ diff --git a/packages/@uppy/webdav/CHANGELOG.md b/packages/@uppy/webdav/CHANGELOG.md index 557153afc2..89618d5d9c 100644 --- a/packages/@uppy/webdav/CHANGELOG.md +++ b/packages/@uppy/webdav/CHANGELOG.md @@ -1,5 +1,19 @@ # @uppy/webdav +## 0.3.0 + +Released: 2025-01-06 +Included in: Uppy v4.11.0 + +- @uppy/angular,@uppy/audio,@uppy/aws-s3,@uppy/box,@uppy/companion-client,@uppy/compressor,@uppy/core,@uppy/dashboard,@uppy/drag-drop,@uppy/drop-target,@uppy/dropbox,@uppy/facebook,@uppy/file-input,@uppy/form,@uppy/golden-retriever,@uppy/google-drive-picker,@uppy/google-drive,@uppy/google-photos-picker,@uppy/google-photos,@uppy/image-editor,@uppy/informer,@uppy/instagram,@uppy/locales,@uppy/onedrive,@uppy/progress-bar,@uppy/provider-views,@uppy/react,@uppy/remote-sources,@uppy/screen-capture,@uppy/status-bar,@uppy/thumbnail-generator,@uppy/transloadit,@uppy/tus,@uppy/unsplash,@uppy/url,@uppy/vue,@uppy/webcam,@uppy/webdav,@uppy/xhr-upload,@uppy/zoom: Remove "paths" from all tsconfig's (Merlijn Vos / #5572) + +## 0.2.0 + +Released: 2025-01-06 +Included in: Uppy v4.10.0 + +- @uppy/webdav: add plugin icon (Merlijn Vos / #5555) + ## 0.1.0 Released: 2024-12-17 diff --git a/packages/@uppy/webdav/package.json b/packages/@uppy/webdav/package.json index e3d6e8ee0e..07152d1a9a 100644 --- a/packages/@uppy/webdav/package.json +++ b/packages/@uppy/webdav/package.json @@ -1,7 +1,7 @@ { "name": "@uppy/webdav", "description": "Import files from WebDAV into Uppy.", - "version": "0.1.0", + "version": "0.3.1", "license": "MIT", "main": "lib/index.js", "types": "types/index.d.ts", diff --git a/packages/@uppy/webdav/src/Webdav.tsx b/packages/@uppy/webdav/src/Webdav.tsx index 1f2fb85288..71c96b8e7d 100644 --- a/packages/@uppy/webdav/src/Webdav.tsx +++ b/packages/@uppy/webdav/src/Webdav.tsx @@ -1,12 +1,15 @@ import { h, type ComponentChild } from 'preact' import { useState, useCallback } from 'preact/hooks' -import { - UIPlugin, - type Body, - type Meta, - type UnknownProviderPlugin, - type UppyFile, +import { UIPlugin } from '@uppy/core' +import type { + Body, + Meta, + UnknownProviderPlugin, + UppyFile, + AsyncStore, + UnknownProviderPluginState, + Uppy, } from '@uppy/core' import { Provider, @@ -15,16 +18,11 @@ import { } from '@uppy/companion-client' import { SearchInput, ProviderViews } from '@uppy/provider-views' -import type { - AsyncStore, - UnknownProviderPluginState, - Uppy, -} from '@uppy/core/lib/Uppy.js' import type { I18n } from '@uppy/utils/lib/Translator' // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore We don't want TS to generate types for the package.json import packageJson from '../package.json' -import locale from './locale.ts' +import locale from './locale.js' class WebdavSimpleAuthProvider extends Provider< M, diff --git a/packages/@uppy/webdav/src/index.ts b/packages/@uppy/webdav/src/index.ts index c5a3243f99..9d0c5cf521 100644 --- a/packages/@uppy/webdav/src/index.ts +++ b/packages/@uppy/webdav/src/index.ts @@ -1 +1 @@ -export { default } from './Webdav.tsx' +export { default } from './Webdav.jsx' diff --git a/packages/@uppy/webdav/tsconfig.build.json b/packages/@uppy/webdav/tsconfig.build.json index 43364c8759..a27e4cdab2 100644 --- a/packages/@uppy/webdav/tsconfig.build.json +++ b/packages/@uppy/webdav/tsconfig.build.json @@ -2,15 +2,6 @@ "extends": "../../../tsconfig.shared", "compilerOptions": { "outDir": "./lib", - "paths": { - "@uppy/utils/lib/*": ["../utils/src/*"], - "@uppy/core": ["../core/src/index.js"], - "@uppy/core/lib/*": ["../core/src/*"], - "@uppy/companion-client": ["../companion-client/src/index.js"], - "@uppy/companion-client/lib/*": ["../companion-client/src/*"], - "@uppy/provider-views": ["../provider-views/src/index.js"], - "@uppy/provider-views/lib/*": ["../provider-views/src/*"] - }, "resolveJsonModule": false, "rootDir": "./src" }, diff --git a/packages/@uppy/webdav/tsconfig.json b/packages/@uppy/webdav/tsconfig.json index 0846a1d621..04373ecd9f 100644 --- a/packages/@uppy/webdav/tsconfig.json +++ b/packages/@uppy/webdav/tsconfig.json @@ -3,15 +3,6 @@ "compilerOptions": { "emitDeclarationOnly": false, "noEmit": true, - "paths": { - "@uppy/utils/lib/*": ["../utils/src/*"], - "@uppy/core": ["../core/src/index.js"], - "@uppy/core/lib/*": ["../core/src/*"], - "@uppy/companion-client": ["../companion-client/src/index.js"], - "@uppy/companion-client/lib/*": ["../companion-client/src/*"], - "@uppy/provider-views": ["../provider-views/src/index.js"], - "@uppy/provider-views/lib/*": ["../provider-views/src/*"], - }, }, "include": ["./package.json", "./src/**/*.*"], "references": [ diff --git a/packages/@uppy/xhr-upload/CHANGELOG.md b/packages/@uppy/xhr-upload/CHANGELOG.md index 278cf1d04e..69914e80a4 100644 --- a/packages/@uppy/xhr-upload/CHANGELOG.md +++ b/packages/@uppy/xhr-upload/CHANGELOG.md @@ -1,5 +1,19 @@ # @uppy/xhr-upload +## 4.3.1 + +Released: 2025-01-08 +Included in: Uppy v4.12.0 + +- @uppy/xhr-upload: allow custom error message in onAfterResponse (Merlijn Vos / #5578) + +## 4.3.0 + +Released: 2025-01-06 +Included in: Uppy v4.11.0 + +- @uppy/angular,@uppy/audio,@uppy/aws-s3,@uppy/box,@uppy/companion-client,@uppy/compressor,@uppy/core,@uppy/dashboard,@uppy/drag-drop,@uppy/drop-target,@uppy/dropbox,@uppy/facebook,@uppy/file-input,@uppy/form,@uppy/golden-retriever,@uppy/google-drive-picker,@uppy/google-drive,@uppy/google-photos-picker,@uppy/google-photos,@uppy/image-editor,@uppy/informer,@uppy/instagram,@uppy/locales,@uppy/onedrive,@uppy/progress-bar,@uppy/provider-views,@uppy/react,@uppy/remote-sources,@uppy/screen-capture,@uppy/status-bar,@uppy/thumbnail-generator,@uppy/transloadit,@uppy/tus,@uppy/unsplash,@uppy/url,@uppy/vue,@uppy/webcam,@uppy/webdav,@uppy/xhr-upload,@uppy/zoom: Remove "paths" from all tsconfig's (Merlijn Vos / #5572) + ## 4.2.3 Released: 2024-12-05 diff --git a/packages/@uppy/xhr-upload/package.json b/packages/@uppy/xhr-upload/package.json index ae37f6b3f0..152251622f 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": "4.2.3", + "version": "4.3.2", "license": "MIT", "main": "lib/index.js", "type": "module", diff --git a/packages/@uppy/xhr-upload/src/index.test.ts b/packages/@uppy/xhr-upload/src/index.test.ts index 127444b339..1818b2a9a3 100644 --- a/packages/@uppy/xhr-upload/src/index.test.ts +++ b/packages/@uppy/xhr-upload/src/index.test.ts @@ -1,7 +1,7 @@ import { vi, describe, it, expect } from 'vitest' import nock from 'nock' import Core, { type UppyEventMap } from '@uppy/core' -import XHRUpload from './index.ts' +import XHRUpload from './index.js' describe('XHRUpload', () => { it('should leverage hooks from fetcher', async () => { @@ -79,7 +79,14 @@ describe('XHRUpload', () => { id: 'XHRUpload', endpoint: 'https://fake-endpoint.uppy.io', shouldRetry, + async onAfterResponse(xhr) { + if (xhr.status === 400) { + // We want to test that we can define our own error message + throw new Error(JSON.parse(xhr.responseText).message) + } + }, }) + const id = core.addFile({ type: 'image/png', source: 'test', @@ -95,7 +102,7 @@ describe('XHRUpload', () => { await Promise.all([ core.upload(), - event.then(([file, , response]) => { + event.then(([file, error, response]) => { const newFile = core.getFile(id) // error and response are set inside upload-error in core. // When we subscribe to upload-error it is emitted before @@ -107,6 +114,7 @@ describe('XHRUpload', () => { // might have changed in the meantime expect(file).toEqual(newFile) expect(response).toBeInstanceOf(XMLHttpRequest) + expect(error.message).toEqual('Oh no') }), ]) diff --git a/packages/@uppy/xhr-upload/src/index.ts b/packages/@uppy/xhr-upload/src/index.ts index 6750aee146..99aacb9526 100644 --- a/packages/@uppy/xhr-upload/src/index.ts +++ b/packages/@uppy/xhr-upload/src/index.ts @@ -1,5 +1,13 @@ -import BasePlugin from '@uppy/core/lib/BasePlugin.js' -import type { DefinePluginOpts, PluginOpts } from '@uppy/core/lib/BasePlugin.js' +import { BasePlugin } from '@uppy/core' +import type { + State, + Uppy, + DefinePluginOpts, + PluginOpts, + Meta, + Body, + UppyFile, +} from '@uppy/core' import type { RequestClient } from '@uppy/companion-client' import EventManager from '@uppy/core/lib/EventManager.js' import { @@ -15,15 +23,11 @@ import { filterNonFailedFiles, filterFilesToEmitUploadStarted, } from '@uppy/utils/lib/fileFilters' -// eslint-disable-next-line @typescript-eslint/ban-ts-comment -// @ts-ignore We don't want TS to generate types for the package.json -import type { Meta, Body, UppyFile } from '@uppy/utils/lib/UppyFile' -import type { State, Uppy } from '@uppy/core' import getAllowedMetaFields from '@uppy/utils/lib/getAllowedMetaFields' // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore We don't want TS to generate types for the package.json import packageJson from '../package.json' -import locale from './locale.ts' +import locale from './locale.js' export interface XhrUploadOpts extends PluginOpts { @@ -82,7 +86,7 @@ declare module '@uppy/core' { } function buildResponseError( - xhr: XMLHttpRequest, + xhr?: XMLHttpRequest, err?: string | Error | NetworkError, ) { let error = err @@ -255,17 +259,15 @@ export default class XHRUpload< if (error.name === 'AbortError') { return undefined } - if (error instanceof NetworkError) { - const request = error.request! - - for (const file of files) { - this.uppy.emit( - 'upload-error', - this.uppy.getFile(file.id), - buildResponseError(request, error), - request, - ) - } + const request = error.request as XMLHttpRequest | undefined + + for (const file of files) { + this.uppy.emit( + 'upload-error', + this.uppy.getFile(file.id), + buildResponseError(request, error), + request, + ) } throw error diff --git a/packages/@uppy/xhr-upload/tsconfig.build.json b/packages/@uppy/xhr-upload/tsconfig.build.json index b61a0f40cb..bd96ae4f3c 100644 --- a/packages/@uppy/xhr-upload/tsconfig.build.json +++ b/packages/@uppy/xhr-upload/tsconfig.build.json @@ -2,13 +2,6 @@ "extends": "../../../tsconfig.shared", "compilerOptions": { "outDir": "./lib", - "paths": { - "@uppy/companion-client": ["../companion-client/src/index.js"], - "@uppy/companion-client/lib/*": ["../companion-client/src/*"], - "@uppy/utils/lib/*": ["../utils/src/*"], - "@uppy/core": ["../core/src/index.js"], - "@uppy/core/lib/*": ["../core/src/*"] - }, "resolveJsonModule": false, "rootDir": "./src" }, diff --git a/packages/@uppy/xhr-upload/tsconfig.json b/packages/@uppy/xhr-upload/tsconfig.json index f43408fa18..2355b5c43d 100644 --- a/packages/@uppy/xhr-upload/tsconfig.json +++ b/packages/@uppy/xhr-upload/tsconfig.json @@ -3,13 +3,6 @@ "compilerOptions": { "emitDeclarationOnly": false, "noEmit": true, - "paths": { - "@uppy/companion-client": ["../companion-client/src/index.js"], - "@uppy/companion-client/lib/*": ["../companion-client/src/*"], - "@uppy/utils/lib/*": ["../utils/src/*"], - "@uppy/core": ["../core/src/index.js"], - "@uppy/core/lib/*": ["../core/src/*"], - }, }, "include": ["./package.json", "./src/**/*.*"], "references": [ diff --git a/packages/@uppy/zoom/CHANGELOG.md b/packages/@uppy/zoom/CHANGELOG.md index 92329efdf4..9fbf09d9b6 100644 --- a/packages/@uppy/zoom/CHANGELOG.md +++ b/packages/@uppy/zoom/CHANGELOG.md @@ -1,5 +1,12 @@ # @uppy/zoom +## 3.2.0 + +Released: 2025-01-06 +Included in: Uppy v4.11.0 + +- @uppy/angular,@uppy/audio,@uppy/aws-s3,@uppy/box,@uppy/companion-client,@uppy/compressor,@uppy/core,@uppy/dashboard,@uppy/drag-drop,@uppy/drop-target,@uppy/dropbox,@uppy/facebook,@uppy/file-input,@uppy/form,@uppy/golden-retriever,@uppy/google-drive-picker,@uppy/google-drive,@uppy/google-photos-picker,@uppy/google-photos,@uppy/image-editor,@uppy/informer,@uppy/instagram,@uppy/locales,@uppy/onedrive,@uppy/progress-bar,@uppy/provider-views,@uppy/react,@uppy/remote-sources,@uppy/screen-capture,@uppy/status-bar,@uppy/thumbnail-generator,@uppy/transloadit,@uppy/tus,@uppy/unsplash,@uppy/url,@uppy/vue,@uppy/webcam,@uppy/webdav,@uppy/xhr-upload,@uppy/zoom: Remove "paths" from all tsconfig's (Merlijn Vos / #5572) + ## 3.1.2 Released: 2024-12-05 diff --git a/packages/@uppy/zoom/package.json b/packages/@uppy/zoom/package.json index 42e0480263..28faeb8ab9 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": "3.1.2", + "version": "3.2.1", "license": "MIT", "main": "lib/index.js", "type": "module", diff --git a/packages/@uppy/zoom/src/Zoom.tsx b/packages/@uppy/zoom/src/Zoom.tsx index 4f70bcfdd0..af326f7a08 100644 --- a/packages/@uppy/zoom/src/Zoom.tsx +++ b/packages/@uppy/zoom/src/Zoom.tsx @@ -8,13 +8,15 @@ import { UIPlugin, Uppy } from '@uppy/core' import { ProviderViews } from '@uppy/provider-views' import { h, type ComponentChild } from 'preact' -import type { UppyFile, Body, Meta } from '@uppy/utils/lib/UppyFile' import type { + UppyFile, + Body, + Meta, AsyncStore, UnknownProviderPlugin, UnknownProviderPluginState, -} from '@uppy/core/lib/Uppy.js' -import locale from './locale.ts' +} from '@uppy/core' +import locale from './locale.js' // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore We don't want TS to generate types for the package.json import packageJson from '../package.json' diff --git a/packages/@uppy/zoom/src/index.ts b/packages/@uppy/zoom/src/index.ts index 4a98e7e541..bbae991ba8 100644 --- a/packages/@uppy/zoom/src/index.ts +++ b/packages/@uppy/zoom/src/index.ts @@ -1,2 +1,2 @@ -export { default } from './Zoom.tsx' -export type { ZoomOptions } from './Zoom.tsx' +export { default } from './Zoom.jsx' +export type { ZoomOptions } from './Zoom.jsx' diff --git a/packages/@uppy/zoom/tsconfig.build.json b/packages/@uppy/zoom/tsconfig.build.json index 0b2f94bc10..82e187bca0 100644 --- a/packages/@uppy/zoom/tsconfig.build.json +++ b/packages/@uppy/zoom/tsconfig.build.json @@ -2,15 +2,6 @@ "extends": "../../../tsconfig.shared", "compilerOptions": { "outDir": "./lib", - "paths": { - "@uppy/companion-client": ["../companion-client/src/index.js"], - "@uppy/companion-client/lib/*": ["../companion-client/src/*"], - "@uppy/provider-views": ["../provider-views/src/index.js"], - "@uppy/provider-views/lib/*": ["../provider-views/src/*"], - "@uppy/utils/lib/*": ["../utils/src/*"], - "@uppy/core": ["../core/src/index.js"], - "@uppy/core/lib/*": ["../core/src/*"] - }, "resolveJsonModule": false, "rootDir": "./src" }, diff --git a/packages/@uppy/zoom/tsconfig.json b/packages/@uppy/zoom/tsconfig.json index e5220fb5ab..b90847da71 100644 --- a/packages/@uppy/zoom/tsconfig.json +++ b/packages/@uppy/zoom/tsconfig.json @@ -3,15 +3,6 @@ "compilerOptions": { "emitDeclarationOnly": false, "noEmit": true, - "paths": { - "@uppy/companion-client": ["../companion-client/src/index.js"], - "@uppy/companion-client/lib/*": ["../companion-client/src/*"], - "@uppy/provider-views": ["../provider-views/src/index.js"], - "@uppy/provider-views/lib/*": ["../provider-views/src/*"], - "@uppy/utils/lib/*": ["../utils/src/*"], - "@uppy/core": ["../core/src/index.js"], - "@uppy/core/lib/*": ["../core/src/*"], - }, }, "include": ["./package.json", "./src/**/*.*"], "references": [ diff --git a/packages/uppy/package.json b/packages/uppy/package.json index bfb016a2bd..a7d4513199 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": "4.9.0", + "version": "4.13.1", "license": "MIT", "main": "lib/index.js", "module": "lib/index.js", diff --git a/packages/uppy/src/bundle.ts b/packages/uppy/src/bundle.ts index 2973473007..14aca4edaf 100644 --- a/packages/uppy/src/bundle.ts +++ b/packages/uppy/src/bundle.ts @@ -4,7 +4,7 @@ export { default as Uppy, debugLogger } from '@uppy/core' // Plugin base classes export { default as UIPlugin } from '@uppy/core/lib/UIPlugin.js' -export { default as BasePlugin } from '@uppy/core/lib/BasePlugin.js' +export { default as BasePlugin } from '@uppy/core' /** * @deprecated Use `Uppy` instead of `Core` diff --git a/packages/uppy/src/index.ts b/packages/uppy/src/index.ts index 14d5eb5ff4..c3fc785790 100644 --- a/packages/uppy/src/index.ts +++ b/packages/uppy/src/index.ts @@ -1,4 +1,4 @@ -export * from './bundle.ts' +export * from './bundle.js' // Core export type { UppyOptions, UIPluginOptions } from '@uppy/core' diff --git a/packages/uppy/tsconfig.build.json b/packages/uppy/tsconfig.build.json index e45d08c6a5..0ad78d400c 100644 --- a/packages/uppy/tsconfig.build.json +++ b/packages/uppy/tsconfig.build.json @@ -2,76 +2,6 @@ "extends": "../../tsconfig.shared", "compilerOptions": { "outDir": "./lib", - "paths": { - "@uppy/audio": ["../audio/src/index.js"], - "@uppy/audio/lib/*": ["../audio/src/*"], - "@uppy/aws-s3": ["../aws-s3/src/index.js"], - "@uppy/aws-s3/lib/*": ["../aws-s3/src/*"], - "@uppy/box": ["../box/src/index.js"], - "@uppy/box/lib/*": ["../box/src/*"], - "@uppy/companion-client": ["../companion-client/src/index.js"], - "@uppy/companion-client/lib/*": ["../companion-client/src/*"], - "@uppy/compressor": ["../compressor/src/index.js"], - "@uppy/compressor/lib/*": ["../compressor/src/*"], - "@uppy/core": ["../core/src/index.js"], - "@uppy/core/lib/*": ["../core/src/*"], - "@uppy/dashboard": ["../dashboard/src/index.js"], - "@uppy/dashboard/lib/*": ["../dashboard/src/*"], - "@uppy/drag-drop": ["../drag-drop/src/index.js"], - "@uppy/drag-drop/lib/*": ["../drag-drop/src/*"], - "@uppy/drop-target": ["../drop-target/src/index.js"], - "@uppy/drop-target/lib/*": ["../drop-target/src/*"], - "@uppy/dropbox": ["../dropbox/src/index.js"], - "@uppy/dropbox/lib/*": ["../dropbox/src/*"], - "@uppy/facebook": ["../facebook/src/index.js"], - "@uppy/facebook/lib/*": ["../facebook/src/*"], - "@uppy/file-input": ["../file-input/src/index.js"], - "@uppy/file-input/lib/*": ["../file-input/src/*"], - "@uppy/form": ["../form/src/index.js"], - "@uppy/form/lib/*": ["../form/src/*"], - "@uppy/golden-retriever": ["../golden-retriever/src/index.js"], - "@uppy/golden-retriever/lib/*": ["../golden-retriever/src/*"], - "@uppy/google-drive": ["../google-drive/src/index.js"], - "@uppy/google-drive/lib/*": ["../google-drive/src/*"], - "@uppy/google-photos": ["../google-photos/src/index.js"], - "@uppy/google-photos/lib/*": ["../google-photos/src/*"], - "@uppy/image-editor": ["../image-editor/src/index.js"], - "@uppy/image-editor/lib/*": ["../image-editor/src/*"], - "@uppy/informer": ["../informer/src/index.js"], - "@uppy/informer/lib/*": ["../informer/src/*"], - "@uppy/instagram": ["../instagram/src/index.js"], - "@uppy/instagram/lib/*": ["../instagram/src/*"], - "@uppy/onedrive": ["../onedrive/src/index.js"], - "@uppy/onedrive/lib/*": ["../onedrive/src/*"], - "@uppy/progress-bar": ["../progress-bar/src/index.js"], - "@uppy/progress-bar/lib/*": ["../progress-bar/src/*"], - "@uppy/provider-views": ["../provider-views/src/index.js"], - "@uppy/provider-views/lib/*": ["../provider-views/src/*"], - "@uppy/remote-sources": ["../remote-sources/src/index.js"], - "@uppy/remote-sources/lib/*": ["../remote-sources/src/*"], - "@uppy/screen-capture": ["../screen-capture/src/index.js"], - "@uppy/screen-capture/lib/*": ["../screen-capture/src/*"], - "@uppy/status-bar": ["../status-bar/src/index.js"], - "@uppy/status-bar/lib/*": ["../status-bar/src/*"], - "@uppy/store-default": ["../store-default/src/index.js"], - "@uppy/store-default/lib/*": ["../store-default/src/*"], - "@uppy/thumbnail-generator": ["../thumbnail-generator/src/index.js"], - "@uppy/thumbnail-generator/lib/*": ["../thumbnail-generator/src/*"], - "@uppy/transloadit": ["../transloadit/src/index.js"], - "@uppy/transloadit/lib/*": ["../transloadit/src/*"], - "@uppy/tus": ["../tus/src/index.js"], - "@uppy/tus/lib/*": ["../tus/src/*"], - "@uppy/unsplash": ["../unsplash/src/index.js"], - "@uppy/unsplash/lib/*": ["../unsplash/src/*"], - "@uppy/url": ["../url/src/index.js"], - "@uppy/url/lib/*": ["../url/src/*"], - "@uppy/webcam": ["../webcam/src/index.js"], - "@uppy/webcam/lib/*": ["../webcam/src/*"], - "@uppy/xhr-upload": ["../xhr-upload/src/index.js"], - "@uppy/xhr-upload/lib/*": ["../xhr-upload/src/*"], - "@uppy/zoom": ["../zoom/src/index.js"], - "@uppy/zoom/lib/*": ["../zoom/src/*"] - }, "resolveJsonModule": false, "rootDir": "./src" }, diff --git a/packages/uppy/tsconfig.json b/packages/uppy/tsconfig.json index d7fbb5b81a..a9000eec05 100644 --- a/packages/uppy/tsconfig.json +++ b/packages/uppy/tsconfig.json @@ -3,76 +3,6 @@ "compilerOptions": { "emitDeclarationOnly": false, "noEmit": true, - "paths": { - "@uppy/audio": ["../audio/src/index.js"], - "@uppy/audio/lib/*": ["../audio/src/*"], - "@uppy/aws-s3": ["../aws-s3/src/index.js"], - "@uppy/aws-s3/lib/*": ["../aws-s3/src/*"], - "@uppy/box": ["../box/src/index.js"], - "@uppy/box/lib/*": ["../box/src/*"], - "@uppy/companion-client": ["../companion-client/src/index.js"], - "@uppy/companion-client/lib/*": ["../companion-client/src/*"], - "@uppy/compressor": ["../compressor/src/index.js"], - "@uppy/compressor/lib/*": ["../compressor/src/*"], - "@uppy/core": ["../core/src/index.js"], - "@uppy/core/lib/*": ["../core/src/*"], - "@uppy/dashboard": ["../dashboard/src/index.js"], - "@uppy/dashboard/lib/*": ["../dashboard/src/*"], - "@uppy/drag-drop": ["../drag-drop/src/index.js"], - "@uppy/drag-drop/lib/*": ["../drag-drop/src/*"], - "@uppy/drop-target": ["../drop-target/src/index.js"], - "@uppy/drop-target/lib/*": ["../drop-target/src/*"], - "@uppy/dropbox": ["../dropbox/src/index.js"], - "@uppy/dropbox/lib/*": ["../dropbox/src/*"], - "@uppy/facebook": ["../facebook/src/index.js"], - "@uppy/facebook/lib/*": ["../facebook/src/*"], - "@uppy/file-input": ["../file-input/src/index.js"], - "@uppy/file-input/lib/*": ["../file-input/src/*"], - "@uppy/form": ["../form/src/index.js"], - "@uppy/form/lib/*": ["../form/src/*"], - "@uppy/golden-retriever": ["../golden-retriever/src/index.js"], - "@uppy/golden-retriever/lib/*": ["../golden-retriever/src/*"], - "@uppy/google-drive": ["../google-drive/src/index.js"], - "@uppy/google-drive/lib/*": ["../google-drive/src/*"], - "@uppy/google-photos": ["../google-photos/src/index.js"], - "@uppy/google-photos/lib/*": ["../google-photos/src/*"], - "@uppy/image-editor": ["../image-editor/src/index.js"], - "@uppy/image-editor/lib/*": ["../image-editor/src/*"], - "@uppy/informer": ["../informer/src/index.js"], - "@uppy/informer/lib/*": ["../informer/src/*"], - "@uppy/instagram": ["../instagram/src/index.js"], - "@uppy/instagram/lib/*": ["../instagram/src/*"], - "@uppy/onedrive": ["../onedrive/src/index.js"], - "@uppy/onedrive/lib/*": ["../onedrive/src/*"], - "@uppy/progress-bar": ["../progress-bar/src/index.js"], - "@uppy/progress-bar/lib/*": ["../progress-bar/src/*"], - "@uppy/provider-views": ["../provider-views/src/index.js"], - "@uppy/provider-views/lib/*": ["../provider-views/src/*"], - "@uppy/remote-sources": ["../remote-sources/src/index.js"], - "@uppy/remote-sources/lib/*": ["../remote-sources/src/*"], - "@uppy/screen-capture": ["../screen-capture/src/index.js"], - "@uppy/screen-capture/lib/*": ["../screen-capture/src/*"], - "@uppy/status-bar": ["../status-bar/src/index.js"], - "@uppy/status-bar/lib/*": ["../status-bar/src/*"], - "@uppy/store-default": ["../store-default/src/index.js"], - "@uppy/store-default/lib/*": ["../store-default/src/*"], - "@uppy/thumbnail-generator": ["../thumbnail-generator/src/index.js"], - "@uppy/thumbnail-generator/lib/*": ["../thumbnail-generator/src/*"], - "@uppy/transloadit": ["../transloadit/src/index.js"], - "@uppy/transloadit/lib/*": ["../transloadit/src/*"], - "@uppy/tus": ["../tus/src/index.js"], - "@uppy/tus/lib/*": ["../tus/src/*"], - "@uppy/unsplash": ["../unsplash/src/index.js"], - "@uppy/unsplash/lib/*": ["../unsplash/src/*"], - "@uppy/url": ["../url/src/index.js"], - "@uppy/url/lib/*": ["../url/src/*"], - "@uppy/webcam": ["../webcam/src/index.js"], - "@uppy/webcam/lib/*": ["../webcam/src/*"], - "@uppy/xhr-upload": ["../xhr-upload/src/index.js"], - "@uppy/xhr-upload/lib/*": ["../xhr-upload/src/*"], - "@uppy/zoom": ["../zoom/src/index.js"], - "@uppy/zoom/lib/*": ["../zoom/src/*"], - }, }, "include": ["./package.json", "./src/**/*.*"], "references": [ diff --git a/private/dev/tsconfig.json b/private/dev/tsconfig.json index 0cdcbab246..397215e5d1 100644 --- a/private/dev/tsconfig.json +++ b/private/dev/tsconfig.json @@ -4,63 +4,6 @@ "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": [ diff --git a/tsconfig.shared.json b/tsconfig.shared.json index de7d0d62f2..dc7be34554 100644 --- a/tsconfig.shared.json +++ b/tsconfig.shared.json @@ -7,7 +7,6 @@ "lib": ["dom", "ESnext"], "resolveJsonModule": true, "useUnknownInCatchVariables": false, - "allowImportingTsExtensions": true, "allowJs": false, "declaration": true, "emitDeclarationOnly": true, diff --git a/yarn.lock b/yarn.lock index 07f033a673..b7ceb8d723 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6954,13 +6954,13 @@ __metadata: languageName: node linkType: hard -"@sveltejs/kit@npm:^2.0.0": - version: 2.5.17 - resolution: "@sveltejs/kit@npm:2.5.17" +"@sveltejs/kit@npm:^2.8.3": + version: 2.8.3 + resolution: "@sveltejs/kit@npm:2.8.3" dependencies: "@types/cookie": "npm:^0.6.0" cookie: "npm:^0.6.0" - devalue: "npm:^5.0.0" + devalue: "npm:^5.1.0" esm-env: "npm:^1.0.0" import-meta-resolve: "npm:^4.1.0" kleur: "npm:^4.1.5" @@ -6968,15 +6968,15 @@ __metadata: mrmime: "npm:^2.0.0" sade: "npm:^1.8.1" set-cookie-parser: "npm:^2.6.0" - sirv: "npm:^2.0.4" + sirv: "npm:^3.0.0" tiny-glob: "npm:^0.2.9" peerDependencies: - "@sveltejs/vite-plugin-svelte": ^3.0.0 + "@sveltejs/vite-plugin-svelte": ^3.0.0 || ^4.0.0-next.1 svelte: ^4.0.0 || ^5.0.0-next.0 vite: ^5.0.3 bin: svelte-kit: svelte-kit.js - checksum: 10/72b3fdcc66a184e52fa6ac1e9bd731b22e347948268121cdb584d0cc241c5e6c02b9d956ff71455df67455cc033340c28d7eff0e1699a4341daaf6c2143c406f + checksum: 10/ec3e4d66888875497ffb8baded9155de6e02134227bf73bcd28e8501ef2d4222f2a5d4a1ad082a899c21630864ca65b674fb86c2c49c774c1024ea01cf1d1bef languageName: node linkType: hard @@ -8538,7 +8538,7 @@ __metadata: resolution: "@uppy-example/svelte-app@workspace:examples/svelte-example" dependencies: "@sveltejs/adapter-static": "npm:^3.0.1" - "@sveltejs/kit": "npm:^2.0.0" + "@sveltejs/kit": "npm:^2.8.3" "@sveltejs/vite-plugin-svelte": "npm:^3.0.0" "@types/formidable": "npm:^3" "@uppy/core": "workspace:*" @@ -8749,10 +8749,10 @@ __metadata: cors: "npm:^2.8.5" escape-goat: "npm:3.0.0" escape-string-regexp: "npm:4.0.0" - express: "npm:4.19.2" + express: "npm:4.21.2" express-interceptor: "npm:1.2.0" express-prom-bundle: "npm:7.0.0" - express-session: "npm:1.18.0" + express-session: "npm:1.18.1" fast-safe-stringify: "npm:^2.1.1" got: "npm:^13.0.0" grant: "npm:5.4.22" @@ -9187,7 +9187,7 @@ __metadata: resolution: "@uppy/svelte@workspace:packages/@uppy/svelte" dependencies: "@sveltejs/adapter-auto": "npm:^3.0.0" - "@sveltejs/kit": "npm:^2.0.0" + "@sveltejs/kit": "npm:^2.8.3" "@sveltejs/package": "npm:^2.0.0" "@sveltejs/vite-plugin-svelte": "npm:^3.0.0" svelte: "npm:^4.2.7" @@ -12352,6 +12352,20 @@ __metadata: languageName: node linkType: hard +"cookie@npm:0.7.1": + version: 0.7.1 + resolution: "cookie@npm:0.7.1" + checksum: 10/aec6a6aa0781761bf55d60447d6be08861d381136a0fe94aa084fddd4f0300faa2b064df490c6798adfa1ebaef9e0af9b08a189c823e0811b8b313b3d9a03380 + languageName: node + linkType: hard + +"cookie@npm:0.7.2": + version: 0.7.2 + resolution: "cookie@npm:0.7.2" + checksum: 10/24b286c556420d4ba4e9bc09120c9d3db7d28ace2bd0f8ccee82422ce42322f73c8312441271e5eefafbead725980e5996cc02766dbb89a90ac7f5636ede608f + languageName: node + linkType: hard + "cookie@npm:^0.5.0": version: 0.5.0 resolution: "cookie@npm:0.5.0" @@ -13400,10 +13414,10 @@ __metadata: languageName: node linkType: hard -"devalue@npm:^5.0.0": - version: 5.0.0 - resolution: "devalue@npm:5.0.0" - checksum: 10/52c4e1b57c3c05dee64f8c64175f53812c4de4fa1a098b238acd74a38c0756b3631ca74081d0141248d27c00c2f18861b6f874298cd68a4fb2e0797b71de4970 +"devalue@npm:^5.1.0": + version: 5.1.1 + resolution: "devalue@npm:5.1.1" + checksum: 10/ff36fe61af61636419eb16692d2fe43d793cdfb17f868bb3560c5485e4c25bc38d472304e61efdec6e806a3c4b450c46247decf59968b4a05ddc7714ea64f885 languageName: node linkType: hard @@ -13718,8 +13732,8 @@ __metadata: linkType: hard "elliptic@npm:^6.5.4": - version: 6.5.7 - resolution: "elliptic@npm:6.5.7" + version: 6.6.0 + resolution: "elliptic@npm:6.6.0" dependencies: bn.js: "npm:^4.11.9" brorand: "npm:^1.1.0" @@ -13728,7 +13742,7 @@ __metadata: inherits: "npm:^2.0.4" minimalistic-assert: "npm:^1.0.1" minimalistic-crypto-utils: "npm:^1.0.1" - checksum: 10/fbad1fad0a5cc07df83f80cc1f7a784247ef59075194d3e340eaeb2f4dd594825ee24c7e9b0cf279c9f1982efe610503bb3139737926428c4821d4fca1bcf348 + checksum: 10/27575b0403e010e5d7e7a131fcadce6a7dd1ae82ccb24cc7c20b275d32ab1cb7ecb6a070225795df08407441dc8c7a32efd986596d48d1d6846f64ff8f094af7 languageName: node linkType: hard @@ -13774,6 +13788,13 @@ __metadata: languageName: node linkType: hard +"encodeurl@npm:~2.0.0": + version: 2.0.0 + resolution: "encodeurl@npm:2.0.0" + checksum: 10/abf5cd51b78082cf8af7be6785813c33b6df2068ce5191a40ca8b1afe6a86f9230af9a9ce694a5ce4665955e5c1120871826df9c128a642e09c58d592e2807fe + languageName: node + linkType: hard + "encoding@npm:^0.1.11, encoding@npm:^0.1.13": version: 0.1.13 resolution: "encoding@npm:0.1.13" @@ -15391,7 +15412,23 @@ __metadata: languageName: node linkType: hard -"express-session@npm:1.18.0, express-session@npm:^1.15.6, express-session@npm:^1.17.3": +"express-session@npm:1.18.1": + version: 1.18.1 + resolution: "express-session@npm:1.18.1" + dependencies: + cookie: "npm:0.7.2" + cookie-signature: "npm:1.0.7" + debug: "npm:2.6.9" + depd: "npm:~2.0.0" + on-headers: "npm:~1.0.2" + parseurl: "npm:~1.3.3" + safe-buffer: "npm:5.2.1" + uid-safe: "npm:~2.1.5" + checksum: 10/fec407d20e2b7c110e92c992f4a094b9603bf3e1d1040cf5a2f70fe64e23560f7f2d41e0e6dc8864dd146bbf0c07d9d5aa6848f80c403cbeac4cee4303192a53 + languageName: node + linkType: hard + +"express-session@npm:^1.15.6, express-session@npm:^1.17.3": version: 1.18.0 resolution: "express-session@npm:1.18.0" dependencies: @@ -15407,7 +15444,46 @@ __metadata: languageName: node linkType: hard -"express@npm:4.19.2, express@npm:^4.14.0, express@npm:^4.17.3, express@npm:^4.18.2, express@npm:^4.19.2": +"express@npm:4.21.2": + version: 4.21.2 + resolution: "express@npm:4.21.2" + dependencies: + accepts: "npm:~1.3.8" + array-flatten: "npm:1.1.1" + body-parser: "npm:1.20.3" + content-disposition: "npm:0.5.4" + content-type: "npm:~1.0.4" + cookie: "npm:0.7.1" + cookie-signature: "npm:1.0.6" + debug: "npm:2.6.9" + depd: "npm:2.0.0" + encodeurl: "npm:~2.0.0" + escape-html: "npm:~1.0.3" + etag: "npm:~1.8.1" + finalhandler: "npm:1.3.1" + fresh: "npm:0.5.2" + http-errors: "npm:2.0.0" + merge-descriptors: "npm:1.0.3" + methods: "npm:~1.1.2" + on-finished: "npm:2.4.1" + parseurl: "npm:~1.3.3" + path-to-regexp: "npm:0.1.12" + proxy-addr: "npm:~2.0.7" + qs: "npm:6.13.0" + range-parser: "npm:~1.2.1" + safe-buffer: "npm:5.2.1" + send: "npm:0.19.0" + serve-static: "npm:1.16.2" + setprototypeof: "npm:1.2.0" + statuses: "npm:2.0.1" + type-is: "npm:~1.6.18" + utils-merge: "npm:1.0.1" + vary: "npm:~1.1.2" + checksum: 10/34571c442fc8c9f2c4b442d2faa10ea1175cf8559237fc6a278f5ce6254a8ffdbeb9a15d99f77c1a9f2926ab183e3b7ba560e3261f1ad4149799e3412ab66bd1 + languageName: node + linkType: hard + +"express@npm:^4.14.0, express@npm:^4.17.3, express@npm:^4.18.2, express@npm:^4.19.2": version: 4.19.2 resolution: "express@npm:4.19.2" dependencies: @@ -15804,6 +15880,21 @@ __metadata: languageName: node linkType: hard +"finalhandler@npm:1.3.1": + version: 1.3.1 + resolution: "finalhandler@npm:1.3.1" + dependencies: + debug: "npm:2.6.9" + encodeurl: "npm:~2.0.0" + escape-html: "npm:~1.0.3" + on-finished: "npm:2.4.1" + parseurl: "npm:~1.3.3" + statuses: "npm:2.0.1" + unpipe: "npm:~1.0.0" + checksum: 10/4babe72969b7373b5842bc9f75c3a641a4d0f8eb53af6b89fa714d4460ce03fb92b28de751d12ba415e96e7e02870c436d67412120555e2b382640535697305b + languageName: node + linkType: hard + "finalhandler@npm:^0.3.0": version: 0.3.6 resolution: "finalhandler@npm:0.3.6" @@ -20997,6 +21088,13 @@ __metadata: languageName: node linkType: hard +"merge-descriptors@npm:1.0.3": + version: 1.0.3 + resolution: "merge-descriptors@npm:1.0.3" + checksum: 10/52117adbe0313d5defa771c9993fe081e2d2df9b840597e966aadafde04ae8d0e3da46bac7ca4efc37d4d2b839436582659cd49c6a43eacb3fe3050896a105d1 + languageName: node + linkType: hard + "merge-options@npm:^3.0.4": version: 3.0.4 resolution: "merge-options@npm:3.0.4" @@ -24084,6 +24182,13 @@ __metadata: languageName: node linkType: hard +"path-to-regexp@npm:0.1.12": + version: 0.1.12 + resolution: "path-to-regexp@npm:0.1.12" + checksum: 10/2e30f6a0144679c1f95c98e166b96e6acd1e72be9417830fefc8de7ac1992147eb9a4c7acaa59119fb1b3c34eec393b2129ef27e24b2054a3906fc4fb0d1398e + languageName: node + linkType: hard + "path-to-regexp@npm:0.1.7": version: 0.1.7 resolution: "path-to-regexp@npm:0.1.7" @@ -27036,6 +27141,27 @@ __metadata: languageName: node linkType: hard +"send@npm:0.19.0": + version: 0.19.0 + resolution: "send@npm:0.19.0" + dependencies: + debug: "npm:2.6.9" + depd: "npm:2.0.0" + destroy: "npm:1.2.0" + encodeurl: "npm:~1.0.2" + escape-html: "npm:~1.0.3" + etag: "npm:~1.8.1" + fresh: "npm:0.5.2" + http-errors: "npm:2.0.0" + mime: "npm:1.6.0" + ms: "npm:2.1.3" + on-finished: "npm:2.4.1" + range-parser: "npm:~1.2.1" + statuses: "npm:2.0.1" + checksum: 10/1f6064dea0ae4cbe4878437aedc9270c33f2a6650a77b56a16b62d057527f2766d96ee282997dd53ec0339082f2aad935bc7d989b46b48c82fc610800dc3a1d0 + languageName: node + linkType: hard + "serialize-error@npm:^11.0.0": version: 11.0.3 resolution: "serialize-error@npm:11.0.3" @@ -27088,6 +27214,18 @@ __metadata: languageName: node linkType: hard +"serve-static@npm:1.16.2": + version: 1.16.2 + resolution: "serve-static@npm:1.16.2" + dependencies: + encodeurl: "npm:~2.0.0" + escape-html: "npm:~1.0.3" + parseurl: "npm:~1.3.3" + send: "npm:0.19.0" + checksum: 10/7fa9d9c68090f6289976b34fc13c50ac8cd7f16ae6bce08d16459300f7fc61fbc2d7ebfa02884c073ec9d6ab9e7e704c89561882bbe338e99fcacb2912fde737 + languageName: node + linkType: hard + "serve-static@npm:~1.14.1": version: 1.14.2 resolution: "serve-static@npm:1.14.2" @@ -27311,14 +27449,14 @@ __metadata: languageName: node linkType: hard -"sirv@npm:^2.0.4": - version: 2.0.4 - resolution: "sirv@npm:2.0.4" +"sirv@npm:^3.0.0": + version: 3.0.0 + resolution: "sirv@npm:3.0.0" dependencies: "@polka/url": "npm:^1.0.0-next.24" mrmime: "npm:^2.0.0" totalist: "npm:^3.0.0" - checksum: 10/24f42cf06895017e589c9d16fc3f1c6c07fe8b0dbafce8a8b46322cfba67b7f2498610183954cb0e9d089c8cb60002a7ee7e8bca6a91a0d7042bfbc3473c95c3 + checksum: 10/94dbd5df7cf4965f7c5941767117cbf9709e1d25de1d619a114c3f77fc63c124b5a5255717af2a0de637bb83d0b0defd0822d01420764b56432b53281b1d675d languageName: node linkType: hard