Use .js(x) for all imports instead .ts(x) (#5573)

.eslintrc.js

@@ -438,9 +438,6 @@ 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',

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

@@ -9,10 +9,10 @@ import type {
 import type { Uppy } from '@uppy/core/lib/Uppy.js'
 
 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'

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

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

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", () => {

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'

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', () => {

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

@@ -3,11 +3,11 @@ 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)

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
 

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 = {

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

@@ -3,7 +3,7 @@ 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 AwsS3Multipart, { type AwsBody } from './index.js'
 
 const KB = 1024
 const MB = KB * KB

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

@@ -14,16 +14,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'
@@ -290,7 +290,7 @@ const defaultOptions = {
   retryDelays: [0, 1000, 3000, 5000],
 } satisfies Partial<AwsS3MultipartOptions<any, any>>
 
-export type { AwsBody } from './utils.ts'
+export type { AwsBody } from './utils.js'
 
 export default class AwsS3Multipart<
   M extends Meta,

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) {

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

@@ -14,7 +14,7 @@ import type {
   UnknownProviderPlugin,
   UnknownProviderPluginState,
 } from '@uppy/core/lib/Uppy.js'
-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'

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'

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

@@ -6,9 +6,9 @@ import type {
   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

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', () => {

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'

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

@@ -1,7 +1,7 @@
 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'
+import RequestClient, { type Opts } from './RequestClient.js'
 
 const getName = (id: string): string => {
   return id

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', () => {

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'

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

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

@@ -9,7 +9,7 @@ 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 locale from './locale.ts'
+import locale from './locale.js'
 
 declare module '@uppy/core' {
   export interface UppyEventMap<M extends Meta, B extends Body> {

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

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

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

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', () => {

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.

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

@@ -8,21 +8,21 @@ import path from 'node:path'
 import prettierBytes from '@transloadit/prettier-bytes'
 import type { Body, Meta } from '@uppy/utils/lib/UppyFile'
 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

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[],

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

@@ -1,4 +1,4 @@
-export { default } from './Uppy.ts'
+export { default } from './Uppy.js'
 export {
   default as Uppy,
   type State,
@@ -8,13 +8,13 @@ export {
   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'
+} from './Uppy.js'
+export { default as UIPlugin } from './UIPlugin.js'
+export { default as BasePlugin } from './BasePlugin.js'
+export { debugLogger } from './loggers.js'
 
 export type { Store } from '@uppy/store-default'
 
-export type { UIPluginOptions } from './UIPlugin.ts'
+export type { UIPluginOptions } from './UIPlugin.js'
 
 export type { UppyFile, Meta, Body } from '@uppy/utils/lib/UppyFile'

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<typeof vi.fn>