From bdf4e8361720175d1c8f1cd2fc10eadf6908f025 Mon Sep 17 00:00:00 2001 From: Baptiste Arnaud Date: Mon, 21 Nov 2022 15:39:31 +0100 Subject: [PATCH] :wrench: Update db turbo scripts --- README.md | 2 ++ apps/docs/docs/self-hosting/vercel.md | 2 +- package.json | 11 ++++------- packages/db/.env.example | 1 + packages/db/package.json | 14 +++++--------- turbo.json | 11 +++++++---- 6 files changed, 20 insertions(+), 21 deletions(-) create mode 100644 packages/db/.env.example diff --git a/README.md b/README.md index 67323cd5d1f..7d7fa00b9d2 100644 --- a/README.md +++ b/README.md @@ -63,6 +63,8 @@ Interested in self-hosting Typebot on your server? Take a look at the [self-host Copy `apps/viewer/.env.local.example` to `apps/viewer/.env.local` + Copy `packages/db/.env.example` to `packages/db/.env` + Check out the [Configuration guide](https://docs.typebot.io/self-hosting/configuration) if you want to enable more options 4. Make sure you have [Docker](https://docs.docker.com/compose/install/) running diff --git a/apps/docs/docs/self-hosting/vercel.md b/apps/docs/docs/self-hosting/vercel.md index 80b7a873064..07224df3714 100644 --- a/apps/docs/docs/self-hosting/vercel.md +++ b/apps/docs/docs/self-hosting/vercel.md @@ -42,7 +42,7 @@ Fork the repository 5. Change the build command to: ```sh - cd ../.. && pnpm prisma generate && pnpm build:viewer && pnpm db:migrate + cd ../.. && pnpm build:viewer && pnpm db:migrate ``` 6. Add the required environment variables ([Check out the configuration guide](/self-hosting/configuration)) diff --git a/package.json b/package.json index 598e3b3a764..5a477a9bc52 100644 --- a/package.json +++ b/package.json @@ -8,21 +8,18 @@ "apps/*" ], "scripts": { + "prepare": "husky install", "docker:up": "docker compose -f docker-compose.dev.yml up -d && sleep 5", "docker:nuke": "docker compose -f docker-compose.dev.yml down --volumes --remove-orphans", + "lint": "turbo run lint", "dev": "pnpm docker:up && NEXT_PUBLIC_E2E_TEST=false turbo run dev --filter=builder... --filter=viewer... --parallel --no-cache", "dev:mocking": "pnpm docker:up && NEXT_PUBLIC_E2E_TEST=true turbo run dev --filter=builder... --filter=viewer... --parallel --no-cache", "build": "pnpm docker:up && TURBO_CI_VENDOR_ENV_KEY=NEXT_PUBLIC_ turbo run build", "build:builder": "TURBO_CI_VENDOR_ENV_KEY=NEXT_PUBLIC_ turbo run build --filter=builder... && ENVSH_ENV=./apps/builder/.env.docker ENVSH_OUTPUT=./apps/builder/public/__env.js bash env.sh", "build:viewer": "TURBO_CI_VENDOR_ENV_KEY=NEXT_PUBLIC_ turbo run build --filter=viewer... && ENVSH_ENV=./apps/viewer/.env.docker ENVSH_OUTPUT=./apps/viewer/public/__env.js bash env.sh", "build:landing-page": "turbo run build --filter=landing-page... && ENVSH_ENV=./apps/landing-page/.env.docker ENVSH_OUTPUT=./apps/landing-page/public/__env.js bash env.sh", - "test:builder": "cd apps/builder && pnpm test", - "test:viewer": "cd apps/viewer && pnpm test", - "db:migrate": "cd packages/db && pnpm migration:deploy", - "build:ci": "turbo run build --filter=builder... --filter=viewer... && ENVSH_ENV=./apps/builder/.env.docker ENVSH_OUTPUT=./apps/builder/public/__env.js bash env.sh && ENVSH_ENV=./apps/viewer/.env.docker ENVSH_OUTPUT=./apps/viewer/public/__env.js bash env.sh", - "generate-change-log": "pnpx gitmoji-changelog", - "lint": "turbo run lint", - "prepare": "husky install" + "db:migrate": "cd packages/db && pnpm run db:migrate", + "generate-change-log": "pnpx gitmoji-changelog" }, "devDependencies": { "cz-emoji": "1.3.2-canary.2", diff --git a/packages/db/.env.example b/packages/db/.env.example new file mode 100644 index 00000000000..b6832edf33e --- /dev/null +++ b/packages/db/.env.example @@ -0,0 +1 @@ +DATABASE_URL=postgresql://postgres:typebot@localhost:5432/typebot \ No newline at end of file diff --git a/packages/db/package.json b/packages/db/package.json index a71903702ac..a8880bad0ca 100644 --- a/packages/db/package.json +++ b/packages/db/package.json @@ -5,15 +5,11 @@ "main": "./index.ts", "types": "./index.ts", "scripts": { - "dev": "dotenv -e ../../apps/builder/.env.local prisma db push && pnpm generate:schema && pnpm start:sutdio", - "build": "pnpm generate:schema", - "start:sutdio": "dotenv -e ../../apps/builder/.env.local -v BROWSER=none prisma studio", - "generate:schema": "dotenv -e ../../apps/builder/.env.local prisma generate", - "prisma": "dotenv -e ../../apps/builder/.env.local prisma", - "migration:push": "dotenv -e ../../apps/builder/.env.local prisma db push", - "migration:create": "dotenv -e ../../apps/builder/.env.local prisma migrate dev", - "migration:reset": "dotenv -e ../../apps/builder/.env.local prisma migrate reset", - "migration:deploy": "prisma migrate deploy" + "dev": "BROWSER=none prisma studio", + "db:generate": "prisma generate", + "db:push": "prisma db push --skip-generate", + "db:migrate": "prisma migrate deploy", + "create:migration": "prisma migrate dev" }, "dependencies": { "@prisma/client": "4.6.1" diff --git a/turbo.json b/turbo.json index 635bde19cf7..03d93b4676c 100644 --- a/turbo.json +++ b/turbo.json @@ -4,16 +4,19 @@ "lint": { "outputs": [] }, + "dev": { + "dependsOn": ["^dev", "^db:generate", "^db:push"], + "cache": false + }, "build": { - "dependsOn": ["^build"], + "dependsOn": ["^build", "^db:generate"], "outputs": [".next/**", "dist/**", "build/**"], "outputMode": "new-only" }, - "db#build": { + "db:generate": { "cache": false }, - "dev": { - "dependsOn": ["^dev"], + "db:push": { "cache": false } }