Fastify V4->V5 Upgrade

packages/adapters/fastify/web/package.json

@@ -21,15 +21,15 @@
     "test:watch": "vitest watch"
   },
   "dependencies": {
-    "@fastify/http-proxy": "9.5.0",
-    "@fastify/static": "6.12.0",
-    "@fastify/url-data": "5.4.0",
+    "@fastify/http-proxy": "11.1.2",
+    "@fastify/static": "8.2.0",
+    "@fastify/url-data": "6.0.3",
     "@redwoodjs/project-config": "workspace:*",
     "fast-glob": "3.3.2"
   },
   "devDependencies": {
     "@redwoodjs/framework-tools": "workspace:*",
-    "fastify": "4.28.1",
+    "fastify": "5.3.3",
     "tsx": "4.19.2",
     "typescript": "5.6.2",
     "vitest": "2.1.9"

packages/adapters/fastify/web/src/web.test.ts

@@ -51,7 +51,7 @@ describe('redwoodFastifyWeb', () => {
       })
 
       expect(res.statusCode).toBe(200)
-      expect(res.headers['content-type']).toBe('text/html; charset=UTF-8')
+      expect(res.headers['content-type']).toBe('text/html; charset=utf-8')
       expect(res.body).toBe(
         fs.readFileSync(path.join(getPaths().web.dist, `${url}.html`), 'utf-8'),
       )
@@ -66,7 +66,7 @@ describe('redwoodFastifyWeb', () => {
       })
 
       expect(res.statusCode).toBe(200)
-      expect(res.headers['content-type']).toBe('text/html; charset=UTF-8')
+      expect(res.headers['content-type']).toBe('text/html; charset=utf-8')
       expect(res.body).toBe(
         fs.readFileSync(path.join(getPaths().web.dist, `${url}.html`), 'utf-8'),
       )
@@ -83,7 +83,7 @@ describe('redwoodFastifyWeb', () => {
       })
 
       expect(res.statusCode).toBe(200)
-      expect(res.headers['content-type']).toBe('text/html; charset=UTF-8')
+      expect(res.headers['content-type']).toBe('text/html; charset=utf-8')
       expect(res.body).toBe(
         fs.readFileSync(path.join(getPaths().web.dist, `${url}.html`), 'utf-8'),
       )
@@ -122,7 +122,7 @@ describe('redwoodFastifyWeb', () => {
       })
 
       expect(res.statusCode).toBe(200)
-      expect(res.headers['content-type']).toBe('text/html; charset=UTF-8')
+      expect(res.headers['content-type']).toBe('text/html; charset=utf-8')
       expect(res.body).toBe(
         fs.readFileSync(path.join(getPaths().web.dist, url), 'utf-8'),
       )
@@ -135,7 +135,7 @@ describe('redwoodFastifyWeb', () => {
       })
 
       expect(res.statusCode).toBe(200)
-      expect(res.headers['content-type']).toBe('text/html; charset=UTF-8')
+      expect(res.headers['content-type']).toBe('text/html; charset=utf-8')
       expect(res.body).toBe(
         fs.readFileSync(path.join(getPaths().web.dist, '200.html'), 'utf-8'),
       )
@@ -153,7 +153,7 @@ describe('redwoodFastifyWeb', () => {
 
       expect(res.statusCode).toBe(200)
       expect(res.headers['content-type']).toBe(
-        'application/javascript; charset=UTF-8',
+        'application/javascript; charset=utf-8',
       )
       expect(res.body).toBe(
         fs.readFileSync(
@@ -172,7 +172,7 @@ describe('redwoodFastifyWeb', () => {
       })
 
       expect(res.statusCode).toBe(200)
-      expect(res.headers['content-type']).toBe('text/css; charset=UTF-8')
+      expect(res.headers['content-type']).toBe('text/css; charset=utf-8')
       expect(res.body).toBe(
         fs.readFileSync(
           path.join(getPaths().web.dist, relativeFilePath),
@@ -191,7 +191,7 @@ describe('redwoodFastifyWeb', () => {
 
       expect(res.statusCode).toBe(200)
       expect(res.headers['content-type']).toBe(
-        'application/json; charset=UTF-8',
+        'application/json; charset=utf-8',
       )
       expect(res.body).toBe(
         fs.readFileSync(
@@ -220,7 +220,7 @@ describe('redwoodFastifyWeb', () => {
       })
 
       expect(res.statusCode).toBe(200)
-      expect(res.headers['content-type']).toBe('text/markdown; charset=UTF-8')
+      expect(res.headers['content-type']).toBe('text/markdown; charset=utf-8')
       expect(res.body).toBe(
         fs.readFileSync(
           path.join(getPaths().web.dist, relativeFilePath),
@@ -238,7 +238,7 @@ describe('redwoodFastifyWeb', () => {
       })
 
       expect(res.statusCode).toBe(200)
-      expect(res.headers['content-type']).toBe('text/plain; charset=UTF-8')
+      expect(res.headers['content-type']).toBe('text/plain; charset=utf-8')
       expect(res.body).toBe(
         fs.readFileSync(
           path.join(getPaths().web.dist, relativeFilePath),

packages/adapters/fastify/web/src/webFallback.test.ts

@@ -37,7 +37,7 @@ describe('webFallback', () => {
     })
 
     expect(res.statusCode).toBe(200)
-    expect(res.headers['content-type']).toBe('text/html; charset=UTF-8')
+    expect(res.headers['content-type']).toBe('text/html; charset=utf-8')
     expect(res.body).toBe(
       fs.readFileSync(path.join(getPaths().web.dist, url), 'utf-8'),
     )

packages/api-server/package.json

@@ -29,8 +29,8 @@
     "test:watch": "vitest watch"
   },
   "dependencies": {
-    "@fastify/multipart": "8.3.1",
-    "@fastify/url-data": "5.4.0",
+    "@fastify/multipart": "9.0.3",
+    "@fastify/url-data": "6.0.3",
     "@redwoodjs/context": "workspace:*",
     "@redwoodjs/fastify-web": "workspace:*",
     "@redwoodjs/internal": "workspace:*",
@@ -41,8 +41,8 @@
     "dotenv-defaults": "5.0.2",
     "fast-glob": "3.3.2",
     "fast-json-parse": "1.0.3",
-    "fastify": "4.28.1",
-    "fastify-raw-body": "4.3.0",
+    "fastify": "5.3.3",
+    "fastify-raw-body": "5.0.0",
     "lodash": "4.17.21",
     "pretty-bytes": "5.6.0",
     "pretty-ms": "7.0.1",
@@ -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,
@@ -19,7 +19,7 @@ import type { createServer as tCreateServer } from '../createServer.js'
 import type { ResolvedOptions } from '../createServerHelpers'
 import {
   resolveOptions,
-  DEFAULT_CREATE_SERVER_OPTIONS,
+  getDefaultCreateServerOptions,
 } from '../createServerHelpers'
 
 // Set up RWJS_CWD.
@@ -161,7 +161,6 @@ describe('createServer', () => {
       level: 30,
       msg: 'incoming request',
       req: {
-        hostname: 'localhost:80',
         method: 'GET',
         remoteAddress: '127.0.0.1',
         url: '/hello',
@@ -226,18 +225,16 @@ describe('createServer', () => {
 describe('resolveOptions', () => {
   it('nothing passed', () => {
     const resolvedOptions = resolveOptions()
+    const defaults = getDefaultCreateServerOptions()
 
     expect(resolvedOptions).toEqual({
-      apiRootPath: DEFAULT_CREATE_SERVER_OPTIONS.apiRootPath,
-      configureApiServer: DEFAULT_CREATE_SERVER_OPTIONS.configureApiServer,
+      apiRootPath: defaults.apiRootPath,
+      configureApiServer: defaults.configureApiServer,
       fastifyServerOptions: {
-        requestTimeout:
-          DEFAULT_CREATE_SERVER_OPTIONS.fastifyServerOptions.requestTimeout,
-        logger: DEFAULT_CREATE_SERVER_OPTIONS.logger,
-        bodyLimit: DEFAULT_CREATE_SERVER_OPTIONS.fastifyServerOptions.bodyLimit,
+        requestTimeout: defaults.fastifyServerOptions.requestTimeout,
+        logger: defaults.logger,
+        bodyLimit: defaults.fastifyServerOptions.bodyLimit,
       },
-      discoverFunctionsGlob:
-        DEFAULT_CREATE_SERVER_OPTIONS.discoverFunctionsGlob,
       apiPort: 65501,
       apiHost: '::',
     } as ResolvedOptions)
@@ -303,7 +300,7 @@ describe('resolveOptions', () => {
 
     expect(resolvedOptions).toMatchObject({
       fastifyServerOptions: {
-        logger: DEFAULT_CREATE_SERVER_OPTIONS.logger,
+        logger: getDefaultCreateServerOptions().logger,
       },
     })
   })

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'
 
@@ -67,7 +67,6 @@ export async function createServer(options: CreateServerOptions = {}) {
   const {
     apiRootPath,
     fastifyServerOptions,
-    discoverFunctionsGlob,
     configureApiServer,
     apiPort,
     apiHost,
@@ -120,7 +119,6 @@ export async function createServer(options: CreateServerOptions = {}) {
       fastGlobOptions: {
         ignore: ['**/dist/functions/graphql.js'],
       },
-      discoverFunctionsGlob,
       configureServer: configureApiServer,
     },
   })