Merge branch 'master' into UI-patch

packages/logger/package.json

 {
   "name": "@pubsweet/logger",
   "version": "0.0.2",
-  "description": "A module encapsulating standard logging features for pubsweet components and services.",
+  "description":
+    "A module encapsulating standard logging features for pubsweet components and services.",
   "main": "src/index.js",
   "scripts": {
     "test": "jest",
@@ -19,7 +20,6 @@
   "author": "Antony Denyer",
   "license": "MIT",
   "devDependencies": {
-    "bunyan": "^1.8.12",
     "jest": "^21.2.1",
     "nsp": "^2.7.0",
     "winston": "^2.3.1"

packages/logger/test/index.test.js

@@ -80,27 +80,6 @@ describe('Logging manager', () => {
       expect(winston.error).toHaveBeenLastCalledWith('error')
     })
 
-    it('works with bunyan', () => {
-      jest.resetModules()
-      config = require('config')
-      const logger = require('../src/')
-      const bunyan = require('bunyan').createLogger({ name: 'test' })
-      jest.spyOn(bunyan, 'debug').mockImplementation()
-      jest.spyOn(bunyan, 'info').mockImplementation()
-      jest.spyOn(bunyan, 'warn').mockImplementation()
-      jest.spyOn(bunyan, 'error').mockImplementation()
-      logger.configure(bunyan)
-
-      logger.debug('debug')
-      expect(bunyan.debug).toHaveBeenLastCalledWith('debug')
-      logger.info('info')
-      expect(bunyan.info).toHaveBeenLastCalledWith('info')
-      logger.warn('warn')
-      expect(bunyan.warn).toHaveBeenLastCalledWith('warn')
-      logger.error('error')
-      expect(bunyan.error).toHaveBeenLastCalledWith('error')
-    })
-
     it('prevents configuration again', () => {
       jest.resetModules()
       config = require('config')
@@ -115,24 +94,14 @@ describe('Logging manager', () => {
     it('which returns raw logger', () => {
       jest.resetModules()
       const logger = require('../src/')
-      const bunyan = require('bunyan').createLogger({ name: 'test' })
-      logger.configure(bunyan)
+      const winston = require('winston')
+      logger.configure(winston)
       const rawLogger = logger.getRawLogger()
-      expect(rawLogger.fields.name).toBe('test')
+      expect(rawLogger).toBe(winston)
     })
   })
 
   describe('when a logger is passed by config', () => {
-    it('sets logger to "bunyan" if specified', () => {
-      jest.resetModules()
-      config = require('config')
-      const bunyan = require('bunyan').createLogger({ name: 'test' })
-      config['pubsweet-server'] = { logger: bunyan }
-      const logger = require('../src/')
-      const rawLogger = logger.getRawLogger()
-      expect(rawLogger.fields.name).toBe('test')
-    })
-
     it('sets logger to "winston" if specified', () => {
       jest.resetModules()
       config = require('config')

yarn.lock

@@ -1664,15 +1664,6 @@ builtin-status-codes@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8"
 
-bunyan@^1.8.12:
-  version "1.8.12"
-  resolved "https://registry.yarnpkg.com/bunyan/-/bunyan-1.8.12.tgz#f150f0f6748abdd72aeae84f04403be2ef113797"
-  optionalDependencies:
-    dtrace-provider "~0.8"
-    moment "^2.10.6"
-    mv "~2"
-    safe-json-stringify "~1"
-
 busboy@^0.2.11, busboy@^0.2.13:
   version "0.2.14"
   resolved "https://registry.yarnpkg.com/busboy/-/busboy-0.2.14.tgz#6c2a622efcf47c57bbbe1e2a9c37ad36c7925453"
@@ -3106,12 +3097,6 @@ draft-js@^0.10.0:
     immutable "~3.7.4"
     object-assign "^4.1.0"
 
-dtrace-provider@~0.8:
-  version "0.8.5"
-  resolved "https://registry.yarnpkg.com/dtrace-provider/-/dtrace-provider-0.8.5.tgz#98ebba221afac46e1c39fd36858d8f9367524b92"
-  dependencies:
-    nan "^2.3.3"
-
 duplexer2@~0.0.2:
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.0.2.tgz#c614dcf67e2fb14995a91711e5a617e8a60a31db"
@@ -4468,7 +4453,7 @@ glob@^5.0.15:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@^6.0.1, glob@^6.0.4:
+glob@^6.0.4:
   version "6.0.4"
   resolved "https://registry.yarnpkg.com/glob/-/glob-6.0.4.tgz#0f08860f6a155127b2fadd4f9ce24b1aab6e4d22"
   dependencies:
@@ -6986,7 +6971,7 @@ modify-values@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/modify-values/-/modify-values-1.0.0.tgz#e2b6cdeb9ce19f99317a53722f3dbf5df5eaaab2"
 
-moment@2.x.x, moment@^2.10.6, moment@^2.18.1, moment@^2.6.0:
+moment@2.x.x, moment@^2.18.1, moment@^2.6.0:
   version "2.19.4"
   resolved "https://registry.yarnpkg.com/moment/-/moment-2.19.4.tgz#17e5e2c6ead8819c8ecfad83a0acccb312e94682"
 
@@ -7055,14 +7040,6 @@ mute-stream@0.0.7, mute-stream@~0.0.4:
   version "0.0.7"
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
 
-mv@~2:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/mv/-/mv-2.1.1.tgz#ae6ce0d6f6d5e0a4f7d893798d03c1ea9559b6a2"
-  dependencies:
-    mkdirp "~0.5.1"
-    ncp "~2.0.0"
-    rimraf "~2.4.0"
-
 nan-x@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/nan-x/-/nan-x-1.0.0.tgz#0ee78e8d1cd0592d5b4260a5940154545c61c121"
@@ -7071,7 +7048,7 @@ nan@2.6.2:
   version "2.6.2"
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.6.2.tgz#e4ff34e6c95fdfb5aecc08de6596f43605a7db45"
 
-nan@^2.1.0, nan@^2.3.0, nan@^2.3.2, nan@^2.3.3:
+nan@^2.1.0, nan@^2.3.0, nan@^2.3.2:
   version "2.8.0"
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.8.0.tgz#ed715f3fe9de02b57a5e6252d90a96675e1f085a"
 
@@ -7105,10 +7082,6 @@ ncp@1.0.x:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/ncp/-/ncp-1.0.1.tgz#d15367e5cb87432ba117d2bf80fdf45aecfb4246"
 
-ncp@~2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/ncp/-/ncp-2.0.0.tgz#195a21d6c46e361d2fb1281ba38b91e9df7bdbb3"
-
 nearley@^2.7.10:
   version "2.11.0"
   resolved "https://registry.yarnpkg.com/nearley/-/nearley-2.11.0.tgz#5e626c79a6cd2f6ab9e7e5d5805e7668967757ae"
@@ -9884,12 +9857,6 @@ rimraf@~2.2.6:
   version "2.2.8"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.2.8.tgz#e439be2aaee327321952730f99a8929e4fc50582"
 
-rimraf@~2.4.0:
-  version "2.4.5"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.4.5.tgz#ee710ce5d93a8fdb856fb5ea8ff0e2d75934b2da"
-  dependencies:
-    glob "^6.0.1"
-
 ripemd160@^2.0.0, ripemd160@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.1.tgz#0f4584295c53a3628af7e6d79aca21ce57d1c6e7"
@@ -9950,10 +9917,6 @@ safe-buffer@5.1.1, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, s
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853"
 
-safe-json-stringify@~1:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/safe-json-stringify/-/safe-json-stringify-1.0.4.tgz#81a098f447e4bbc3ff3312a243521bc060ef5911"
-
 sane@^2.0.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/sane/-/sane-2.2.0.tgz#d6d2e2fcab00e3d283c93b912b7c3a20846f1d56"