transloadit · aduh95 · Oct 17, 2023 · Aug 22, 2023 · Aug 30, 2023 · Aug 30, 2023
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -357,11 +357,13 @@ module.exports = {
         'test/**/*.js',
         'test/**/*.ts',
         '*.test.js',
+        '*.test.ts',
         '*.test-d.ts',
         '*.test-d.tsx',
         'postcss.config.js',
         '.eslintrc.js',
         'private/**/*.js',
+        'private/**/*.mjs',
       ],
       rules: {
         'no-console': 'off',
@@ -461,9 +463,17 @@ module.exports = {
       rules: {
         'import/prefer-default-export': 'off',
         '@typescript-eslint/no-explicit-any': 'off',
+        '@typescript-eslint/no-extra-semi': 'off',
         '@typescript-eslint/no-namespace': 'off',
       },
     },
+    {
+      files: ['packages/@uppy/*/src/**/*.ts', 'packages/@uppy/*/src/**/*.tsx'],
+      excludedFiles: ['packages/@uppy/**/*.test.ts'],
+      rules: {
+        '@typescript-eslint/explicit-function-return-type': 'error',
+      },
+    },
     {
       files: ['**/*.md/*.*'],
       rules: {

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -103,3 +103,5 @@ jobs:
           corepack yarn run build:locale-pack
       - name: Run type tests
         run: corepack yarn run test:type
+      - name: Attempt building TS packages
+        run: corepack yarn run build:ts
diff --git a/.gitignore b/.gitignore
@@ -14,6 +14,8 @@ node_modules
 yarn-error.log
 .idea
 .env
+tsconfig.tsbuildinfo
+tsconfig.build.tsbuildinfo
 
 dist/
 lib/

diff --git a/.prettierignore b/.prettierignore
@@ -3,5 +3,6 @@ node_modules/
 *.jsx
 *.cjs
 *.mjs
+!private/js2ts/*
 *.md
 *.lock
diff --git a/bin/build-lib.js b/bin/build-lib.js
@@ -8,9 +8,9 @@ const path = require('node:path')
 const { mkdir, stat, writeFile } = fs.promises
 
 const PACKAGE_JSON_IMPORT = /^\..*\/package.json$/
-const SOURCE = 'packages/{*,@uppy/*}/src/**/*.js?(x)'
+const SOURCE = 'packages/{*,@uppy/*}/src/**/*.{js,ts}?(x)'
 // Files not to build (such as tests)
-const IGNORE = /\.test\.js$|__mocks__|svelte|angular|companion\//
+const IGNORE = /\.test\.[jt]s$|__mocks__|svelte|angular|companion\//
 // Files that should trigger a rebuild of everything on change
 const META_FILES = [
   'babel.config.js',
@@ -32,32 +32,28 @@ function lastModified (file, createParentDir = false) {
   })
 }
 
-const moduleTypeCache = new Map()
 const versionCache = new Map()
-async function isTypeModule (file) {
-  const packageFolder = file.slice(0, file.indexOf('/src/'))
 
-  const cachedValue = moduleTypeCache.get(packageFolder)
-  if (cachedValue != null) return cachedValue
+async function preparePackage (file) {
+  const packageFolder = file.slice(0, file.indexOf('/src/'))
+  if (versionCache.has(packageFolder)) return
 
   // eslint-disable-next-line import/no-dynamic-require, global-require
-  const { type, version } = require(path.join(__dirname, '..', packageFolder, 'package.json'))
-  const typeModule = type === 'module'
+  const { version } = require(path.join(__dirname, '..', packageFolder, 'package.json'))
   if (process.env.FRESH) {
     // in case it hasn't been done before.
     await mkdir(path.join(packageFolder, 'lib'), { recursive: true })
   }
-  moduleTypeCache.set(packageFolder, typeModule)
   versionCache.set(packageFolder, version)
-  return typeModule
 }
 
+const nonJSImport = /^\.\.?\/.+\.([jt]sx|ts)$/
 // eslint-disable-next-line no-shadow
-function transformJSXImportsToJS (path) {
-  const { value } = path.node.source
-  if (value.endsWith('.jsx') && (value.startsWith('./') || value.startsWith('../'))) {
-    // Rewrite .jsx imports to .js:
-    path.node.source.value = value.slice(0, -1) // eslint-disable-line no-param-reassign
+function rewriteNonJSImportsToJS (path) {
+  const match = nonJSImport.exec(path.node.source.value)
+  if (match) {
+    // eslint-disable-next-line no-param-reassign
+    path.node.source.value = `${match[0].slice(0, -match[1].length)}js`
   }
 }
 
@@ -71,7 +67,8 @@ async function buildLib () {
     if (IGNORE.test(file)) {
       continue
     }
-    const libFile = file.replace('/src/', '/lib/').replace(/\.jsx$/, '.js')
+    await preparePackage(file)
+    const libFile = file.replace('/src/', '/lib/').replace(/\.[jt]sx?$/, '.js')
 
     // on a fresh build, rebuild everything.
     if (!process.env.FRESH) {
@@ -85,11 +82,11 @@ async function buildLib () {
       }
     }
 
-    const plugins = await isTypeModule(file) ? [{
+    const plugins = [{
       visitor: {
         // eslint-disable-next-line no-shadow
         ImportDeclaration (path) {
-          transformJSXImportsToJS(path)
+          rewriteNonJSImportsToJS(path)
           if (PACKAGE_JSON_IMPORT.test(path.node.source.value)
               && path.node.specifiers.length === 1
               && path.node.specifiers[0].type === 'ImportDefaultSpecifier') {
@@ -107,15 +104,18 @@ async function buildLib () {
           }
         },
 
-        ExportAllDeclaration: transformJSXImportsToJS,
+        ExportAllDeclaration: rewriteNonJSImportsToJS,
         // eslint-disable-next-line no-shadow
         ExportNamedDeclaration (path) {
           if (path.node.source != null) {
-            transformJSXImportsToJS(path)
+            rewriteNonJSImportsToJS(path)
           }
         },
       },
-    }] : undefined
+    }]
+    const isTSX = file.endsWith('.tsx')
+    if (isTSX || file.endsWith('.ts')) { plugins.push(['@babel/plugin-transform-typescript', { disallowAmbiguousJSXLike: true, isTSX, jsxPragma: 'h' }]) }
+
     const { code, map } = await babel.transformFileAsync(file, { sourceMaps: true, plugins })
     const [{ default: chalk }] = await Promise.all([
       import('chalk'),

diff --git a/bin/build-ts.mjs b/bin/build-ts.mjs
@@ -0,0 +1,41 @@
+#!/usr/bin/env node
+
+import { spawn } from 'node:child_process'
+import { once } from 'node:events'
+import { existsSync } from 'node:fs'
+import path from 'node:path'
+import { stdin, env } from 'node:process'
+import { createInterface as readLines } from 'node:readline'
+import { fileURLToPath } from 'node:url'
+
+const fromYarn = 'npm_execpath' in env
+const exe = fromYarn ? env.npm_execpath : 'corepack'
+const argv0 = fromYarn ? [] : ['yarn']
+
+const cwd = fileURLToPath(new URL('../', import.meta.url))
+
+for await (const line of readLines(stdin)) {
+  const { location, name } = JSON.parse(line)
+  if (existsSync(path.join(cwd, location, 'tsconfig.json'))) {
+    const cp = spawn(exe, [...argv0, 'tsc', '-p', location], {
+      stdio: 'inherit',
+      cwd,
+    })
+    await Promise.race([
+      once(cp, 'error').then(err => Promise.reject(err)),
+      await once(cp, 'exit')
+        .then(([code]) => (code && Promise.reject(new Error(`Non-zero exit code when building "${name}": ${code}`)))),
+    ])
+  }
+  if (existsSync(path.join(cwd, location, 'tsconfig.build.json'))) {
+    const cp = spawn(exe, [...argv0, 'tsc', '--build', path.join(cwd, location, 'tsconfig.build.json')], {
+      stdio: 'inherit',
+      cwd,
+    })
+    await Promise.race([
+      once(cp, 'error').then(err => Promise.reject(err)),
+      await once(cp, 'exit')
+        .then(([code]) => (code && Promise.reject(new Error(`Non-zero exit code when building "${name}": ${code}`)))),
+    ])
+  }
+}
diff --git a/e2e/cypress/integration/dashboard-transloadit.spec.ts b/e2e/cypress/integration/dashboard-transloadit.spec.ts
@@ -40,6 +40,8 @@ describe('Dashboard with Transloadit', () => {
       cy.get('.uppy-StatusBar-actionBtn--upload').click()
 
       cy.wait(['@createAssemblies']).then(() => {
+        // eslint-disable-next-line
+        // @ts-ignore fix me
         expect(
           Object.values(uppy.getPlugin('Transloadit').activeAssemblies).every(
             (a: any) => a.pollInterval,
@@ -49,6 +51,8 @@ describe('Dashboard with Transloadit', () => {
         uppy.cancelAll()
 
         cy.wait(['@delete']).then(() => {
+          // eslint-disable-next-line
+          // @ts-ignore fix me
           expect(
             Object.values(uppy.getPlugin('Transloadit').activeAssemblies).some(
               (a: any) => a.pollInterval,
@@ -67,6 +71,8 @@ describe('Dashboard with Transloadit', () => {
     const spy = cy.spy()
 
     cy.window().then(({ uppy }) => {
+      // eslint-disable-next-line
+      // @ts-ignore fix me
       uppy.on('transloadit:assembly-cancelled', spy)
 
       cy.get('@file-input').selectFile(
@@ -111,6 +117,8 @@ describe('Dashboard with Transloadit', () => {
     const spy = cy.spy()
 
     cy.window().then(({ uppy }) => {
+      // eslint-disable-next-line
+      // @ts-ignore fix me
       uppy.on('transloadit:assembly-cancelled', spy)
 
       cy.get('@file-input').selectFile(
@@ -141,16 +149,22 @@ describe('Dashboard with Transloadit', () => {
 
       cy.get('.uppy-StatusBar-actionBtn--upload').click()
       cy.wait('@assemblyPolling')
+      // eslint-disable-next-line
+      // @ts-ignore fix me
       expect(
         Object.values(uppy.getPlugin('Transloadit').activeAssemblies).every(
           (a: any) => a.pollInterval,
         ),
       ).to.equal(true)
 
       const { files } = uppy.getState()
+      // eslint-disable-next-line
+      // @ts-ignore fix me
       uppy.removeFiles(Object.keys(files))
 
       cy.wait('@assemblyDeletion').then(() => {
+        // eslint-disable-next-line
+        // @ts-ignore fix me
         expect(
           Object.values(uppy.getPlugin('Transloadit').activeAssemblies).some(
             (a: any) => a.pollInterval,
@@ -172,14 +186,20 @@ describe('Dashboard with Transloadit', () => {
     cy.get('.uppy-StatusBar-actionBtn--upload').click()
 
     cy.window().then(({ uppy }) => {
+      // eslint-disable-next-line
+      // @ts-ignore fix me
       expect(
         Object.values(uppy.getPlugin('Transloadit').activeAssemblies).length,
       ).to.equal(0)
 
       const { files } = uppy.getState()
+      // eslint-disable-next-line
+      // @ts-ignore fix me
       uppy.removeFiles(Object.keys(files))
 
       cy.wait('@createAssemblies').then(() => {
+        // eslint-disable-next-line
+        // @ts-ignore fix me
         expect(
           Object.values(uppy.getPlugin('Transloadit').activeAssemblies).some(
             (a: any) => a.pollInterval,
@@ -201,6 +221,8 @@ describe('Dashboard with Transloadit', () => {
     cy.get('.uppy-StatusBar-actionBtn--upload').click()
 
     cy.window().then(({ uppy }) => {
+      // eslint-disable-next-line
+      // @ts-ignore fix me
       expect(
         Object.values(uppy.getPlugin('Transloadit').activeAssemblies).length,
       ).to.equal(0)

diff --git a/e2e/cypress/integration/react.spec.ts b/e2e/cypress/integration/react.spec.ts
@@ -52,6 +52,8 @@ describe('@uppy/react', () => {
   it('should render Drag & Drop in React and create a thumbail with @uppy/thumbnail-generator', () => {
     const spy = cy.spy()
 
+    // eslint-disable-next-line
+    // @ts-ignore fix me
     cy.window().then(({ uppy }) => uppy.on('thumbnail:generated', spy))
     cy.get('@dragdrop-input').selectFile(
       [

diff --git a/e2e/package.json b/e2e/package.json
@@ -49,7 +49,6 @@
     "cypress": "^13.0.0",
     "cypress-terminal-report": "^5.0.0",
     "deep-freeze": "^0.0.1",
-    "execa": "^6.1.0",
     "parcel": "^2.9.3",
     "process": "^0.11.10",
     "prompts": "^2.4.2",

diff --git a/e2e/start-companion-with-load-balancer.mjs b/e2e/start-companion-with-load-balancer.mjs
@@ -1,8 +1,9 @@
 #!/usr/bin/env node
 
-import { execa } from 'execa'
+import { spawn } from 'node:child_process'
 import http from 'node:http'
 import httpProxy from 'http-proxy'
+import process from 'node:process'
 
 const numInstances = 3
 const lbPort = 3020
@@ -45,20 +46,42 @@ function createLoadBalancer (baseUrls) {
   return server
 }
 
-const startCompanion = ({ name, port }) => execa('nodemon', [
-  '--watch', 'packages/@uppy/companion/src', '--exec', 'node', '-r', 'dotenv/config', './packages/@uppy/companion/src/standalone/start-server.js',
-], {
-  cwd: new URL('../', import.meta.url),
-  stdio: 'inherit',
-  env: {
-    // Note: these env variables will override anything set in .env
-    COMPANION_PORT: port,
-    COMPANION_SECRET: 'development', // multi instance will not work without secret set
-    COMPANION_PREAUTH_SECRET: 'development', // multi instance will not work without secret set
-    COMPANION_ALLOW_LOCAL_URLS: 'true',
-    COMPANION_LOGGER_PROCESS_NAME: name,
-  },
-})
+const isWindows = process.platform === 'win32'
+const isOSX = process.platform === 'darwin'
+
+const startCompanion = ({ name, port }) => {
+  const cp = spawn(process.execPath, [
+    '-r', 'dotenv/config',
+    // Watch mode support is limited to Windows and macOS at the time of writing.
+    ...(isWindows || isOSX ? ['--watch-path', 'packages/@uppy/companion/src', '--watch'] : []),
+    './packages/@uppy/companion/src/standalone/start-server.js',
+  ], {
+    cwd: new URL('../', import.meta.url),
+    stdio: 'inherit',
+    env: {
+      // Note: these env variables will override anything set in .env
+      ...process.env,
+      COMPANION_PORT: port,
+      COMPANION_SECRET: 'development', // multi instance will not work without secret set
+      COMPANION_PREAUTH_SECRET: 'development', // multi instance will not work without secret set
+      COMPANION_ALLOW_LOCAL_URLS: 'true',
+      COMPANION_LOGGER_PROCESS_NAME: name,
+    },
+  })
+  // Adding a `then` property so the return value is awaitable:
+  return Object.defineProperty(cp, 'then', {
+    __proto__: null,
+    writable: true,
+    configurable: true,
+    value: Promise.prototype.then.bind(new Promise((resolve, reject) => {
+      cp.on('exit', (code) => {
+        if (code === 0) resolve(cp)
+        else reject(new Error(`Non-zero exit code: ${code}`))
+      })
+      cp.on('error', reject)
+    })),
+  })
+}
 
 const hosts = Array.from({ length: numInstances }, (_, index) => {
   const port = companionStartPort + index

diff --git a/e2e/tsconfig.json b/e2e/tsconfig.json
@@ -1,5 +1,7 @@
 {
   "compilerOptions": {
+    "moduleResolution": "NodeNext",
+    "noEmit": true,
     "target": "es2020",
     "lib": ["es2020", "dom"],
     "types": ["cypress"]

diff --git a/examples/svelte-example/package.json b/examples/svelte-example/package.json
@@ -26,9 +26,9 @@
     "rollup-plugin-terser": "^7.0.0",
     "svelte": ">=3.24.0",
     "svelte-check": "^1.6.0",
-    "svelte-preprocess": "^4.6.1",
+    "svelte-preprocess": "^5.0.0",
     "tslib": "^2.0.0",
-    "typescript": "~4.8"
+    "typescript": "~5.1"
   },
   "dependencies": {
     "@uppy/core": "workspace:*",
-Original file line number
+Diff line change
@@ Expand Up / @@ -14,6 +14,8 @@ node_modules @@
     yarn-error.log
     .idea
     .env
+    tsconfig.tsbuildinfo
+    tsconfig.build.tsbuildinfo
     dist/
     lib/
@@ Expand Down @@