From 7fccd3e798bc0fc92fa1af209b0fb9b134579370 Mon Sep 17 00:00:00 2001 From: Tobbe Lundberg Date: Sun, 14 Jan 2024 16:02:33 +0100 Subject: [PATCH] Fastify config: Use exact file extension in log message --- packages/fastify/src/config.ts | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/packages/fastify/src/config.ts b/packages/fastify/src/config.ts index 59cbfe658aef..8daadb0f4c67 100644 --- a/packages/fastify/src/config.ts +++ b/packages/fastify/src/config.ts @@ -36,14 +36,16 @@ let serverConfigFile: { } export function loadFastifyConfig() { - const serverFileExists = - fs.existsSync(path.join(getPaths().api.src, 'server.js')) || - fs.existsSync(path.join(getPaths().api.src, 'server.ts')) + const serverTsFileExists = fs.existsSync( + path.join(getPaths().api.src, 'server.ts') + ) + const serverJsFileExists = + !serverTsFileExists && + fs.existsSync(path.join(getPaths().api.src, 'server.js')) - if (serverFileExists) { - console.log( - "Ignoring Fastify config inside 'api/src/server.config.(js|ts)'" - ) + if (serverTsFileExists || serverJsFileExists) { + const ext = serverTsFileExists ? 'ts' : 'js' + console.log(`Ignoring Fastify config inside 'api/src/server.config.${ext}`) return { config: {},