Unverified Commit de535e48 authored by JJ Kasper's avatar JJ Kasper Committed by GitHub

Ensure middleware layer is applied for node (#76293)

This ensures we apply the middleware layer when in the node runtime so
that `server-only` imports are properly handled. Also ensures our test
suite includes this condition for `edge` and `node` runtimes.

Fixes: https://github.com/vercel/next.js/issues/75904
parent beb1f72e
......@@ -407,7 +407,10 @@ export function getEdgeServerEntry(opts: {
).toString('base64'),
}
return `next-middleware-loader?${stringify(loaderParams)}!`
return {
import: `next-middleware-loader?${stringify(loaderParams)}!`,
layer: WEBPACK_LAYERS.middleware,
}
}
if (isAPIRoute(opts.page)) {
......
import 'server-only'
export async function getSomeData() {
return 'some data'
}
/* global globalThis */
import { NextRequest, NextResponse } from 'next/server'
import { getSomeData } from './lib/some-data'
import magicValue from 'shared-package'
export const config = {
......@@ -29,6 +30,8 @@ const params = (url) => {
}
export async function middleware(request) {
getSomeData()
const url = request.nextUrl
if (process.env.NEXT_RUNTIME === 'nodejs') {
......
/* global globalThis */
import { NextRequest, NextResponse, URLPattern } from 'next/server'
import { getSomeData } from './lib/some-data'
import magicValue from 'shared-package'
export const config = {
......@@ -38,6 +39,8 @@ const params = (url) => {
}
export async function middleware(request) {
getSomeData()
const url = request.nextUrl
if (request.headers.get('x-prerender-revalidate')) {
......
......@@ -37,6 +37,7 @@ describe('Middleware Runtime', () => {
isNodeMiddleware ? 'middleware-node.js' : 'middleware.js'
)
),
lib: new FileRef(join(__dirname, '../app/lib')),
pages: new FileRef(join(__dirname, '../app/pages')),
'shared-package': new FileRef(
join(__dirname, '../app/node_modules/shared-package')
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment