From 945b70e07f1391fe2d9d26639e7e1558547ab575 Mon Sep 17 00:00:00 2001 From: julien huang Date: Thu, 19 May 2022 22:43:08 +0200 Subject: [PATCH 1/2] feat(kit): Support the method suffix in addServerHandler --- packages/kit/src/server.ts | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/packages/kit/src/server.ts b/packages/kit/src/server.ts index d2c6a20476b..8c61cd8f545 100644 --- a/packages/kit/src/server.ts +++ b/packages/kit/src/server.ts @@ -9,6 +9,19 @@ export interface LegacyServerMiddleware { handler: Middleware | string } +/** + * normalize handler object + * + */ +function normalizeHandlerMethod (handler: NitroEventHandler) { + // retrieve method from handler file name + const [, method = undefined] = handler.handler.match(/\.(get|head|patch|post|put|delete|connect|options|trace)(\.\w+)*$/) || [] + return { + ...handler, + method + } +} + /** * Adds a new server middleware to the end of the server middleware array. * @@ -23,7 +36,7 @@ export function addServerMiddleware (middleware: LegacyServerMiddleware) { * */ export function addServerHandler (handler: NitroEventHandler) { - useNuxt().options.serverHandlers.push(handler) + useNuxt().options.serverHandlers.push(normalizeHandlerMethod(handler)) } /** From 3e98b1f08fe646d173cc9464f1af528a34e02f0a Mon Sep 17 00:00:00 2001 From: julien huang Date: Tue, 14 Jun 2022 23:36:44 +0200 Subject: [PATCH 2/2] refactor(kit): allow method override in normalizeHandlerMethod() --- packages/kit/src/server.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/kit/src/server.ts b/packages/kit/src/server.ts index 8c61cd8f545..ba2a031f118 100644 --- a/packages/kit/src/server.ts +++ b/packages/kit/src/server.ts @@ -17,8 +17,8 @@ function normalizeHandlerMethod (handler: NitroEventHandler) { // retrieve method from handler file name const [, method = undefined] = handler.handler.match(/\.(get|head|patch|post|put|delete|connect|options|trace)(\.\w+)*$/) || [] return { - ...handler, - method + method, + ...handler } }