Skip to content
Snippets Groups Projects
Commit 09bc6314 authored by Sam Galson's avatar Sam Galson
Browse files

Merge branch 'pubsweet-dependencies' into 'master'

Update PubSweet core dependencies and set winston as default logger

See merge request xpub!81
parents d844193c b72727a7
No related branches found
No related tags found
No related merge requests found
const path = require('path') const path = require('path')
const components = require('./components.json') const components = require('./components.json')
const logger = require('winston')
const environment = process.env.NODE_ENV || 'development' const environment = process.env.NODE_ENV || 'development'
...@@ -18,6 +19,7 @@ module.exports = { ...@@ -18,6 +19,7 @@ module.exports = {
dbPath: dbPath:
process.env.PUBSWEET_DB || process.env.PUBSWEET_DB ||
path.join(__dirname, '..', 'api', 'db', environment), path.join(__dirname, '..', 'api', 'db', environment),
logger,
}, },
'pubsweet-client': { 'pubsweet-client': {
API_ENDPOINT: '/api', API_ENDPOINT: '/api',
......
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
"url": "https://gitlab.coko.foundation/xpub/xpub" "url": "https://gitlab.coko.foundation/xpub/xpub"
}, },
"dependencies": { "dependencies": {
"@pubsweet/ui": "^0.1.1",
"babel-core": "^6.26.0", "babel-core": "^6.26.0",
"config": "^1.26.2", "config": "^1.26.2",
"font-awesome": "^4.7.0", "font-awesome": "^4.7.0",
...@@ -17,8 +18,8 @@ ...@@ -17,8 +18,8 @@
"loadable-components": "^0.3.0", "loadable-components": "^0.3.0",
"moment": "^2.18.1", "moment": "^2.18.1",
"prop-types": "^15.5.10", "prop-types": "^15.5.10",
"pubsweet": "^1.0.0-beta.5", "pubsweet": "^1.1.1",
"pubsweet-client": "^1.0.0-beta.8", "pubsweet-client": "^1.1.1",
"pubsweet-component-ink-backend": "^0.1.1", "pubsweet-component-ink-backend": "^0.1.1",
"pubsweet-component-ink-frontend": "^0.2.3", "pubsweet-component-ink-frontend": "^0.2.3",
"pubsweet-component-xpub-app": "^0.0.2", "pubsweet-component-xpub-app": "^0.0.2",
...@@ -27,7 +28,7 @@ ...@@ -27,7 +28,7 @@
"pubsweet-component-xpub-manuscript": "^0.0.2", "pubsweet-component-xpub-manuscript": "^0.0.2",
"pubsweet-component-xpub-review": "^0.0.2", "pubsweet-component-xpub-review": "^0.0.2",
"pubsweet-component-xpub-submit": "^0.0.2", "pubsweet-component-xpub-submit": "^0.0.2",
"pubsweet-server": "^1.0.0-beta.2", "pubsweet-server": "^1.0.1",
"react": "^15.6.1", "react": "^15.6.1",
"react-dom": "^15.6.1", "react-dom": "^15.6.1",
"react-router-dom": "^4.2.2", "react-router-dom": "^4.2.2",
...@@ -35,10 +36,10 @@ ...@@ -35,10 +36,10 @@
"redux": "^3.6.0", "redux": "^3.6.0",
"redux-form": "^7.0.3", "redux-form": "^7.0.3",
"redux-logger": "^3.0.1", "redux-logger": "^3.0.1",
"winston": "^2.4.0",
"xpub-journal": "^0.0.2", "xpub-journal": "^0.0.2",
"xpub-selectors": "^0.0.2", "xpub-selectors": "^0.0.2",
"xpub-theme": "^0.0.2", "xpub-theme": "^0.0.2"
"@pubsweet/ui": "^0.1.1"
}, },
"devDependencies": { "devDependencies": {
"babel-core": "^6.26.0", "babel-core": "^6.26.0",
......
This diff is collapsed.
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