diff --git a/.eslintrc.js b/.eslintrc.js
index 8e4d0624de..013859d0d9 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -203,6 +203,7 @@ module.exports = {
         'packages/@uppy/drag-drop/src/**/*.js',
         'packages/@uppy/drop-target/src/**/*.js',
         'packages/@uppy/compressor/src/**/*.js',
+        'packages/@uppy/form/src/**/*.js',
         'packages/@uppy/vue/src/**/*.js',
       ],
       parserOptions: {
diff --git a/bin/build-lib.js b/bin/build-lib.js
index 55fa623633..5d39b5971e 100644
--- a/bin/build-lib.js
+++ b/bin/build-lib.js
@@ -21,6 +21,12 @@ const META_FILES = [
   'bin/build-lib.js',
 ]
 
+// Rollup uses get-form-data's ES modules build, and rollup-plugin-commonjs automatically resolves `.default`.
+// So, if we are being built using rollup, this require() won't have a `.default` property.
+const esPackagesThatNeedSpecialTreatmentForRollupInterop = [
+  'get-form-data',
+]
+
 function lastModified (file, createParentDir = false) {
   return stat(file).then((s) => s.mtime, async (err) => {
     if (err.code === 'ENOENT') {
@@ -150,13 +156,18 @@ async function buildLib () {
                 local,
               )]))
             }
+
+            let requireCall = t.callExpression(t.identifier('require'), [
+              t.stringLiteral(value),
+            ])
+            if (esPackagesThatNeedSpecialTreatmentForRollupInterop.includes(value)) {
+              requireCall = t.logicalExpression('||', t.memberExpression(requireCall, t.identifier('default')), requireCall)
+            }
             path.replaceWith(
               t.variableDeclaration('const', [
                 t.variableDeclarator(
                   local,
-                  t.callExpression(t.identifier('require'), [
-                    t.stringLiteral(value),
-                  ]),
+                  requireCall,
                 ),
               ]),
             )
diff --git a/packages/@uppy/form/package.json b/packages/@uppy/form/package.json
index 6c2458ecc9..f0eaf8bb64 100644
--- a/packages/@uppy/form/package.json
+++ b/packages/@uppy/form/package.json
@@ -4,6 +4,7 @@
   "version": "2.0.4",
   "license": "MIT",
   "main": "lib/index.js",
+  "type": "module",
   "types": "types/index.d.ts",
   "keywords": [
     "file uploader",
diff --git a/packages/@uppy/form/src/index.js b/packages/@uppy/form/src/index.js
index 3e3575df0b..81e58f9a5d 100644
--- a/packages/@uppy/form/src/index.js
+++ b/packages/@uppy/form/src/index.js
@@ -1,15 +1,16 @@
-const BasePlugin = require('@uppy/core/lib/BasePlugin')
-const findDOMElement = require('@uppy/utils/lib/findDOMElement')
-const toArray = require('@uppy/utils/lib/toArray')
-// Rollup uses get-form-data's ES modules build, and rollup-plugin-commonjs automatically resolves `.default`.
-// So, if we are being built using rollup, this require() won't have a `.default` property.
-const getFormData = require('get-form-data').default || require('get-form-data')
+import BasePlugin from '@uppy/core/lib/BasePlugin'
+import findDOMElement from '@uppy/utils/lib/findDOMElement'
+import toArray from '@uppy/utils/lib/toArray'
+
+import getFormData from 'get-form-data'
+
+import packageJson from '../package.json'
 
 /**
  * Form
  */
-module.exports = class Form extends BasePlugin {
-  static VERSION = require('../package.json').version
+export default class Form extends BasePlugin {
+  static VERSION = packageJson.version
 
   constructor (uppy, opts) {
     super(uppy, opts)
@@ -61,17 +62,17 @@ module.exports = class Form extends BasePlugin {
       elements.forEach((el) => {
         const isButton = el.tagName === 'BUTTON' || (el.tagName === 'INPUT' && el.type === 'submit')
         if (isButton && !el.disabled) {
-          el.disabled = true
+          el.disabled = true // eslint-disable-line no-param-reassign
           disabledByUppy.push(el)
         }
       })
       this.uppy.upload().then(() => {
         disabledByUppy.forEach((button) => {
-          button.disabled = false
+          button.disabled = false // eslint-disable-line no-param-reassign
         })
       }, (err) => {
         disabledByUppy.forEach((button) => {
-          button.disabled = false
+          button.disabled = false // eslint-disable-line no-param-reassign
         })
         return Promise.reject(err)
       }).catch((err) => {