diff --git a/examples/custom-provider/client/MyCustomProvider.js b/examples/custom-provider/client/MyCustomProvider.js index a290f0556..62ba459c1 100644 --- a/examples/custom-provider/client/MyCustomProvider.js +++ b/examples/custom-provider/client/MyCustomProvider.js @@ -1,4 +1,4 @@ -const Plugin = require('@uppy/core/lib/Plugin') +const { Plugin } = require('@uppy/core') const { Provider } = require('@uppy/server-utils') const ProviderViews = require('@uppy/provider-views') const { h } = require('preact') diff --git a/packages/@uppy/aws-s3-multipart/src/index.js b/packages/@uppy/aws-s3-multipart/src/index.js index fb4225451..b88f38615 100644 --- a/packages/@uppy/aws-s3-multipart/src/index.js +++ b/packages/@uppy/aws-s3-multipart/src/index.js @@ -1,4 +1,4 @@ -const Plugin = require('@uppy/core/lib/Plugin') +const { Plugin } = require('@uppy/core') const { Socket, RequestClient } = require('@uppy/server-utils') const emitSocketProgress = require('@uppy/utils/lib/emitSocketProgress') const getSocketHost = require('@uppy/utils/lib/getSocketHost') diff --git a/packages/@uppy/aws-s3/src/index.js b/packages/@uppy/aws-s3/src/index.js index bc8b92b32..7cae635a7 100644 --- a/packages/@uppy/aws-s3/src/index.js +++ b/packages/@uppy/aws-s3/src/index.js @@ -1,5 +1,5 @@ const resolveUrl = require('resolve-url') -const Plugin = require('@uppy/core/lib/Plugin') +const { Plugin } = require('@uppy/core') const Translator = require('@uppy/utils/lib/Translator') const limitPromises = require('@uppy/utils/lib/limitPromises') const XHRUpload = require('@uppy/xhr-upload') diff --git a/packages/@uppy/core/src/index.js b/packages/@uppy/core/src/index.js index c6bc330af..6d229c79c 100644 --- a/packages/@uppy/core/src/index.js +++ b/packages/@uppy/core/src/index.js @@ -10,6 +10,7 @@ const getFileNameAndExtension = require('@uppy/utils/lib/getFileNameAndExtension const generateFileID = require('@uppy/utils/lib/generateFileID') const isObjectURL = require('@uppy/utils/lib/isObjectURL') const getTimeStamp = require('@uppy/utils/lib/getTimeStamp') +const Plugin = require('./Plugin') // Exported from here. /** * Uppy Core module. @@ -1220,3 +1221,4 @@ module.exports = function (opts) { // Expose class constructor. module.exports.Uppy = Uppy +module.exports.Plugin = Plugin diff --git a/packages/@uppy/dashboard/src/index.js b/packages/@uppy/dashboard/src/index.js index eff0ac698..2bd7d632c 100644 --- a/packages/@uppy/dashboard/src/index.js +++ b/packages/@uppy/dashboard/src/index.js @@ -1,4 +1,4 @@ -const Plugin = require('@uppy/core/lib/Plugin') +const { Plugin } = require('@uppy/core') const Translator = require('@uppy/utils/lib/Translator') const dragDrop = require('drag-drop') const DashboardUI = require('./Dashboard') diff --git a/packages/@uppy/drag-drop/src/index.js b/packages/@uppy/drag-drop/src/index.js index 62eb5dee9..f9e25a4e5 100644 --- a/packages/@uppy/drag-drop/src/index.js +++ b/packages/@uppy/drag-drop/src/index.js @@ -1,4 +1,4 @@ -const Plugin = require('@uppy/core/lib/Plugin') +const { Plugin } = require('@uppy/core') const Translator = require('@uppy/utils/lib/Translator') const toArray = require('@uppy/utils/lib/toArray') const dragDrop = require('drag-drop') diff --git a/packages/@uppy/dropbox/src/index.js b/packages/@uppy/dropbox/src/index.js index 961b31c6b..a3c4cc191 100644 --- a/packages/@uppy/dropbox/src/index.js +++ b/packages/@uppy/dropbox/src/index.js @@ -1,4 +1,4 @@ -const Plugin = require('@uppy/core/lib/Plugin') +const { Plugin } = require('@uppy/core') const { Provider } = require('@uppy/server-utils') const ProviderViews = require('@uppy/provider-views') const icons = require('./icons') diff --git a/packages/@uppy/file-input/src/index.js b/packages/@uppy/file-input/src/index.js index 960be4284..456eb850c 100644 --- a/packages/@uppy/file-input/src/index.js +++ b/packages/@uppy/file-input/src/index.js @@ -1,4 +1,4 @@ -const Plugin = require('@uppy/core/lib/Plugin') +const { Plugin } = require('@uppy/core') const toArray = require('@uppy/utils/lib/toArray') const Translator = require('@uppy/utils/lib/Translator') const { h } = require('preact') diff --git a/packages/@uppy/form/src/index.js b/packages/@uppy/form/src/index.js index 55ae9f722..2f741883d 100644 --- a/packages/@uppy/form/src/index.js +++ b/packages/@uppy/form/src/index.js @@ -1,4 +1,4 @@ -const Plugin = require('@uppy/core/lib/Plugin') +const { Plugin } = require('@uppy/core') const findDOMElement = require('@uppy/utils/lib/findDOMElement') // 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. diff --git a/packages/@uppy/golden-retriever/src/index.js b/packages/@uppy/golden-retriever/src/index.js index ccb13f284..a50a9f28b 100644 --- a/packages/@uppy/golden-retriever/src/index.js +++ b/packages/@uppy/golden-retriever/src/index.js @@ -1,4 +1,4 @@ -const Plugin = require('@uppy/core/lib/Plugin') +const { Plugin } = require('@uppy/core') const ServiceWorkerStore = require('./ServiceWorkerStore') const IndexedDBStore = require('./IndexedDBStore') const MetaDataStore = require('./MetaDataStore') diff --git a/packages/@uppy/google-drive/src/index.js b/packages/@uppy/google-drive/src/index.js index a985cfe3c..19181053c 100644 --- a/packages/@uppy/google-drive/src/index.js +++ b/packages/@uppy/google-drive/src/index.js @@ -1,4 +1,4 @@ -const Plugin = require('@uppy/core/lib/Plugin') +const { Plugin } = require('@uppy/core') const { Provider } = require('@uppy/server-utils') const ProviderViews = require('@uppy/provider-views') const { h } = require('preact') diff --git a/packages/@uppy/informer/src/index.js b/packages/@uppy/informer/src/index.js index ae12e8add..27b49cefb 100644 --- a/packages/@uppy/informer/src/index.js +++ b/packages/@uppy/informer/src/index.js @@ -1,4 +1,4 @@ -const Plugin = require('@uppy/core/lib/Plugin') +const { Plugin } = require('@uppy/core') const { h } = require('preact') /** diff --git a/packages/@uppy/instagram/src/index.js b/packages/@uppy/instagram/src/index.js index 826a2d5e7..e71824642 100644 --- a/packages/@uppy/instagram/src/index.js +++ b/packages/@uppy/instagram/src/index.js @@ -1,4 +1,4 @@ -const Plugin = require('@uppy/core/lib/Plugin') +const { Plugin } = require('@uppy/core') const { Provider } = require('@uppy/server-utils') const ProviderViews = require('@uppy/provider-views') const { h } = require('preact') diff --git a/packages/@uppy/progress-bar/src/index.js b/packages/@uppy/progress-bar/src/index.js index 6359976b6..f09f1e35a 100644 --- a/packages/@uppy/progress-bar/src/index.js +++ b/packages/@uppy/progress-bar/src/index.js @@ -1,4 +1,4 @@ -const Plugin = require('@uppy/core/lib/Plugin') +const { Plugin } = require('@uppy/core') const { h } = require('preact') /** diff --git a/packages/@uppy/react/src/__mocks__/DashboardPlugin.js b/packages/@uppy/react/src/__mocks__/DashboardPlugin.js index a3681d82c..c5c0b8b6b 100644 --- a/packages/@uppy/react/src/__mocks__/DashboardPlugin.js +++ b/packages/@uppy/react/src/__mocks__/DashboardPlugin.js @@ -1,4 +1,4 @@ -const Plugin = require('@uppy/core/lib/Plugin') +const { Plugin } = require('@uppy/core') module.exports = class Dashboard extends Plugin { constructor (uppy, opts) { diff --git a/packages/@uppy/react/src/__mocks__/DragDropPlugin.js b/packages/@uppy/react/src/__mocks__/DragDropPlugin.js index efa5dd3a5..58b211481 100644 --- a/packages/@uppy/react/src/__mocks__/DragDropPlugin.js +++ b/packages/@uppy/react/src/__mocks__/DragDropPlugin.js @@ -1,4 +1,4 @@ -const Plugin = require('@uppy/core/lib/Plugin') +const { Plugin } = require('@uppy/core') module.exports = class DragDrop extends Plugin { constructor (uppy, opts) { diff --git a/packages/@uppy/react/src/__mocks__/ProgressBarPlugin.js b/packages/@uppy/react/src/__mocks__/ProgressBarPlugin.js index e2dbdd333..752247bc6 100644 --- a/packages/@uppy/react/src/__mocks__/ProgressBarPlugin.js +++ b/packages/@uppy/react/src/__mocks__/ProgressBarPlugin.js @@ -1,4 +1,4 @@ -const Plugin = require('@uppy/core/lib/Plugin') +const { Plugin } = require('@uppy/core') module.exports = class ProgressBar extends Plugin { constructor (uppy, opts) { diff --git a/packages/@uppy/react/src/__mocks__/StatusBarPlugin.js b/packages/@uppy/react/src/__mocks__/StatusBarPlugin.js index cb41cb1d9..e954fff54 100644 --- a/packages/@uppy/react/src/__mocks__/StatusBarPlugin.js +++ b/packages/@uppy/react/src/__mocks__/StatusBarPlugin.js @@ -1,4 +1,4 @@ -const Plugin = require('@uppy/core/lib/Plugin') +const { Plugin } = require('@uppy/core') module.exports = class StatusBar extends Plugin { constructor (uppy, opts) { diff --git a/packages/@uppy/redux-dev-tools/src/index.js b/packages/@uppy/redux-dev-tools/src/index.js index 52fa6fa78..2b98ec463 100644 --- a/packages/@uppy/redux-dev-tools/src/index.js +++ b/packages/@uppy/redux-dev-tools/src/index.js @@ -1,4 +1,4 @@ -const Plugin = require('@uppy/core/lib/Plugin') +const { Plugin } = require('@uppy/core') /** * Add Redux DevTools support to Uppy diff --git a/packages/@uppy/status-bar/src/index.js b/packages/@uppy/status-bar/src/index.js index 7aa610894..77dc9f646 100644 --- a/packages/@uppy/status-bar/src/index.js +++ b/packages/@uppy/status-bar/src/index.js @@ -1,4 +1,4 @@ -const Plugin = require('@uppy/core/lib/Plugin') +const { Plugin } = require('@uppy/core') const Translator = require('@uppy/utils/lib/Translator') const StatusBarUI = require('./StatusBar') const statusBarStates = require('./StatusBarStates') diff --git a/packages/@uppy/thumbnail-generator/src/index.js b/packages/@uppy/thumbnail-generator/src/index.js index 1fc1ff999..437f5f254 100644 --- a/packages/@uppy/thumbnail-generator/src/index.js +++ b/packages/@uppy/thumbnail-generator/src/index.js @@ -1,4 +1,4 @@ -const Plugin = require('@uppy/core/lib/Plugin') +const { Plugin } = require('@uppy/core') const dataURItoBlob = require('@uppy/utils/lib/dataURItoBlob') const isPreviewSupported = require('@uppy/utils/lib/isPreviewSupported') diff --git a/packages/@uppy/thumbnail-generator/src/index.test.js b/packages/@uppy/thumbnail-generator/src/index.test.js index df5fbe3f1..59ea50464 100644 --- a/packages/@uppy/thumbnail-generator/src/index.test.js +++ b/packages/@uppy/thumbnail-generator/src/index.test.js @@ -1,5 +1,5 @@ const ThumbnailGeneratorPlugin = require('./index') -const Plugin = require('@uppy/core/lib/Plugin') +const { Plugin } = require('@uppy/core') const emitter = require('namespace-emitter') const delay = duration => new Promise(resolve => setTimeout(resolve, duration)) diff --git a/packages/@uppy/transloadit/src/index.js b/packages/@uppy/transloadit/src/index.js index ac2594acc..9aaa1e3d1 100644 --- a/packages/@uppy/transloadit/src/index.js +++ b/packages/@uppy/transloadit/src/index.js @@ -1,5 +1,5 @@ const Translator = require('@uppy/utils/lib/Translator') -const Plugin = require('@uppy/core/lib/Plugin') +const { Plugin } = require('@uppy/core') const Tus = require('@uppy/tus') const Client = require('./Client') const StatusSocket = require('./Socket') diff --git a/packages/@uppy/tus/src/index.js b/packages/@uppy/tus/src/index.js index acf64f336..380811be8 100644 --- a/packages/@uppy/tus/src/index.js +++ b/packages/@uppy/tus/src/index.js @@ -1,4 +1,4 @@ -const Plugin = require('@uppy/core/lib/Plugin') +const { Plugin } = require('@uppy/core') const tus = require('tus-js-client') const { Provider, RequestClient, Socket } = require('@uppy/server-utils') const emitSocketProgress = require('@uppy/utils/lib/emitSocketProgress') diff --git a/packages/@uppy/url/src/index.js b/packages/@uppy/url/src/index.js index 37d4c022b..992138a32 100644 --- a/packages/@uppy/url/src/index.js +++ b/packages/@uppy/url/src/index.js @@ -1,4 +1,4 @@ -const Plugin = require('@uppy/core/lib/Plugin') +const { Plugin } = require('@uppy/core') const Translator = require('@uppy/utils/lib/Translator') const { h } = require('preact') const { RequestClient } = require('@uppy/server-utils') diff --git a/packages/@uppy/webcam/src/index.js b/packages/@uppy/webcam/src/index.js index 9cbc722af..2c9cf0458 100644 --- a/packages/@uppy/webcam/src/index.js +++ b/packages/@uppy/webcam/src/index.js @@ -1,5 +1,5 @@ const { h } = require('preact') -const Plugin = require('@uppy/core/lib/Plugin') +const { Plugin } = require('@uppy/core') const Translator = require('@uppy/utils/lib/Translator') const getFileTypeExtension = require('@uppy/utils/lib/getFileTypeExtension') const canvasToBlob = require('@uppy/utils/lib/canvasToBlob') diff --git a/packages/@uppy/xhr-upload/src/index.js b/packages/@uppy/xhr-upload/src/index.js index 1ed32884a..110b049ee 100644 --- a/packages/@uppy/xhr-upload/src/index.js +++ b/packages/@uppy/xhr-upload/src/index.js @@ -1,4 +1,4 @@ -const Plugin = require('@uppy/core/lib/Plugin') +const { Plugin } = require('@uppy/core') const cuid = require('cuid') const Translator = require('@uppy/utils/lib/Translator') const { Provider, Socket } = require('@uppy/server-utils') diff --git a/test/mocks/acquirerPlugin1.js b/test/mocks/acquirerPlugin1.js index 14a4f2247..c92692b2b 100644 --- a/test/mocks/acquirerPlugin1.js +++ b/test/mocks/acquirerPlugin1.js @@ -1,4 +1,4 @@ -const Plugin = require('../../packages/@uppy/core/lib/Plugin') +const { Plugin } = require('../../packages/@uppy/core') module.exports = class TestSelector1 extends Plugin { constructor (uppy, opts) { diff --git a/test/mocks/acquirerPlugin2.js b/test/mocks/acquirerPlugin2.js index bf2594ad3..551b5ffa5 100644 --- a/test/mocks/acquirerPlugin2.js +++ b/test/mocks/acquirerPlugin2.js @@ -1,4 +1,4 @@ -const Plugin = require('../../packages/@uppy/core/lib/Plugin') +const { Plugin } = require('../../packages/@uppy/core') module.exports = class TestSelector2 extends Plugin { constructor (uppy, opts) { diff --git a/test/mocks/invalidPluginWithoutId.js b/test/mocks/invalidPluginWithoutId.js index a1901c499..43664bd35 100644 --- a/test/mocks/invalidPluginWithoutId.js +++ b/test/mocks/invalidPluginWithoutId.js @@ -1,4 +1,4 @@ -const Plugin = require('../../packages/@uppy/core/lib/Plugin') +const { Plugin } = require('../../packages/@uppy/core') module.exports = class InvalidPluginWithoutName extends Plugin { constructor (uppy, opts) { diff --git a/test/mocks/invalidPluginWithoutType.js b/test/mocks/invalidPluginWithoutType.js index c5fd74d35..8b6dc54ee 100644 --- a/test/mocks/invalidPluginWithoutType.js +++ b/test/mocks/invalidPluginWithoutType.js @@ -1,4 +1,4 @@ -const Plugin = require('../../packages/@uppy/core/lib/Plugin') +const { Plugin } = require('../../packages/@uppy/core') module.exports = class InvalidPluginWithoutType extends Plugin { constructor (uppy, opts) { diff --git a/website/src/docs/writing-plugins.md b/website/src/docs/writing-plugins.md index 9a1afff43..1eaccc428 100644 --- a/website/src/docs/writing-plugins.md +++ b/website/src/docs/writing-plugins.md @@ -18,7 +18,7 @@ Plugins are classes that extend from Uppy's `Plugin` class. Each plugin has an ` The plugin constructor receives the Uppy instance in the first parameter, and any options passed to `uppy.use()` in the second parameter. ```js -const Plugin = require('@uppy/core/lib/Plugin') +const { Plugin } = require('@uppy/core') module.exports = class MyPlugin extends Plugin { constructor (uppy, opts) { super(uppy, opts) @@ -175,7 +175,7 @@ See the Preact [Getting Started Guide](https://preactjs.com/guide/getting-starte ```js /** @jsx h */ -const Plugin = require('@uppy/core/lib/Plugin') +const { Plugin } = require('@uppy/core') const { h } = require('preact') class NumFiles extends Plugin {