diff --git a/.yarn/patches/babel-plugin-transform-commonjs-npm-1.1.6-0007fa2809 b/.yarn/patches/babel-plugin-transform-commonjs-npm-1.1.6-0007fa2809
new file mode 100644
index 0000000000..741d93274b
--- /dev/null
+++ b/.yarn/patches/babel-plugin-transform-commonjs-npm-1.1.6-0007fa2809
@@ -0,0 +1,47 @@
+diff --git a/dist/index.js b/dist/index.js
+index 0f9a4b342c75d75309b78a36473fb5c68f7b89b5..57effed56c190a946756d191cb3d390dbc84aee3 100644
+--- a/dist/index.js
++++ b/dist/index.js
+@@ -92,18 +92,32 @@ exports.default = helper_plugin_utils_1.declare((api, options) => {
+ const specifiers = [];
+ // Convert to named import.
+ if (core_1.types.isObjectPattern(path.parentPath.node.id)) {
+- path.parentPath.node.id.properties.forEach(prop => {
+- specifiers.push(core_1.types.importSpecifier(prop.value, prop.key));
+- state.globals.add(prop.value.name);
+- });
+- const decl = core_1.types.importDeclaration(specifiers, core_1.types.stringLiteral(str.value));
+- // @ts-ignore
+- decl.__replaced = true;
+- path.scope.getProgramParent().path.unshiftContainer('body', decl);
+- path.parentPath.remove();
++ if(node.arguments[0].value.startsWith('.') || node.arguments[0].value.startsWith('@uppy/')) {
++ const id = path.scope.generateUidIdentifier(node.arguments[0].value)
++ const destructuring = core_1.types.variableDeclarator(path.parentPath.node.id, id)
++ const decl = core_1.types.importDeclaration([core_1.types.importDefaultSpecifier(id)], core_1.types.stringLiteral(str.value));
++ // @ts-ignore
++ decl.__replaced = true;
++ path.scope.getProgramParent().path.unshiftContainer('body', decl);
++ path.parentPath.replaceWith(destructuring)
++ } else {
++ path.parentPath.node.id.properties.forEach(prop => {
++ specifiers.push(core_1.types.importSpecifier(prop.value, prop.key));
++ state.globals.add(prop.value.name);
++ });
++ const decl = core_1.types.importDeclaration(specifiers, core_1.types.stringLiteral(str.value));
++ // @ts-ignore
++ decl.__replaced = true;
++ path.scope.getProgramParent().path.unshiftContainer('body', decl);
++ path.parentPath.remove()
++ }
+ }
++ else if (node.arguments[0].value === 'tus-js-client' && str) {
++ const decl = core_1.types.importDeclaration([core_1.types.importNamespaceSpecifier(path.parentPath.node.id)], core_1.types.stringLiteral(str.value))
++ path.scope.getProgramParent().path.unshiftContainer('body', decl);
++ path.parentPath.remove()
+ // Convert to default import.
+- else if (str) {
++ } else if (str) {
+ const { parentPath } = path;
+ const { left } = parentPath.node;
+ // @ts-ignore
diff --git a/babel.config.js b/babel.config.js
index 5d811c9e0a..24be08d968 100644
--- a/babel.config.js
+++ b/babel.config.js
@@ -20,7 +20,7 @@ module.exports = (api) => {
],
plugins: [
['@babel/plugin-transform-react-jsx', { pragma: 'h' }],
- 'babel-plugin-inline-package-json',
+ process.env.NODE_ENV !== 'dev' && 'babel-plugin-inline-package-json',
].filter(Boolean),
}
}
diff --git a/examples/dev/Dashboard.js b/examples/dev/Dashboard.js
index 884175dc0a..b7f5bb99f4 100644
--- a/examples/dev/Dashboard.js
+++ b/examples/dev/Dashboard.js
@@ -1,28 +1,28 @@
-// The @uppy/ dependencies are resolved using aliasify
+// The @uppy/ dependencies are resolved from source
/* eslint-disable import/no-extraneous-dependencies */
-const Uppy = require('@uppy/core/src')
-const Dashboard = require('@uppy/dashboard/src')
-const Instagram = require('@uppy/instagram/src')
-const Facebook = require('@uppy/facebook/src')
-const OneDrive = require('@uppy/onedrive/src')
-const Dropbox = require('@uppy/dropbox/src')
-const Box = require('@uppy/box/src')
-const GoogleDrive = require('@uppy/google-drive/src')
-const Unsplash = require('@uppy/unsplash/src')
-const Zoom = require('@uppy/zoom/src')
-const Url = require('@uppy/url/src')
-const Webcam = require('@uppy/webcam/src')
-const ScreenCapture = require('@uppy/screen-capture/src')
-const GoldenRetriever = require('@uppy/golden-retriever/src')
-const Tus = require('@uppy/tus/src')
-const AwsS3 = require('@uppy/aws-s3/src')
-const AwsS3Multipart = require('@uppy/aws-s3-multipart/src')
-const XHRUpload = require('@uppy/xhr-upload/src')
-const Transloadit = require('@uppy/transloadit/src')
-const Form = require('@uppy/form/src')
-const ImageEditor = require('@uppy/image-editor/src')
-const DropTarget = require('@uppy/drop-target/src')
-const Audio = require('@uppy/audio/src')
+import Uppy from '@uppy/core'
+import Dashboard from '@uppy/dashboard'
+import Instagram from '@uppy/instagram'
+import Facebook from '@uppy/facebook'
+import OneDrive from '@uppy/onedrive'
+import Dropbox from '@uppy/dropbox'
+import Box from '@uppy/box'
+import GoogleDrive from '@uppy/google-drive'
+import Unsplash from '@uppy/unsplash'
+import Zoom from '@uppy/zoom'
+import Url from '@uppy/url'
+import Webcam from '@uppy/webcam'
+import ScreenCapture from '@uppy/screen-capture'
+import GoldenRetriever from '@uppy/golden-retriever'
+import Tus from '@uppy/tus'
+import AwsS3 from '@uppy/aws-s3'
+import AwsS3Multipart from '@uppy/aws-s3-multipart'
+import XHRUpload from '@uppy/xhr-upload'
+import Transloadit from '@uppy/transloadit'
+import Form from '@uppy/form'
+import ImageEditor from '@uppy/image-editor'
+import DropTarget from '@uppy/drop-target'
+import Audio from '@uppy/audio'
/* eslint-enable import/no-extraneous-dependencies */
// DEV CONFIG: pick an uploader
@@ -55,7 +55,7 @@ const RESTORE = false
// Rest is implementation! Obviously edit as necessary...
-module.exports = () => {
+export default () => {
const uppyDashboard = new Uppy({
logger: Uppy.debugLogger,
meta: {
diff --git a/examples/dev/DragDrop.js b/examples/dev/DragDrop.js
index 5855ee49d5..ecec190df9 100644
--- a/examples/dev/DragDrop.js
+++ b/examples/dev/DragDrop.js
@@ -1,12 +1,12 @@
-// The @uppy/ dependencies are resolved using aliasify
+// The @uppy/ dependencies are resolved from source
/* eslint-disable import/no-extraneous-dependencies */
-const Uppy = require('@uppy/core/src')
-const Tus = require('@uppy/tus/src')
-const DragDrop = require('@uppy/drag-drop/src')
-const ProgressBar = require('@uppy/progress-bar/src')
+import Uppy from '@uppy/core'
+import Tus from '@uppy/tus'
+import DragDrop from '@uppy/drag-drop'
+import ProgressBar from '@uppy/progress-bar'
/* eslint-enable import/no-extraneous-dependencies */
-module.exports = () => {
+export default () => {
const uppyDragDrop = new Uppy({
debug: true,
autoProceed: true,
diff --git a/examples/dev/Dashboard.html b/examples/dev/index.html
similarity index 93%
rename from examples/dev/Dashboard.html
rename to examples/dev/index.html
index 99a64e8a8c..c2f7b92e48 100644
--- a/examples/dev/Dashboard.html
+++ b/examples/dev/index.html
@@ -51,7 +51,6 @@ Dashboard is here
-
-
+