Skip to content

Commit 40523a6

Browse files
fix: updated fastify to version 5
1 parent b54c395 commit 40523a6

File tree

9 files changed

+593
-774
lines changed

9 files changed

+593
-774
lines changed

package-lock.json

Lines changed: 576 additions & 757 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,17 @@
2222
"author": "Supabase",
2323
"license": "ISC",
2424
"engines": {
25-
"node": ">= 14.0.0"
25+
"node": ">= 20.0.0"
2626
},
2727
"dependencies": {
2828
"@aws-sdk/client-s3": "3.654.0",
2929
"@aws-sdk/lib-storage": "3.654.0",
3030
"@aws-sdk/s3-request-presigner": "3.654.0",
31-
"@fastify/accepts": "^4.3.0",
32-
"@fastify/multipart": "^8.3.0",
31+
"@fastify/accepts": "^5.0.2",
32+
"@fastify/multipart": "^9.0.1",
3333
"@fastify/rate-limit": "^7.6.0",
34-
"@fastify/swagger": "^8.3.1",
35-
"@fastify/swagger-ui": "^4.1.0",
34+
"@fastify/swagger": "^9.4.0",
35+
"@fastify/swagger-ui": "^5.2.0",
3636
"@isaacs/ttlcache": "^1.4.1",
3737
"@opentelemetry/api": "^1.8.0",
3838
"@opentelemetry/auto-instrumentations-node": "^0.50.0",
@@ -55,9 +55,9 @@
5555
"conventional-changelog-conventionalcommits": "^5.0.0",
5656
"crypto-js": "^4.2.0",
5757
"dotenv": "^16.0.0",
58-
"fastify": "^4.28.1",
59-
"fastify-metrics": "^10.2.0",
60-
"fastify-plugin": "^4.5.1",
58+
"fastify": "^5.2.1",
59+
"fastify-metrics": "^10.6.0",
60+
"fastify-plugin": "^5.0.1",
6161
"fastify-xml-body-parser": "^2.2.0",
6262
"fs-extra": "^10.0.1",
6363
"fs-xattr": "0.3.1",

src/http/plugins/db.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ export const db = fastifyPlugin(
3131
async function db(fastify) {
3232
fastify.register(migrations)
3333

34-
fastify.decorateRequest('db', null)
34+
fastify.decorateRequest('db')
3535

3636
fastify.addHook('preHandler', async (request) => {
3737
const adminUser = await getServiceKeyUser(request.tenantId)
@@ -97,7 +97,7 @@ interface DbSuperUserPluginOptions {
9797
export const dbSuperUser = fastifyPlugin<DbSuperUserPluginOptions>(
9898
async function dbSuperUser(fastify, opts) {
9999
fastify.register(migrations)
100-
fastify.decorateRequest('db', null)
100+
fastify.decorateRequest('db')
101101

102102
fastify.addHook('preHandler', async (request) => {
103103
const adminUser = await getServiceKeyUser(request.tenantId)

src/http/plugins/storage.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ const storageBackend = createStorageBackend(storageBackendType)
1717

1818
export const storage = fastifyPlugin(
1919
async function storagePlugin(fastify) {
20-
fastify.decorateRequest('storage', null)
20+
fastify.decorateRequest('storage')
2121
fastify.addHook('preHandler', async (request) => {
2222
const database = new StorageKnexDB(request.db, {
2323
tenantId: request.tenantId,

src/http/routes/object/getObject.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@ interface getObjectRequestInterface extends AuthenticatedRangeRequest {
3333
async function requestHandler(
3434
request: FastifyRequest<getObjectRequestInterface, Server, IncomingMessage>,
3535
response: FastifyReply<
36+
getObjectRequestInterface,
3637
Server,
3738
IncomingMessage,
3839
ServerResponse,
39-
getObjectRequestInterface,
4040
unknown
4141
>
4242
) {

src/http/routes/object/getObjectInfo.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ interface getObjectRequestInterface extends AuthenticatedRangeRequest {
2525
async function requestHandler(
2626
request: FastifyRequest<getObjectRequestInterface, Server, IncomingMessage>,
2727
response: FastifyReply<
28+
getObjectRequestInterface,
2829
Server,
2930
IncomingMessage,
3031
ServerResponse,
31-
getObjectRequestInterface,
3232
unknown
3333
>,
3434
publicRoute = false,

src/start/server.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ async function httpServer(signal: AbortSignal) {
9292
const { exposeDocs, requestTraceHeader, port, host } = getConfig()
9393

9494
const app: FastifyInstance<Server, IncomingMessage, ServerResponse> = build({
95-
logger,
95+
loggerInstance: logger,
9696
disableRequestLogging: true,
9797
exposeDocs,
9898
requestIdHeader: requestTraceHeader,
@@ -141,7 +141,7 @@ async function httpAdminServer(
141141

142142
const adminApp = buildAdmin(
143143
{
144-
logger,
144+
loggerInstance: logger,
145145
disableRequestLogging: true,
146146
requestIdHeader: adminRequestIdHeader,
147147
},

src/start/worker.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ export async function main() {
5757
])
5858

5959
const server = adminApp({
60-
logger,
60+
loggerInstance: logger,
6161
disableRequestLogging: true,
6262
requestIdHeader: requestTraceHeader,
6363
})

src/test/tus.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ describe('Tus multipart', () => {
3131

3232
beforeAll(async () => {
3333
server = await app({
34-
logger: logger,
34+
loggerInstance: logger,
3535
})
3636

3737
await server.listen({

0 commit comments

Comments
 (0)