From 864d16f10525744261b4769178f268706ed78b6b Mon Sep 17 00:00:00 2001 From: Romain Lenzotti Date: Tue, 7 May 2024 10:16:08 +0200 Subject: [PATCH] fix(swagger): use getAbsolutePath from swagger-ui-dist/get-absolute-path.js Closes: #2695 --- packages/specs/swagger/.npmignore | 5 ++++- packages/specs/swagger/scripts/constants.js | 3 ++- packages/specs/swagger/src/constants.ts | 4 ++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/packages/specs/swagger/.npmignore b/packages/specs/swagger/.npmignore index 478650b28fb..db1eeccb108 100644 --- a/packages/specs/swagger/.npmignore +++ b/packages/specs/swagger/.npmignore @@ -1,5 +1,8 @@ src test -tsconfig.compile.json +tsconfig.esm.json tsconfig.json *.tsbuildinfo +scripts +jest.config.js +*.spec.js diff --git a/packages/specs/swagger/scripts/constants.js b/packages/specs/swagger/scripts/constants.js index dcd7b43347c..503cce7fde4 100644 --- a/packages/specs/swagger/scripts/constants.js +++ b/packages/specs/swagger/scripts/constants.js @@ -1,7 +1,8 @@ import {dirname} from "node:path"; import {fileURLToPath} from "node:url"; +import * as SwaggerUIDist from "swagger-ui-dist/absolute-path.js"; // @ts-ignore -export const SWAGGER_UI_DIST = dirname(fileURLToPath(import.meta.resolve("swagger-ui-dist"))); +export const SWAGGER_UI_DIST = await (SwaggerUIDist.default || SwaggerUIDist)(); // @ts-expect-error export const ROOT_DIR = dirname(fileURLToPath(import.meta.url)); diff --git a/packages/specs/swagger/src/constants.ts b/packages/specs/swagger/src/constants.ts index 8cb249b948a..d1c3bedf859 100644 --- a/packages/specs/swagger/src/constants.ts +++ b/packages/specs/swagger/src/constants.ts @@ -1,4 +1,4 @@ -import {dirname} from "path"; +import getAbsoluteFSPath from "swagger-ui-dist/absolute-path"; -export const SWAGGER_UI_DIST = dirname(require.resolve("swagger-ui-dist")); +export const SWAGGER_UI_DIST = getAbsoluteFSPath(); export const ROOT_DIR = __dirname;