Skip to content

Commit

Permalink
fix(nitro): resolve alias for serverMiddleware
Browse files Browse the repository at this point in the history
  • Loading branch information
pi0 committed Apr 4, 2021
1 parent dfa3d8d commit 79ef2fb
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
2 changes: 1 addition & 1 deletion src/compat.ts
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ export default function nuxt2CompatModule () {

// Resolve middleware
nuxt.hook('modules:done', () => {
const { middleware, legacyMiddleware } = resolveMiddleware(nuxt.options.serverMiddleware)
const { middleware, legacyMiddleware } = resolveMiddleware(nuxt)
if (nuxt.server) {
nuxt.server.setLegacyMiddleware(legacyMiddleware)
}
Expand Down
10 changes: 6 additions & 4 deletions src/server/middleware.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { resolve, join, extname } from 'upath'
import { joinURL } from 'ufo'
import globby from 'globby'
import { watch } from 'chokidar'
import { tryResolvePath } from '@nuxt/kit'
import { tryResolvePath, Nuxt } from '@nuxt/kit'

export interface ServerMiddleware {
route: string
Expand Down Expand Up @@ -51,11 +51,11 @@ export function scanMiddleware (serverDir: string, onChange?: (results: ServerMi
return scan()
}

export function resolveMiddleware (serverMiddleware: any[]) {
export function resolveMiddleware (nuxt: Nuxt) {
const middleware: ServerMiddleware[] = []
const legacyMiddleware: ServerMiddleware[] = []

for (let m of serverMiddleware) {
for (let m of nuxt.options.serverMiddleware) {
if (typeof m === 'string') { m = { handler: m } }
const route = m.path || m.route || '/'
const handle = m.handler || m.handle
Expand All @@ -67,7 +67,9 @@ export function resolveMiddleware (serverMiddleware: any[]) {
middleware.push({
...m,
handle: tryResolvePath(handle, {
extensions: ['.ts', '.js']
extensions: ['.ts', '.js'],
alias: nuxt.options.alias,
base: nuxt.options.srcDir
}),
route
})
Expand Down

0 comments on commit 79ef2fb

Please sign in to comment.