From 0d5ec20a4b5309e4d0f8f1531cae32770a7b3657 Mon Sep 17 00:00:00 2001
From: Ahad Birang <farnabaz@gmail.com>
Date: Mon, 11 Apr 2022 20:38:42 +0200
Subject: [PATCH] fix(nitro): pass resolved handlers to the nitro config
 (#4263)

---
 packages/bridge/src/nitro.ts     | 7 ++++---
 packages/nuxt3/src/core/nitro.ts | 7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/packages/bridge/src/nitro.ts b/packages/bridge/src/nitro.ts
index 83162238dc..4a37520fab 100644
--- a/packages/bridge/src/nitro.ts
+++ b/packages/bridge/src/nitro.ts
@@ -56,6 +56,9 @@ export async function setupNitroBridge () {
     }
   }
 
+  // Resolve Handlers
+  const { handlers, devHandlers } = await resolveHandlers(nuxt)
+
   // Resolve config
   const _nitroConfig = (nuxt.options as any).nitro || {} as NitroConfig
   const nitroConfig: NitroConfig = defu(_nitroConfig, <NitroConfig>{
@@ -67,7 +70,7 @@ export async function setupNitroBridge () {
     scanDirs: nuxt.options._layers.map(layer => join(layer.config.srcDir, 'server')),
     renderer: resolve(distDir, 'runtime/nitro/renderer'),
     nodeModulesDirs: nuxt.options.modulesDir,
-    handlers: [],
+    handlers,
     devHandlers: [],
     runtimeConfig: {
       ...nuxt.options.runtimeConfig,
@@ -231,8 +234,6 @@ export async function setupNitroBridge () {
   // Setup handlers
   const devMidlewareHandler = dynamicEventHandler()
   nitro.options.devHandlers.unshift({ handler: devMidlewareHandler })
-  const { handlers, devHandlers } = await resolveHandlers(nuxt)
-  nitro.options.handlers.push(...handlers)
   nitro.options.devHandlers.push(...devHandlers)
   nitro.options.handlers.unshift({
     route: '/__nuxt_error',
diff --git a/packages/nuxt3/src/core/nitro.ts b/packages/nuxt3/src/core/nitro.ts
index 3b520c9ef4..2c43c169fc 100644
--- a/packages/nuxt3/src/core/nitro.ts
+++ b/packages/nuxt3/src/core/nitro.ts
@@ -12,6 +12,9 @@ import { distDir } from '../dirs'
 import { ImportProtectionPlugin } from './plugins/import-protection'
 
 export async function initNitro (nuxt: Nuxt) {
+  // Resolve handlers
+  const { handlers, devHandlers } = await resolveHandlers(nuxt)
+
   // Resolve config
   const _nitroConfig = ((nuxt.options as any).nitro || {}) as NitroConfig
   const nitroConfig: NitroConfig = defu(_nitroConfig, <NitroConfig>{
@@ -23,7 +26,7 @@ export async function initNitro (nuxt: Nuxt) {
     scanDirs: nuxt.options._layers.map(layer => join(layer.config.srcDir, 'server')),
     renderer: resolve(distDir, 'core/runtime/nitro/renderer'),
     nodeModulesDirs: nuxt.options.modulesDir,
-    handlers: [],
+    handlers,
     devHandlers: [],
     baseURL: nuxt.options.app.baseURL,
     runtimeConfig: {
@@ -117,8 +120,6 @@ export async function initNitro (nuxt: Nuxt) {
   // Setup handlers
   const devMidlewareHandler = dynamicEventHandler()
   nitro.options.devHandlers.unshift({ handler: devMidlewareHandler })
-  const { handlers, devHandlers } = await resolveHandlers(nuxt)
-  nitro.options.handlers.push(...handlers)
   nitro.options.devHandlers.push(...devHandlers)
   nitro.options.handlers.unshift({
     route: '/__nuxt_error',