Skip to content
Snippets Groups Projects
Commit 0f47dce7 authored by Jure's avatar Jure
Browse files

Bring over...

Bring over pubsweet-server!129 (diffs) and resolve conflicts
parents 1d5f17e4 d9763a7d
No related branches found
No related tags found
No related merge requests found
{ {
"exceptions": ["https://nodesecurity.io/advisories/534"] "exceptions": ["https://nodesecurity.io/advisories/534", "https://nodesecurity.io/advisories/532"]
} }
...@@ -46,6 +46,7 @@ ...@@ -46,6 +46,7 @@
"prompt": "^1.0.0", "prompt": "^1.0.0",
"pubsweet-sse": "^0.1.4", "pubsweet-sse": "^0.1.4",
"relational-pouch": "^1.4.5", "relational-pouch": "^1.4.5",
"require-relative": "^0.8.7",
"uuid": "^3.0.1", "uuid": "^3.0.1",
"winston": "^2.2.0" "winston": "^2.2.0"
}, },
......
const logger = require('@pubsweet/logger') const logger = require('@pubsweet/logger')
const config = require('config') const config = require('config')
const requireRelative = require('require-relative')
module.exports = app => { module.exports = app => {
if (config.has('pubsweet.components')) { if (config.has('pubsweet.components')) {
config.get('pubsweet.components').forEach(name => { config.get('pubsweet.components').forEach(name => {
const component = require(name) const component = requireRelative(name)
logger.info('Registered component', name) logger.info('Registered component', name)
const backendComponent = component.server || component.backend const backendComponent = component.server || component.backend
if (backendComponent) { if (backendComponent) {
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment