diff --git a/package.json b/package.json index 7964d5812..fce7139e6 100644 --- a/package.json +++ b/package.json @@ -9,6 +9,7 @@ "build:webapp": "lerna run build --scope \"@bigcapital/webapp\"", "dev:server": "lerna run dev --scope \"@bigcapital/server\"", "build:server": "lerna run build --scope \"@bigcapital/server\"", + "serve:server": "lerna run serve --scope \"@bigcapital/server\"", "prepare": "husky install" }, "workspaces": [ diff --git a/packages/server/package.json b/packages/server/package.json index 7b23f9734..fa60bfee8 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -11,6 +11,7 @@ "build:app": "cross-env NODE_ENV=production webpack --config scripts/webpack.config.js", "build:commands": "cross-env NODE_ENV=production webpack --config scripts/webpack.cli.js", "build": "npm-run-all build:*", + "serve": "node ./build/index.js", "lint:fix": "eslint --fix ./**/*.ts" }, "author": "Ahmed Bouhuolia, ", diff --git a/packages/server/src/config/index.ts b/packages/server/src/config/index.ts index 51c32c779..928eac2a8 100644 --- a/packages/server/src/config/index.ts +++ b/packages/server/src/config/index.ts @@ -1,8 +1,7 @@ import dotenv from 'dotenv'; +import path from 'path'; -dotenv.config({ - path: '../../.env', -}); +dotenv.config(); module.exports = { /** @@ -20,9 +19,8 @@ module.exports = { db_password: process.env.SYSTEM_DB_PASSWORD || process.env.DB_PASSWORD, db_name: process.env.SYSTEM_DB_NAME, charset: process.env.SYSTEM_DB_CHARSET || process.env.DB_CHARSET, - migrations_dir: - process.env.SYSTEM_MIGRATIONS_DIR || './src/system/migrations', - seeds_dir: process.env.SYSTEM_SEEDS_DIR || './src/system/seeds', + migrations_dir: path.join(global.__root_dir, './src/system/migrations'), + seeds_dir: path.join(global.__root_dir, './src/system/seeds'), }, /** @@ -35,9 +33,8 @@ module.exports = { db_user: process.env.TENANT_DB_USER || process.env.DB_USER, db_password: process.env.TENANT_DB_PASSWORD || process.env.DB_PASSWORD, charset: process.env.TENANT_DB_CHARSET || process.env.DB_CHARSET, - migrations_dir: - process.env.TENANT_MIGRATIONS_DIR || './src/database/migrations', - seeds_dir: process.env.TENANT_SEEDS_DIR || './src/database/seeds/core', + migrations_dir: path.join(global.__root_dir, './src/database/migrations'), + seeds_dir: path.join(global.__root_dir, './src/database/seeds/core'), }, /** diff --git a/packages/server/src/server.ts b/packages/server/src/server.ts index de1fecd70..2bbc9a789 100644 --- a/packages/server/src/server.ts +++ b/packages/server/src/server.ts @@ -1,6 +1,6 @@ import 'reflect-metadata'; // We need this in order to use @Decorators -import '@/config'; import './before'; +import '@/config'; import express from 'express'; import loadersFactory from 'loaders';