-
Notifications
You must be signed in to change notification settings - Fork 2k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
@uppy/core: fix plugin detection #4951
Merged
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Using `instanceof` is problematic as it won't detect plugins from different Uppy distributions.
Diff output filesdiff --git a/packages/@uppy/core/lib/UIPlugin.js b/packages/@uppy/core/lib/UIPlugin.js
index c640aa7..4d04353 100644
--- a/packages/@uppy/core/lib/UIPlugin.js
+++ b/packages/@uppy/core/lib/UIPlugin.js
@@ -40,8 +40,21 @@ class UIPlugin extends BasePlugin {
}
getTargetPlugin(target) {
let targetPlugin;
- if (typeof target === "object" && target instanceof UIPlugin) {
+ if (typeof (target == null ? void 0 : target.addTarget) === "function") {
targetPlugin = target;
+ if (!(targetPlugin instanceof UIPlugin)) {
+ console.warn(
+ new Error(
+ "The provided plugin is not an instance of UIPlugin. This is an indication of a bug with the way Uppy is bundled.",
+ {
+ cause: {
+ targetPlugin,
+ UIPlugin,
+ },
+ },
+ ),
+ );
+ }
} else if (typeof target === "function") {
const Target = target;
this.uppy.iteratePlugins(p => { |
Murderlon
approved these changes
Feb 22, 2024
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It's a bit weird but I don't know an alternative now
Merged
github-actions bot
added a commit
that referenced
this pull request
Feb 22, 2024
| Package | Version | Package | Version | | ---------------------- | ------- | ---------------------- | ------- | | @uppy/audio | 1.1.7 | @uppy/react | 3.2.2 | | @uppy/companion | 4.12.3 | @uppy/status-bar | 3.2.8 | | @uppy/companion-client | 3.7.3 | @uppy/tus | 3.5.3 | | @uppy/core | 3.9.2 | @uppy/utils | 5.7.3 | | @uppy/dashboard | 3.7.4 | @uppy/xhr-upload | 3.6.3 | | @uppy/image-editor | 2.4.3 | uppy | 3.22.2 | - @uppy/core: fix plugin detection (Antoine du Hamel / #4951) - @uppy/core,@uppy/utils: Introduce `ValidateableFile` & move `MinimalRequiredUppyFile` into utils (Antoine du Hamel / #4944) - meta: uppy: fix bundle builder (Antoine du Hamel / #4950) - @uppy/core: improve `UIPluginOptions` types (Merlijn Vos / #4946) - @uppy/companion-client: fix body/url on upload-success (Merlijn Vos / #4922) - @uppy/utils: remove EventManager circular reference (Merlijn Vos / #4949) - @uppy/dashboard: MetaEditor + ImageEditor - new state machine logic (Evgenia Karunus / #4939) - meta: disable `@typescript-eslint/no-non-null-assertion` lint rule (Antoine du Hamel / #4945) - @uppy/companion-client: remove unnecessary `'use strict'` directives (Antoine du Hamel / #4943) - @uppy/companion-client: type changes for provider-views (Antoine du Hamel / #4938) - meta: bump ip from 1.1.8 to 1.1.9 (dependabot[bot] / #4941) - @uppy/companion-client: update types (Antoine du Hamel / #4927)
Murderlon
added a commit
that referenced
this pull request
Feb 26, 2024
* main: @uppy/file-input: refactor to TypeScript (#4954) Release: uppy@3.22.2 (#4952) @uppy/core: fix plugin detection (#4951) Introduce `ValidateableFile` & move `MinimalRequiredUppyFile` into utils (#4944) uppy: fix bundle builder (#4950) @uppy/core: improve `UIPluginOptions` types (#4946) @uppy/companion-client: fix body/url on upload-success (#4922) @uppy/utils: remove EventManager circular reference (#4949) MetaEditor + ImageEditor - new state machine logic (#4939) meta: disable `@typescript-eslint/no-non-null-assertion` lint rule (#4945) remove unnecessary `'use strict'` directives (#4943) @uppy/companion-client: type changes for provider-views (#4938) meta: bump ip from 1.1.8 to 1.1.9 (#4941)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Using
instanceof
is problematic as it won't detect plugins from different Uppy distributions. Whether we should support that use-case is certainly debatable – having more than one Uppy distribution is good indication that there's a bug in the build chain – but it seems useful to only produce a warning rather than failing hard.