Skip to content

Commit

Permalink
Merge develop into main (#2)
Browse files Browse the repository at this point in the history
* Develop many features
Co-authored-by: Lam Ngoc Khuong (khuongln-1346) <lam.ngoc.khuong@sun-asterisk.com>
  • Loading branch information
lamngockhuong authored Sep 12, 2021
1 parent f4bcf21 commit 81a3456
Show file tree
Hide file tree
Showing 52 changed files with 1,573 additions and 1,176 deletions.
2 changes: 1 addition & 1 deletion .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"parser": "@typescript-eslint/parser",
"extends": ["prettier", "plugin:@typescript-eslint/recommended", "plugin:prettier/recommended"],
"parserOptions": {
"ecmaVersion": 2018,
"ecmaVersion": 2021,
"sourceType": "module"
},
"rules": {
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -116,3 +116,6 @@ dist
# IDE, Editor
.vscode
.idea

# App
data.json
1 change: 1 addition & 0 deletions Procfile
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
web: npx prisma migrate deploy && npm start
File renamed without changes.
10 changes: 6 additions & 4 deletions ecosystem.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* production mode :: pm2 start ecosystem.config.js --only prod
* development mode :: pm2 start ecosystem.config.js --only dev
*/
module.exports = {
module.exports = {
apps: [
{
name: 'prod', // pm2 start App name
Expand All @@ -19,7 +19,8 @@
merge_logs: true, // if true, stdout and stderr will be merged and sent to pm2 log
output: './logs/access.log', // pm2 log file
error: './logs/error.log', // pm2 error log file
env: { // environment variable
env: {
// environment variable
PORT: 3000,
NODE_ENV: 'production',
},
Expand All @@ -38,7 +39,8 @@
merge_logs: true, // if true, stdout and stderr will be merged and sent to pm2 log
output: './logs/access.log', // pm2 log file
error: './logs/error.log', // pm2 error log file
env: { // environment variable
env: {
// environment variable
PORT: 3000,
NODE_ENV: 'development',
},
Expand All @@ -48,7 +50,7 @@
production: {
user: 'user',
host: '0.0.0.0',
ref: 'origin/master',
ref: 'origin/main',
repo: 'git@github.com:repo.git',
path: 'dist/server.js',
'post-deploy': 'npm install && npm run build && pm2 reload ecosystem.config.js --only prod',
Expand Down
2 changes: 1 addition & 1 deletion jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ const { compilerOptions } = require('./tsconfig.json');
module.exports = {
preset: 'ts-jest',
testEnvironment: 'node',
roots: ['<rootDir>/src'],
transform: {
'^.+\\.tsx?$': 'ts-jest',
},
testMatch: ['**/__tests__/**/*.test.[jt]s?(x)'],
moduleNameMapper: pathsToModuleNameMapper(compilerOptions.paths, { prefix: '<rootDir>/src' }),
};
12 changes: 12 additions & 0 deletions nodemon.debug.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"watch": [
"src",
".env"
],
"ext": "js,ts,json",
"ignore": [
"src/**/*.spec.ts",
"src/**/*.test.ts"
],
"exec": "node --inspect=0.0.0.0:9229 -r ts-node/register -r tsconfig-paths/register src/server.ts"
}
23 changes: 12 additions & 11 deletions nodemon.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
{
"watch": [
"src",
".env"
],
"ext": "js,ts,json",
"ignore": [
"src/**/*.spec.ts",
"src/**/*.test.ts"
],
"exec": "ts-node -r tsconfig-paths/register --transpile-only src/server.ts"
}
"watch": [
"src",
"static",
".env"
],
"ext": "js,ts,json,pr",
"ignore": [
"src/**/*.spec.ts",
"src/**/*.test.ts"
],
"exec": "ts-node -r tsconfig-paths/register --transpile-only src/server.ts"
}
Loading

0 comments on commit 81a3456

Please sign in to comment.