From ff25d7a18e7095cc3edc4eff029e1c03a49c7e4c Mon Sep 17 00:00:00 2001
From: Paul Carduner <paul@carduner.net>
Date: Wed, 8 Jan 2025 14:42:45 -0800
Subject: [PATCH] fix: middlewares not being used when GET handler is missing

---
 src/plugins/fs_routes/mod.ts       |  5 +++-
 src/plugins/fs_routes/mod_test.tsx | 41 ++++++++++++++++++++++++++++++
 2 files changed, 45 insertions(+), 1 deletion(-)

diff --git a/src/plugins/fs_routes/mod.ts b/src/plugins/fs_routes/mod.ts
index 7e9cb6c5605..46a92f26b33 100644
--- a/src/plugins/fs_routes/mod.ts
+++ b/src/plugins/fs_routes/mod.ts
@@ -296,7 +296,10 @@ export async function fsRoutes<State>(
         isHandlerByMethod(handlers) &&
         !Object.keys(handlers).includes("GET");
       if (missingGetHandler) {
-        app.get(routePath, renderMiddleware(components, undefined));
+        const combined = middlewares.concat(
+          renderMiddleware(components, undefined),
+        );
+        app.get(routePath, ...combined);
       }
     }
 
diff --git a/src/plugins/fs_routes/mod_test.tsx b/src/plugins/fs_routes/mod_test.tsx
index 261a2dec2de..2760689213d 100644
--- a/src/plugins/fs_routes/mod_test.tsx
+++ b/src/plugins/fs_routes/mod_test.tsx
@@ -1193,6 +1193,47 @@ Deno.test("fsRoutes - registers default GET route for component without GET hand
   );
 });
 
+Deno.test("fsRoutes - default GET route works with nested middleware", async () => {
+  const server = await createServer<{ text: string }>({
+    "routes/_middleware.ts": {
+      handler: (ctx) => {
+        ctx.state.text = "A";
+        return ctx.next();
+      },
+    },
+    "routes/foo/_middleware.ts": {
+      handler: (ctx) => {
+        ctx.state.text += "B";
+        return ctx.next();
+      },
+    },
+    "routes/foo/noGetHandler.tsx": {
+      default: (ctx) => {
+        return <h1>{ctx.state.text}</h1>;
+      },
+      handlers: {
+        POST: () => new Response("POST"),
+      },
+    },
+  });
+
+  const postRes = await server.post("/foo/noGetHandler");
+  expect(postRes.status).toEqual(200);
+  expect(postRes.headers.get("Content-Type")).toEqual(
+    "text/plain;charset=UTF-8",
+  );
+  expect(await postRes.text()).toEqual("POST");
+
+  const getRes = await server.get("/foo/noGetHandler");
+  expect(getRes.status).toEqual(200);
+  expect(getRes.headers.get("Content-Type")).toEqual(
+    "text/html; charset=utf-8",
+  );
+  expect(await getRes.text()).toContain(
+    "<h1>AB</h1>",
+  );
+});
+
 Deno.test("fsRoutes - default GET route doesn't override existing handler", async () => {
   const server = await createServer<{ value: boolean }>({
     "routes/withGetHandler.tsx": {