From 2d1f41118a3cb045cc29f30df35794eb964da6ba Mon Sep 17 00:00:00 2001
From: Jure Triglav <juretriglav@gmail.com>
Date: Mon, 8 Jan 2018 16:57:28 +0100
Subject: [PATCH] Update pubsweet-starter ref
---
packages/logger/src/index.js | 8 ++++----
yarn.lock | 40 ++++++++++++++++++++++++++++--------
2 files changed, 35 insertions(+), 13 deletions(-)
diff --git a/packages/logger/src/index.js b/packages/logger/src/index.js
index 33abcc77d..590138538 100644
--- a/packages/logger/src/index.js
+++ b/packages/logger/src/index.js
@@ -5,15 +5,15 @@ const validations = require('./validations')
const { get } = require('lodash/fp')
const loggerFromConfig = get('pubsweet-server.logger', config)
+
config.util.setModuleDefaults('pubsweet-server.logger', loggerFromConfig)
-let configured = loggerFromConfig === {}
-let logger
+
+let logger = validations.validateConfig(loggerFromConfig)
+let configured = Boolean(logger)
if (!configured) {
global.console.debug = (...args) => global.console.log(args)
logger = global.console
-} else {
- logger = validations.validateConfig(loggerFromConfig)
}
module.exports = {
diff --git a/yarn.lock b/yarn.lock
index 48131d9a7..1ee8cc4ca 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -86,15 +86,15 @@
"@pubsweet/starter@git+https://gitlab.coko.foundation/pubsweet/pubsweet-starter.git":
version "1.0.0-alpha.1"
- resolved "git+https://gitlab.coko.foundation/pubsweet/pubsweet-starter.git#600e39e8b6a759e9bdce0844f611dc72368d5c85"
+ resolved "git+https://gitlab.coko.foundation/pubsweet/pubsweet-starter.git#2a2a5c197a90befc2c60a6cf226b699353a6daae"
dependencies:
- "@pubsweet/db-manager" "^0.0.10"
- "@pubsweet/logger" "^0.1.0"
- authsome "0.0.9"
- pubsweet "1.1.2"
- pubsweet-client "1.1.2"
+ "@pubsweet/db-manager" "^0.0.12"
+ "@pubsweet/logger" "^0.1.2"
+ authsome "^0.0.9"
+ pubsweet "^1.1.4"
+ pubsweet-client "^1.1.2"
pubsweet-component-blog "^0.3.1"
- pubsweet-component-form-group "0.1.5"
+ pubsweet-component-form-group "0.1.6"
pubsweet-component-html "^0.2.0"
pubsweet-component-login "^0.5.2"
pubsweet-component-manage "^0.2.2"
@@ -107,7 +107,7 @@
pubsweet-component-signup "^0.4.0"
pubsweet-component-teams-manager "^0.3.0"
pubsweet-component-users-manager "^0.2.1"
- pubsweet-server "1.0.2"
+ pubsweet-server "^1.0.4"
pubsweet-theme-plugin "^0.0.3"
react-router-redux next
@@ -567,7 +567,7 @@ attr-accept@^1.0.3:
version "1.1.0"
resolved "https://registry.yarnpkg.com/attr-accept/-/attr-accept-1.1.0.tgz#b5cd35227f163935a8f1de10ed3eba16941f6be6"
-authsome@0.0.9:
+authsome@0.0.9, authsome@^0.0.9:
version "0.0.9"
resolved "https://registry.yarnpkg.com/authsome/-/authsome-0.0.9.tgz#08b34f1797b3539e6a362f0fb11a01ae0613f928"
@@ -8600,6 +8600,28 @@ public-encrypt@^4.0.0:
parse-asn1 "^5.0.0"
randombytes "^2.0.1"
+pubsweet-component-form-group@0.1.5:
+ version "0.1.5"
+ resolved "https://registry.yarnpkg.com/pubsweet-component-form-group/-/pubsweet-component-form-group-0.1.5.tgz#392d76f8a9506731c82a7027ba95ab562f6c90ca"
+ dependencies:
+ joi-browser "^13.0.1"
+ prop-types "^15.5.10"
+ pubsweet-server "^1.0.3"
+ react-bootstrap "^0.31.3"
+
+pubsweet-component-posts-manager@0.6.5:
+ version "0.6.5"
+ resolved "https://registry.yarnpkg.com/pubsweet-component-posts-manager/-/pubsweet-component-posts-manager-0.6.5.tgz#d35ac7f74bf198d652ff81e9a790ea006ec3719c"
+ dependencies:
+ prop-types "^15.5.10"
+ pubsweet-component-form-group "^0.1.5"
+ react-bootstrap "^0.31.3"
+ react-dom "^15.6.1"
+ react-redux "^5.0.6"
+ react-router-bootstrap "^0.24.4"
+ react-router-dom "^4.2.2"
+ redux "^3.7.2"
+
pubsweet-server@1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/pubsweet-server/-/pubsweet-server-1.0.2.tgz#3c48267c6e010ddea6c380599c341aadd465f541"
--
GitLab