admin/twenty
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

feat: easier makefile commands (#2077)

Browse Source 
* feat: easier makefile commands

* fix: cleaner command
This commit is contained in:
Jérémy M
2023-10-17 10:38:10 +02:00
committed by GitHub
parent a6542719df
commit 4a96ae225e
3 changed files with 19 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
docs/docs/contributor/local-setup/docker-setup.mdx
View File

@ -90,10 +90,9 @@ Start the containers:
make up make up
``` ```
Run database migrations, generate prisma client, and seed: Setup database, generate prisma client, run migrations, and seed:
```bash ```bash
make server-database-setup make server-database-init
make server-database-reset
``` ```
## Step 5: Start Twenty ## Step 5: Start Twenty

28
infra/dev/Makefile
View File

@ -41,20 +41,20 @@ front-storybook:
server-start: server-start:
@docker compose exec twenty-dev sh -c "cd /app/server && yarn start:dev" @docker compose exec twenty-dev sh -c "cd /app/server && yarn start:dev"
server-prisma-generate: server-database-init:
@docker compose exec twenty-dev sh -c "cd /app/server && yarn prisma:generate" @docker compose exec twenty-dev sh -c "cd /app/server && yarn database:init"
server-prisma-migrate:
@docker compose exec twenty-dev sh -c "cd /app/server && yarn prisma:migrate"
server-prisma-seed:
@docker compose exec twenty-dev sh -c "cd /app/server && yarn prisma:seed"
server-prisma-reset:
@docker compose exec twenty-dev sh -c "cd /app/server && yarn prisma:reset"
server-database-reset:
@docker compose exec twenty-dev sh -c "cd /app/server && yarn database:reset"
server-database-setup: server-database-setup:
@docker compose exec twenty-dev sh -c "cd /app/server && yarn database:setup" @docker compose exec twenty-dev sh -c "cd /app/server && yarn database:setup"
server-database-migrate:
@docker compose exec twenty-dev sh -c "cd /app/server && yarn database:migrate"
server-database-generate:
@docker compose exec twenty-dev sh -c "cd /app/server && yarn database:generate"
server-database-seed:
@docker compose exec twenty-dev sh -c "cd /app/server && yarn database:seed"
server-database-reset:
@docker compose exec twenty-dev sh -c "cd /app/server && yarn database:reset"

8
server/package.json
View File

@ -20,7 +20,6 @@
"test:cov": "jest --coverage", "test:cov": "jest --coverage",
"test:debug": "node --inspect-brk -r tsconfig-paths/register -r ts-node/register node_modules/.bin/jest --runInBand", "test:debug": "node --inspect-brk -r tsconfig-paths/register -r ts-node/register node_modules/.bin/jest --runInBand",
"test:e2e": "./scripts/run-integration.sh", "test:e2e": "./scripts/run-integration.sh",
"prisma:generate-client": "npx prisma generate --generator client && yarn prisma:generate-gql-select", "prisma:generate-client": "npx prisma generate --generator client && yarn prisma:generate-gql-select",
"prisma:generate-gql-select": "node scripts/generate-model-select-map.js", "prisma:generate-gql-select": "node scripts/generate-model-select-map.js",
"prisma:generate-nest-graphql": "npx prisma generate --generator nestgraphql", "prisma:generate-nest-graphql": "npx prisma generate --generator nestgraphql",
@ -30,13 +29,12 @@
"prisma:migrate": "npx prisma migrate deploy", "prisma:migrate": "npx prisma migrate deploy",
"typeorm": "ts-node -r tsconfig-paths/register ./node_modules/typeorm/cli.js", "typeorm": "ts-node -r tsconfig-paths/register ./node_modules/typeorm/cli.js",
"typeorm:migrate": "yarn typeorm migration:run -- -d ./src/metadata/metadata.datasource.ts", "typeorm:migrate": "yarn typeorm migration:run -- -d ./src/metadata/metadata.datasource.ts",
"database:init": "yarn database:setup && yarn database:reset",
"database:setup": "npx ts-node ./scripts/setup-db.ts", "database:setup": "npx ts-node ./scripts/setup-db.ts",
"database:migrate": "yarn prisma:migrate && yarn typeorm:migrate", "database:migrate": "yarn typeorm:migrate && yarn prisma:migrate",
"database:generate": "yarn prisma:generate", "database:generate": "yarn prisma:generate",
"database:seed": "yarn prisma:seed", "database:seed": "yarn prisma:seed",
"database:reset": "yarn database:migrate && yarn database:generate && yarn database:seed" "database:reset": "yarn database:generate && yarn database:migrate && yarn database:seed"
}, },
"dependencies": { "dependencies": {
"@apollo/server": "^4.7.3", "@apollo/server": "^4.7.3",