package_updates_v5_logger_fix

Author: ladderschool

packages/api-server/package.json

@@ -57,6 +57,7 @@
     "@types/qs": "6.9.16",
     "@types/split2": "4.2.3",
     "@types/yargs": "17.0.33",
+    "memfs": "4.14.0",
     "pino-abstract-transport": "1.2.0",
     "tsx": "4.19.2",
     "typescript": "5.6.2",

packages/api-server/src/__tests__/createServer.test.ts

@@ -1,6 +1,6 @@
 import path from 'path'
 
-import pino from 'pino'
+import pino from 'pino/pino'
 import build from 'pino-abstract-transport'
 import {
   vi,
@@ -160,7 +160,6 @@ describe('createServer', () => {
       level: 30,
       msg: 'incoming request',
       req: {
-        hostname: 'localhost:80',
         method: 'GET',
         remoteAddress: '127.0.0.1',
         url: '/hello',

packages/api-server/src/__tests__/fastify.test.ts

@@ -1,4 +1,4 @@
-import fastify from 'fastify'
+import fastify from 'fastify/fastify'
 import { vol } from 'memfs'
 import {
   vi,

packages/api-server/src/createServer.ts

@@ -4,9 +4,9 @@ import path from 'path'
 import chalk from 'chalk'
 import { config } from 'dotenv-defaults'
 import fg from 'fast-glob'
-import fastify from 'fastify'
+import fastify from 'fastify/fastify'
 
-import type { GlobalContext } from '@redwoodjs/context'
+import type { GlobalContext } from '@redwoodjs/context/dist'
 import { getAsyncStoreInstance } from '@redwoodjs/context/dist/store'
 import { getConfig, getPaths } from '@redwoodjs/project-config'
 

packages/api-server/src/createServerHelpers.ts

@@ -4,7 +4,7 @@ import type {
   FastifyListenOptions,
   FastifyServerOptions,
   FastifyInstance,
-} from 'fastify'
+} from 'fastify/fastify'
 
 import { coerceRootPath } from '@redwoodjs/fastify-web/dist/helpers'
 
@@ -89,7 +89,6 @@ export function resolveOptions(
     fastifyServerOptions: options.fastifyServerOptions ?? {
       requestTimeout:
         DEFAULT_CREATE_SERVER_OPTIONS.fastifyServerOptions.requestTimeout,
-      logger: options.logger ?? DEFAULT_CREATE_SERVER_OPTIONS.logger,
       bodyLimit: DEFAULT_CREATE_SERVER_OPTIONS.fastifyServerOptions.bodyLimit,
     },
     configureApiServer:
@@ -102,7 +101,20 @@ export function resolveOptions(
   // Merge fastifyServerOptions.
   resolvedOptions.fastifyServerOptions.requestTimeout ??=
     DEFAULT_CREATE_SERVER_OPTIONS.fastifyServerOptions.requestTimeout
-  resolvedOptions.fastifyServerOptions.logger = options.logger
+
+  // Fastify v5: Custom logger instances use 'loggerInstance', config uses 'logger'
+  const isCustomLoggerInstance =
+    options.logger &&
+    typeof options.logger === 'object' &&
+    'info' in options.logger
+
+  if (isCustomLoggerInstance) {
+    ;(resolvedOptions.fastifyServerOptions as any).loggerInstance =
+      options.logger
+  } else {
+    resolvedOptions.fastifyServerOptions.logger =
+      options.logger ?? DEFAULT_CREATE_SERVER_OPTIONS.logger
+  }
 
   if (options.parseArgs) {
     const { values } = parseArgs({

packages/api-server/src/fastify.ts

@@ -1,10 +1,10 @@
 import fs from 'fs'
 import path from 'path'
 
-import type { FastifyInstance, FastifyServerOptions } from 'fastify'
-import Fastify from 'fastify'
+import type { FastifyInstance, FastifyServerOptions } from 'fastify/fastify'
+import Fastify from 'fastify/fastify'
 
-import type { GlobalContext } from '@redwoodjs/context'
+import type { GlobalContext } from '@redwoodjs/context/dist/'
 import { getAsyncStoreInstance } from '@redwoodjs/context/dist/store'
 import { getPaths, getConfig } from '@redwoodjs/project-config'
 

yarn.lock

@@ -7370,6 +7370,7 @@ __metadata:
     fastify: "npm:5.3.3"
     fastify-raw-body: "npm:5.0.0"
     lodash: "npm:4.17.21"
+    memfs: "npm:4.14.0"
     pino-abstract-transport: "npm:1.2.0"
     pretty-bytes: "npm:5.6.0"
     pretty-ms: "npm:7.0.1"
@@ -22473,6 +22474,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"memfs@npm:4.14.0":
+  version: 4.14.0
+  resolution: "memfs@npm:4.14.0"
+  dependencies:
+    "@jsonjoy.com/json-pack": "npm:^1.0.3"
+    "@jsonjoy.com/util": "npm:^1.3.0"
+    tree-dump: "npm:^1.0.1"
+    tslib: "npm:^2.0.0"
+  checksum: 10c0/d1de2e4b3c269f5b5f27b63f60bb8ea9ae5800843776e0bed4548f2957dcd55237ac5eab3a5ffe0d561a6be53e42c055a7bc79efc1613563b14e14c287ef3b0a
+  languageName: node
+  linkType: hard
+
 "memfs@npm:4.15.1":
   version: 4.15.1
   resolution: "memfs@npm:4.15.1"