Merge branch 'main'

packages/@uppy/audio/src/Audio.tsx

@@ -6,7 +6,7 @@ import type {
   Meta,
   MinimalRequiredUppyFile,
 } from '@uppy/utils/lib/UppyFile'
-import type { Uppy } from '@uppy/core/lib/Uppy.ts'
+import type { Uppy } from '@uppy/core/lib/Uppy'
 
 import getFileTypeExtension from '@uppy/utils/lib/getFileTypeExtension'
 import supportsMediaRecorder from './supportsMediaRecorder.ts'

packages/@uppy/aws-s3-multipart/src/index.ts

@@ -3,7 +3,7 @@ import BasePlugin, {
   type PluginOpts,
 } from '@uppy/core/lib/BasePlugin.js'
 import { RequestClient } from '@uppy/companion-client'
-import type { RequestOptions } from '@uppy/utils/lib/CompanionClientProvider.ts'
+import type { RequestOptions } from '@uppy/utils/lib/CompanionClientProvider'
 import type { Body as _Body, Meta, UppyFile } from '@uppy/utils/lib/UppyFile'
 import type { Uppy } from '@uppy/core'
 import EventManager from '@uppy/core/lib/EventManager.js'
@@ -344,7 +344,7 @@ export default class AwsS3Multipart<
 
   protected uploaderSockets: Record<string, never>
 
