@uppy/utils: use exports map

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

@@ -1,4 +1,4 @@
-import BasePlugin from '@uppy/core/lib/BasePlugin'
+import BasePlugin from '@uppy/core/lib/BasePlugin.js'
 import { Socket, Provider, RequestClient } from '@uppy/companion-client'
 import EventTracker from '@uppy/utils/lib/EventTracker'
 import emitSocketProgress from '@uppy/utils/lib/emitSocketProgress'

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

@@ -25,7 +25,7 @@
  * the XHRUpload code, but at least it's not horrifically broken :)
  */
 
-import BasePlugin from '@uppy/core/lib/BasePlugin'
+import BasePlugin from '@uppy/core/lib/BasePlugin.js'
 import { RateLimitedQueue, internalRateLimitedQueue } from '@uppy/utils/lib/RateLimitedQueue'
 import { RequestClient } from '@uppy/companion-client'
 

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

@@ -1,4 +1,4 @@
-import BasePlugin from '@uppy/core/lib/BasePlugin'
+import BasePlugin from '@uppy/core/lib/BasePlugin.js'
 import getDroppedFiles from '@uppy/utils/lib/getDroppedFiles'
 import toArray from '@uppy/utils/lib/toArray'
 

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

@@ -1,4 +1,4 @@
-import BasePlugin from '@uppy/core/lib/BasePlugin'
+import BasePlugin from '@uppy/core/lib/BasePlugin.js'
 import findDOMElement from '@uppy/utils/lib/findDOMElement'
 import toArray from '@uppy/utils/lib/toArray'
 

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

@@ -1,5 +1,5 @@
 import throttle from 'lodash.throttle'
-import BasePlugin from '@uppy/core/lib/BasePlugin'
+import BasePlugin from '@uppy/core/lib/BasePlugin.js'
 import ServiceWorkerStore from './ServiceWorkerStore.js'
 import IndexedDBStore from './IndexedDBStore.js'
 import MetaDataStore from './MetaDataStore.js'

packages/@uppy/transloadit/src/index.js

@@ -1,7 +1,7 @@
 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'
+import BasePlugin from '@uppy/core/lib/BasePlugin.js'
 import Tus from '@uppy/tus'
 import Assembly from './Assembly.js'
 import Client from './Client.js'

packages/@uppy/tus/src/index.js

@@ -1,4 +1,4 @@
-import BasePlugin from '@uppy/core/lib/BasePlugin'
+import BasePlugin from '@uppy/core/lib/BasePlugin.js'
 import * as tus from 'tus-js-client'
 import { Provider, RequestClient, Socket } from '@uppy/companion-client'
 import emitSocketProgress from '@uppy/utils/lib/emitSocketProgress'

packages/@uppy/utils/package.json

@@ -3,7 +3,6 @@
   "description": "Shared utility functions for Uppy Core and plugins maintained by the Uppy team.",
   "version": "5.0.0-beta",
   "license": "MIT",
-  "main": "lib/index.js",
   "types": "types/index.d.ts",
   "type": "module",
   "keywords": [
@@ -18,6 +17,37 @@
     "type": "git",
     "url": "git+https://github.com/transloadit/uppy.git"
   },
