@uppy/aws-s3: refactor to ESM (#3673)

.eslintrc.js

@@ -197,6 +197,7 @@ module.exports = {
 
         // Packages that have switched to ESM sources:
         'packages/@uppy/audio/src/**/*.js',
+        'packages/@uppy/aws-s3/src/**/*.js',
         'packages/@uppy/box/src/**/*.js',
         'packages/@uppy/compressor/src/**/*.js',
         'packages/@uppy/drag-drop/src/**/*.js',

packages/@uppy/aws-s3/package.json

@@ -4,6 +4,7 @@
   "version": "2.1.0",
   "license": "MIT",
   "main": "lib/index.js",
+  "type": "module",
   "types": "types/index.d.ts",
   "keywords": [
     "file uploader",

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

@@ -1,13 +1,13 @@
-const { nanoid } = require('nanoid/non-secure')
-const { Provider, RequestClient, Socket } = require('@uppy/companion-client')
-const emitSocketProgress = require('@uppy/utils/lib/emitSocketProgress')
-const getSocketHost = require('@uppy/utils/lib/getSocketHost')
-const EventTracker = require('@uppy/utils/lib/EventTracker')
-const ProgressTimeout = require('@uppy/utils/lib/ProgressTimeout')
-const ErrorWithCause = require('@uppy/utils/lib/ErrorWithCause')
-const NetworkError = require('@uppy/utils/lib/NetworkError')
-const isNetworkError = require('@uppy/utils/lib/isNetworkError')
-const { internalRateLimitedQueue } = require('@uppy/utils/lib/RateLimitedQueue')
+import { nanoid } from 'nanoid/non-secure'
+import { Provider, RequestClient, Socket } from '@uppy/companion-client'
+import emitSocketProgress from '@uppy/utils/lib/emitSocketProgress'
+import getSocketHost from '@uppy/utils/lib/getSocketHost'
+import EventTracker from '@uppy/utils/lib/EventTracker'
+import ProgressTimeout from '@uppy/utils/lib/ProgressTimeout'
+import ErrorWithCause from '@uppy/utils/lib/ErrorWithCause'
+import NetworkError from '@uppy/utils/lib/NetworkError'
+import isNetworkError from '@uppy/utils/lib/isNetworkError'
+import { internalRateLimitedQueue } from '@uppy/utils/lib/RateLimitedQueue'
 
 // See XHRUpload
 function buildResponseError (xhr, error) {
@@ -52,7 +52,7 @@ function createFormDataUpload (file, opts) {
 
 const createBareUpload = file => file.data
 
-module.exports = class MiniXHRUpload {
+export default class MiniXHRUpload {
   constructor (uppy, opts) {
     this.uppy = uppy
     this.opts = {

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

@@ -25,13 +25,14 @@
  * the XHRUpload code, but at least it's not horrifically broken :)
  */
 
-const BasePlugin = require('@uppy/core/lib/BasePlugin')
-const { RateLimitedQueue, internalRateLimitedQueue } = require('@uppy/utils/lib/RateLimitedQueue')
-const { RequestClient } = require('@uppy/companion-client')
-const MiniXHRUpload = require('./MiniXHRUpload')
-const isXml = require('./isXml')
+import BasePlugin from '@uppy/core/lib/BasePlugin'
+import { RateLimitedQueue, internalRateLimitedQueue } from '@uppy/utils/lib/RateLimitedQueue'
+import { RequestClient } from '@uppy/companion-client'
 
-const locale = require('./locale')
+import packageJson from '../package.json'
+import MiniXHRUpload from './MiniXHRUpload.js'
+import isXml from './isXml.js'
+import locale from './locale.js'
 
 function resolveUrl (origin, link) {
   return new URL(link, origin || undefined).toString()
@@ -94,9 +95,8 @@ function defaultGetResponseError (content, xhr) {
 // warning deduplication flag: see `getResponseData()` XHRUpload option definition
 let warnedSuccessActionStatus = false
 
-module.exports = class AwsS3 extends BasePlugin {
-  // eslint-disable-next-line global-require
-  static VERSION = require('../package.json').version
+export default class AwsS3 extends BasePlugin {
+  static VERSION = packageJson.version
 
   #client
 

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

@@ -1,6 +1,6 @@
-require('whatwg-fetch')
-const Core = require('@uppy/core')
-const AwsS3 = require('.')
+import 'whatwg-fetch'
+import Core from '@uppy/core'
+import AwsS3 from './index.js'
 
 describe('AwsS3', () => {
   it('Registers AwsS3 upload plugin', () => {

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

@@ -32,4 +32,4 @@ function isXml (content, xhr) {
   return false
 }
 
-module.exports = isXml
+export default isXml

packages/@uppy/aws-s3/src/isXml.test.js

@@ -1,4 +1,4 @@
-const isXml = require('./isXml')
+import isXml from './isXml.js'
 
 describe('AwsS3', () => {
   describe('isXml', () => {

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

@@ -1,4 +1,4 @@
-module.exports = {
+export default  {
   strings: {
     timedOut: 'Upload stalled for %{seconds} seconds, aborting.',
   },

website/src/docs/aws-s3.md

@@ -118,7 +118,7 @@ This option is useful when uploading to an S3-like service that doesn’t reply
 <!-- eslint-disable no-restricted-globals, no-multiple-empty-lines -->
 
 ```js
-module.exports = {
+export default  {
   strings: {
     timedOut: 'Upload stalled for %{seconds} seconds, aborting.',
   },