From aaff73036b56730d82a16d23445ed6d404973fd5 Mon Sep 17 00:00:00 2001 From: David Mehren Date: Fri, 22 May 2020 14:15:45 +0200 Subject: [PATCH] Fix remaining paths after moving everything to src Signed-off-by: David Mehren --- .sequelizerc.example | 4 ++-- package.json | 6 +++--- src/lib/config/index.ts | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.sequelizerc.example b/.sequelizerc.example index 81248936b..c5c9973ed 100644 --- a/.sequelizerc.example +++ b/.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'), - 'models-path': path.resolve('lib', 'models') + 'migrations-path': path.resolve('src/lib', 'migrations'), + 'models-path': path.resolve('src/lib', 'models') } diff --git a/package.json b/package.json index 7f5e84d75..5807008b9 100644 --- a/package.json +++ b/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", diff --git a/src/lib/config/index.ts b/src/lib/config/index.ts index 8e8a91685..2924dc263 100644 --- a/src/lib/config/index.ts +++ b/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)