From 27cdec2c075766535e1779a52846e262f0c9bcd0 Mon Sep 17 00:00:00 2001
From: Daniel Choudhury <dannychoudhury@gmail.com>
Date: Thu, 4 Apr 2024 22:18:42 +0700
Subject: [PATCH 1/3] fix(middleware): Handle POST requests in middleware
 router too

---
 packages/vite/src/devFeServer.ts         | 9 ++++-----
 packages/vite/src/middleware/register.ts | 4 ++--
 packages/vite/src/runFeServer.ts         | 8 ++++----
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/packages/vite/src/devFeServer.ts b/packages/vite/src/devFeServer.ts
index afbe9890c570..3c46f940b892 100644
--- a/packages/vite/src/devFeServer.ts
+++ b/packages/vite/src/devFeServer.ts
@@ -75,16 +75,15 @@ async function createServer() {
     return createServerAdapter(async (req: Request) => {
       // Recreate middleware router on each request in dev
       const middlewareRouter = await createMiddlewareRouter(vite)
-
-      if (!middlewareRouter) {
-        return new Response('No middleware found', { status: 404 })
-      }
-
       const middleware = middlewareRouter.find(
         req.method as HTTPMethod,
         req.url,
       )?.handler as Middleware | undefined
 
+      if (!middleware) {
+        return new Response('No middleware found', { status: 404 })
+      }
+
       const [mwRes] = await invoke(req, middleware, route ? { route } : {})
 
       return mwRes.toResponse()
diff --git a/packages/vite/src/middleware/register.ts b/packages/vite/src/middleware/register.ts
index df3845fcc2b7..b916fbf0598f 100644
--- a/packages/vite/src/middleware/register.ts
+++ b/packages/vite/src/middleware/register.ts
@@ -88,8 +88,8 @@ export const addMiddlewareHandlers = (mwRegList: MiddlewareReg = []) => {
     const chainedMw = chain(mwList)
 
     // @NOTE: as any, because we don't actually use the fmw router to invoke the mw
-    // we use it just for matching. FMW doesn't seem to have a way of customising the handler signature
-    mwRouter.on('GET', pattern, chainedMw as any)
+    // we use it just for matching. FMW doesn't seem to have a way of customizing the handler type
+    mwRouter.on(['GET', 'POST'], pattern, chainedMw as any)
   }
 
   return mwRouter
diff --git a/packages/vite/src/runFeServer.ts b/packages/vite/src/runFeServer.ts
index e629ec1f6a81..9204ad611b9b 100644
--- a/packages/vite/src/runFeServer.ts
+++ b/packages/vite/src/runFeServer.ts
@@ -98,15 +98,15 @@ export async function runFeServer() {
 
   const handleWithMiddleware = (route?: RWRouteManifestItem) => {
     return createServerAdapter(async (req: Request) => {
-      if (!middlewareRouter) {
-        return new Response('No middleware found', { status: 404 })
-      }
-
       const middleware = middlewareRouter.find(
         req.method as HTTPMethod,
         req.url,
       )?.handler as Middleware | undefined
 
+      if (!middleware) {
+        return new Response('No middleware found', { status: 404 })
+      }
+
       const [mwRes] = await invoke(req, middleware, route ? { route } : {})
 
       return mwRes.toResponse()

From 9496a8cdf4a2a4cbfdf1483294f4f0cc3a14f153 Mon Sep 17 00:00:00 2001
From: Daniel Choudhury <dannychoudhury@gmail.com>
Date: Thu, 4 Apr 2024 22:19:57 +0700
Subject: [PATCH 2/3] Update snapshot

---
 .../src/middleware/createMiddlewareRouter.test.ts    | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/vite/src/middleware/createMiddlewareRouter.test.ts b/packages/vite/src/middleware/createMiddlewareRouter.test.ts
index fcd304f63a16..a8d65f09de11 100644
--- a/packages/vite/src/middleware/createMiddlewareRouter.test.ts
+++ b/packages/vite/src/middleware/createMiddlewareRouter.test.ts
@@ -64,9 +64,9 @@ describe('createMiddlewareRouter', () => {
     expect(result.prettyPrint()).toMatchInlineSnapshot(`
       "└── (empty root node)
           ├── /
-          │   ├── bazinga (GET)
-          │   └── kittens (GET)
-          └── * (GET)
+          │   ├── bazinga (GET, POST)
+          │   └── kittens (GET, POST)
+          └── * (GET, POST)
       "
     `)
     expect(distRegisterMwMock).toHaveBeenCalled()
@@ -85,9 +85,9 @@ describe('createMiddlewareRouter', () => {
     expect(result.prettyPrint()).toMatchInlineSnapshot(`
       "└── (empty root node)
           ├── /
-          │   ├── bazinga (GET)
-          │   └── kittens (GET)
-          └── * (GET)
+          │   ├── bazinga (GET, POST)
+          │   └── kittens (GET, POST)
+          └── * (GET, POST)
       "
     `)
     expect(distRegisterMwMock).toHaveBeenCalled()

From c068de7dc08e31454cfcc0b94c59f1647b1afeba Mon Sep 17 00:00:00 2001
From: Daniel Choudhury <dannychoudhury@gmail.com>
Date: Thu, 4 Apr 2024 22:55:45 +0700
Subject: [PATCH 3/3] Add changeset

---
 .changesets/10418.md | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 .changesets/10418.md

diff --git a/.changesets/10418.md b/.changesets/10418.md
new file mode 100644
index 000000000000..67e279473290
--- /dev/null
+++ b/.changesets/10418.md
@@ -0,0 +1,3 @@
+- fix(middleware): Handle POST requests in middleware router too (#10418) by @dac09
+
+Fixes issue with middleware router not accepted POST requests.