Merge branch 'pr-origin-365' into release/2.0.x

.sequelizerc.example

@@ -26,6 +26,6 @@ fs.writeFile(path.resolve('config', 'database.json'), JSON.stringify(database),
 
 module.exports = {
     'config':          path.resolve('config', 'database.json'),
-    'migrations-path': path.resolve('lib', 'migrations'),
+    'migrations-path': path.resolve('src/lib', 'migrations'),
-    'models-path':     path.resolve('lib', 'models')
+    'models-path':     path.resolve('src/lib', 'models')
 }

package.json

@@ -6,14 +6,14 @@
   "license": "AGPL-3.0",
   "scripts": {
     "test": "npm run-script eslint && npm run-script jsonlint && npm run-script mocha-suite",
-    "eslint": "node_modules/.bin/eslint --max-warnings 0 lib public test",
+    "eslint": "node_modules/.bin/eslint --max-warnings 0 src",
     "jsonlint": "find . -not -path './node_modules/*' -type f -name '*.json' -o -type f -name '*.json.example' | while read json; do echo $json ; jq . $json; done",
     "mocha-suite": "NODE_ENV=test CMD_DB_URL=\"sqlite::memory:\" mocha --exit",
     "standard": "echo 'standard is no longer being used, use `npm run eslint` instead!' && exit 1",
     "dev": "webpack --config webpack.dev.js --progress --colors --watch",
     "heroku-prebuild": "bin/heroku",
     "build": "webpack --config webpack.prod.js --progress --colors --bail",
-    "start": "tsc && sequelize db:migrate && node built/app.js"
+    "start": "tsc && sequelize db:migrate && node built/lib/app.js"
   },
   "dependencies": {
     "@passport-next/passport-openid": "^1.0.0",
@@ -120,7 +120,7 @@
     "socket.io": "~2.1.1",
     "socket.io-client": "~2.1.1",
     "spin.js": "^2.3.2",
-    "sqlite3": "^4.1.0",
+    "sqlite3": "^4.2.0",
     "store": "^2.0.12",
     "string": "^3.3.3",
     "tedious": "^6.6.0",

src/lib/config/index.ts

@@ -14,7 +14,7 @@ import { environment } from './environment'
 import { dockerSecret } from './dockerSecret'
 import deepFreeze = require('deep-freeze')
 
-const appRootPath = path.resolve(__dirname, '../../')
+const appRootPath = path.resolve(__dirname, '../../../')
 const env = process.env.NODE_ENV || Environment.development
 const debugConfig = {
   debug: (env === Environment.development)

src/lib/models/revision.ts

@@ -24,7 +24,7 @@ class Data {
 }
 
 function createDmpWorker (): ChildProcess {
-  const worker = childProcess.fork(path.resolve(__dirname, '../workers/dmpWorker.js'), ['ignore'])
+  const worker = childProcess.fork(path.resolve(__dirname, '../workers/dmpWorker'), ['ignore'])
   logger.debug('dmp worker process started')
   worker.on('message', function (data: Data) {
     if (!data || !data.msg || !data.cacheKey) {