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

Merge branch 'master' into master

This commit is contained in:
Juan Picado @jotadeveloper 2018-04-14 22:54:38 +02:00 committed by GitHub
parent 52078cff9d f1a5ee43be
commit 86e3151d4a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package.json
View File

@ -16,7 +16,7 @@
},
"dependencies": {
"@verdaccio/file-locking": "0.0.5",
"@verdaccio/local-storage": "^0.3.0",
"@verdaccio/local-storage": "0.3.0",
"@verdaccio/streams": "1.0.0",
"JSONStream": "1.3.2",
"async": "2.6.0",
@ -51,7 +51,7 @@
"@commitlint/cli": "6.1.3",
"@commitlint/config-conventional": "6.1.3",
"@commitlint/travis-cli": "6.1.3",
"@verdaccio/types": "2.0.3",
"@verdaccio/types": "2.0.4",
"babel-cli": "6.26.0",
"babel-core": "6.26.0",
"babel-eslint": "8.2.2",

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)) {

8
yarn.lock
View File

@ -227,7 +227,7 @@
lockfile "1.0.3"
lodash "4.17.4"
"@verdaccio/local-storage@^0.3.0":
"@verdaccio/local-storage@0.3.0":
version "0.3.0"
resolved "https://registry.npmjs.org/@verdaccio/local-storage/-/local-storage-0.3.0.tgz#6fdf3fac243a43842ecfc84a0207c4ba5e4cd5cb"
dependencies:
@ -242,9 +242,9 @@
version "1.0.0"
resolved "https://registry.npmjs.org/@verdaccio/streams/-/streams-1.0.0.tgz#d5d24c6747208728b9fd16b908e3932c3fb1f864"
"@verdaccio/types@2.0.3":
version "2.0.3"
resolved "https://registry.npmjs.org/@verdaccio/types/-/types-2.0.3.tgz#ae72544af5f867975bc68d8862b040611f1b80ed"
"@verdaccio/types@2.0.4":
version "2.0.4"
resolved "https://registry.npmjs.org/@verdaccio/types/-/types-2.0.4.tgz#a81566b00e305f3e25e1f2913299b3e57a303f11"
JSONStream@1.3.2, JSONStream@^1.0.4:
version "1.3.2"