QT/bigcapital
1
0
Fork 0
mirror of https://github.com/bigcapitalhq/bigcapital.git synced 2026-02-21 07:10:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(server): fix migrations and seeds dir (#101)

Browse Source
This commit is contained in:
Ahmed Bouhuolia
2023-03-31 02:26:23 +02:00
committed by GitHub
parent 1ffa3a4b8b
commit b24a367438
4 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
package.json
View File

@@ -9,6 +9,7 @@
"build:webapp": "lerna run build --scope \"@bigcapital/webapp\"", "build:webapp": "lerna run build --scope \"@bigcapital/webapp\"",
"dev:server": "lerna run dev --scope \"@bigcapital/server\"", "dev:server": "lerna run dev --scope \"@bigcapital/server\"",
"build:server": "lerna run build --scope \"@bigcapital/server\"", "build:server": "lerna run build --scope \"@bigcapital/server\"",
"serve:server": "lerna run serve --scope \"@bigcapital/server\"",
"prepare": "husky install" "prepare": "husky install"
}, },
"workspaces": [ "workspaces": [

1
packages/server/package.json
View File

@@ -11,6 +11,7 @@
"build:app": "cross-env NODE_ENV=production webpack --config scripts/webpack.config.js", "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:commands": "cross-env NODE_ENV=production webpack --config scripts/webpack.cli.js",
"build": "npm-run-all build:*", "build": "npm-run-all build:*",
"serve": "node ./build/index.js",
"lint:fix": "eslint --fix ./**/*.ts" "lint:fix": "eslint --fix ./**/*.ts"
}, },
"author": "Ahmed Bouhuolia, <a.bouhuolia@gmail.com>", "author": "Ahmed Bouhuolia, <a.bouhuolia@gmail.com>",

15
packages/server/src/config/index.ts
View File

@@ -1,8 +1,7 @@
import dotenv from 'dotenv'; import dotenv from 'dotenv';
import path from 'path';
dotenv.config({ dotenv.config();
path: '../../.env',
});
module.exports = { module.exports = {
/** /**
@@ -20,9 +19,8 @@ module.exports = {
db_password: process.env.SYSTEM_DB_PASSWORD || process.env.DB_PASSWORD, db_password: process.env.SYSTEM_DB_PASSWORD || process.env.DB_PASSWORD,
db_name: process.env.SYSTEM_DB_NAME, db_name: process.env.SYSTEM_DB_NAME,
charset: process.env.SYSTEM_DB_CHARSET || process.env.DB_CHARSET, charset: process.env.SYSTEM_DB_CHARSET || process.env.DB_CHARSET,
migrations_dir: migrations_dir: path.join(global.__root_dir, './src/system/migrations'),
process.env.SYSTEM_MIGRATIONS_DIR || './src/system/migrations', seeds_dir: path.join(global.__root_dir, './src/system/seeds'),
seeds_dir: process.env.SYSTEM_SEEDS_DIR || './src/system/seeds',
}, },
/** /**
@@ -35,9 +33,8 @@ module.exports = {
db_user: process.env.TENANT_DB_USER || process.env.DB_USER, db_user: process.env.TENANT_DB_USER || process.env.DB_USER,
db_password: process.env.TENANT_DB_PASSWORD || process.env.DB_PASSWORD, db_password: process.env.TENANT_DB_PASSWORD || process.env.DB_PASSWORD,
charset: process.env.TENANT_DB_CHARSET || process.env.DB_CHARSET, charset: process.env.TENANT_DB_CHARSET || process.env.DB_CHARSET,
migrations_dir: migrations_dir: path.join(global.__root_dir, './src/database/migrations'),
process.env.TENANT_MIGRATIONS_DIR || './src/database/migrations', seeds_dir: path.join(global.__root_dir, './src/database/seeds/core'),
seeds_dir: process.env.TENANT_SEEDS_DIR || './src/database/seeds/core',
}, },
/** /**

2
packages/server/src/server.ts
View File

@@ -1,6 +1,6 @@
import 'reflect-metadata'; // We need this in order to use @Decorators import 'reflect-metadata'; // We need this in order to use @Decorators
import '@/config';
import './before'; import './before';
import '@/config';
import express from 'express'; import express from 'express';
import loadersFactory from 'loaders'; import loadersFactory from 'loaders';