Skip to content

Commit 37522df

Browse files
authored
Merge pull request #439 from PROCEED-Labs/ms2/node-db-helper
Convert db-helper shell script to node
2 parents d418434 + fd37bad commit 37522df

File tree

7 files changed

+524
-292
lines changed

7 files changed

+524
-292
lines changed

jsconfig.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@
1010
"jsdoc"
1111
],
1212
"compilerOptions": {
13+
// For "execa" import in db-helper.mts
14+
"target": "es2017",
15+
"module": "NodeNext",
1316
"baseUrl": "./src", // this must be specified if "paths" is specified.
1417
"paths": {
1518
// defined aliases in webpack for import

package.json

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,12 @@
3838
},
3939
"scripts": {
4040
"dev": "ts-node src/engine/native/node/index.ts --trace-warnings",
41-
"dev-ms-db": "cd src/management-system-v2 && docker compose -f docker-compose-dev.yml up -d && ./db-helper.sh --init",
42-
"dev-ms-db-create": "cd src/management-system-v2 && ./db-helper.sh --new",
41+
"dev-ms-db": "cd src/management-system-v2 && docker compose -f docker-compose-dev.yml up -d && tsx scripts/db-helper.mts --init",
42+
"dev-ms-db-create": "cd src/management-system-v2 && tsx scripts/db-helper.mts --new",
4343
"dev-ms-db-deploy": "cd src/management-system-v2 && yarn prisma migrate deploy",
4444
"dev-ms-db-migrate": "cd src/management-system-v2 && yarn prisma migrate dev",
45-
"dev-ms-db-use": "cd src/management-system-v2 && ./db-helper.sh --use",
46-
"dev-ms-db-delete": "cd src/management-system-v2 && ./db-helper.sh --delete",
45+
"dev-ms-db-use": "cd src/management-system-v2 && tsx scripts/db-helper.mts --use",
46+
"dev-ms-db-delete": "cd src/management-system-v2 && tsx scripts/db-helper.mts --delete",
4747
"dev-ms": "cd src/management-system-v2 && yarn dev",
4848
"dev-ms-old": "cd src/management-system && yarn web:dev",
4949
"dev-ms-old-iam": "cd src/management-system && yarn web:dev-iam",
@@ -117,7 +117,8 @@
117117
"webpack": "^4.35.3",
118118
"webpack-cli": "^3.3.0",
119119
"webpack-dev-server": "^3.2.1",
120-
"node-loader": "^1.0.3"
120+
"node-loader": "^1.0.3",
121+
"tsx": "4.19.2"
121122
},
122123
"dependencies": {
123124
"react-resizable": "^3.0.5"

src/management-system-v2/db-helper.sh

Lines changed: 0 additions & 269 deletions
This file was deleted.

src/management-system-v2/docker-compose-dev.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ services:
77
POSTGRES_USER: proceed
88
POSTGRES_PASSWORD: proceed
99
ports:
10-
- '5432:5432'
10+
- '5433:5432'
1111
volumes:
1212
- postgres_data:/var/lib/postgresql/data
1313

src/management-system-v2/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@
9191
"sass": "1.75.0",
9292
"ts-node": "10.9.2",
9393
"typescript": "5.4.5",
94-
"@types/react-resizable": "^3.0.7"
94+
"@types/react-resizable": "^3.0.7",
95+
"execa": "9.5.2"
9596
}
9697
}

0 commit comments

Comments
 (0)