fix(fastify): Prevent duplicate @fastify/url-data registration (#9794)

redwoodjs · Jan 3, 2024 · 660f033 · 660f033
1 parent f053729
commit 660f033
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 6 deletions.
diff --git a/packages/api-server/src/plugins/withFunctions.ts b/packages/api-server/src/plugins/withFunctions.ts
@@ -13,7 +13,9 @@ const withFunctions = async (
 ) => {
   const { apiRootPath } = options
   // Add extra fastify plugins
-  fastify.register(fastifyUrlData)
+  if (!fastify.hasPlugin('@fastify/url-data')) {
+    await fastify.register(fastifyUrlData)
+  }
 
   // Fastify v4 must await the fastifyRawBody plugin
   // registration to ensure the plugin is ready

diff --git a/packages/api-server/src/plugins/withWebServer.ts b/packages/api-server/src/plugins/withWebServer.ts
@@ -28,7 +28,9 @@ const withWebServer = async (
   fastify: FastifyInstance,
   options: WebServerArgs
 ) => {
-  fastify.register(fastifyUrlData)
+  if (!fastify.hasPlugin('@fastify/url-data')) {
+    await fastify.register(fastifyUrlData)
+  }
 
   const prerenderedFiles = findPrerenderedHtml()
   const indexPath = getFallbackIndexPath()

diff --git a/packages/fastify/src/api.ts b/packages/fastify/src/api.ts
@@ -14,7 +14,9 @@ export async function redwoodFastifyAPI(
   opts: RedwoodFastifyAPIOptions,
   done: HookHandlerDoneFunction
 ) {
-  fastify.register(fastifyUrlData)
+  if (!fastify.hasPlugin('@fastify/url-data')) {
+    await fastify.register(fastifyUrlData)
+  }
   await fastify.register(fastifyRawBody)
 
   // TODO: This should be refactored to only be defined once and it might not live here

diff --git a/packages/fastify/src/graphql.ts b/packages/fastify/src/graphql.ts
@@ -34,7 +34,9 @@ export async function redwoodFastifyGraphQLServer(
   // These two plugins are needed to transform a Fastify Request to a Lambda event
   // which is used by the RedwoodGraphQLContext and mimics the behavior of the
   // api-server withFunction plugin
-  fastify.register(fastifyUrlData)
+  if (!fastify.hasPlugin('@fastify/url-data')) {
+    await fastify.register(fastifyUrlData)
+  }
   await fastify.register(fastifyRawBody)
 
   try {

diff --git a/packages/fastify/src/web.ts b/packages/fastify/src/web.ts
@@ -21,7 +21,9 @@ export async function redwoodFastifyWeb(
   opts: RedwoodFastifyWebOptions,
   done: HookHandlerDoneFunction
 ) {
-  fastify.register(fastifyUrlData)
+  if (!fastify.hasPlugin('@fastify/url-data')) {
+    await fastify.register(fastifyUrlData)
+  }
   const prerenderedFiles = findPrerenderedHtml()
 
   // Serve prerendered HTML directly, instead of the index.

diff --git a/packages/web-server/src/web.ts b/packages/web-server/src/web.ts
@@ -27,7 +27,9 @@ export async function redwoodFastifyWeb(
   opts: RedwoodFastifyWebOptions,
   done: HookHandlerDoneFunction
 ) {
-  fastify.register(fastifyUrlData)
+  if (!fastify.hasPlugin('@fastify/url-data')) {
+    await fastify.register(fastifyUrlData)
+  }
   const prerenderedFiles = findPrerenderedHtml()
 
   // Serve prerendered HTML directly, instead of the index.