+  "exports": {
+    "./lib/Translator":"./lib/Translator.js",
+    "./lib/EventTracker":"./lib/EventTracker.js",
+    "./lib/ProgressTimeout":"./lib/ProgressTimeout.js",
+    "./lib/RateLimitedQueue":"./lib/RateLimitedQueue.js",
+    "./lib/canvasToBlob":"./lib/canvasToBlob.js",
+    "./lib/dataURItoBlob":"./lib/dataURItoBlob.js",
+    "./lib/dataURItoFile":"./lib/dataURItoFile.js",
+    "./lib/emitSocketProgress":"./lib/emitSocketProgress.js",
+    "./lib/findAllDOMElements":"./lib/findAllDOMElements.js",
+    "./lib/findDOMElement":"./lib/findDOMElement.js",
+    "./lib/generateFileID":"./lib/generateFileID.js",
+    "./lib/getBytesRemaining":"./lib/getBytesRemaining.js",
+    "./lib/getETA":"./lib/getETA.js",
+    "./lib/getFileNameAndExtension":"./lib/getFileNameAndExtension.js",
+    "./lib/getFileType":"./lib/getFileType.js",
+    "./lib/getFileTypeExtension":"./lib/getFileTypeExtension.js",
+    "./lib/getSocketHost":"./lib/getSocketHost.js",
+    "./lib/getSpeed":"./lib/getSpeed.js",
+    "./lib/getTimeStamp":"./lib/getTimeStamp.js",
+    "./lib/isDOMElement":"./lib/isDOMElement.js",
+    "./lib/isObjectURL":"./lib/isObjectURL.js",
+    "./lib/isDragDropSupported":"./lib/isDragDropSupported.js",
+    "./lib/isPreviewSupported":"./lib/isPreviewSupported.js",
+    "./lib/isTouchDevice":"./lib/isTouchDevice.js",
+    "./lib/prettyETA":"./lib/prettyETA.js",
+    "./lib/secondsToTime":"./lib/secondsToTime.js",
+    "./lib/settle":"./lib/settle.js",
+    "./lib/toArray":"./lib/toArray.js",
+    "./lib/getDroppedFiles":"./lib/getDroppedFiles/index.js"
+  },
   "dependencies": {
     "lodash.throttle": "^4.1.1"
   },

packages/@uppy/utils/types/index.d.ts

@@ -16,7 +16,7 @@ declare module '@uppy/utils/lib/Translator' {
     translateArray (key: string, options: Record<string, unknown>): any[]
   }
 
