From 9a18df428d54f386df9fe75022eb5ec4736546b0 Mon Sep 17 00:00:00 2001
From: Horu <73709188+HigherOrderLogic@users.noreply.github.com>
Date: Sat, 17 Feb 2024 15:13:57 +0700
Subject: [PATCH 01/24] chore: last time, lukasz, /dev/urandom is not a
 variable name generator...

---
 packages/nuxt/src/core/nuxt.ts                  | 17 +++++++++++++++++
 .../nuxt/src/pages/runtime/plugins/router.ts    | 11 ++++++++++-
 packages/schema/src/config/nitro.ts             |  2 +-
 test/basic.test.ts                              |  5 +++++
 .../basic/middleware/routeRulesMiddleware.ts    |  3 +++
 test/fixtures/basic/nuxt.config.ts              |  1 +
 .../basic/pages/route-rules/middleware.vue      | 10 ++++++++++
 7 files changed, 47 insertions(+), 2 deletions(-)
 create mode 100644 test/fixtures/basic/middleware/routeRulesMiddleware.ts
 create mode 100644 test/fixtures/basic/pages/route-rules/middleware.vue

diff --git a/packages/nuxt/src/core/nuxt.ts b/packages/nuxt/src/core/nuxt.ts
index 0b83c3885c06..38b83bb00c3a 100644
--- a/packages/nuxt/src/core/nuxt.ts
+++ b/packages/nuxt/src/core/nuxt.ts
@@ -515,6 +515,23 @@ export async function loadNuxt (opts: LoadNuxtOptions): Promise<Nuxt> {
     }
   }
 