-  constructor(uppy: Uppy<M, B>, opts: AwsS3MultipartOptions<M, B>) {
+  constructor(uppy: Uppy<M, B>, opts?: AwsS3MultipartOptions<M, B>) {
     super(uppy, {
       ...defaultOptions,
       uploadPartBytes: AwsS3Multipart.uploadPartBytes,

packages/@uppy/companion-client/src/Provider.ts

@@ -1,11 +1,11 @@
 import type { Uppy } from '@uppy/core'
 import type { Body, Meta } from '@uppy/utils/lib/UppyFile'
-import type { PluginOpts } from '@uppy/core/lib/BasePlugin.ts'
+import type { PluginOpts } from '@uppy/core/lib/BasePlugin'
 import type {
   RequestOptions,
   CompanionClientProvider,
 } from '@uppy/utils/lib/CompanionClientProvider'
-import type { UnknownProviderPlugin } from '@uppy/core/lib/Uppy.ts'
+import type { UnknownProviderPlugin } from '@uppy/core/lib/Uppy'
 import RequestClient, { authErrorStatusCode } from './RequestClient.ts'
 import type { CompanionPluginOptions } from '.'
 

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.ts'
+import type { RequestOptions } from '@uppy/utils/lib/CompanionClientProvider'
 import AuthError from './AuthError.ts'
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore We don't want TS to generate types for the package.json

packages/@uppy/companion-client/src/SearchProvider.ts

@@ -1,4 +1,4 @@
-import type { Body, Meta } from '@uppy/utils/lib/UppyFile.ts'
+import type { Body, Meta } from '@uppy/utils/lib/UppyFile'
 import type { Uppy } from '@uppy/core'
 import type { CompanionClientSearchProvider } from '@uppy/utils/lib/CompanionClientProvider'
 import RequestClient, { type Opts } from './RequestClient.ts'

packages/@uppy/compressor/src/index.ts

@@ -7,7 +7,7 @@ import prettierBytes from '@transloadit/prettier-bytes'
 import CompressorJS from 'compressorjs'
 
 import type { Body, Meta, UppyFile } from '@uppy/utils/lib/UppyFile'
-import type { PluginOpts } from '@uppy/core/lib/BasePlugin.ts'
+import type { PluginOpts } from '@uppy/core/lib/BasePlugin'
 
 import locale from './locale.ts'
 

packages/@uppy/dashboard/src/Dashboard.tsx

@@ -7,7 +7,7 @@ import {
   type State,
 } from '@uppy/core'
 import type { ComponentChild, VNode } from 'preact'
-import type { DefinePluginOpts } from '@uppy/core/lib/BasePlugin.ts'
+import type { DefinePluginOpts } from '@uppy/core/lib/BasePlugin'
 import type { Body, Meta, UppyFile } from '@uppy/utils/lib/UppyFile'
 import StatusBar from '@uppy/status-bar'
 import Informer from '@uppy/informer'

packages/@uppy/drag-drop/src/DragDrop.tsx

@@ -1,6 +1,6 @@
 import { UIPlugin, type Uppy } from '@uppy/core'
-import type { DefinePluginOpts } from '@uppy/core/lib/BasePlugin.ts'
-import type { UIPluginOptions } from '@uppy/core/lib/UIPlugin.ts'
+import type { DefinePluginOpts } from '@uppy/core/lib/BasePlugin'
+import type { UIPluginOptions } from '@uppy/core/lib/UIPlugin'
 import type { Body, Meta } from '@uppy/utils/lib/UppyFile'
 import type { ChangeEvent } from 'preact/compat'
 import toArray from '@uppy/utils/lib/toArray'

packages/@uppy/drop-target/src/index.ts

@@ -1,5 +1,5 @@
 import type { Body, Meta } from '@uppy/utils/lib/UppyFile'
-import type { Uppy } from '@uppy/core/src/Uppy.ts'
+import type { Uppy } from '@uppy/core/lib/Uppy'
 import type { DefinePluginOpts, PluginOpts } from '@uppy/core/lib/BasePlugin.js'
 import BasePlugin from '@uppy/core/lib/BasePlugin.js'
 import getDroppedFiles from '@uppy/utils/lib/getDroppedFiles'

packages/@uppy/dropbox/src/Dropbox.tsx

@@ -9,7 +9,7 @@ import { ProviderViews } from '@uppy/provider-views'
 import { h, type ComponentChild } from 'preact'
 
 import type { UppyFile, Body, Meta } from '@uppy/utils/lib/UppyFile'
-import type { UnknownProviderPluginState } from '@uppy/core/lib/Uppy.ts'
+import type { UnknownProviderPluginState } from '@uppy/core/lib/Uppy'
 import locale from './locale.ts'
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore We don't want TS to generate types for the package.json

packages/@uppy/facebook/src/Facebook.tsx

@@ -9,7 +9,7 @@ import { ProviderViews } from '@uppy/provider-views'
 import { h, type ComponentChild } from 'preact'
 
 import type { UppyFile, Body, Meta } from '@uppy/utils/lib/UppyFile'
-import type { UnknownProviderPluginState } from '@uppy/core/lib/Uppy.ts'
+import type { UnknownProviderPluginState } from '@uppy/core/lib/Uppy'
 import locale from './locale.ts'
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore We don't want TS to generate types for the package.json

packages/@uppy/golden-retriever/src/index.ts

@@ -1,6 +1,6 @@
 import throttle from 'lodash/throttle.js'
 import BasePlugin from '@uppy/core/lib/BasePlugin.js'
-import type { PluginOpts, DefinePluginOpts } from '@uppy/core/lib/BasePlugin.ts'
+import type { PluginOpts, DefinePluginOpts } from '@uppy/core/lib/BasePlugin'
 import type { Body, Meta, UppyFile } from '@uppy/utils/lib/UppyFile'
 import type Uppy from '@uppy/core'
 import type { UploadResult } from '@uppy/core'

packages/@uppy/google-drive/src/GoogleDrive.tsx

@@ -9,7 +9,7 @@ import { ProviderViews } from '@uppy/provider-views'
 import { h, type ComponentChild } from 'preact'
 
 import type { UppyFile, Body, Meta } from '@uppy/utils/lib/UppyFile'
-import type { UnknownProviderPluginState } from '@uppy/core/lib/Uppy.ts'
+import type { UnknownProviderPluginState } from '@uppy/core/lib/Uppy'
 import DriveProviderViews from './DriveProviderViews.ts'
 import locale from './locale.ts'
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment

packages/@uppy/instagram/src/Instagram.tsx

@@ -9,7 +9,7 @@ import { ProviderViews } from '@uppy/provider-views'
 import { h, type ComponentChild } from 'preact'
 
 import type { UppyFile, Body, Meta } from '@uppy/utils/lib/UppyFile'
-import type { UnknownProviderPluginState } from '@uppy/core/lib/Uppy.ts'
+import type { UnknownProviderPluginState } from '@uppy/core/lib/Uppy'
 import locale from './locale.ts'
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore We don't want TS to generate types for the package.json

packages/@uppy/onedrive/src/OneDrive.tsx

@@ -9,7 +9,7 @@ import { ProviderViews } from '@uppy/provider-views'
 import { h, type ComponentChild } from 'preact'
 
 import type { UppyFile, Body, Meta } from '@uppy/utils/lib/UppyFile'
-import type { UnknownProviderPluginState } from '@uppy/core/lib/Uppy.ts'
+import type { UnknownProviderPluginState } from '@uppy/core/lib/Uppy'
 import locale from './locale.ts'
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore We don't want TS to generate types for the package.json

packages/@uppy/progress-bar/src/ProgressBar.tsx

@@ -1,5 +1,6 @@
 import { h, type ComponentChild } from 'preact'
-import { UIPlugin, Uppy, type UIPluginOptions, type State } from '@uppy/core'
+import { UIPlugin, type UIPluginOptions } from '@uppy/core'
+import type { Uppy, State } from '@uppy/core/lib/Uppy'
 import type { Body, Meta } from '@uppy/utils/lib/UppyFile'
 import type { DefinePluginOpts } from '@uppy/core/lib/BasePlugin.js'
 

packages/@uppy/provider-views/src/Item/index.tsx

@@ -4,7 +4,7 @@ import { h } from 'preact'
 import classNames from 'classnames'
 import type { I18n } from '@uppy/utils/lib/Translator'
 import type { CompanionFile } from '@uppy/utils/lib/CompanionFile'
-import type { RestrictionError } from '@uppy/core/lib/Restricter.ts'
+import type { RestrictionError } from '@uppy/core/lib/Restricter'
 import type { Meta, Body } from '@uppy/utils/lib/UppyFile'
 import ItemIcon from './components/ItemIcon.tsx'
 import GridListItem from './components/GridLi.tsx'

packages/@uppy/provider-views/src/ProviderView/Header.tsx

@@ -2,7 +2,7 @@
 import { h, Fragment } from 'preact'
 import type { I18n } from '@uppy/utils/lib/Translator'
 import type { Body, Meta } from '@uppy/utils/lib/UppyFile'
-import type { UnknownProviderPluginState } from '@uppy/core/lib/Uppy.ts'
+import type { UnknownProviderPluginState } from '@uppy/core/lib/Uppy'
 import User from './User.tsx'
 import Breadcrumbs from '../Breadcrumbs.tsx'
 import type ProviderView from './ProviderView.tsx'

packages/@uppy/provider-views/src/ProviderView/ProviderView.tsx

@@ -9,9 +9,9 @@ import type {
   Uppy,
 } from '@uppy/core/lib/Uppy.ts'
 import type { Body, Meta } from '@uppy/utils/lib/UppyFile'
-import type { CompanionFile } from '@uppy/utils/lib/CompanionFile.ts'
+import type { CompanionFile } from '@uppy/utils/lib/CompanionFile'
 import type Translator from '@uppy/utils/lib/Translator'
-import type { DefinePluginOpts } from '@uppy/core/lib/BasePlugin.ts'
+import type { DefinePluginOpts } from '@uppy/core/lib/BasePlugin'
 import AuthView from './AuthView.tsx'
 import Header from './Header.tsx'
 import Browser from '../Browser.tsx'

packages/@uppy/provider-views/src/SearchProviderView/SearchProviderView.tsx

@@ -1,8 +1,8 @@
 import { h } from 'preact'
 
 import type { Body, Meta } from '@uppy/utils/lib/UppyFile'
-import type { UnknownSearchProviderPlugin } from '@uppy/core/lib/Uppy.ts'
-import type { DefinePluginOpts } from '@uppy/core/lib/BasePlugin.ts'
+import type { UnknownSearchProviderPlugin } from '@uppy/core/lib/Uppy'
+import type { DefinePluginOpts } from '@uppy/core/lib/BasePlugin'
 import type Uppy from '@uppy/core'
 import type { CompanionFile } from '@uppy/utils/lib/CompanionFile'
 import SearchFilterInput from '../SearchFilterInput.tsx'

packages/@uppy/remote-sources/src/index.ts

@@ -15,7 +15,7 @@ import Url from '@uppy/url'
 import Zoom from '@uppy/zoom'
 
 import type { DefinePluginOpts } from '@uppy/core/lib/BasePlugin'
-import type { Body, Meta } from '../../utils/src/UppyFile'
+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'

packages/@uppy/screen-capture/src/ScreenCapture.tsx

@@ -1,7 +1,7 @@
 import { h, type ComponentChild } from 'preact'
 import { UIPlugin, Uppy, type UIPluginOptions } from '@uppy/core'
 import getFileTypeExtension from '@uppy/utils/lib/getFileTypeExtension'
-import type { DefinePluginOpts } from '@uppy/core/lib/BasePlugin.ts'
+import type { DefinePluginOpts } from '@uppy/core/lib/BasePlugin'
 import type { Body, Meta } from '@uppy/utils/lib/UppyFile'
 import ScreenRecIcon from './ScreenRecIcon.tsx'
 import RecorderScreen from './RecorderScreen.tsx'

packages/@uppy/status-bar/src/Components.tsx

@@ -1,5 +1,5 @@
 import type { Body, Meta } from '@uppy/utils/lib/UppyFile'
-import type { State, Uppy } from '@uppy/core/src/Uppy.ts'
+import type { State, Uppy } from '@uppy/core/lib/Uppy'
 import type { FileProcessingInfo } from '@uppy/utils/lib/FileProgress'
 import type { I18n } from '@uppy/utils/lib/Translator'
 import { h } from 'preact'

packages/@uppy/status-bar/src/StatusBar.tsx

@@ -1,7 +1,7 @@
 import type { ComponentChild } from 'preact'
 import type { Body, Meta, UppyFile } from '@uppy/utils/lib/UppyFile'
-import type { Uppy, State } from '@uppy/core/src/Uppy.ts'
-import type { DefinePluginOpts } from '@uppy/core/lib/BasePlugin.ts'
+import type { Uppy, State } from '@uppy/core/lib/Uppy'
+import type { DefinePluginOpts } from '@uppy/core/lib/BasePlugin'
 import { UIPlugin } from '@uppy/core'
 import emaFilter from '@uppy/utils/lib/emaFilter'
 import getTextDirection from '@uppy/utils/lib/getTextDirection'

packages/@uppy/status-bar/src/StatusBarUI.tsx

@@ -1,6 +1,6 @@
 import type { Body, Meta, UppyFile } from '@uppy/utils/lib/UppyFile'
 import type { I18n } from '@uppy/utils/lib/Translator'
-import type { Uppy, State } from '@uppy/core/src/Uppy.ts'
+import type { Uppy, State } from '@uppy/core/lib/Uppy'
 import { h } from 'preact'
 import classNames from 'classnames'
 import statusBarStates from './StatusBarStates.ts'

packages/@uppy/thumbnail-generator/src/index.ts

@@ -6,7 +6,7 @@ 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.ts'
+import type { DefinePluginOpts } from '@uppy/core/lib/BasePlugin'
 import type { Body, Meta, UppyFile } from '@uppy/utils/lib/UppyFile'
 import locale from './locale.ts'
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment

packages/@uppy/unsplash/src/Unsplash.tsx

@@ -9,7 +9,7 @@ import { SearchProviderViews } from '@uppy/provider-views'
 import { h, type ComponentChild } from 'preact'
 
 import type { UppyFile, Body, Meta } from '@uppy/utils/lib/UppyFile'
-import type { UnknownSearchProviderPluginState } from '@uppy/core/lib/Uppy.ts'
+import type { UnknownSearchProviderPluginState } from '@uppy/core/lib/Uppy'
 // 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'

packages/@uppy/webcam/src/Webcam.tsx

@@ -2,13 +2,13 @@ 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.ts'
+import type { DefinePluginOpts } from '@uppy/core/lib/BasePlugin'
 import type {
   Body,
   Meta,
   MinimalRequiredUppyFile,
 } from '@uppy/utils/lib/UppyFile.ts'
-import type { PluginTarget } from '@uppy/core/lib/UIPlugin.ts'
+import type { PluginTarget } from '@uppy/core/lib/UIPlugin'
 import getFileTypeExtension from '@uppy/utils/lib/getFileTypeExtension'
 import mimeTypes from '@uppy/utils/lib/mimeTypes'
 import isMobile from 'is-mobile'

packages/@uppy/zoom/src/Zoom.tsx

@@ -9,7 +9,7 @@ import { ProviderViews } from '@uppy/provider-views'
 import { h, type ComponentChild } from 'preact'
 
 import type { UppyFile, Body, Meta } from '@uppy/utils/lib/UppyFile'
-import type { UnknownProviderPluginState } from '@uppy/core/lib/Uppy.ts'
+import type { UnknownProviderPluginState } from '@uppy/core/lib/Uppy'
 import locale from './locale.ts'
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore We don't want TS to generate types for the package.json

yarn.lock

@@ -8286,13 +8286,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/node@npm:^18.17.5":
-  version: 18.18.4
-  resolution: "@types/node@npm:18.18.4"
-  checksum: 4901e91c4cc479bb58acbcd79236a97a0ad6db4a53cb1f4ba4cf32af15324c61b16faa6e31c1b09bf538a20feb5f5274239157ce5237f5741db0b9ab71e69c52
-  languageName: node
-  linkType: hard
-
 "@types/normalize-package-data@npm:^2.4.0":
   version: 2.4.1
   resolution: "@types/normalize-package-data@npm:2.4.1"
@@ -12053,7 +12046,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"buffer@npm:^5.5.0, buffer@npm:^5.6.0":
+"buffer@npm:^5.5.0, buffer@npm:^5.7.1":
   version: 5.7.1
   resolution: "buffer@npm:5.7.1"
   dependencies:
@@ -13588,33 +13581,32 @@ __metadata:
   linkType: hard
 
 "cypress-terminal-report@npm:^5.0.0":
-  version: 5.3.7
-  resolution: "cypress-terminal-report@npm:5.3.7"
+  version: 5.3.12
+  resolution: "cypress-terminal-report@npm:5.3.12"
   dependencies:
     chalk: ^4.0.0
     fs-extra: ^10.1.0
     process: ^0.11.10
-    semver: ^7.3.5
+    semver: ^7.5.4
     tv4: ^1.3.0
   peerDependencies:
     cypress: ">=10.0.0"
-  checksum: 7bd433c26009936d74a0cc002ec4e48942fa806b465d71ffdb783785074433f650cb95dda77ec4ea00e10cf723bcbea8543f74cfbd49104c89022776690dcc1c
+  checksum: e90443438e0dabb49007cc0009b74b79da97728c6b74cbba2f4791d59b2effd35398675b4cc0770d7ca0b7524af329bcfa37fc2662ccbf45e8292966fdc8970d
   languageName: node
   linkType: hard
 
 "cypress@npm:^13.0.0":
-  version: 13.3.0
-  resolution: "cypress@npm:13.3.0"
+  version: 13.7.1
+  resolution: "cypress@npm:13.7.1"
   dependencies:
     "@cypress/request": ^3.0.0
     "@cypress/xvfb": ^1.2.4
-    "@types/node": ^18.17.5
     "@types/sinonjs__fake-timers": 8.1.1
     "@types/sizzle": ^2.3.2
     arch: ^2.2.0
     blob-util: ^2.0.2
     bluebird: ^3.7.2
-    buffer: ^5.6.0
+    buffer: ^5.7.1
     cachedir: ^2.3.0
     chalk: ^4.1.0
     check-more-types: ^2.24.0
@@ -13632,7 +13624,7 @@ __metadata:
     figures: ^3.2.0
     fs-extra: ^9.1.0
     getos: ^3.2.1
-    is-ci: ^3.0.0
+    is-ci: ^3.0.1
     is-installed-globally: ~0.4.0
     lazy-ass: ^1.6.0
     listr2: ^3.8.3
@@ -13651,7 +13643,7 @@ __metadata:
     yauzl: ^2.10.0
   bin:
     cypress: bin/cypress
-  checksum: 6ad11bd6aabccfaf8be78afff0e854c9c8ccc935704c41efe4d8e9412ccfcb652f23791931c3aa26fc41068eeeb739a51563308670c9dada91cb272d08227caf
+  checksum: f6c3cafdc53f5737d3b981c9e8ace574398bc999c47e87bb8c8855052b6aa53c140d8361484b573f600acbcbcc113aad4c97a6953878e8c82f0a43864b58e17c
   languageName: node
   linkType: hard
 
@@ -18738,7 +18730,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-ci@npm:^3.0.0":
+"is-ci@npm:^3.0.1":
   version: 3.0.1
   resolution: "is-ci@npm:3.0.1"
   dependencies:
@@ -28093,6 +28085,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"semver@npm:^7.5.4":
+  version: 7.6.0
+  resolution: "semver@npm:7.6.0"
+  dependencies:
+    lru-cache: ^6.0.0
+  bin:
+    semver: bin/semver.js
+  checksum: 7427f05b70786c696640edc29fdd4bc33b2acf3bbe1740b955029044f80575fc664e1a512e4113c3af21e767154a94b4aa214bf6cd6e42a1f6dba5914e0b208c
+  languageName: node
+  linkType: hard
+
 "semver@npm:~7.0.0":
   version: 7.0.0
   resolution: "semver@npm:7.0.0"