github.com
/
verdaccio
mirror of https://github.com/verdaccio/verdaccio.git
1
0
Fork 0
Code Releases Wiki Activity

fix: restore plugin loader

This commit is contained in:
Juan Picado @jotadeveloper 2018-04-14 21:58:24 +02:00
parent 98ebd9ac5d
commit 3c1c3ca818
No known key found for this signature in database
GPG Key ID: 18AC54485952D158
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/lib/plugin-loader.js
View File

@ -21,6 +21,10 @@ function tryLoad(path: string) {
}
}
function mergeConfig(appConfig, pluginConfig) {
return _.merge(appConfig, pluginConfig);
}
function isValid(plugin) {
return (_.isFunction(plugin) || _.isFunction(plugin.default));
}
@ -74,9 +78,8 @@ function loadPlugin(config: Config, pluginConfigs: any, params: any, sanityCheck
logger.logger.error({content: pluginId}, '@{content} doesn\'t look like a valid plugin');
throw Error('"' + pluginId + '" doesn\'t look like a valid plugin');
}
const pluginConfiguration = pluginConfigs[pluginId];
/* eslint new-cap:off */
plugin = isES6(plugin) ? new plugin.default(pluginConfiguration, params) : plugin(pluginConfiguration, params);
plugin = isES6(plugin) ? new plugin.default(mergeConfig(config, pluginConfigs[pluginId]), params) : plugin(pluginConfigs[pluginId], params);
/* eslint new-cap:off */
if (plugin === null || !sanityCheck(plugin)) {