From 635e6887f37616ae22d681095b1f41a3d095afe1 Mon Sep 17 00:00:00 2001 From: Baptiste Arnaud Date: Tue, 22 Nov 2022 20:58:22 +0100 Subject: [PATCH] :green_heart: (docs) Fix api schema generation in CI --- apps/builder/package.json | 1 + apps/docs/openapi/builder.json | 3 ++- apps/docs/package.json | 2 +- apps/landing-page/package.json | 1 + apps/viewer/package.json | 1 + package.json | 7 +++---- turbo.json | 12 ++++++++++++ 7 files changed, 21 insertions(+), 6 deletions(-) diff --git a/apps/builder/package.json b/apps/builder/package.json index 10bdda82b..c03a3e179 100644 --- a/apps/builder/package.json +++ b/apps/builder/package.json @@ -5,6 +5,7 @@ "scripts": { "dev": "ENVSH_ENV=.env.local bash ../../env.sh next dev -p 3000", "build": "next build", + "build:env": "cd ../.. && ENVSH_ENV=./apps/builder/.env.docker ENVSH_OUTPUT=./apps/builder/public/__env.js bash env.sh", "start": "next start", "lint": "next lint", "test": "pnpm playwright test", diff --git a/apps/docs/openapi/builder.json b/apps/docs/openapi/builder.json index 9d2754df3..bc504e8d9 100644 --- a/apps/docs/openapi/builder.json +++ b/apps/docs/openapi/builder.json @@ -90,7 +90,8 @@ "type": "string" }, "value": { - "type": "string" + "type": "string", + "nullable": true } }, "required": [ diff --git a/apps/docs/package.json b/apps/docs/package.json index e6f48bbc1..175b58a77 100644 --- a/apps/docs/package.json +++ b/apps/docs/package.json @@ -13,7 +13,7 @@ "write-translations": "docusaurus write-translations", "write-heading-ids": "docusaurus write-heading-ids", "update-search": "docker run -it --rm --env-file=.env -e \"CONFIG=$(cat docsearch-scrapper-config.json | jq -r tostring)\" algolia/docsearch-scraper", - "builder:generate:openapi": "tsx --tsconfig ../builder/tsconfig.json ../builder/src/utils/server/generateOpenApi.ts" + "api:generate": "tsx --tsconfig ../builder/tsconfig.json ../builder/src/utils/server/generateOpenApi.ts" }, "dependencies": { "@docusaurus/core": "2.2.0", diff --git a/apps/landing-page/package.json b/apps/landing-page/package.json index fbbfd017c..09e8a3107 100644 --- a/apps/landing-page/package.json +++ b/apps/landing-page/package.json @@ -5,6 +5,7 @@ "dev": "ENVSH_ENV=.env.local bash ../../env.sh next dev -p 3002", "start": "next start", "build": "next build", + "build:env": "cd ../.. && ENVSH_ENV=./apps/landing-page/.env.docker ENVSH_OUTPUT=./apps/landing-page/public/__env.js bash env.sh", "lint": "next lint", "analyze": "cross-env ANALYZE=true next build" }, diff --git a/apps/viewer/package.json b/apps/viewer/package.json index a67262ccd..bf2a6861d 100644 --- a/apps/viewer/package.json +++ b/apps/viewer/package.json @@ -5,6 +5,7 @@ "scripts": { "dev": "ENVSH_ENV=.env.local bash ../../env.sh next dev -p 3001", "build": "next build", + "build:env": "cd ../.. && ENVSH_ENV=./apps/viewer/.env.docker ENVSH_OUTPUT=./apps/viewer/public/__env.js bash env.sh", "start": "next start -p 3001", "lint": "next lint", "test": "pnpm playwright test", diff --git a/package.json b/package.json index 9cb42aec7..dfa54559e 100644 --- a/package.json +++ b/package.json @@ -15,10 +15,9 @@ "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 run build", - "build:builder": "turbo run build --filter=builder... && ENVSH_ENV=./apps/builder/.env.docker ENVSH_OUTPUT=./apps/builder/public/__env.js bash env.sh", - "build:viewer": "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", - "build:docs": "cd apps/docs && pnpm run builder:generate:openapi && cd ../.. && turbo run build --filter=docs...", + "build:builder": "turbo run build --filter=builder... && turbo run build:env --filter=builder...", + "build:viewer": "turbo run build --filter=viewer... && turbo run build:env --filter=viewer...", + "build:landing-page": "turbo run build --filter=landing-page... && turbo run build:env --filter=landing-page...", "db:migrate": "cd packages/db && pnpm run db:migrate", "generate-change-log": "pnpx gitmoji-changelog" }, diff --git a/turbo.json b/turbo.json index 03d93b467..fb16f7d39 100644 --- a/turbo.json +++ b/turbo.json @@ -13,6 +13,18 @@ "outputs": [".next/**", "dist/**", "build/**"], "outputMode": "new-only" }, + "docs#build": { + "dependsOn": ["api:generate"], + "outputs": ["build/**"], + "outputMode": "new-only" + }, + "build:env": { + "cache": false + }, + "api:generate": { + "dependsOn": ["db#db:generate"], + "cache": false + }, "db:generate": { "cache": false },