+  options.routeRules ||= {}
+  for(const path in options.routeRules) {
+    if (!options.routeRules[path].nuxtMiddleware) {
+      continue
+    }
+    if (typeof options.routeRules[path].nuxtMiddleware === 'string') {
+      options.routeRules[path].nuxtMiddleware = [options.routeRules[path].nuxtMiddleware as string]
+    }
+    if (Array.isArray(options.routeRules[path].nuxtMiddleware)) {
+      const middlewareObject: Record<string, boolean> = {}
+      for (const middleware in options.routeRules[path].nuxtMiddleware as string[]) {
+        middlewareObject[middleware] = true
+      }
+      options.routeRules[path].nuxtMiddleware = middlewareObject
+    }
+  }
+
   // Add core modules
   options._modules.push(pagesModule, metaModule, componentsModule)
   options._modules.push([importsModule, {
diff --git a/packages/nuxt/src/pages/runtime/plugins/router.ts b/packages/nuxt/src/pages/runtime/plugins/router.ts
index 267ea380d732..1406809d00ba 100644
--- a/packages/nuxt/src/pages/runtime/plugins/router.ts
+++ b/packages/nuxt/src/pages/runtime/plugins/router.ts
@@ -14,7 +14,7 @@ import { isEqual, withoutBase } from 'ufo'
 import type { PageMeta } from '../composables'
 
 import { toArray } from '../utils'
-import type { Plugin, RouteMiddleware } from '#app'
+import { type Plugin, type RouteMiddleware, getRouteRules } from '#app'
 import { defineNuxtPlugin, useRuntimeConfig } from '#app/nuxt'
 import { clearError, showError, useError } from '#app/composables/error'
 import { navigateTo } from '#app/composables/router'
@@ -173,6 +173,15 @@ const plugin: Plugin<{ router: Router }> = defineNuxtPlugin({
           }
         }
 
+        const routeRules = await getRouteRules(to.fullPath);
+        if (routeRules.nuxtMiddleware) {
+          for (const middleware in routeRules.nuxtMiddleware) {
+            if (routeRules.nuxtMiddleware[middleware] === true) {
+              middlewareEntries.add(middleware)
+            }
+          }
+        }
+
         for (const entry of middlewareEntries) {
           const middleware = typeof entry === 'string' ? nuxtApp._middleware.named[entry] || await namedMiddleware[entry]?.().then((r: any) => r.default || r) : entry
 
diff --git a/packages/schema/src/config/nitro.ts b/packages/schema/src/config/nitro.ts
index c37275dda8b6..41194dc007fe 100644
--- a/packages/schema/src/config/nitro.ts
+++ b/packages/schema/src/config/nitro.ts
@@ -19,7 +19,7 @@ export default defineUntypedSchema({
    * Global route options applied to matching server routes.
    * @experimental This is an experimental feature and API may change in the future.
    * @see https://nitro.unjs.io/config/#routerules
-   * @type {typeof import('nitropack')['NitroConfig']['routeRules']}
+   * @type {{ [path: string]: typeof import('nitropack')['NitroRouteConfig'] & { nuxtMiddleware?: string | string[] | Record<string, boolean> }}}
    */
   routeRules: {},
 
diff --git a/test/basic.test.ts b/test/basic.test.ts
index e7cd7e15acbe..82dbfcbf4bab 100644
--- a/test/basic.test.ts
+++ b/test/basic.test.ts
@@ -82,6 +82,11 @@ describe('route rules', () => {
   })
 })
 
+it('should run middleware defined in routeRules config', async () => {
+  const html = await fetch('/route-rules/middleware')
+  expect(html).toContain('Hello from routeRules!')
+})
+
 describe('modules', () => {
   it('should auto-register modules in ~/modules', async () => {
     const result = await $fetch('/auto-registered-module')
diff --git a/test/fixtures/basic/middleware/routeRulesMiddleware.ts b/test/fixtures/basic/middleware/routeRulesMiddleware.ts
new file mode 100644
index 000000000000..36ecf8c9983e
--- /dev/null
+++ b/test/fixtures/basic/middleware/routeRulesMiddleware.ts
@@ -0,0 +1,3 @@
+export default defineNuxtRouteMiddleware((to) => {
+  to.meta.hello = 'Hello from routeRules!'
+})
diff --git a/test/fixtures/basic/nuxt.config.ts b/test/fixtures/basic/nuxt.config.ts
index 7269a31f135c..d5040fe976c3 100644
--- a/test/fixtures/basic/nuxt.config.ts
+++ b/test/fixtures/basic/nuxt.config.ts
@@ -60,6 +60,7 @@ export default defineNuxtConfig({
     },
     routeRules: {
       '/route-rules/spa': { ssr: false },
+      '/route-rules/middleware': { nuxtMiddleware: 'routeRulesMiddleware' },
       '/hydration/spa-redirection/**': { ssr: false },
       '/no-scripts': { experimentalNoScripts: true }
     },
diff --git a/test/fixtures/basic/pages/route-rules/middleware.vue b/test/fixtures/basic/pages/route-rules/middleware.vue
new file mode 100644
index 000000000000..187dcddf1e9a
--- /dev/null
+++ b/test/fixtures/basic/pages/route-rules/middleware.vue
@@ -0,0 +1,10 @@
+<script setup>
+// needed because without it, $route's type will error out
+definePageMeta()
+</script>
+
+<template>
+  <div>
+    <div>Greeting: {{ $route.meta.hello }}</div>
+  </div>
+</template>

From edfa10d96569522a61d31de37febbb8c5aee54e3 Mon Sep 17 00:00:00 2001
From: Horu <73709188+HigherOrderLogic@users.noreply.github.com>
Date: Sat, 17 Feb 2024 15:50:14 +0700
Subject: [PATCH 02/24] chore: weird tests fix

---
 test/prepare.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/test/prepare.ts b/test/prepare.ts
index 845ec57c5f06..5d577b4d157a 100644
--- a/test/prepare.ts
+++ b/test/prepare.ts
@@ -18,7 +18,9 @@ async function initTesting () {
   ])
 
   await Promise.all(
-    dirs.map(dir => execa('pnpm', ['nuxi', 'prepare'], { cwd: dir }))
+    dirs.map(dir => {
+      execa('pnpm', ['nuxi', 'prepare'], { cwd: dir })
+    })
   )
 }
 

From 74e8f1e87e5346223aa57597289e50daabc64378 Mon Sep 17 00:00:00 2001
From: HigherOrderLogic <nguyenphankhanhan2001@gmail.com>
Date: Sat, 17 Feb 2024 23:38:09 +0700
Subject: [PATCH 03/24] chore: testing the test fix

---
 .../nuxt/src/pages/runtime/plugins/router.ts   | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/packages/nuxt/src/pages/runtime/plugins/router.ts b/packages/nuxt/src/pages/runtime/plugins/router.ts
index 1406809d00ba..2d9f2d5ef332 100644
--- a/packages/nuxt/src/pages/runtime/plugins/router.ts
+++ b/packages/nuxt/src/pages/runtime/plugins/router.ts
@@ -14,7 +14,7 @@ import { isEqual, withoutBase } from 'ufo'
 import type { PageMeta } from '../composables'
 
 import { toArray } from '../utils'
-import { type Plugin, type RouteMiddleware, getRouteRules } from '#app'
+import { type Plugin, type RouteMiddleware, getRouteRules, onNuxtReady } from '#app'
 import { defineNuxtPlugin, useRuntimeConfig } from '#app/nuxt'
 import { clearError, showError, useError } from '#app/composables/error'
 import { navigateTo } from '#app/composables/router'
@@ -173,11 +173,17 @@ const plugin: Plugin<{ router: Router }> = defineNuxtPlugin({
           }
         }
 
-        const routeRules = await getRouteRules(to.fullPath);
-        if (routeRules.nuxtMiddleware) {
-          for (const middleware in routeRules.nuxtMiddleware) {
-            if (routeRules.nuxtMiddleware[middleware] === true) {
-              middlewareEntries.add(middleware)
+        let nuxtReady: boolean = false
+
+        onNuxtReady(() => nuxtReady = true)
+
+        if (nuxtReady) {
+          const routeRules = await getRouteRules(to.path);
+          if (routeRules.nuxtMiddleware) {
+            for (const middleware in routeRules.nuxtMiddleware) {
+              if (routeRules.nuxtMiddleware[middleware] === true) {
+                middlewareEntries.add(middleware)
+              }
             }
           }
         }

From 24998a7844f8d7c1982e1279fa99f2ccf5716326 Mon Sep 17 00:00:00 2001
From: Horu <73709188+HigherOrderLogic@users.noreply.github.com>
Date: Sun, 3 Mar 2024 22:42:44 +0700
Subject: [PATCH 04/24] fix: properly get route rules

---
 .../nuxt/src/pages/runtime/plugins/router.ts  | 21 ++++++++++++-------
 .../basic/pages/route-rules/middleware.vue    |  5 -----
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/packages/nuxt/src/pages/runtime/plugins/router.ts b/packages/nuxt/src/pages/runtime/plugins/router.ts
index 2d9f2d5ef332..b90e86d60b48 100644
--- a/packages/nuxt/src/pages/runtime/plugins/router.ts
+++ b/packages/nuxt/src/pages/runtime/plugins/router.ts
@@ -14,7 +14,8 @@ import { isEqual, withoutBase } from 'ufo'
 import type { PageMeta } from '../composables'
 
 import { toArray } from '../utils'
-import { type Plugin, type RouteMiddleware, getRouteRules, onNuxtReady } from '#app'
+import { type Plugin, type RouteMiddleware } from '#app'
+import { getRouteRules } from '#app/composables/manifest'
 import { defineNuxtPlugin, useRuntimeConfig } from '#app/nuxt'
 import { clearError, showError, useError } from '#app/composables/error'
 import { navigateTo } from '#app/composables/router'
@@ -173,13 +174,15 @@ const plugin: Plugin<{ router: Router }> = defineNuxtPlugin({
           }
         }
 
-        let nuxtReady: boolean = false
-
-        onNuxtReady(() => nuxtReady = true)
+        const routeRules = await nuxtApp.runWithContext(async () => {
+          console.log('get route rules')
+          return await getRouteRules(to.path)
+        })
+        console.log('routerules ', routeRules)
 
-        if (nuxtReady) {
-          const routeRules = await getRouteRules(to.path);
-          if (routeRules.nuxtMiddleware) {
+        if (routeRules.nuxtMiddleware) {
+          if (typeof routeRules.nuxtMiddleware === 'string') routeRules.nuxtMiddleware = [routeRules.nuxtMiddleware]
+          if (Array.isArray(routeRules.nuxtMiddleware)) {
             for (const middleware in routeRules.nuxtMiddleware) {
               if (routeRules.nuxtMiddleware[middleware] === true) {
                 middlewareEntries.add(middleware)
@@ -188,9 +191,13 @@ const plugin: Plugin<{ router: Router }> = defineNuxtPlugin({
           }
         }
 
+        console.log('named', nuxtApp._middleware.named)
+
         for (const entry of middlewareEntries) {
           const middleware = typeof entry === 'string' ? nuxtApp._middleware.named[entry] || await namedMiddleware[entry]?.().then((r: any) => r.default || r) : entry
 
+          console.log(entry, ' ', middleware)
+
           if (!middleware) {
             if (import.meta.dev) {
               throw new Error(`Unknown route middleware: '${entry}'. Valid middleware: ${Object.keys(namedMiddleware).map(mw => `'${mw}'`).join(', ')}.`)
diff --git a/test/fixtures/basic/pages/route-rules/middleware.vue b/test/fixtures/basic/pages/route-rules/middleware.vue
index 187dcddf1e9a..c1d69e15147a 100644
--- a/test/fixtures/basic/pages/route-rules/middleware.vue
+++ b/test/fixtures/basic/pages/route-rules/middleware.vue
@@ -1,8 +1,3 @@
-<script setup>
-// needed because without it, $route's type will error out
-definePageMeta()
-</script>
-
 <template>
   <div>
     <div>Greeting: {{ $route.meta.hello }}</div>

From 75464843eba381fc71d04f5a2e3720ce7a143ffb Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Sat, 9 Mar 2024 15:49:59 +0100
Subject: [PATCH 05/24] fix: use augmentation to define route rules type

---
 packages/nuxt/src/core/templates.ts | 2 ++
 packages/nuxt/types.d.mts           | 2 ++
 packages/nuxt/types.d.ts            | 2 ++
 packages/schema/src/config/nitro.ts | 2 +-
 4 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/packages/nuxt/src/core/templates.ts b/packages/nuxt/src/core/templates.ts
index 383fc2c179a0..e708e72df3f8 100644
--- a/packages/nuxt/src/core/templates.ts
+++ b/packages/nuxt/src/core/templates.ts
@@ -240,10 +240,12 @@ declare module 'nitropack' {
   interface NitroRouteConfig {
     ssr?: boolean
     experimentalNoScripts?: boolean
+    nuxtMiddleware?: string | string[] | Record<string, boolean>
   }
   interface NitroRouteRules {
     ssr?: boolean
     experimentalNoScripts?: boolean
+    nuxtMiddleware?: Record<string, boolean>
   }
   interface NitroRuntimeHooks {
     'dev:ssr-logs': (ctx: { logs: LogObject[], path: string }) => void | Promise<void>
diff --git a/packages/nuxt/types.d.mts b/packages/nuxt/types.d.mts
index 98771c18e2ed..326e9fbfa8fb 100644
--- a/packages/nuxt/types.d.mts
+++ b/packages/nuxt/types.d.mts
@@ -22,10 +22,12 @@ declare module 'nitropack' {
   interface NitroRouteConfig {
     ssr?: boolean
     experimentalNoScripts?: boolean
+    nuxtMiddleware?: string | string[] | Record<string, boolean>
   }
   interface NitroRouteRules {
     ssr?: boolean
     experimentalNoScripts?: boolean
+    nuxtMiddleware?: Record<string, boolean>
   }
   interface NitroRuntimeHooks {
     'dev:ssr-logs': (ctx: { logs: LogObject[], path: string }) => void | Promise<void>
diff --git a/packages/nuxt/types.d.ts b/packages/nuxt/types.d.ts
index 8b9c9b911887..c3619961b601 100644
--- a/packages/nuxt/types.d.ts
+++ b/packages/nuxt/types.d.ts
@@ -22,10 +22,12 @@ declare module 'nitropack' {
   interface NitroRouteConfig {
     ssr?: boolean
     experimentalNoScripts?: boolean
+    nuxtMiddleware?: string | string[] | Record<string, boolean>
   }
   interface NitroRouteRules {
     ssr?: boolean
     experimentalNoScripts?: boolean
+    nuxtMiddleware?: Record<string, boolean>
   }
   interface NitroRuntimeHooks {
     'dev:ssr-logs': (ctx: { logs: LogObject[], path: string }) => void | Promise<void>
diff --git a/packages/schema/src/config/nitro.ts b/packages/schema/src/config/nitro.ts
index 41194dc007fe..c37275dda8b6 100644
--- a/packages/schema/src/config/nitro.ts
+++ b/packages/schema/src/config/nitro.ts
@@ -19,7 +19,7 @@ export default defineUntypedSchema({
    * Global route options applied to matching server routes.
    * @experimental This is an experimental feature and API may change in the future.
    * @see https://nitro.unjs.io/config/#routerules
-   * @type {{ [path: string]: typeof import('nitropack')['NitroRouteConfig'] & { nuxtMiddleware?: string | string[] | Record<string, boolean> }}}
+   * @type {typeof import('nitropack')['NitroConfig']['routeRules']}
    */
   routeRules: {},
 

From 66be20242acc5f9f78d06138547b24751cc6115e Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Sat, 9 Mar 2024 15:51:14 +0100
Subject: [PATCH 06/24] style: small lints

---
 packages/nuxt/src/core/nuxt.ts                    |  2 +-
 packages/nuxt/src/pages/runtime/plugins/router.ts | 12 +++---------
 test/prepare.ts                                   |  4 +---
 3 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/packages/nuxt/src/core/nuxt.ts b/packages/nuxt/src/core/nuxt.ts
index 38b83bb00c3a..bab5c69f5637 100644
--- a/packages/nuxt/src/core/nuxt.ts
+++ b/packages/nuxt/src/core/nuxt.ts
@@ -516,7 +516,7 @@ export async function loadNuxt (opts: LoadNuxtOptions): Promise<Nuxt> {
   }
 
   options.routeRules ||= {}
-  for(const path in options.routeRules) {
+  for (const path in options.routeRules) {
     if (!options.routeRules[path].nuxtMiddleware) {
       continue
     }
diff --git a/packages/nuxt/src/pages/runtime/plugins/router.ts b/packages/nuxt/src/pages/runtime/plugins/router.ts
index b90e86d60b48..c1cf70b52d10 100644
--- a/packages/nuxt/src/pages/runtime/plugins/router.ts
+++ b/packages/nuxt/src/pages/runtime/plugins/router.ts
@@ -14,7 +14,7 @@ import { isEqual, withoutBase } from 'ufo'
 import type { PageMeta } from '../composables'
 
 import { toArray } from '../utils'
-import { type Plugin, type RouteMiddleware } from '#app'
+import type { Plugin, RouteMiddleware } from '#app'
 import { getRouteRules } from '#app/composables/manifest'
 import { defineNuxtPlugin, useRuntimeConfig } from '#app/nuxt'
 import { clearError, showError, useError } from '#app/composables/error'
@@ -174,14 +174,10 @@ const plugin: Plugin<{ router: Router }> = defineNuxtPlugin({
           }
         }
 
-        const routeRules = await nuxtApp.runWithContext(async () => {
-          console.log('get route rules')
-          return await getRouteRules(to.path)
-        })
-        console.log('routerules ', routeRules)
+        const routeRules = await nuxtApp.runWithContext(() => getRouteRules(to.path))
 
         if (routeRules.nuxtMiddleware) {
-          if (typeof routeRules.nuxtMiddleware === 'string') routeRules.nuxtMiddleware = [routeRules.nuxtMiddleware]
+          if (typeof routeRules.nuxtMiddleware === 'string') { routeRules.nuxtMiddleware = [routeRules.nuxtMiddleware] }
           if (Array.isArray(routeRules.nuxtMiddleware)) {
             for (const middleware in routeRules.nuxtMiddleware) {
               if (routeRules.nuxtMiddleware[middleware] === true) {
@@ -191,8 +187,6 @@ const plugin: Plugin<{ router: Router }> = defineNuxtPlugin({
           }
         }
 
-        console.log('named', nuxtApp._middleware.named)
-
         for (const entry of middlewareEntries) {
           const middleware = typeof entry === 'string' ? nuxtApp._middleware.named[entry] || await namedMiddleware[entry]?.().then((r: any) => r.default || r) : entry
 
diff --git a/test/prepare.ts b/test/prepare.ts
index 5d577b4d157a..845ec57c5f06 100644
--- a/test/prepare.ts
+++ b/test/prepare.ts
@@ -18,9 +18,7 @@ async function initTesting () {
   ])
 
   await Promise.all(
-    dirs.map(dir => {
-      execa('pnpm', ['nuxi', 'prepare'], { cwd: dir })
-    })
+    dirs.map(dir => execa('pnpm', ['nuxi', 'prepare'], { cwd: dir }))
   )
 }
 

From 44af5a87c5520efe0ba46e1dfd681daef5b78bac Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Sat, 9 Mar 2024 15:54:57 +0100
Subject: [PATCH 07/24] fix: normalise middleware in nitro init

---
 packages/nuxt/src/core/nitro.ts | 21 +++++++++++++++++++--
 packages/nuxt/src/core/nuxt.ts  | 17 -----------------
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/packages/nuxt/src/core/nitro.ts b/packages/nuxt/src/core/nitro.ts
index 8b95434d25ca..726dffc41ce6 100644
--- a/packages/nuxt/src/core/nitro.ts
+++ b/packages/nuxt/src/core/nitro.ts
@@ -272,8 +272,25 @@ export async function initNitro (nuxt: Nuxt & { _nitro?: Nitro }) {
           const filteredRules = {} as Record<string, any>
           for (const routeKey in _routeRules[key]) {
             const value = (_routeRules as any)[key][routeKey]
-            if (['prerender', 'redirect'].includes(routeKey) && value) {
-              filteredRules[routeKey] = routeKey === 'redirect' ? typeof value === 'string' ? value : value.to : value
+            if (['prerender', 'redirect', 'nuxtMiddleware'].includes(routeKey) && value) {
+              if (routeKey === 'redirect') {
+                filteredRules[routeKey] = typeof value === 'string' ? value : value.to
+              }
+              if (routeKey === 'prerender') {
+                filteredRules[routeKey] = value
+              }
+              if (routeKey === 'nuxtMiddleware') {
+                if (typeof value === 'string') {
+                  filteredRules[routeKey] = { value: true }
+                } else if (Array.isArray(value)) {
+                  filteredRules[routeKey] = {}
+                  for (const middleware of value) {
+                    filteredRules[routeKey][middleware] = true
+                  }
+                } else {
+                  filteredRules[routeKey] = value
+                }
+              }
               hasRules = true
             }
           }
diff --git a/packages/nuxt/src/core/nuxt.ts b/packages/nuxt/src/core/nuxt.ts
index bab5c69f5637..0b83c3885c06 100644
--- a/packages/nuxt/src/core/nuxt.ts
+++ b/packages/nuxt/src/core/nuxt.ts
@@ -515,23 +515,6 @@ export async function loadNuxt (opts: LoadNuxtOptions): Promise<Nuxt> {
     }
   }
 
-  options.routeRules ||= {}
-  for (const path in options.routeRules) {
-    if (!options.routeRules[path].nuxtMiddleware) {
-      continue
-    }
-    if (typeof options.routeRules[path].nuxtMiddleware === 'string') {
-      options.routeRules[path].nuxtMiddleware = [options.routeRules[path].nuxtMiddleware as string]
-    }
-    if (Array.isArray(options.routeRules[path].nuxtMiddleware)) {
-      const middlewareObject: Record<string, boolean> = {}
-      for (const middleware in options.routeRules[path].nuxtMiddleware as string[]) {
-        middlewareObject[middleware] = true
-      }
-      options.routeRules[path].nuxtMiddleware = middlewareObject
-    }
-  }
-
   // Add core modules
   options._modules.push(pagesModule, metaModule, componentsModule)
   options._modules.push([importsModule, {

From 3f80bee00871f92a7bb2ffeb10c5273999bdb9d7 Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Sat, 9 Mar 2024 15:59:42 +0100
Subject: [PATCH 08/24] fix: use middleware name

---
 packages/nuxt/src/core/nitro.ts | 52 +++++++++++++++++----------------
 1 file changed, 27 insertions(+), 25 deletions(-)

diff --git a/packages/nuxt/src/core/nitro.ts b/packages/nuxt/src/core/nitro.ts
index 726dffc41ce6..55e88c250672 100644
--- a/packages/nuxt/src/core/nitro.ts
+++ b/packages/nuxt/src/core/nitro.ts
@@ -92,10 +92,10 @@ export async function initNitro (nuxt: Nuxt & { _nitro?: Nitro }) {
     },
     analyze: !nuxt.options.test && nuxt.options.build.analyze && (nuxt.options.build.analyze === true || nuxt.options.build.analyze.enabled)
       ? {
-          template: 'treemap',
-          projectRoot: nuxt.options.rootDir,
-          filename: join(nuxt.options.analyzeDir, '{name}.html')
-        }
+        template: 'treemap',
+        projectRoot: nuxt.options.rootDir,
+        filename: join(nuxt.options.analyzeDir, '{name}.html')
+      }
       : false,
     scanDirs: nuxt.options._layers.map(layer => (layer.config.serverDir || layer.config.srcDir) && resolve(layer.cwd, layer.config.serverDir || resolve(layer.config.srcDir, 'server'))).filter(Boolean),
     renderer: resolve(distDir, 'core/runtime/nitro/renderer'),
@@ -149,10 +149,10 @@ export async function initNitro (nuxt: Nuxt & { _nitro?: Nitro }) {
       nuxt.options.dev
         ? { dir: resolve(nuxt.options.buildDir, 'dist/client') }
         : {
-            dir: join(nuxt.options.buildDir, 'dist/client', nuxt.options.app.buildAssetsDir),
-            maxAge: 31536000 /* 1 year */,
-            baseURL: nuxt.options.app.buildAssetsDir
-          },
+          dir: join(nuxt.options.buildDir, 'dist/client', nuxt.options.app.buildAssetsDir),
+          maxAge: 31536000 /* 1 year */,
+          baseURL: nuxt.options.app.buildAssetsDir
+        },
       ...nuxt.options._layers
         .map(layer => join(layer.config.srcDir, (layer.config.rootDir === nuxt.options.rootDir ? nuxt.options : layer.config).dir?.public || 'public'))
         .filter(dir => existsSync(dir))
@@ -169,10 +169,10 @@ export async function initNitro (nuxt: Nuxt & { _nitro?: Nitro }) {
         ...(nuxt.options.dev
           ? []
           : [
-              ...nuxt.options.experimental.externalVue ? [] : ['vue', '@vue/'],
-              '@nuxt/',
-              nuxt.options.buildDir
-            ]),
+            ...nuxt.options.experimental.externalVue ? [] : ['vue', '@vue/'],
+            '@nuxt/',
+            nuxt.options.buildDir
+          ]),
         ...nuxt.options.build.transpile.filter((i): i is string => typeof i === 'string'),
         'nuxt/dist',
         'nuxt3/dist',
@@ -183,12 +183,12 @@ export async function initNitro (nuxt: Nuxt & { _nitro?: Nitro }) {
         // force include files used in generated code from the runtime-compiler
         ...(nuxt.options.vue.runtimeCompiler && !nuxt.options.experimental.externalVue)
           ? [
-              ...nuxt.options.modulesDir.reduce<string[]>((targets, path) => {
-                const serverRendererPath = resolve(path, 'vue/server-renderer/index.js')
-                if (existsSync(serverRendererPath)) { targets.push(serverRendererPath) }
-                return targets
-              }, [])
-            ]
+            ...nuxt.options.modulesDir.reduce<string[]>((targets, path) => {
+              const serverRendererPath = resolve(path, 'vue/server-renderer/index.js')
+              if (existsSync(serverRendererPath)) { targets.push(serverRendererPath) }
+              return targets
+            }, [])
+          ]
           : []
       ]
     },
@@ -197,12 +197,12 @@ export async function initNitro (nuxt: Nuxt & { _nitro?: Nitro }) {
       ...nuxt.options.vue.runtimeCompiler || nuxt.options.experimental.externalVue
         ? {}
         : {
-            'estree-walker': 'unenv/runtime/mock/proxy',
-            '@babel/parser': 'unenv/runtime/mock/proxy',
-            '@vue/compiler-core': 'unenv/runtime/mock/proxy',
-            '@vue/compiler-dom': 'unenv/runtime/mock/proxy',
-            '@vue/compiler-ssr': 'unenv/runtime/mock/proxy'
-          },
+          'estree-walker': 'unenv/runtime/mock/proxy',
+          '@babel/parser': 'unenv/runtime/mock/proxy',
+          '@vue/compiler-core': 'unenv/runtime/mock/proxy',
+          '@vue/compiler-dom': 'unenv/runtime/mock/proxy',
+          '@vue/compiler-ssr': 'unenv/runtime/mock/proxy'
+        },
       '@vue/devtools-api': 'vue-devtools-stub',
 
       // Paths
@@ -262,6 +262,8 @@ export async function initNitro (nuxt: Nuxt & { _nitro?: Nitro }) {
       }
     )
 
+    nuxt.options.alias['#app-manifest'] = join(tempDir, `meta/${buildId}.json`)
+
     nuxt.hook('nitro:init', (nitro) => {
       nitro.hooks.hook('rollup:before', async (nitro) => {
         const routeRules = {} as Record<string, any>
@@ -281,7 +283,7 @@ export async function initNitro (nuxt: Nuxt & { _nitro?: Nitro }) {
               }
               if (routeKey === 'nuxtMiddleware') {
                 if (typeof value === 'string') {
-                  filteredRules[routeKey] = { value: true }
+                  filteredRules[routeKey] = { [value]: true }
                 } else if (Array.isArray(value)) {
                   filteredRules[routeKey] = {}
                   for (const middleware of value) {

From dfff49b402ed85be75343322141edb550b2d113a Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Sat, 9 Mar 2024 16:03:19 +0100
Subject: [PATCH 09/24] fix(nuxt): support getting route rules on server

closes #26063
fixes #26062
---
 packages/nuxt/src/app/composables/manifest.ts     |  9 +++++----
 packages/nuxt/src/pages/runtime/plugins/router.ts | 13 +++++--------
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/packages/nuxt/src/app/composables/manifest.ts b/packages/nuxt/src/app/composables/manifest.ts
index cc7ff4148044..f27d1e69be59 100644
--- a/packages/nuxt/src/app/composables/manifest.ts
+++ b/packages/nuxt/src/app/composables/manifest.ts
@@ -26,10 +26,11 @@ function fetchManifest () {
   }
   // @ts-expect-error private property
   const buildId = useAppConfig().nuxt?.buildId
-  manifest = $fetch<NuxtAppManifest>(buildAssetsURL(`builds/meta/${buildId}.json`))
-  manifest.then((m) => {
-    matcher = createMatcherFromExport(m.matcher)
-  })
+  manifest = import.meta.server
+    // @ts-expect-error virtual file
+    ? import('#app-manifest').then(r => r.default).then(r => r.default || r)
+    : $fetch<NuxtAppManifest>(buildAssetsURL(`builds/meta/${buildId}.json`))
+  manifest.then((m) => { matcher = createMatcherFromExport(m.matcher) })
   return manifest
 }
 
diff --git a/packages/nuxt/src/pages/runtime/plugins/router.ts b/packages/nuxt/src/pages/runtime/plugins/router.ts
index c1cf70b52d10..70c42c3fc664 100644
--- a/packages/nuxt/src/pages/runtime/plugins/router.ts
+++ b/packages/nuxt/src/pages/runtime/plugins/router.ts
@@ -177,12 +177,11 @@ const plugin: Plugin<{ router: Router }> = defineNuxtPlugin({
         const routeRules = await nuxtApp.runWithContext(() => getRouteRules(to.path))
 
         if (routeRules.nuxtMiddleware) {
-          if (typeof routeRules.nuxtMiddleware === 'string') { routeRules.nuxtMiddleware = [routeRules.nuxtMiddleware] }
-          if (Array.isArray(routeRules.nuxtMiddleware)) {
-            for (const middleware in routeRules.nuxtMiddleware) {
-              if (routeRules.nuxtMiddleware[middleware] === true) {
-                middlewareEntries.add(middleware)
-              }
+          for (const key in routeRules.nuxtMiddleware) {
+            if (routeRules.nuxtMiddleware[key]) {
+              middlewareEntries.add(key)
+            } else {
+              middlewareEntries.delete(key)
             }
           }
         }
@@ -190,8 +189,6 @@ const plugin: Plugin<{ router: Router }> = defineNuxtPlugin({
         for (const entry of middlewareEntries) {
           const middleware = typeof entry === 'string' ? nuxtApp._middleware.named[entry] || await namedMiddleware[entry]?.().then((r: any) => r.default || r) : entry
 
-          console.log(entry, ' ', middleware)
-
           if (!middleware) {
             if (import.meta.dev) {
               throw new Error(`Unknown route middleware: '${entry}'. Valid middleware: ${Object.keys(namedMiddleware).map(mw => `'${mw}'`).join(', ')}.`)

From 311a4a28debafd798dad99dd7aaf7389c03c560c Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Sat, 9 Mar 2024 16:04:55 +0100
Subject: [PATCH 10/24] style: revert formatting change

---
 packages/nuxt/src/core/nitro.ts | 48 ++++++++++++++++-----------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/packages/nuxt/src/core/nitro.ts b/packages/nuxt/src/core/nitro.ts
index 55e88c250672..5fc84478c1ea 100644
--- a/packages/nuxt/src/core/nitro.ts
+++ b/packages/nuxt/src/core/nitro.ts
@@ -92,10 +92,10 @@ export async function initNitro (nuxt: Nuxt & { _nitro?: Nitro }) {
     },
     analyze: !nuxt.options.test && nuxt.options.build.analyze && (nuxt.options.build.analyze === true || nuxt.options.build.analyze.enabled)
       ? {
-        template: 'treemap',
-        projectRoot: nuxt.options.rootDir,
-        filename: join(nuxt.options.analyzeDir, '{name}.html')
-      }
+          template: 'treemap',
+          projectRoot: nuxt.options.rootDir,
+          filename: join(nuxt.options.analyzeDir, '{name}.html')
+        }
       : false,
     scanDirs: nuxt.options._layers.map(layer => (layer.config.serverDir || layer.config.srcDir) && resolve(layer.cwd, layer.config.serverDir || resolve(layer.config.srcDir, 'server'))).filter(Boolean),
     renderer: resolve(distDir, 'core/runtime/nitro/renderer'),
@@ -149,10 +149,10 @@ export async function initNitro (nuxt: Nuxt & { _nitro?: Nitro }) {
       nuxt.options.dev
         ? { dir: resolve(nuxt.options.buildDir, 'dist/client') }
         : {
-          dir: join(nuxt.options.buildDir, 'dist/client', nuxt.options.app.buildAssetsDir),
-          maxAge: 31536000 /* 1 year */,
-          baseURL: nuxt.options.app.buildAssetsDir
-        },
+            dir: join(nuxt.options.buildDir, 'dist/client', nuxt.options.app.buildAssetsDir),
+            maxAge: 31536000 /* 1 year */,
+            baseURL: nuxt.options.app.buildAssetsDir
+          },
       ...nuxt.options._layers
         .map(layer => join(layer.config.srcDir, (layer.config.rootDir === nuxt.options.rootDir ? nuxt.options : layer.config).dir?.public || 'public'))
         .filter(dir => existsSync(dir))
@@ -169,10 +169,10 @@ export async function initNitro (nuxt: Nuxt & { _nitro?: Nitro }) {
         ...(nuxt.options.dev
           ? []
           : [
-            ...nuxt.options.experimental.externalVue ? [] : ['vue', '@vue/'],
-            '@nuxt/',
-            nuxt.options.buildDir
-          ]),
+              ...nuxt.options.experimental.externalVue ? [] : ['vue', '@vue/'],
+              '@nuxt/',
+              nuxt.options.buildDir
+            ]),
         ...nuxt.options.build.transpile.filter((i): i is string => typeof i === 'string'),
         'nuxt/dist',
         'nuxt3/dist',
@@ -183,12 +183,12 @@ export async function initNitro (nuxt: Nuxt & { _nitro?: Nitro }) {
         // force include files used in generated code from the runtime-compiler
         ...(nuxt.options.vue.runtimeCompiler && !nuxt.options.experimental.externalVue)
           ? [
-            ...nuxt.options.modulesDir.reduce<string[]>((targets, path) => {
-              const serverRendererPath = resolve(path, 'vue/server-renderer/index.js')
-              if (existsSync(serverRendererPath)) { targets.push(serverRendererPath) }
-              return targets
-            }, [])
-          ]
+              ...nuxt.options.modulesDir.reduce<string[]>((targets, path) => {
+                const serverRendererPath = resolve(path, 'vue/server-renderer/index.js')
+                if (existsSync(serverRendererPath)) { targets.push(serverRendererPath) }
+                return targets
+              }, [])
+            ]
           : []
       ]
     },
@@ -197,12 +197,12 @@ export async function initNitro (nuxt: Nuxt & { _nitro?: Nitro }) {
       ...nuxt.options.vue.runtimeCompiler || nuxt.options.experimental.externalVue
         ? {}
         : {
-          'estree-walker': 'unenv/runtime/mock/proxy',
-          '@babel/parser': 'unenv/runtime/mock/proxy',
-          '@vue/compiler-core': 'unenv/runtime/mock/proxy',
-          '@vue/compiler-dom': 'unenv/runtime/mock/proxy',
-          '@vue/compiler-ssr': 'unenv/runtime/mock/proxy'
-        },
+            'estree-walker': 'unenv/runtime/mock/proxy',
+            '@babel/parser': 'unenv/runtime/mock/proxy',
+            '@vue/compiler-core': 'unenv/runtime/mock/proxy',
+            '@vue/compiler-dom': 'unenv/runtime/mock/proxy',
+            '@vue/compiler-ssr': 'unenv/runtime/mock/proxy'
+          },
       '@vue/devtools-api': 'vue-devtools-stub',
 
       // Paths

From 8f613f905f8054c4255bd1e2814f757149e21a50 Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Sat, 9 Mar 2024 17:05:18 +0100
Subject: [PATCH 11/24] fix: provide typed values for `nuxtMiddleware`

---
 packages/nuxt/src/core/templates.ts | 1 -
 packages/nuxt/src/pages/module.ts   | 5 +++++
 packages/nuxt/types.d.mts           | 1 -
 packages/nuxt/types.d.ts            | 1 -
 test/fixtures/basic/nuxt.config.ts  | 2 +-
 5 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/packages/nuxt/src/core/templates.ts b/packages/nuxt/src/core/templates.ts
index e708e72df3f8..62b33f02cd0e 100644
--- a/packages/nuxt/src/core/templates.ts
+++ b/packages/nuxt/src/core/templates.ts
@@ -240,7 +240,6 @@ declare module 'nitropack' {
   interface NitroRouteConfig {
     ssr?: boolean
     experimentalNoScripts?: boolean
-    nuxtMiddleware?: string | string[] | Record<string, boolean>
   }
   interface NitroRouteRules {
     ssr?: boolean
diff --git a/packages/nuxt/src/pages/module.ts b/packages/nuxt/src/pages/module.ts
index f03c6279c3d9..3b6be825f3ce 100644
--- a/packages/nuxt/src/pages/module.ts
+++ b/packages/nuxt/src/pages/module.ts
@@ -474,6 +474,11 @@ export default defineNuxtModule({
           '  interface PageMeta {',
           '    middleware?: MiddlewareKey | NavigationGuard | Array<MiddlewareKey | NavigationGuard>',
           '  }',
+          '}',
+          'declare module \'nitropack\' {',
+          '  interface NitroRouteConfig {',
+          '    nuxtMiddleware?: MiddlewareKey | MiddlewareKey[] | Record<MiddlewareKey, boolean>',
+          '  }',
           '}'
         ].join('\n')
       }
diff --git a/packages/nuxt/types.d.mts b/packages/nuxt/types.d.mts
index 326e9fbfa8fb..cdfd68e0434b 100644
--- a/packages/nuxt/types.d.mts
+++ b/packages/nuxt/types.d.mts
@@ -22,7 +22,6 @@ declare module 'nitropack' {
   interface NitroRouteConfig {
     ssr?: boolean
     experimentalNoScripts?: boolean
-    nuxtMiddleware?: string | string[] | Record<string, boolean>
   }
   interface NitroRouteRules {
     ssr?: boolean
diff --git a/packages/nuxt/types.d.ts b/packages/nuxt/types.d.ts
index c3619961b601..23ca5b4ff88a 100644
--- a/packages/nuxt/types.d.ts
+++ b/packages/nuxt/types.d.ts
@@ -22,7 +22,6 @@ declare module 'nitropack' {
   interface NitroRouteConfig {
     ssr?: boolean
     experimentalNoScripts?: boolean
-    nuxtMiddleware?: string | string[] | Record<string, boolean>
   }
   interface NitroRouteRules {
     ssr?: boolean
diff --git a/test/fixtures/basic/nuxt.config.ts b/test/fixtures/basic/nuxt.config.ts
index d5040fe976c3..5231b0dbed53 100644
--- a/test/fixtures/basic/nuxt.config.ts
+++ b/test/fixtures/basic/nuxt.config.ts
@@ -60,7 +60,7 @@ export default defineNuxtConfig({
     },
     routeRules: {
       '/route-rules/spa': { ssr: false },
-      '/route-rules/middleware': { nuxtMiddleware: 'routeRulesMiddleware' },
+      '/route-rules/middleware': { nuxtMiddleware: 'route-rules-middleware' },
       '/hydration/spa-redirection/**': { ssr: false },
       '/no-scripts': { experimentalNoScripts: true }
     },

From 9244713b7d1ddb057a893221a921fe450abf1fa3 Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Sat, 9 Mar 2024 17:05:38 +0100
Subject: [PATCH 12/24] fix(nuxt): normalise route rules before starting nitro

---
 packages/nuxt/src/core/nitro.ts | 34 ++++++++++++++++++---------------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/packages/nuxt/src/core/nitro.ts b/packages/nuxt/src/core/nitro.ts
index 5fc84478c1ea..87d3da4bba46 100644
--- a/packages/nuxt/src/core/nitro.ts
+++ b/packages/nuxt/src/core/nitro.ts
@@ -6,7 +6,7 @@ import { createRouter as createRadixRouter, exportMatcher, toRouteMatcher } from
 import { randomUUID } from 'uncrypto'
 import { joinURL, withTrailingSlash } from 'ufo'
 import { build, copyPublicAssets, createDevServer, createNitro, prepare, prerender, scanHandlers, writeTypes } from 'nitropack'
-import type { Nitro, NitroConfig } from 'nitropack'
+import type { Nitro, NitroConfig, NitroOptions } from 'nitropack'
 import { findPath, logger, resolveIgnorePatterns, resolveNuxtModule, resolvePath } from '@nuxt/kit'
 import escapeRE from 'escape-string-regexp'
 import { defu } from 'defu'
@@ -264,6 +264,23 @@ export async function initNitro (nuxt: Nuxt & { _nitro?: Nitro }) {
 
     nuxt.options.alias['#app-manifest'] = join(tempDir, `meta/${buildId}.json`)
 
+    nuxt.hook('nitro:config', (config) => {
+      const rules = config.routeRules
+      for (const rule in rules) {
+        if (!(rules[rule] as any).nuxtMiddleware) { continue }
+        const value = (rules[rule] as any).nuxtMiddleware
+        if (typeof value === 'string') {
+          (rules[rule] as NitroOptions['routeRules']).nuxtMiddleware = { [value]: true }
+        } else if (Array.isArray(value)) {
+          const normalizedRules: Record<string, boolean> = {}
+          for (const middleware of value) {
+            normalizedRules[middleware] = true
+          }
+          (rules[rule] as NitroOptions['routeRules']).nuxtMiddleware = normalizedRules
+        }
+      }
+    })
+
     nuxt.hook('nitro:init', (nitro) => {
       nitro.hooks.hook('rollup:before', async (nitro) => {
         const routeRules = {} as Record<string, any>
@@ -277,22 +294,9 @@ export async function initNitro (nuxt: Nuxt & { _nitro?: Nitro }) {
             if (['prerender', 'redirect', 'nuxtMiddleware'].includes(routeKey) && value) {
               if (routeKey === 'redirect') {
                 filteredRules[routeKey] = typeof value === 'string' ? value : value.to
-              }
-              if (routeKey === 'prerender') {
+              } else {
                 filteredRules[routeKey] = value
               }
-              if (routeKey === 'nuxtMiddleware') {
-                if (typeof value === 'string') {
-                  filteredRules[routeKey] = { [value]: true }
-                } else if (Array.isArray(value)) {
-                  filteredRules[routeKey] = {}
-                  for (const middleware of value) {
-                    filteredRules[routeKey][middleware] = true
-                  }
-                } else {
-                  filteredRules[routeKey] = value
-                }
-              }
               hasRules = true
             }
           }

From cd9e4417ae0f5e8696b3129c6e12d83ee71fe0ea Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Sat, 9 Mar 2024 17:41:09 +0100
Subject: [PATCH 13/24] fix: use route rules from nitro config

---
 packages/nuxt/src/app/composables/manifest.ts | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/packages/nuxt/src/app/composables/manifest.ts b/packages/nuxt/src/app/composables/manifest.ts
index f27d1e69be59..24700222a936 100644
--- a/packages/nuxt/src/app/composables/manifest.ts
+++ b/packages/nuxt/src/app/composables/manifest.ts
@@ -1,7 +1,8 @@
 import type { MatcherExport, RouteMatcher } from 'radix3'
-import { createMatcherFromExport } from 'radix3'
+import { createMatcherFromExport, createRouter as createRadixRouter, toRouteMatcher } from 'radix3'
 import { defu } from 'defu'
 import { useAppConfig } from '../config'
+import { useRuntimeConfig } from '../nuxt'
 // @ts-expect-error virtual file
 import { appManifest as isAppManifestEnabled } from '#build/nuxt.config.mjs'
 // @ts-expect-error virtual file
@@ -26,10 +27,7 @@ function fetchManifest () {
   }
   // @ts-expect-error private property
   const buildId = useAppConfig().nuxt?.buildId
-  manifest = import.meta.server
-    // @ts-expect-error virtual file
-    ? import('#app-manifest').then(r => r.default).then(r => r.default || r)
-    : $fetch<NuxtAppManifest>(buildAssetsURL(`builds/meta/${buildId}.json`))
+  manifest = $fetch<NuxtAppManifest>(buildAssetsURL(`builds/meta/${buildId}.json`))
   manifest.then((m) => { matcher = createMatcherFromExport(m.matcher) })
   return manifest
 }
@@ -44,6 +42,12 @@ export function getAppManifest (): Promise<NuxtAppManifest> {
 
 /** @since 3.7.4 */
 export async function getRouteRules (url: string) {
+  if (import.meta.server) {
+    const _routeRulesMatcher = toRouteMatcher(
+      createRadixRouter({ routes: useRuntimeConfig().nitro!.routeRules })
+    )
+    return defu({}, ..._routeRulesMatcher.matchAll(url).reverse())
+  }
   await getAppManifest()
   return defu({} as Record<string, any>, ...matcher.matchAll(url).reverse())
 }

From 061fe38ef5b211da8333e8dcdedb71dc63aa3023 Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Sat, 9 Mar 2024 17:42:00 +0100
Subject: [PATCH 14/24] test: get html text rather than FetchResponse

---
 test/basic.test.ts | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/test/basic.test.ts b/test/basic.test.ts
index 82dbfcbf4bab..b459165ab714 100644
--- a/test/basic.test.ts
+++ b/test/basic.test.ts
@@ -80,13 +80,14 @@ describe('route rules', () => {
     const html = await $fetch('/no-scripts')
     expect(html).not.toContain('<script')
   })
-})
 
-it('should run middleware defined in routeRules config', async () => {
-  const html = await fetch('/route-rules/middleware')
-  expect(html).toContain('Hello from routeRules!')
+  it('should run middleware defined in routeRules config', async () => {
+    const html = await $fetch('/route-rules/middleware')
+    expect(html).toContain('Hello from routeRules!')
+  })
 })
 
+
 describe('modules', () => {
   it('should auto-register modules in ~/modules', async () => {
     const result = await $fetch('/auto-registered-module')

From 0a57fe13ca490092ced4c2f100a00972b1a9f555 Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Sat, 9 Mar 2024 17:44:41 +0100
Subject: [PATCH 15/24] style: remove blank line

---
 test/basic.test.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/test/basic.test.ts b/test/basic.test.ts
index b459165ab714..ec773d47c5af 100644
--- a/test/basic.test.ts
+++ b/test/basic.test.ts
@@ -87,7 +87,6 @@ describe('route rules', () => {
   })
 })
 
-
 describe('modules', () => {
   it('should auto-register modules in ~/modules', async () => {
     const result = await $fetch('/auto-registered-module')

From dd95d76399e0f573a4e5c052032de72f0294a85c Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Sat, 9 Mar 2024 17:59:01 +0100
Subject: [PATCH 16/24] fix: type matched route rule return

---
 packages/nuxt/src/app/composables/manifest.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nuxt/src/app/composables/manifest.ts b/packages/nuxt/src/app/composables/manifest.ts
index 24700222a936..e525bba8576a 100644
--- a/packages/nuxt/src/app/composables/manifest.ts
+++ b/packages/nuxt/src/app/composables/manifest.ts
@@ -46,7 +46,7 @@ export async function getRouteRules (url: string) {
     const _routeRulesMatcher = toRouteMatcher(
       createRadixRouter({ routes: useRuntimeConfig().nitro!.routeRules })
     )
-    return defu({}, ..._routeRulesMatcher.matchAll(url).reverse())
+    return defu({} as Record<string, any>, ..._routeRulesMatcher.matchAll(url).reverse())
   }
   await getAppManifest()
   return defu({} as Record<string, any>, ...matcher.matchAll(url).reverse())

From 544e427316fb84158749cca7779991a477e0b5bf Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Sat, 16 Mar 2024 09:55:12 -0700
Subject: [PATCH 17/24] chore: reduce diff

---
 packages/nuxt/src/app/composables/manifest.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/nuxt/src/app/composables/manifest.ts b/packages/nuxt/src/app/composables/manifest.ts
index e525bba8576a..5463d870fbf6 100644
--- a/packages/nuxt/src/app/composables/manifest.ts
+++ b/packages/nuxt/src/app/composables/manifest.ts
@@ -28,7 +28,9 @@ function fetchManifest () {
   // @ts-expect-error private property
   const buildId = useAppConfig().nuxt?.buildId
   manifest = $fetch<NuxtAppManifest>(buildAssetsURL(`builds/meta/${buildId}.json`))
-  manifest.then((m) => { matcher = createMatcherFromExport(m.matcher) })
+  manifest.then((m) => {
+    matcher = createMatcherFromExport(m.matcher)
+  })
   return manifest
 }
 

From a46b8daabac39e680300f2fc21939adefa34ad3f Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Sat, 16 Mar 2024 09:56:34 -0700
Subject: [PATCH 18/24] test: only run route rules test when app manifest is on

---
 test/basic.test.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/basic.test.ts b/test/basic.test.ts
index ec773d47c5af..408b3bfecc4f 100644
--- a/test/basic.test.ts
+++ b/test/basic.test.ts
@@ -81,7 +81,7 @@ describe('route rules', () => {
     expect(html).not.toContain('<script')
   })
 
-  it('should run middleware defined in routeRules config', async () => {
+  it.runIf(isTestingAppManifest)('should run middleware defined in routeRules config', async () => {
     const html = await $fetch('/route-rules/middleware')
     expect(html).toContain('Hello from routeRules!')
   })

From e9f06e31b1b2f4b2183341c5950f9127571dd126 Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Sat, 16 Mar 2024 10:01:16 -0700
Subject: [PATCH 19/24] fix: only add middleware if manifest is enabled

---
 .../nuxt/src/pages/runtime/plugins/router.ts   | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/packages/nuxt/src/pages/runtime/plugins/router.ts b/packages/nuxt/src/pages/runtime/plugins/router.ts
index 70c42c3fc664..ad27599a6fac 100644
--- a/packages/nuxt/src/pages/runtime/plugins/router.ts
+++ b/packages/nuxt/src/pages/runtime/plugins/router.ts
@@ -20,6 +20,8 @@ import { defineNuxtPlugin, useRuntimeConfig } from '#app/nuxt'
 import { clearError, showError, useError } from '#app/composables/error'
 import { navigateTo } from '#app/composables/router'
 
+// @ts-expect-error virtual file
+import { appManifest as isAppManifestEnabled } from '#build/nuxt.config.mjs'
 // @ts-expect-error virtual file
 import _routes from '#build/routes'
 // @ts-expect-error virtual file
@@ -174,14 +176,16 @@ const plugin: Plugin<{ router: Router }> = defineNuxtPlugin({
           }
         }
 
-        const routeRules = await nuxtApp.runWithContext(() => getRouteRules(to.path))
+        if (isAppManifestEnabled) {
+          const routeRules = await nuxtApp.runWithContext(() => getRouteRules(to.path))
 
-        if (routeRules.nuxtMiddleware) {
-          for (const key in routeRules.nuxtMiddleware) {
-            if (routeRules.nuxtMiddleware[key]) {
-              middlewareEntries.add(key)
-            } else {
-              middlewareEntries.delete(key)
+          if (routeRules.nuxtMiddleware) {
+            for (const key in routeRules.nuxtMiddleware) {
+              if (routeRules.nuxtMiddleware[key]) {
+                middlewareEntries.add(key)
+              } else {
+                middlewareEntries.delete(key)
+              }
             }
           }
         }

From 3369471a4e21b55b26c4c7224a6fa6ea1bccb364 Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Sat, 16 Mar 2024 10:07:10 -0700
Subject: [PATCH 20/24] feat: add support in universal router

---
 packages/nuxt/src/app/plugins/router.ts | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/packages/nuxt/src/app/plugins/router.ts b/packages/nuxt/src/app/plugins/router.ts
index 576053bf5604..4c6fa9c07e8b 100644
--- a/packages/nuxt/src/app/plugins/router.ts
+++ b/packages/nuxt/src/app/plugins/router.ts
@@ -3,11 +3,14 @@ import { computed, defineComponent, h, isReadonly, reactive } from 'vue'
 import { isEqual, joinURL, parseQuery, parseURL, stringifyParsedURL, stringifyQuery, withoutBase } from 'ufo'
 import { createError } from 'h3'
 import { defineNuxtPlugin, useRuntimeConfig } from '../nuxt'
+import { getRouteRules } from '../composables/manifest'
 import { clearError, showError } from '../composables/error'
 import { navigateTo } from '../composables/router'
 
 // @ts-expect-error virtual file
 import { globalMiddleware } from '#build/middleware'
+// @ts-expect-error virtual file
+import { appManifest as isAppManifestEnabled } from '#build/nuxt.config.mjs'
 
 interface Route {
   /** Percentage encoded pathname section of the URL. */
@@ -243,6 +246,23 @@ export default defineNuxtPlugin<{ route: Route, router: Router }>({
         if (import.meta.client || !nuxtApp.ssrContext?.islandContext) {
           const middlewareEntries = new Set<RouteGuard>([...globalMiddleware, ...nuxtApp._middleware.global])
 
+          if (isAppManifestEnabled) {
+            const routeRules = await nuxtApp.runWithContext(() => getRouteRules(to.path))
+
+            if (routeRules.nuxtMiddleware) {
+              for (const key in routeRules.nuxtMiddleware) {
+                const guard = nuxtApp._middleware.named[key] as RouteGuard | undefined
+                if (!guard) { return }
+
+                if (routeRules.nuxtMiddleware[key]) {
+                  middlewareEntries.add(guard)
+                } else {
+                  middlewareEntries.delete(guard)
+                }
+              }
+            }
+          }
+
           for (const middleware of middlewareEntries) {
             const result = await nuxtApp.runWithContext(() => middleware(to, from))
             if (import.meta.server) {

From 91f9e08ce86b4fb1402daa1e8a60d26f1e855ad0 Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Sat, 16 Mar 2024 11:05:42 -0700
Subject: [PATCH 21/24] chore: remove old code

---
 packages/schema/src/config/experimental.ts | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/packages/schema/src/config/experimental.ts b/packages/schema/src/config/experimental.ts
index dd93075c25f0..590505017f55 100644
--- a/packages/schema/src/config/experimental.ts
+++ b/packages/schema/src/config/experimental.ts
@@ -232,11 +232,6 @@ export default defineUntypedSchema({
      */
     appManifest: true,
 
-    // This is enabled when `experimental.payloadExtraction` is set to `true`.
-    // appManifest: {
-    //   $resolve: (val, get) => val ?? get('experimental.payloadExtraction')
-    // },
-
     /**
      * Set an alternative watcher that will be used as the watching service for Nuxt.
      *

From 24745e008cb71cb4c3f530b6373962db53865c82 Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Sat, 16 Mar 2024 11:06:29 -0700
Subject: [PATCH 22/24] test: also run composables test with appManifest off

---
 test/nuxt/composables.test.ts | 2 +-
 vitest.nuxt.config.ts         | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/test/nuxt/composables.test.ts b/test/nuxt/composables.test.ts
index e50c1614e5fd..d61479768603 100644
--- a/test/nuxt/composables.test.ts
+++ b/test/nuxt/composables.test.ts
@@ -619,7 +619,7 @@ describe('routing utilities: `abortNavigation`', () => {
 })
 
 describe('routing utilities: `setPageLayout`', () => {
-  it('should set error on page metadata if run outside middleware', () => {
+  it('should set layout on page metadata if run outside middleware', () => {
     const route = useRoute()
     expect(route.meta.layout).toBeUndefined()
     setPageLayout('custom')
diff --git a/vitest.nuxt.config.ts b/vitest.nuxt.config.ts
index 9598af55e659..e71fedae2401 100644
--- a/vitest.nuxt.config.ts
+++ b/vitest.nuxt.config.ts
@@ -10,6 +10,9 @@ export default defineVitestConfig({
     environmentOptions: {
       nuxt: {
         overrides: {
+          experimental: {
+            appManifest: process.env.TEST_MANIFEST !== 'manifest-off'
+          },
           appConfig: {
             nuxt: {
               buildId: 'override'

From e1adddd5bfc548b8bb0ef478f04a0bb081092a36 Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Sat, 16 Mar 2024 11:12:21 -0700
Subject: [PATCH 23/24] test: mock manifest before environment is set up

---
 test/nuxt/composables.test.ts | 23 -----------------------
 test/setup-runtime.ts         | 28 ++++++++++++++++++++++++++++
 vitest.nuxt.config.ts         |  3 +++
 3 files changed, 31 insertions(+), 23 deletions(-)
 create mode 100644 test/setup-runtime.ts

diff --git a/test/nuxt/composables.test.ts b/test/nuxt/composables.test.ts
index d61479768603..d74718302c10 100644
--- a/test/nuxt/composables.test.ts
+++ b/test/nuxt/composables.test.ts
@@ -19,29 +19,6 @@ import { useId } from '#app/composables/id'
 import { callOnce } from '#app/composables/once'
 import { useLoadingIndicator } from '#app/composables/loading-indicator'
 
-vi.mock('#app/compat/idle-callback', () => ({
-  requestIdleCallback: (cb: Function) => cb()
-}))
-
-const timestamp = Date.now()
-registerEndpoint('/_nuxt/builds/latest.json', defineEventHandler(() => ({
-  id: 'override',
-  timestamp
-})))
-registerEndpoint('/_nuxt/builds/meta/override.json', defineEventHandler(() => ({
-  id: 'override',
-  timestamp,
-  matcher: {
-    static: {
-      '/': null,
-      '/pre': null,
-      '/pre/test': { redirect: true }
-    },
-    wildcard: { '/pre': { prerender: true } },
-    dynamic: {}
-  },
-  prerendered: ['/specific-prerendered']
-})))
 registerEndpoint('/api/test', defineEventHandler(event => ({
   method: event.method,
   headers: Object.fromEntries(event.headers.entries())
diff --git a/test/setup-runtime.ts b/test/setup-runtime.ts
new file mode 100644
index 000000000000..f152abe1d45a
--- /dev/null
+++ b/test/setup-runtime.ts
@@ -0,0 +1,28 @@
+import { vi } from 'vitest'
+import { defineEventHandler } from 'h3'
+
+import { registerEndpoint } from '@nuxt/test-utils/runtime'
+
+vi.mock('#app/compat/idle-callback', () => ({
+  requestIdleCallback: (cb: Function) => cb()
+}))
+
+const timestamp = Date.now()
+registerEndpoint('/_nuxt/builds/latest.json', defineEventHandler(() => ({
+  id: 'override',
+  timestamp
+})))
+registerEndpoint('/_nuxt/builds/meta/override.json', defineEventHandler(() => ({
+  id: 'override',
+  timestamp,
+  matcher: {
+    static: {
+      '/': null,
+      '/pre': null,
+      '/pre/test': { redirect: true }
+    },
+    wildcard: { '/pre': { prerender: true } },
+    dynamic: {}
+  },
+  prerendered: ['/specific-prerendered']
+})))
diff --git a/vitest.nuxt.config.ts b/vitest.nuxt.config.ts
index e71fedae2401..9a38b900cc9f 100644
--- a/vitest.nuxt.config.ts
+++ b/vitest.nuxt.config.ts
@@ -7,6 +7,9 @@ export default defineVitestConfig({
       include: ['packages/nuxt/src/app']
     },
     environment: 'nuxt',
+    setupFiles: [
+      './test/setup-runtime.ts'
+    ],
     environmentOptions: {
       nuxt: {
         overrides: {

From f3e3a3a30b760987ee3a9a91d5b8229f1e546f40 Mon Sep 17 00:00:00 2001
From: "autofix-ci[bot]" <114827586+autofix-ci[bot]@users.noreply.github.com>
Date: Sat, 16 Mar 2024 18:15:18 +0000
Subject: [PATCH 24/24] [autofix.ci] apply automated fixes

---
 test/bundle.test.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/bundle.test.ts b/test/bundle.test.ts
index fdc4012581d5..284518788ff4 100644
--- a/test/bundle.test.ts
+++ b/test/bundle.test.ts
@@ -19,7 +19,7 @@ describe.skipIf(process.env.SKIP_BUNDLE_SIZE === 'true' || process.env.ECOSYSTEM
   for (const outputDir of ['.output', '.output-inline']) {
     it('default client bundle size', async () => {
       const clientStats = await analyzeSizes('**/*.js', join(rootDir, outputDir, 'public'))
-      expect.soft(roundToKilobytes(clientStats.totalBytes)).toMatchInlineSnapshot('"105k"')
+      expect.soft(roundToKilobytes(clientStats.totalBytes)).toMatchInlineSnapshot('"106k"')
       expect(clientStats.files.map(f => f.replace(/\..*\.js/, '.js'))).toMatchInlineSnapshot(`
         [
           "_nuxt/entry.js",
@@ -32,7 +32,7 @@ describe.skipIf(process.env.SKIP_BUNDLE_SIZE === 'true' || process.env.ECOSYSTEM
     const serverDir = join(rootDir, '.output/server')
 
     const serverStats = await analyzeSizes(['**/*.mjs', '!node_modules'], serverDir)
-    expect.soft(roundToKilobytes(serverStats.totalBytes)).toMatchInlineSnapshot('"205k"')
+    expect.soft(roundToKilobytes(serverStats.totalBytes)).toMatchInlineSnapshot('"206k"')
 
     const modules = await analyzeSizes('node_modules/**/*', serverDir)
     expect.soft(roundToKilobytes(modules.totalBytes)).toMatchInlineSnapshot('"1336k"')
@@ -72,7 +72,7 @@ describe.skipIf(process.env.SKIP_BUNDLE_SIZE === 'true' || process.env.ECOSYSTEM
     const serverDir = join(rootDir, '.output-inline/server')
 
     const serverStats = await analyzeSizes(['**/*.mjs', '!node_modules'], serverDir)
-    expect.soft(roundToKilobytes(serverStats.totalBytes)).toMatchInlineSnapshot('"524k"')
+    expect.soft(roundToKilobytes(serverStats.totalBytes)).toMatchInlineSnapshot('"525k"')
 
     const modules = await analyzeSizes('node_modules/**/*', serverDir)
     expect.soft(roundToKilobytes(modules.totalBytes)).toMatchInlineSnapshot('"77.8k"')