Fastify config: Use exact file extension in log message

redwoodjs · Jan 14, 2024 · 7fccd3e · 7fccd3e
1 parent 23b330d
commit 7fccd3e
Showing 1 changed file with 9 additions and 7 deletions.
diff --git 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: {},