@uppy/utils: update export maps (#5900)

- cleanup `@uppy/utils ` removed unused / redundant modules .
- migrated modules and tests from `.js` to `.ts`
- removed all the nested export paths
- updated `@uppy/utils` import paths for all packages
- `@uppy/angular` is still failing while running`yarn build` , I'm
looking into it.

---------

Co-authored-by: Merlijn Vos <merlijn@soverin.net>

.changeset/legal-yaks-decide.md

@@ -0,0 +1,70 @@
+---
+"@uppy/utils": major
+"@uppy/angular": patch
+"@uppy/google-photos-picker": patch
+"example-companion-custom-provider": patch
+"@uppy/google-drive-picker": patch
+"@uppy/thumbnail-generator": patch
+"@uppy/companion-client": patch
+"@uppy/golden-retriever": patch
+"@uppy/provider-views": patch
+"@uppy/remote-sources": patch
+"@uppy/screen-capture": patch
+"@uppy/store-default": patch
+"@uppy/google-drive": patch
+"@uppy/image-editor": patch
+"@uppy/react-native": patch
+"@uppy/drop-target": patch
+"@uppy/transloadit": patch
+"@uppy/components": patch
+"@uppy/compressor": patch
+"@uppy/xhr-upload": patch
+"@uppy/companion": patch
+"@uppy/dashboard": patch
+"@uppy/instagram": patch
+"@uppy/facebook": patch
+"@uppy/onedrive": patch
+"@uppy/unsplash": patch
+"angular": patch
+"@uppy/dropbox": patch
+"@uppy/locales": patch
+"@uppy/aws-s3": patch
+"@uppy/svelte": patch
+"@uppy/webcam": patch
+"@uppy/webdav": patch
+"example-transloadit": patch
+"@uppy/audio": patch
+"@uppy/react": patch
+"example-xhr-bundle": patch
+"@uppy/core": patch
+"@uppy/form": patch
+"@uppy/zoom": patch
+"example-sveltekit": patch
+"@uppy/box": patch
+"@uppy/tus": patch
+"@uppy/url": patch
+"@uppy/vue": patch
+"example-angular": patch
+"uppy": patch
+"example-vue": patch
+"@uppy-dev/dev": patch
+---
+
+Updated export maps for @uppy/utils: removed nested subpath exports; all utilities are now exported from the root index.js.
+
+
+**Before :**
+
+```typescript
+
+import getFileTypeExtension from '@uppy/utils/lib/getFileTypeExtension'
+
+```
+
+**After :**
+
+```typescript
+
+import { getFileTypeExtension } from '@uppy/utils'
+
+```

packages/@uppy/angular/projects/uppy/angular/src/lib/components/dashboard-modal/dashboard-modal-demo.component.ts

@@ -1,7 +1,7 @@
 import { ChangeDetectionStrategy, Component } from "@angular/core";
 import { Uppy } from "@uppy/core";
 import type * as Dashboard from "@uppy/dashboard";
-import type { Body, Meta } from "@uppy/utils/lib/UppyFile";
+import type { Body, Meta } from "@uppy/utils";
 
 @Component({
 	selector: "uppy-dashboard-demo",

packages/@uppy/angular/projects/uppy/angular/src/lib/components/dashboard-modal/dashboard-modal.component.ts

@@ -11,7 +11,7 @@ import {
 import { Uppy } from "@uppy/core";
 import type { DashboardOptions } from "@uppy/dashboard";
 import Dashboard from "@uppy/dashboard";
-import type { Body, Meta } from "@uppy/utils/lib/UppyFile";
+import type { Body, Meta } from "@uppy/utils";
 import { UppyAngularWrapper } from "../../utils/wrapper";
 
 @Component({

packages/@uppy/angular/projects/uppy/angular/src/lib/components/dashboard/dashboard-demo.component.ts

@@ -1,7 +1,7 @@
 import { ChangeDetectionStrategy, Component } from "@angular/core";
 import { Uppy } from "@uppy/core";
 import type * as Dashboard from "@uppy/dashboard";
-import type { Body, Meta } from "@uppy/utils/lib/UppyFile";
+import type { Body, Meta } from "@uppy/utils";
 
 @Component({
 	selector: "uppy-dashboard-demo",

packages/@uppy/angular/projects/uppy/angular/src/lib/components/dashboard/dashboard.component.ts

@@ -11,7 +11,7 @@ import {
 import { Uppy } from "@uppy/core";
 import type { DashboardOptions } from "@uppy/dashboard";
 import Dashboard from "@uppy/dashboard";
-import type { Body, Meta } from "@uppy/utils/lib/UppyFile";
+import type { Body, Meta } from "@uppy/utils";
 import { UppyAngularWrapper } from "../../utils/wrapper";
 
 @Component({

packages/@uppy/angular/projects/uppy/angular/src/lib/utils/wrapper.ts

@@ -1,7 +1,7 @@
 import type { ElementRef, SimpleChanges } from "@angular/core";
 import type { UIPlugin, UIPluginOptions, Uppy } from "@uppy/core";
 import type { DashboardOptions } from "@uppy/dashboard";
-import type { Body, Meta } from "@uppy/utils/lib/UppyFile";
+import type { Body, Meta } from "@uppy/utils";
 
 export abstract class UppyAngularWrapper<
 	M extends Meta,

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

@@ -7,9 +7,8 @@ import type {
 } from '@uppy/core'
 
 import { UIPlugin } from '@uppy/core'
-import getFileTypeExtension from '@uppy/utils/lib/getFileTypeExtension'
+import type { LocaleStrings } from '@uppy/utils'
-
+import { getFileTypeExtension } from '@uppy/utils'
-import type { LocaleStrings } from '@uppy/utils/lib/Translator'
 import { h } from 'preact'
 import packageJson from '../package.json' with { type: 'json' }
 import locale from './locale.js'

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

@@ -1,4 +1,4 @@
-import type { I18n } from '@uppy/utils/lib/Translator'
+import type { I18n } from '@uppy/utils'
 import { h } from 'preact'
 
 interface DiscardButtonProps {

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

@@ -1,4 +1,4 @@
-import type { I18n } from '@uppy/utils/lib/Translator'
+import type { I18n } from '@uppy/utils'
 import { h } from 'preact'
 
 interface PermissionsScreenProps {

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

@@ -1,4 +1,4 @@
-import type { I18n } from '@uppy/utils/lib/Translator'
+import type { I18n } from '@uppy/utils'
 import { h } from 'preact'
 
 interface RecordButtonProps {

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

@@ -1,4 +1,4 @@
-import type { I18n } from '@uppy/utils/lib/Translator'
+import type { I18n } from '@uppy/utils'
 import { h } from 'preact'
 import { useEffect, useRef } from 'preact/hooks'
 import AudioSourceSelect, {

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

@@ -1,4 +1,4 @@
-import type { I18n } from '@uppy/utils/lib/Translator'
+import type { I18n } from '@uppy/utils'
 import { h } from 'preact'
 
 interface SubmitButtonProps {

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

@@ -1,8 +1,5 @@
 import type { Body, Meta, UppyFile } from '@uppy/core'
-import type {
+import type { RateLimitedQueue, WrapPromiseFunctionType } from '@uppy/utils'
-  RateLimitedQueue,
-  WrapPromiseFunctionType,
-} from '@uppy/utils/lib/RateLimitedQueue'
 import type AwsS3Multipart from './index.js'
 import type {
   AwsS3MultipartOptions,

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

@@ -1,6 +1,6 @@
 import type { Uppy } from '@uppy/core'
-import { AbortController } from '@uppy/utils/lib/AbortController'
+import type { Body, Meta, UppyFile } from '@uppy/utils'
-import type { Body, Meta, UppyFile } from '@uppy/utils/lib/UppyFile'
+import { AbortController } from '@uppy/utils'
 import type { HTTPCommunicationQueue } from './HTTPCommunicationQueue.js'
 
 const MB = 1024 * 1024

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

@@ -6,15 +6,14 @@ import {
   type PluginOpts,
   type Uppy,
 } from '@uppy/core'
-import { createAbortError } from '@uppy/utils/lib/AbortController'
+import type { Body, Meta, RequestOptions, UppyFile } from '@uppy/utils'
-import type { RequestOptions } from '@uppy/utils/lib/CompanionClientProvider'
 import {
+  createAbortError,
   filterFilesToEmitUploadStarted,
   filterNonFailedFiles,
-} from '@uppy/utils/lib/fileFilters'
+  getAllowedMetaFields,
-import getAllowedMetaFields from '@uppy/utils/lib/getAllowedMetaFields'
+  RateLimitedQueue,
-import { RateLimitedQueue } from '@uppy/utils/lib/RateLimitedQueue'
+} from '@uppy/utils'
-import type { Body, Meta, UppyFile } from '@uppy/utils/lib/UppyFile'
 import packageJson from '../package.json' with { type: 'json' }
 import createSignedURL from './createSignedURL.js'
 import { HTTPCommunicationQueue } from './HTTPCommunicationQueue.js'

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

@@ -1,5 +1,5 @@
-import { createAbortError } from '@uppy/utils/lib/AbortController'
+import type { Body } from '@uppy/utils'
-import type { Body } from '@uppy/utils/lib/UppyFile'
+import { createAbortError } from '@uppy/utils'
 
 import type { AwsS3Part } from './index.js'
 

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

@@ -15,7 +15,7 @@ import type {
 import { UIPlugin, type Uppy } from '@uppy/core'
 import { ProviderViews } from '@uppy/provider-views'
 
-import type { LocaleStrings } from '@uppy/utils/lib/Translator'
+import type { LocaleStrings } from '@uppy/utils'
 // biome-ignore lint/style/useImportType: h is not a type
 import { type ComponentChild, h } from 'preact'
 import packageJson from '../package.json' with { type: 'json' }

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

@@ -5,10 +5,7 @@ import type {
   UnknownProviderPlugin,
   Uppy,
 } from '@uppy/core'
-import type {
+import type { CompanionClientProvider, RequestOptions } from '@uppy/utils'
-  CompanionClientProvider,
-  RequestOptions,
-} from '@uppy/utils/lib/CompanionClientProvider'
 import { isOriginAllowed } from './getAllowedHosts.js'
 import type { CompanionPluginOptions } from './index.js'
 import RequestClient, { authErrorStatusCode } from './RequestClient.js'

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

@@ -1,10 +1,11 @@
 import type Uppy from '@uppy/core'
-import type { RequestOptions } from '@uppy/utils/lib/CompanionClientProvider'
+import type { Body, Meta, RequestOptions, UppyFile } from '@uppy/utils'
-import ErrorWithCause from '@uppy/utils/lib/ErrorWithCause'
+import {
-import fetchWithNetworkError from '@uppy/utils/lib/fetchWithNetworkError'
+  ErrorWithCause,
-import getSocketHost from '@uppy/utils/lib/getSocketHost'
+  fetchWithNetworkError,
-import type { Body, Meta, UppyFile } from '@uppy/utils/lib/UppyFile'
+  getSocketHost,
-import UserFacingApiError from '@uppy/utils/lib/UserFacingApiError'
+  UserFacingApiError,
+} from '@uppy/utils'
 import pRetry, { AbortError } from 'p-retry'
 import packageJson from '../package.json' with { type: 'json' }
 import AuthError from './AuthError.js'

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

@@ -1,5 +1,5 @@
 import type { Body, Meta, Uppy } from '@uppy/core'
-import type { CompanionClientSearchProvider } from '@uppy/utils/lib/CompanionClientProvider'
+import type { CompanionClientSearchProvider } from '@uppy/utils'
 import RequestClient, { type Opts } from './RequestClient.js'
 
 const getName = (id: string): string => {

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

@@ -1,7 +1,7 @@
 import fs from 'node:fs'
 import path from 'node:path'
 import Core from '@uppy/core'
-import getFileNameAndExtension from '@uppy/utils/lib/getFileNameAndExtension'
+import { getFileNameAndExtension } from '@uppy/utils'
 import { describe, expect, it } from 'vitest'
 import CompressorPlugin from './index.js'
 

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

@@ -1,11 +1,9 @@
 import prettierBytes from '@transloadit/prettier-bytes'
 import type { DefinePluginOpts, PluginOpts } from '@uppy/core'
 import { BasePlugin, type Uppy } from '@uppy/core'
-import getFileNameAndExtension from '@uppy/utils/lib/getFileNameAndExtension'
+import type { Body, Meta, UppyFile } from '@uppy/utils'
 // @ts-ignore
-import { RateLimitedQueue } from '@uppy/utils/lib/RateLimitedQueue'
+import { getFileNameAndExtension, RateLimitedQueue } from '@uppy/utils'
-
-import type { Body, Meta, UppyFile } from '@uppy/utils/lib/UppyFile'
 import CompressorJS from 'compressorjs'
 
 import locale from './locale.js'

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

@@ -7,9 +7,8 @@
  * See `Plugin` for the extended version with Preact rendering for interfaces.
  */
 
-import type { I18n, OptionalPluralizeLocale } from '@uppy/utils/lib/Translator'
+import type { Body, I18n, Meta, OptionalPluralizeLocale } from '@uppy/utils'
-import Translator from '@uppy/utils/lib/Translator'
+import { Translator } from '@uppy/utils'
-import type { Body, Meta } from '@uppy/utils/lib/UppyFile'
 import type { State, UnknownPlugin, Uppy } from './Uppy.js'
 
 export type PluginOpts = {

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

@@ -1,4 +1,4 @@
-import type { Body, Meta, UppyFile } from '@uppy/utils/lib/UppyFile'
+import type { Body, Meta, UppyFile } from '@uppy/utils'
 import type { _UppyEventMap, Uppy, UppyEventMap } from './Uppy.js'
 
 /**

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

@@ -1,6 +1,5 @@
 import prettierBytes from '@transloadit/prettier-bytes'
-import type { I18n } from '@uppy/utils/lib/Translator'
+import type { Body, I18n, Meta, UppyFile } from '@uppy/utils'
-import type { Body, Meta, UppyFile } from '@uppy/utils/lib/UppyFile'
 // @ts-ignore untyped
 import match from 'mime-match'
 import type { NonNullableUppyOptions, State } from './Uppy.js'

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

@@ -1,6 +1,5 @@
-import findDOMElement from '@uppy/utils/lib/findDOMElement'
+import type { Body, Meta } from '@uppy/utils'
-import getTextDirection from '@uppy/utils/lib/getTextDirection'
+import { findDOMElement, getTextDirection } from '@uppy/utils'
-import type { Body, Meta } from '@uppy/utils/lib/UppyFile'
 import { render } from 'preact/compat'
 import type { PluginOpts } from './BasePlugin.js'
 import BasePlugin from './BasePlugin.js'

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

@@ -3,7 +3,7 @@ import fs from 'node:fs'
 import path from 'node:path'
 import prettierBytes from '@transloadit/prettier-bytes'
 import type { Body, Meta } from '@uppy/core'
-import type { Locale } from '@uppy/utils/lib/Translator'
+import type { Locale } from '@uppy/utils'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import BasePlugin, {
   type DefinePluginOpts,

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

@@ -2,29 +2,25 @@
 
 import DefaultStore, { type Store } from '@uppy/store-default'
 import type {
+  Body,
   CompanionClientProvider,
   CompanionClientSearchProvider,
-} from '@uppy/utils/lib/CompanionClientProvider'
+  CompanionFile,
-import type { CompanionFile } from '@uppy/utils/lib/CompanionFile'
-import type {
   FileProgressNotStarted,
   FileProgressStarted,
-} from '@uppy/utils/lib/FileProgress'
-import { getSafeFileId } from '@uppy/utils/lib/generateFileID'
-import getFileNameAndExtension from '@uppy/utils/lib/getFileNameAndExtension'
-import getFileType from '@uppy/utils/lib/getFileType'
-import type {
   I18n,
   Locale,
-  OptionalPluralizeLocale,
-} from '@uppy/utils/lib/Translator'
-import Translator from '@uppy/utils/lib/Translator'
-import type {
-  Body,
   Meta,
   MinimalRequiredUppyFile,
+  OptionalPluralizeLocale,
   UppyFile,
-} from '@uppy/utils/lib/UppyFile'
+} from '@uppy/utils'
+import {
+  getFileNameAndExtension,
+  getFileType,
+  getSafeFileId,
+  Translator,
+} from '@uppy/utils'
 import throttle from 'lodash/throttle.js'
 // @ts-ignore untyped
 import ee from 'namespace-emitter'

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

@@ -4,7 +4,7 @@ export type {
   Meta,
   MinimalRequiredUppyFile,
   UppyFile,
-} from '@uppy/utils/lib/UppyFile'
+} from '@uppy/utils'
 export type { DefinePluginOpts, PluginOpts } from './BasePlugin.js'
 export { default as BasePlugin } from './BasePlugin.js'
 export { default as EventManager } from './EventManager.js'

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

@@ -1,4 +1,4 @@
-import getTimeStamp from '@uppy/utils/lib/getTimeStamp'
+import { getTimeStamp } from '@uppy/utils'
 
 // Swallow all logs, except errors.
 // default if logger is not set or debug: false

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

@@ -1,6 +1,4 @@
-import type { LocaleStrings } from '@uppy/utils/lib/Translator'
+import type { Body, InternalMetadata, LocaleStrings, Meta } from '@uppy/utils'
-
-import type { Body, InternalMetadata, Meta } from '@uppy/utils/lib/UppyFile'
 import { expectTypeOf, test } from 'vitest'
 import UIPlugin, { type UIPluginOptions } from './UIPlugin.js'
 import Uppy, { type UnknownPlugin } from './Uppy.js'

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

@@ -12,10 +12,8 @@ import type {
 import { UIPlugin } from '@uppy/core'
 import { defaultPickerIcon } from '@uppy/provider-views'
 import ThumbnailGenerator from '@uppy/thumbnail-generator'
-import findAllDOMElements from '@uppy/utils/lib/findAllDOMElements'
+import type { LocaleStrings } from '@uppy/utils'
-import getDroppedFiles from '@uppy/utils/lib/getDroppedFiles'
+import { findAllDOMElements, getDroppedFiles, toArray } from '@uppy/utils'
-import type { LocaleStrings } from '@uppy/utils/lib/Translator'
-import toArray from '@uppy/utils/lib/toArray'
 import { nanoid } from 'nanoid/non-secure'
 import type { ComponentChild, VNode } from 'preact'
 import { h } from 'preact'

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

@@ -1,5 +1,4 @@
-import type Translator from '@uppy/utils/lib/Translator'
+import type { I18n, Translator } from '@uppy/utils'
-import type { I18n } from '@uppy/utils/lib/Translator'
 import { Component, type ComponentChild, Fragment, h } from 'preact'
 import type { TargetedEvent } from 'preact/compat'
 import type { DashboardState, TargetWithRender } from '../Dashboard.js'

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

@@ -7,9 +7,8 @@ import type {
   Uppy,
   UppyFile,
 } from '@uppy/core'
-import isDragDropSupported from '@uppy/utils/lib/isDragDropSupported'
+import type { I18n, Translator } from '@uppy/utils'
-import type Translator from '@uppy/utils/lib/Translator'
+import { isDragDropSupported } from '@uppy/utils'
-import type { I18n } from '@uppy/utils/lib/Translator'
 import classNames from 'classnames'
 import { h } from 'preact'
 import type { TargetedEvent } from 'preact/compat'

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

@@ -1,6 +1,6 @@
 import type Uppy from '@uppy/core'
 import type { Body, Meta, UppyFile } from '@uppy/core'
-import type { I18n } from '@uppy/utils/lib/Translator'
+import type { I18n } from '@uppy/utils'
 import { h } from 'preact'
 import type { DashboardState } from '../../../Dashboard.js'
 import copyToClipboard from '../../../utils/copyToClipboard.js'

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

@@ -1,7 +1,7 @@
 import prettierBytes from '@transloadit/prettier-bytes'
 import type { UppyFile } from '@uppy/core'
-import type { I18n } from '@uppy/utils/lib/Translator'
+import type { I18n } from '@uppy/utils'
-import truncateString from '@uppy/utils/lib/truncateString'
+import { truncateString } from '@uppy/utils'
 import { h } from 'preact'
 import type { DashboardState } from '../../../Dashboard.js'
 import MetaErrorMessage from '../MetaErrorMessage.js'

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

@@ -1,5 +1,5 @@
 import type { Body, Meta, State, Uppy, UppyFile } from '@uppy/core'
-import type { I18n } from '@uppy/utils/lib/Translator'
+import type { I18n } from '@uppy/utils'
 import { type ComponentChild, h } from 'preact'
 
 interface Props<M extends Meta, B extends Body> {

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

@@ -1,6 +1,6 @@
 import type Uppy from '@uppy/core'
 import type { Body, Meta, State, UppyFile } from '@uppy/core'
-import type { I18n } from '@uppy/utils/lib/Translator'
+import type { I18n } from '@uppy/utils'
 import classNames from 'classnames'
 // biome-ignore lint/style/useImportType: h is not a type
 import { Component, type ComponentChild, h } from 'preact'

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

@@ -1,7 +1,7 @@
 import type { Body, Meta, State, Uppy, UppyFile } from '@uppy/core'
-import type { I18n } from '@uppy/utils/lib/Translator'
+import type { I18n } from '@uppy/utils'
 // @ts-ignore untyped
-import VirtualList from '@uppy/utils/lib/VirtualList'
+import { VirtualList } from '@uppy/utils'
 import { h } from 'preact'
 import { useMemo } from 'preact/hooks'
 import type { DashboardState } from '../Dashboard.js'

packages/@uppy/dashboard/src/components/StatusBar/Components.tsx

@@ -1,8 +1,7 @@
 import prettierBytes from '@transloadit/prettier-bytes'
 import type { Body, Meta, State, Uppy } from '@uppy/core'
-import type { FileProcessingInfo } from '@uppy/utils/lib/FileProgress'
+import type { FileProcessingInfo, I18n } from '@uppy/utils'
-import prettyETA from '@uppy/utils/lib/prettyETA'
+import { prettyETA } from '@uppy/utils'
-import type { I18n } from '@uppy/utils/lib/Translator'
 import classNames from 'classnames'
 import { h } from 'preact'
 

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

@@ -1,6 +1,6 @@
 import type { Body, Meta, Uppy, UppyFile } from '@uppy/core'
-import emaFilter from '@uppy/utils/lib/emaFilter'
+import type { I18n } from '@uppy/utils'
-import type { I18n } from '@uppy/utils/lib/Translator'
+import { emaFilter } from '@uppy/utils'
 import type { ComponentChild } from 'preact'
 import { Component, h } from 'preact'
 import type { StatusBarOptions } from './StatusBarOptions.js'

packages/@uppy/dashboard/src/components/StatusBar/StatusBarUI.tsx

@@ -1,5 +1,5 @@
 import type { Body, Meta, State, Uppy, UppyFile } from '@uppy/core'
-import type { I18n } from '@uppy/utils/lib/Translator'
+import type { I18n } from '@uppy/utils'
 import classNames from 'classnames'
 import { h } from 'preact'
 import {

packages/@uppy/dashboard/src/components/StatusBar/calculateProcessingProgress.ts

@@ -1,5 +1,4 @@
-import type { FileProcessingInfo } from '@uppy/utils/lib/FileProgress'
+import type { FileProcessingInfo, UppyFile } from '@uppy/utils'
-import type { UppyFile } from '@uppy/utils/lib/UppyFile'
 
 export default function calculateProcessingProgress(
   files: Record<string, UppyFile<any, any>>,

packages/@uppy/dashboard/src/utils/createSuperFocus.ts

@@ -1,5 +1,5 @@
 // @ts-ignore untyped
-import FOCUSABLE_ELEMENTS from '@uppy/utils/lib/FOCUSABLE_ELEMENTS'
+import { FOCUSABLE_ELEMENTS } from '@uppy/utils'
 import debounce from 'lodash/debounce.js'
 import getActiveOverlayEl from './getActiveOverlayEl.js'
 

packages/@uppy/dashboard/src/utils/trapFocus.ts

@@ -1,6 +1,5 @@
 // @ts-ignore untyped
-import FOCUSABLE_ELEMENTS from '@uppy/utils/lib/FOCUSABLE_ELEMENTS'
+import { FOCUSABLE_ELEMENTS, toArray } from '@uppy/utils'
-import toArray from '@uppy/utils/lib/toArray'
 import getActiveOverlayEl from './getActiveOverlayEl.js'
 
 type $TSFixMe = any

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

@@ -1,7 +1,6 @@
 import type { Body, DefinePluginOpts, Meta, PluginOpts, Uppy } from '@uppy/core'
 import { BasePlugin } from '@uppy/core'
-import getDroppedFiles from '@uppy/utils/lib/getDroppedFiles'
+import { getDroppedFiles, toArray } from '@uppy/utils'
-import toArray from '@uppy/utils/lib/toArray'
 import packageJson from '../package.json' with { type: 'json' }
 
 export interface DropTargetOptions extends PluginOpts {

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

@@ -15,7 +15,7 @@ import type {
 import { UIPlugin, type Uppy } from '@uppy/core'
 import { ProviderViews } from '@uppy/provider-views'
 
-import type { LocaleStrings } from '@uppy/utils/lib/Translator'
+import type { LocaleStrings } from '@uppy/utils'
 // biome-ignore lint/style/useImportType: h is not a type
 import { type ComponentChild, h } from 'preact'
 import packageJson from '../package.json' with { type: 'json' }

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

@@ -15,7 +15,7 @@ import type {
 import { UIPlugin, type Uppy } from '@uppy/core'
 import { ProviderViews } from '@uppy/provider-views'
 
-import type { LocaleStrings } from '@uppy/utils/lib/Translator'
+import type { LocaleStrings } from '@uppy/utils'
 // biome-ignore lint/style/useImportType: h is not a type
 import { type ComponentChild, h } from 'preact'
 import packageJson from '../package.json' with { type: 'json' }

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

@@ -7,8 +7,7 @@ import type {
   UppyEventMap,
 } from '@uppy/core'
 import { BasePlugin } from '@uppy/core'
-import findDOMElement from '@uppy/utils/lib/findDOMElement'
+import { findDOMElement, toArray } from '@uppy/utils'
-import toArray from '@uppy/utils/lib/toArray'
 
 // @ts-ignore untyped
 import getFormData from 'get-form-data'

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

@@ -1,4 +1,4 @@
-import type { UppyFile } from '@uppy/utils/lib/UppyFile'
+import type { UppyFile } from '@uppy/utils'
 
 const indexedDB =
   typeof window !== 'undefined' &&

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

@@ -1,4 +1,4 @@
-import type { Body, Meta, UppyFile } from '@uppy/utils/lib/UppyFile'
+import type { Body, Meta, UppyFile } from '@uppy/utils'
 
 const isSupported =
   typeof navigator !== 'undefined' && 'serviceWorker' in navigator

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

@@ -10,7 +10,7 @@ import {
   GooglePickerView,
   type PickedItem,
 } from '@uppy/provider-views'
-import type { LocaleStrings } from '@uppy/utils/lib/Translator'
+import type { LocaleStrings } from '@uppy/utils'
 import { h } from 'preact'
 
 import packageJson from '../package.json' with { type: 'json' }

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

@@ -15,7 +15,7 @@ import type {
 import { UIPlugin, type Uppy } from '@uppy/core'
 import type { ProviderViews } from '@uppy/provider-views'
 
-import type { LocaleStrings } from '@uppy/utils/lib/Translator'
+import type { LocaleStrings } from '@uppy/utils'
 // biome-ignore lint/style/useImportType: h is not a type
 import { type ComponentChild, h } from 'preact'
 import packageJson from '../package.json' with { type: 'json' }

packages/@uppy/google-photos-picker/src/GooglePhotosPicker.tsx

@@ -10,7 +10,7 @@ import {
   GooglePickerView,
   type PickedItem,
 } from '@uppy/provider-views'
-import type { LocaleStrings } from '@uppy/utils/lib/Translator'
+import type { LocaleStrings } from '@uppy/utils'
 import { h } from 'preact'
 
 import packageJson from '../package.json' with { type: 'json' }

packages/@uppy/image-editor/src/Editor.tsx

@@ -1,5 +1,5 @@
 import type { Body, Meta, UppyFile } from '@uppy/core'
-import type { I18n } from '@uppy/utils/lib/Translator'
+import type { I18n } from '@uppy/utils'
 import Cropper from 'cropperjs'
 import { Component, h } from 'preact'
 import type ImageEditor from './ImageEditor.js'

packages/@uppy/image-editor/src/ImageEditor.tsx

@@ -7,7 +7,7 @@ import type {
   UppyFile,
 } from '@uppy/core'
 import { UIPlugin } from '@uppy/core'
-import type { LocaleStrings } from '@uppy/utils/lib/Translator'
+import type { LocaleStrings } from '@uppy/utils'
 import type Cropper from 'cropperjs'
 import { h } from 'preact'
 import packageJson from '../package.json' with { type: 'json' }

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

@@ -15,7 +15,7 @@ import type {
 import { UIPlugin, type Uppy } from '@uppy/core'
 import { ProviderViews } from '@uppy/provider-views'
 
-import type { LocaleStrings } from '@uppy/utils/lib/Translator'
+import type { LocaleStrings } from '@uppy/utils'
 // biome-ignore lint/style/useImportType: h is not a type
 import { type ComponentChild, h } from 'preact'
 import packageJson from '../package.json' with { type: 'json' }

packages/@uppy/locales/src/ar_SA.ts

@@ -1,4 +1,4 @@
-import type { Locale } from '@uppy/utils/lib/Translator'
+import type { Locale } from '@uppy/utils'
 
 const ar_SA: Locale<0 | 1> = {
   strings: {},

packages/@uppy/locales/src/bg_BG.ts

@@ -1,4 +1,4 @@
-import type { Locale } from '@uppy/utils/lib/Translator'
+import type { Locale } from '@uppy/utils'
 
 const bg_BG: Locale<0 | 1> = {
   strings: {},

packages/@uppy/locales/src/ca_ES.ts

@@ -1,4 +1,4 @@
-import type { Locale } from '@uppy/utils/lib/Translator'
+import type { Locale } from '@uppy/utils'
 
 const ca_ES: Locale<0 | 1> = {
   strings: {},

packages/@uppy/locales/src/cs_CZ.ts

@@ -1,4 +1,4 @@
-import type { Locale } from '@uppy/utils/lib/Translator'
+import type { Locale } from '@uppy/utils'
 
 const cs_CZ: Locale<0 | 1 | 2> = {
   strings: {},

packages/@uppy/locales/src/da_DK.ts

@@ -1,4 +1,4 @@
-import type { Locale } from '@uppy/utils/lib/Translator'
+import type { Locale } from '@uppy/utils'
 
 const da_DK: Locale<0 | 1> = {
   strings: {},

packages/@uppy/locales/src/de_DE.ts

@@ -1,4 +1,4 @@
-import type { Locale } from '@uppy/utils/lib/Translator'
+import type { Locale } from '@uppy/utils'
 
 const de_DE: Locale<0 | 1> = {
   strings: {},

packages/@uppy/locales/src/el_GR.ts

@@ -1,4 +1,4 @@
-import type { Locale } from '@uppy/utils/lib/Translator'
+import type { Locale } from '@uppy/utils'
 
 const el_GR: Locale<0 | 1> = {
   strings: {},

packages/@uppy/locales/src/en_US.ts

@@ -1,4 +1,4 @@
-import type { Locale } from '@uppy/utils/lib/Translator'
+import type { Locale } from '@uppy/utils'
 
 const en_US: Locale<0 | 1> = {
   strings: {},
@@ -39,7 +39,7 @@ en_US.strings = {
   authenticateWithTitle:
     'Please authenticate with %{pluginName} to select files',
   back: 'Back',
-  browse: 'browse',
+  browse: 'Browse',
   browseFiles: 'browse files',
   browseFolders: 'browse folders',
   cancel: 'Cancel',

packages/@uppy/locales/src/es_ES.ts

@@ -1,4 +1,4 @@
-import type { Locale } from '@uppy/utils/lib/Translator'
+import type { Locale } from '@uppy/utils'
 
 const es_ES: Locale<0 | 1> = {
   strings: {},

packages/@uppy/locales/src/es_MX.ts

@@ -1,4 +1,4 @@
-import type { Locale } from '@uppy/utils/lib/Translator'
+import type { Locale } from '@uppy/utils'
 
 const es_MX: Locale<0 | 1> = {
   strings: {},

packages/@uppy/locales/src/fa_IR.ts

@@ -1,4 +1,4 @@
-import type { Locale } from '@uppy/utils/lib/Translator'
+import type { Locale } from '@uppy/utils'
 
 const fa_IR: Locale<0 | 1> = {
   strings: {},

packages/@uppy/locales/src/fi_FI.ts

@@ -1,4 +1,4 @@
-import type { Locale } from '@uppy/utils/lib/Translator'
+import type { Locale } from '@uppy/utils'
 
 const fi_FI: Locale<0 | 1> = {
   strings: {},

packages/@uppy/locales/src/fr_FR.ts

@@ -1,4 +1,4 @@
-import type { Locale } from '@uppy/utils/lib/Translator'
+import type { Locale } from '@uppy/utils'
 
 const fr_FR: Locale<0 | 1> = {
   strings: {},

packages/@uppy/locales/src/gl_ES.ts

@@ -1,4 +1,4 @@
-import type { Locale } from '@uppy/utils/lib/Translator'
+import type { Locale } from '@uppy/utils'
 
 const gl_ES: Locale<0 | 1> = {
   strings: {},

packages/@uppy/locales/src/he_IL.ts

@@ -1,4 +1,4 @@
-import type { Locale } from '@uppy/utils/lib/Translator'
+import type { Locale } from '@uppy/utils'
 
 const he_IL: Locale<0 | 1> = {
   strings: {},

packages/@uppy/locales/src/hi_IN.ts

@@ -1,4 +1,4 @@
-import type { Locale } from '@uppy/utils/lib/Translator'
+import type { Locale } from '@uppy/utils'
 
 const hi_IN: Locale<0 | 1> = {
   strings: {},

packages/@uppy/locales/src/hr_HR.ts

@@ -1,4 +1,4 @@
-import type { Locale } from '@uppy/utils/lib/Translator'
+import type { Locale } from '@uppy/utils'
 
 const hr_HR: Locale<0 | 1> = {
   strings: {},

packages/@uppy/locales/src/hu_HU.ts

@@ -1,4 +1,4 @@
-import type { Locale } from '@uppy/utils/lib/Translator'
+import type { Locale } from '@uppy/utils'
 
 const hu_HU: Locale<0> = {
   strings: {},

packages/@uppy/locales/src/id_ID.ts

@@ -1,4 +1,4 @@
-import type { Locale } from '@uppy/utils/lib/Translator'
+import type { Locale } from '@uppy/utils'
 
 const id_ID: Locale<0 | 1> = {
   strings: {},

packages/@uppy/locales/src/is_IS.ts

@@ -1,4 +1,4 @@
-import type { Locale } from '@uppy/utils/lib/Translator'
+import type { Locale } from '@uppy/utils'
 
 const is_IS: Locale<0 | 1> = {
   strings: {},

packages/@uppy/locales/src/it_IT.ts

@@ -1,4 +1,4 @@
-import type { Locale } from '@uppy/utils/lib/Translator'
+import type { Locale } from '@uppy/utils'
 
 const it_IT: Locale<0 | 1> = {
   strings: {},

packages/@uppy/locales/src/ja_JP.ts

@@ -1,4 +1,4 @@
-import type { Locale } from '@uppy/utils/lib/Translator'
+import type { Locale } from '@uppy/utils'
 
 const ja_JP: Locale<0 | 1> = {
   strings: {},

packages/@uppy/locales/src/ko_KR.ts

@@ -1,4 +1,4 @@
-import type { Locale } from '@uppy/utils/lib/Translator'
+import type { Locale } from '@uppy/utils'
 
 const ko_KR: Locale<0> = {
   strings: {},

packages/@uppy/locales/src/ms_MY.ts

@@ -1,4 +1,4 @@
-import type { Locale } from '@uppy/utils/lib/Translator'
+import type { Locale } from '@uppy/utils'
 
 const ms_MY: Locale<0 | 1> = {
   strings: {},

packages/@uppy/locales/src/nb_NO.ts

@@ -1,4 +1,4 @@
-import type { Locale } from '@uppy/utils/lib/Translator'
+import type { Locale } from '@uppy/utils'
 
 const nb_NO: Locale<0 | 1> = {
   strings: {},

packages/@uppy/locales/src/nl_NL.ts

@@ -1,4 +1,4 @@
-import type { Locale } from '@uppy/utils/lib/Translator'
+import type { Locale } from '@uppy/utils'
 
 const nl_NL: Locale<0 | 1> = {
   strings: {},

packages/@uppy/locales/src/pl_PL.ts

@@ -1,4 +1,4 @@
-import type { Locale } from '@uppy/utils/lib/Translator'
+import type { Locale } from '@uppy/utils'
 
 const pl_PL: Locale<0 | 1> = {
   strings: {},

packages/@uppy/locales/src/pt_BR.ts

@@ -1,4 +1,4 @@
-import type { Locale } from '@uppy/utils/lib/Translator'
+import type { Locale } from '@uppy/utils'
 
 const pt_BR: Locale<0 | 1> = {
   strings: {},

packages/@uppy/locales/src/pt_PT.ts

@@ -1,4 +1,4 @@
-import type { Locale } from '@uppy/utils/lib/Translator'
+import type { Locale } from '@uppy/utils'
 
 const pt_PT: Locale<0 | 1> = {
   strings: {},

packages/@uppy/locales/src/ro_RO.ts

@@ -1,4 +1,4 @@
-import type { Locale } from '@uppy/utils/lib/Translator'
+import type { Locale } from '@uppy/utils'
 
 const ro_RO: Locale<0 | 1> = {
   strings: {},

packages/@uppy/locales/src/ru_RU.ts

@@ -1,4 +1,4 @@
-import type { Locale } from '@uppy/utils/lib/Translator'
+import type { Locale } from '@uppy/utils'
 
 const ru_RU: Locale<0 | 1 | 2> = {
   strings: {},

packages/@uppy/locales/src/sk_SK.ts

@@ -1,4 +1,4 @@
-import type { Locale } from '@uppy/utils/lib/Translator'
+import type { Locale } from '@uppy/utils'
 
 const sk_SK: Locale<0 | 1> = {
   strings: {},

packages/@uppy/locales/src/sr_RS_Cyrillic.ts

@@ -1,4 +1,4 @@
-import type { Locale } from '@uppy/utils/lib/Translator'
+import type { Locale } from '@uppy/utils'
 
 const sr_RS_Cyrillic: Locale<0 | 1> = {
   strings: {},

packages/@uppy/locales/src/sr_RS_Latin.ts

@@ -1,4 +1,4 @@
-import type { Locale } from '@uppy/utils/lib/Translator'
+import type { Locale } from '@uppy/utils'
 
 const sr_RS_Latin: Locale<0 | 1> = {
   strings: {},

packages/@uppy/locales/src/sv_SE.ts

@@ -1,4 +1,4 @@
-import type { Locale } from '@uppy/utils/lib/Translator'
+import type { Locale } from '@uppy/utils'
 
 const sv_SE: Locale<0 | 1> = {
   strings: {},

packages/@uppy/locales/src/th_TH.ts

@@ -1,4 +1,4 @@
-import type { Locale } from '@uppy/utils/lib/Translator'
+import type { Locale } from '@uppy/utils'
 
 const th_TH: Locale<0 | 1> = {
   strings: {},

packages/@uppy/locales/src/tr_TR.ts

@@ -1,4 +1,4 @@
-import type { Locale } from '@uppy/utils/lib/Translator'
+import type { Locale } from '@uppy/utils'
 
 const tr_TR: Locale<0 | 1> = {
   strings: {},

packages/@uppy/locales/src/uk_UA.ts

@@ -1,4 +1,4 @@
-import type { Locale } from '@uppy/utils/lib/Translator'
+import type { Locale } from '@uppy/utils'
 
 const uk_UA: Locale<0 | 1 | 2> = {
   strings: {},

packages/@uppy/locales/src/uz_UZ.ts

@@ -1,4 +1,4 @@
-import type { Locale } from '@uppy/utils/lib/Translator'
+import type { Locale } from '@uppy/utils'
 
 const uz_UZ: Locale<0 | 1> = {
   strings: {},

packages/@uppy/locales/src/vi_VN.ts

@@ -1,4 +1,4 @@
-import type { Locale } from '@uppy/utils/lib/Translator'
+import type { Locale } from '@uppy/utils'
 
 const vi_VN: Locale<0 | 1> = {
   strings: {},

packages/@uppy/locales/src/zh_CN.ts

@@ -1,4 +1,4 @@
-import type { Locale } from '@uppy/utils/lib/Translator'
+import type { Locale } from '@uppy/utils'
 
 const zh_CN: Locale<0> = {
   strings: {},

packages/@uppy/locales/src/zh_TW.ts

@@ -1,4 +1,4 @@
-import type { Locale } from '@uppy/utils/lib/Translator'
+import type { Locale } from '@uppy/utils'
 
 const zh_TW: Locale<0> = {
   strings: {},

packages/@uppy/locales/template.ts

@@ -1,4 +1,4 @@
-import type { Locale } from '@uppy/utils/lib/Translator'
+import type { Locale } from '@uppy/utils'
 
 const en_US: Locale<0 | 1> = {
   strings: {},