Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit cac7454

Browse files
danielroedanielroe
committed
refactor(nuxt): rename nuxtMiddleware to appMiddleware 
1 parent c6aa617 commit cac7454

File tree

8 files changed

+16
-16
lines changed

8 files changed

+16
-16
lines changed

‎packages/nuxt/src/app/plugins/router.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -249,12 +249,12 @@ export default defineNuxtPlugin<{ route: Route, router: Router }>({
249249
if (isAppManifestEnabled) {
250250
const routeRules = await nuxtApp.runWithContext(() => getRouteRules(to.path))
251251

252-
if (routeRules.nuxtMiddleware) {
253-
for (const key in routeRules.nuxtMiddleware) {
252+
if (routeRules.appMiddleware) {
253+
for (const key in routeRules.appMiddleware) {
254254
const guard = nuxtApp._middleware.named[key] as RouteGuard | undefined
255255
if (!guard) { return }
256256

257-
if (routeRules.nuxtMiddleware[key]) {
257+
if (routeRules.appMiddleware[key]) {
258258
middlewareEntries.add(guard)
259259
} else {
260260
middlewareEntries.delete(guard)

‎packages/nuxt/src/core/nitro.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -267,16 +267,16 @@ export async function initNitro (nuxt: Nuxt & { _nitro?: Nitro }) {
267267
nuxt.hook('nitro:config', (config) => {
268268
const rules = config.routeRules
269269
for (const rule in rules) {
270-
if (!(rules[rule] as any).nuxtMiddleware) { continue }
271-
const value = (rules[rule] as any).nuxtMiddleware
270+
if (!(rules[rule] as any).appMiddleware) { continue }
271+
const value = (rules[rule] as any).appMiddleware
272272
if (typeof value === 'string') {
273-
(rules[rule] as NitroOptions['routeRules']).nuxtMiddleware = { [value]: true }
273+
(rules[rule] as NitroOptions['routeRules']).appMiddleware = { [value]: true }
274274
} else if (Array.isArray(value)) {
275275
const normalizedRules: Record<string, boolean> = {}
276276
for (const middleware of value) {
277277
normalizedRules[middleware] = true
278278
}
279-
(rules[rule] as NitroOptions['routeRules']).nuxtMiddleware = normalizedRules
279+
(rules[rule] as NitroOptions['routeRules']).appMiddleware = normalizedRules
280280
}
281281
}
282282
})
@@ -291,7 +291,7 @@ export async function initNitro (nuxt: Nuxt & { _nitro?: Nitro }) {
291291
const filteredRules = {} as Record<string, any>
292292
for (const routeKey in _routeRules[key]) {
293293
const value = (_routeRules as any)[key][routeKey]
294-
if (['prerender', 'redirect', 'nuxtMiddleware'].includes(routeKey) && value) {
294+
if (['prerender', 'redirect', 'appMiddleware'].includes(routeKey) && value) {
295295
if (routeKey === 'redirect') {
296296
filteredRules[routeKey] = typeof value === 'string' ? value : value.to
297297
} else {

‎packages/nuxt/src/core/templates.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ declare module 'nitropack' {
244244
interface NitroRouteRules {
245245
ssr?: boolean
246246
experimentalNoScripts?: boolean
247-
nuxtMiddleware?: Record<string, boolean>
247+
appMiddleware?: Record<string, boolean>
248248
}
249249
interface NitroRuntimeHooks {
250250
'dev:ssr-logs': (ctx: { logs: LogObject[], path: string }) => void | Promise<void>

‎packages/nuxt/src/pages/module.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -477,7 +477,7 @@ export default defineNuxtModule({
477477
'}',
478478
'declare module \'nitropack\' {',
479479
' interface NitroRouteConfig {',
480-
' nuxtMiddleware?: MiddlewareKey | MiddlewareKey[] | Record<MiddlewareKey, boolean>',
480+
' appMiddleware?: MiddlewareKey | MiddlewareKey[] | Record<MiddlewareKey, boolean>',
481481
' }',
482482
'}'
483483
].join('\n')

‎packages/nuxt/src/pages/runtime/plugins/router.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -179,9 +179,9 @@ const plugin: Plugin<{ router: Router }> = defineNuxtPlugin({
179179
if (isAppManifestEnabled) {
180180
const routeRules = await nuxtApp.runWithContext(() => getRouteRules(to.path))
181181

182-
if (routeRules.nuxtMiddleware) {
183-
for (const key in routeRules.nuxtMiddleware) {
184-
if (routeRules.nuxtMiddleware[key]) {
182+
if (routeRules.appMiddleware) {
183+
for (const key in routeRules.appMiddleware) {
184+
if (routeRules.appMiddleware[key]) {
185185
middlewareEntries.add(key)
186186
} else {
187187
middlewareEntries.delete(key)

‎packages/nuxt/types.d.mts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ declare module 'nitropack' {
2626
interface NitroRouteRules {
2727
ssr?: boolean
2828
experimentalNoScripts?: boolean
29-
nuxtMiddleware?: Record<string, boolean>
29+
appMiddleware?: Record<string, boolean>
3030
}
3131
interface NitroRuntimeHooks {
3232
'dev:ssr-logs': (ctx: { logs: LogObject[], path: string }) => void | Promise<void>

‎packages/nuxt/types.d.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ declare module 'nitropack' {
2626
interface NitroRouteRules {
2727
ssr?: boolean
2828
experimentalNoScripts?: boolean
29-
nuxtMiddleware?: Record<string, boolean>
29+
appMiddleware?: Record<string, boolean>
3030
}
3131
interface NitroRuntimeHooks {
3232
'dev:ssr-logs': (ctx: { logs: LogObject[], path: string }) => void | Promise<void>

‎test/fixtures/basic/nuxt.config.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ export default defineNuxtConfig({
6060
},
6161
routeRules: {
6262
'/route-rules/spa': { ssr: false },
63-
'/route-rules/middleware': { nuxtMiddleware: 'route-rules-middleware' },
63+
'/route-rules/middleware': { appMiddleware: 'route-rules-middleware' },
6464
'/hydration/spa-redirection/**': { ssr: false },
6565
'/no-scripts': { experimentalNoScripts: true }
6666
},

0 commit comments

Comments
 (0)