Import types consistently from @uppy/core

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

@@ -1,12 +1,13 @@
 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.js'

packages/@uppy/aws-s3/src/HTTPCommunicationQueue.ts

@@ -1,4 +1,4 @@
-import type { Meta, Body, UppyFile } from '@uppy/utils/lib/UppyFile'
+import type { Meta, Body, UppyFile } from '@uppy/core'
 import type {
   RateLimitedQueue,
   WrapPromiseFunctionType,

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 {

packages/@uppy/box/src/Box.tsx

@@ -8,12 +8,14 @@ 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'
+} 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

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

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

@@ -1,11 +1,14 @@
-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.js'
 import type { CompanionPluginOptions } from './index.js'
 import { isOriginAllowed } from './getAllowedHosts.js'

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

@@ -1,5 +1,4 @@
-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.js'
 

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 { DefinePluginOpts, PluginOpts } from '@uppy/core/lib/BasePlugin.js'
+import type { DefinePluginOpts, PluginOpts } from '@uppy/core'
 
 import locale from './locale.js'
 

packages/@uppy/core/src/Uppy.test.ts

@@ -6,7 +6,7 @@ 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.js'
 import UIPlugin from './UIPlugin.js'

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

@@ -2,12 +2,22 @@ export { default } from './Uppy.js'
 export {
   default as Uppy,
   type State,
+  type BaseProviderPlugin,
+  type PartialTree,
+  type PartialTreeFile,
+  type PartialTreeFolder,
+  type PartialTreeFolderNode,
+  type PartialTreeFolderRoot,
+  type PartialTreeId,
   type UnknownPlugin,
   type UnknownProviderPlugin,
+  type UnknownProviderPluginState,
   type UnknownSearchProviderPlugin,
+  type UnknownSearchProviderPluginState,
   type UploadResult,
   type UppyEventMap,
   type UppyOptions,
+  type AsyncStore,
 } from './Uppy.js'
 
 export { default as UIPlugin } from './UIPlugin.js'
@@ -20,4 +30,9 @@ 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'

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'

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

@@ -2,8 +2,15 @@
 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'

packages/@uppy/dashboard/src/components/FileItem/Buttons/index.tsx

@@ -1,5 +1,5 @@
 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.js'

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<M extends Meta, B extends Body> {

packages/@uppy/dashboard/src/components/FileItem/index.tsx

@@ -2,10 +2,9 @@
 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.jsx'
 import FileProgress from './FileProgress/index.jsx'
 import FileInfo from './FileInfo/index.jsx'

packages/@uppy/dashboard/src/components/FileList.tsx

@@ -3,9 +3,8 @@ 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.jsx'
 import type { DashboardState } from '../Dashboard.js'
 

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

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'

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

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

@@ -8,12 +8,14 @@ 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'
+} 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

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

@@ -8,12 +8,14 @@ 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'
+} 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

packages/@uppy/file-input/src/FileInput.tsx

@@ -1,9 +1,14 @@
 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

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

@@ -1,13 +1,19 @@
-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'
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @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'

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<M extends Meta, B extends Body> = {
   expires: number

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

@@ -1,9 +1,14 @@
 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.js'

packages/@uppy/google-drive-picker/src/GoogleDrivePicker.tsx

@@ -9,8 +9,7 @@ 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

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,

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

@@ -8,12 +8,14 @@ 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'
+} from '@uppy/core'
 import DriveProviderViews from './DriveProviderViews.js'
 import locale from './locale.js'
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment