Skip to content

fix: support named & default export for middleware in ntl dev #2116

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
May 17, 2023
Merged

fix: support named & default export for middleware in ntl dev #2116

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
fadac14
fix: support named & default export for middleware in ntl dev
LekoArts May 16, 2023
086a8d6
chore: linting
LekoArts May 16, 2023
7d53878
chore: add typing
LekoArts May 16, 2023
2ef5b0b
Merge branch 'main' into ntl-dev-middleware-exports
LekoArts May 16, 2023
71eb682
fix: more verbose
LekoArts May 17, 2023
60ef41f
chore: formatting
LekoArts May 17, 2023
39c106f
Merge branch 'main' into ntl-dev-middleware-exports
LekoArts May 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions packages/runtime/src/templates/edge-shared/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,3 +305,5 @@ export const redirectTrailingSlash = (url: URL, trailingSlash: boolean): Respons
return Response.redirect(url, 308)
}
}

export const isFunction = (f: unknown) => Boolean(f) && typeof f === 'function'
6 changes: 4 additions & 2 deletions packages/runtime/src/templates/edge/next-dev.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { NextRequest } from 'https://esm.sh/v91/[email protected]/deno/dist/server/web/spec-extension/request.js'
import { NextResponse } from 'https://esm.sh/v91/[email protected]/deno/dist/server/web/spec-extension/response.js'
import { fromFileUrl } from 'https://deno.land/[email protected]/path/mod.ts'
import { buildResponse } from '../edge-shared/utils.ts'
import { buildResponse, isFunction } from '../edge-shared/utils.ts'

globalThis.NFRequestContextMap ||= new Map()
globalThis.__dirname = fromFileUrl(new URL('./', import.meta.url)).slice(0, -1)
Expand Down Expand Up @@ -36,7 +36,9 @@ const handler = async (req, context) => {
// We need to cache-bust the import because otherwise it will claim it
// doesn't exist if the user creates it after the server starts
const nextMiddleware = await import(`../../middleware.js#${++idx}`)
middleware = nextMiddleware.middleware

// The middleware file can export a named `middleware` export or a `default` export
middleware = isFunction(nextMiddleware.middleware) ? nextMiddleware.middleware : nextMiddleware.default
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is the function check necessary? I imagine nextMiddleware.middleware is undefined if the default exists?

Suggested change
middleware = isFunction(nextMiddleware.middleware) ? nextMiddleware.middleware : nextMiddleware.default
middleware = nextMiddleware.middleware ?? nextMiddleware.default

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Someone could for some reason export a named middleware that is for them some utility. Better safe than sorry

} catch (importError) {
if (importError.code === 'ERR_MODULE_NOT_FOUND' && importError.message.includes(`middleware.js`)) {
// No middleware, so we silently return
Expand Down