From e03bac9e6411430a3158283f6fc830ed11fb388b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ivar=20Conradi=20=C3=98sthus?= Date: Fri, 27 Aug 2021 12:02:02 +0200 Subject: [PATCH] fix: oas being overriden --- package.json | 3 ++- src/lib/app.ts | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 4039c9cacb..a1efff3aa7 100644 --- a/package.json +++ b/package.json @@ -30,12 +30,13 @@ "prestart:dev": "yarn run clean", "start:dev": "NODE_ENV=development tsc-watch --onSuccess \"node dist/server-dev.js\"", "copy-templates": "copyfiles -u 1 src/mailtemplates/**/*.mustache dist/", + "copy-docs": "copyfiles -u 1 websitev2/docs/api/oas/* dist", "db-migrate": "db-migrate --migrations-dir ./src/migrations", "lint": "eslint ./src", "prebuild:watch": "yarn run clean", "build:watch": "tsc -w", "prebuild": "yarn run clean", - "build": "yarn run copy-templates && tsc --pretty", + "build": "yarn run copy-docs && yarn run copy-templates && tsc --pretty", "prepare": "yarn run build", "test": "NODE_ENV=test PORT=4243 jest", "test:docker": "./scripts/docker-postgres.sh", diff --git a/src/lib/app.ts b/src/lib/app.ts index 09e93d80b7..eed837e836 100644 --- a/src/lib/app.ts +++ b/src/lib/app.ts @@ -74,7 +74,8 @@ export default function getApp( app.use(baseUriPath, express.static(publicFolder, { index: false })); if (config.enableOAS) { - app.use(`${baseUriPath}/oas`, express.static('docs/api/oas')); + const oasPath = path.resolve(__dirname, '../docs/api/oas'); + app.use(`${baseUriPath}/oas`, express.static(oasPath)); } switch (config.authentication.type) { case IAuthType.OPEN_SOURCE: {