-  export = Translator
+  export default Translator
 }
 
 declare module '@uppy/utils/lib/EventTracker' {
@@ -36,7 +36,7 @@ declare module '@uppy/utils/lib/EventTracker' {
     remove (): void
   }
 
-  export = EventTracker
+  export default EventTracker
 }
 
 declare module '@uppy/utils/lib/ProgressTimeout' {
@@ -47,7 +47,7 @@ declare module '@uppy/utils/lib/ProgressTimeout' {
 
     done (): void
   }
-  export = ProgressTimeout
+  export default ProgressTimeout
 }
 
 declare module '@uppy/utils/lib/RateLimitedQueue' {
@@ -88,27 +88,27 @@ declare module '@uppy/utils/lib/canvasToBlob' {
     type: string,
     quality?: number
   ): Promise<Blob>
-  export = canvasToBlob
+  export default canvasToBlob
 }
 
 declare module '@uppy/utils/lib/dataURItoBlob' {
   function dataURItoBlob (
     dataURI: string,
     opts: { mimeType?: string; name?: string }
   ): Blob
-  export = dataURItoBlob
+  export default dataURItoBlob
 }
 
 declare module '@uppy/utils/lib/dataURItoFile' {
   function dataURItoFile (
     dataURI: string,
     opts: { mimeType?: string; name?: string }
   ): File
-  export = dataURItoFile
+  export default dataURItoFile
 }
 
 declare module '@uppy/utils/lib/emitSocketProgress' {
-  import UppyUtils = require('@uppy/utils')
+  import type { UppyFile } from '@uppy/utils'
 
   interface ProgressData {
     progress: number
@@ -119,131 +119,131 @@ declare module '@uppy/utils/lib/emitSocketProgress' {
   function emitSocketProgress (
     uploader: unknown,
     progressData: ProgressData,
-    file: UppyUtils.UppyFile
+    file: UppyFile
   ): void
-  export = emitSocketProgress
+  export default emitSocketProgress
 }
 
 declare module '@uppy/utils/lib/findAllDOMElements' {
   function findAllDOMElements (element: string | HTMLElement): HTMLElement[]
-  export = findAllDOMElements
+  export default findAllDOMElements
 }
 
 declare module '@uppy/utils/lib/findDOMElement' {
   function findDOMElement (element: string | HTMLElement): HTMLElement | null
-  export = findDOMElement
+  export default findDOMElement
 }
 
 declare module '@uppy/utils/lib/generateFileID' {
-  import UppyUtils = require('@uppy/utils')
+  import type { UppyFile } from '@uppy/utils'
 
-  function generateFileID (file: UppyUtils.UppyFile): string
-  export = generateFileID
+  function generateFileID (file: UppyFile): string
+  export default generateFileID
 }
 
 declare module '@uppy/utils/lib/getBytesRemaining' {
   function getBytesRemaining (progress: {
     bytesTotal: number
     bytesUploaded: number
   }): number
-  export = getBytesRemaining
+  export default getBytesRemaining
 }
 
 declare module '@uppy/utils/lib/getETA' {
   function getETA (progress: unknown): number
-  export = getETA
+  export default getETA
 }
 
 declare module '@uppy/utils/lib/getFileNameAndExtension' {
   function getFileNameAndExtension(
     filename: string
   ): { name: string, extension: string | undefined }
-  export = getFileNameAndExtension
+  export default getFileNameAndExtension
 }
 
 declare module '@uppy/utils/lib/getFileType' {
-  import UppyUtils = require('@uppy/utils')
+  import type { UppyFile } from '@uppy/utils'
 
-  function getFileType (file: UppyUtils.UppyFile): string
-  export = getFileType
+  function getFileType (file: UppyFile): string
+  export default getFileType
 }
 
 declare module '@uppy/utils/lib/getFileTypeExtension' {
   function getFileTypeExtension (mime: string): string
-  export = getFileTypeExtension
+  export default getFileTypeExtension
 }
 
 declare module '@uppy/utils/lib/getSocketHost' {
   function getSocketHost (url: string): string
-  export = getSocketHost
+  export default getSocketHost
 }
 
 declare module '@uppy/utils/lib/getSpeed' {
   function getSpeed (progress: {
     bytesTotal: number
     bytesUploaded: number
   }): number
-  export = getSpeed
+  export default getSpeed
 }
 
 declare module '@uppy/utils/lib/getTimeStamp' {
   function getTimeStamp (): string
-  export = getTimeStamp
+  export default getTimeStamp
 }
 
 declare module '@uppy/utils/lib/isDOMElement' {
   function isDOMElement (element: any): boolean
-  export = isDOMElement
+  export default isDOMElement
 }
 
 declare module '@uppy/utils/lib/isObjectURL' {
   function isObjectURL (url: string): boolean
-  export = isObjectURL
+  export default isObjectURL
 }
 
 declare module '@uppy/utils/lib/isDragDropSupported' {
   function isDragDropSupported (): boolean
-  export = isDragDropSupported
+  export default isDragDropSupported
 }
 
 declare module '@uppy/utils/lib/isPreviewSupported' {
   function isPreviewSupported (mime: string): boolean
-  export = isPreviewSupported
+  export default isPreviewSupported
 }
 
 declare module '@uppy/utils/lib/isTouchDevice' {
   function isTouchDevice (): boolean
-  export = isTouchDevice
+  export default isTouchDevice
 }
 
 declare module '@uppy/utils/lib/prettyETA' {
   function prettyETA (seconds: number): string
-  export = prettyETA
+  export default prettyETA
 }
 
 declare module '@uppy/utils/lib/secondsToTime' {
   function secondsToTime (seconds: number): string
-  export = secondsToTime
+  export default secondsToTime
 }
 
 declare module '@uppy/utils/lib/settle' {
   function settle<T> (
     promises: Promise<T>[]
   ): Promise<{ successful: T[]; failed: any[] }>
-  export = settle
+  export default settle
 }
 
 declare module '@uppy/utils/lib/toArray' {
   function toArray (list: any): any[]
-  export = toArray
+  export default toArray
 }
 
 declare module '@uppy/utils/lib/getDroppedFiles' {
   function getDroppedFiles (
     dataTransfer: DataTransfer,
     options?: Record<string, unknown>
   ): Promise<File[]>
-  export = getDroppedFiles
+  export default getDroppedFiles
 }
 
 declare module '@uppy/utils' {

packages/@uppy/xhr-upload/src/index.js

@@ -1,4 +1,4 @@
-import BasePlugin from '@uppy/core/lib/BasePlugin'
+import BasePlugin from '@uppy/core/lib/BasePlugin.js'
 import { nanoid } from 'nanoid/non-secure'
 import { Provider, RequestClient, Socket } from '@uppy/companion-client'
 import emitSocketProgress from '@uppy/utils/lib/emitSocketProgress'