chore(move-to-postgresql): change db, upgrade pubsweet and pubsweet server

.gitignore

@@ -10,4 +10,6 @@ log.txt
 config.json
 packages/**/_build
 packages/**/api/**/
-.vscode
\ No newline at end of file
+.vscode
+.config/
+.npm/
\ No newline at end of file

Dockerfile

@@ -16,7 +16,7 @@ RUN [ "rm", "-rf", "/npm-packages-offline-cache"]
 
 
 ENV NODE_ENV "development"
-WORKDIR ${HOME}/packages/xpub-faraday
-RUN [ "npm", "run", "start"]
+# WORKDIR ${HOME}/packages/xpub-faraday
+# RUN [ "npm", "run", "server "]
 
 EXPOSE 3000

docker-compose.yml

@@ -5,7 +5,7 @@ services:
     build:
       context: .
       dockerfile: ./Dockerfile
-    command: sh -c "yarn install --frozen-lockfile && ./scripts/wait-for-it.sh postgres:5432 -s -t 40 -- npx pubsweet server"
+    command: sh -c "cd packages/xpub-faraday && yarn install --frozen-lockfile && ./scripts/wait-for-it.sh postgres:5432 -s -t 40 -- npx pubsweet server"
     ports:
       - ${PORT:-3000}:3000
     volumes:

packages/xpub-faraday/config/default.js

@@ -3,7 +3,7 @@ const path = require('path')
 const components = require('./components.json')
 const logger = require('winston')
 
-const environment = process.env.NODE_ENV || 'development'
+// const environment = process.env.NODE_ENV || 'development'
 
 module.exports = {
   authsome: {
@@ -17,10 +17,10 @@ module.exports = {
     components,
   },
   'pubsweet-server': {
-    dbPath:
-      process.env.PUBSWEET_DB ||
-      path.join(__dirname, '..', 'api', 'db', environment),
+    db: {},
+    port: 3000,
     logger,
+    uploads: 'uploads',
   },
   'pubsweet-client': {
     API_ENDPOINT: '/api',

packages/xpub-faraday/config/development.js

+const { deferConfig } = require('config/defer')
+
+module.exports = {
+  'pubsweet-server': {
+    baseUrl: deferConfig(
+      cfg => `http://localhost:${cfg['pubsweet-server'].port}`,
+    ),
+  },
+  dbManager: {
+    username: 'admin',
+    password: 'password',
+    email: 'admin@example.com',
+    admin: true,
+  },
+}

packages/xpub-faraday/package.json

@@ -23,11 +23,11 @@
     "moment": "^2.18.1",
     "nodemailer-ses-transport": "^1.5.1",
     "prop-types": "^15.5.10",
-    "pubsweet": "^1.1.1",
+    "pubsweet": "^2.1.3",
     "pubsweet-client": "^2.2.2",
     "pubsweet-component-login": "^1.1.0",
     "pubsweet-component-signup": "^1.0.0",
-    "pubsweet-server": "^2.0.1",
+    "pubsweet-server": "2.0.3",
     "react": "^16.2.0",
     "react-dnd": "^2.5.4",
     "react-dnd-html5-backend": "^2.5.4",