milas/jellyfish-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #2186 from Maxr1998/fix-plugin-loader

Browse source 
Fix plugin loader for function definitions in window
This commit is contained in:
Bill Thornton 2020-12-09 14:27:50 -05:00 • committed by GitHub
commit 3992265189
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/components/pluginManager.js
View file

@ -74,14 +74,19 @@ import { playbackManager } from './playback/playbackmanager';
if (typeof pluginSpec === 'string') {
if (pluginSpec in window) {
console.log(`Loading plugin (via window): ${pluginSpec}`);
let pluginInstance = await window[pluginSpec];
if (typeof pluginInstance === 'function') {
pluginInstance = await new pluginInstance();
const pluginDefinition = await window[pluginSpec];
if (typeof pluginDefinition !== 'function') {
throw new TypeError('Plugin definitions in window have to be an (async) function returning the plugin class');
}
const pluginClass = await pluginDefinition();
if (typeof pluginClass !== 'function') {
throw new TypeError(`Plugin definition doesn't return a class for '${pluginSpec}'`);
}
// init plugin and pass basic dependencies
plugin = new pluginInstance({
plugin = new pluginClass({
events: Events,
loading,
appSettings,
@ -98,9 +103,7 @@ import { playbackManager } from './playback/playbackmanager';
const pluginResult = await pluginSpec;
plugin = new pluginResult.default;
} else {
const err = new TypeError('Plugins have to be a Promise that resolves to a plugin builder function');
console.error(err);
throw err;
throw new TypeError('Plugins have to be a Promise that resolves to a plugin builder function');
}
return this.#preparePlugin(pluginSpec, plugin);