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

Ensure node middleware is handled with standalone (#75765)

This makes sure we properly copy the necessary files in standalone mode
and node middleware is configured also adds regression test for this.
parent 8ee2d3f7
...@@ -595,6 +595,7 @@ async function writeStandaloneDirectory( ...@@ -595,6 +595,7 @@ async function writeStandaloneDirectory(
outputFileTracingRoot: string, outputFileTracingRoot: string,
requiredServerFiles: RequiredServerFilesManifest, requiredServerFiles: RequiredServerFilesManifest,
middlewareManifest: MiddlewareManifest, middlewareManifest: MiddlewareManifest,
hasNodeMiddleware: boolean,
hasInstrumentationHook: boolean, hasInstrumentationHook: boolean,
staticPages: Set<string>, staticPages: Set<string>,
loadedEnvFiles: LoadedEnvFiles, loadedEnvFiles: LoadedEnvFiles,
...@@ -612,6 +613,7 @@ async function writeStandaloneDirectory( ...@@ -612,6 +613,7 @@ async function writeStandaloneDirectory(
outputFileTracingRoot, outputFileTracingRoot,
requiredServerFiles.config, requiredServerFiles.config,
middlewareManifest, middlewareManifest,
hasNodeMiddleware,
hasInstrumentationHook, hasInstrumentationHook,
staticPages staticPages
) )
...@@ -638,6 +640,23 @@ async function writeStandaloneDirectory( ...@@ -638,6 +640,23 @@ async function writeStandaloneDirectory(
}) })
await fs.copyFile(filePath, outputPath) await fs.copyFile(filePath, outputPath)
} }
if (hasNodeMiddleware) {
const middlewareOutput = path.join(
distDir,
STANDALONE_DIRECTORY,
requiredServerFiles.config.distDir,
SERVER_DIRECTORY,
'middleware.js'
)
await fs.mkdir(path.dirname(middlewareOutput), { recursive: true })
await fs.copyFile(
path.join(distDir, SERVER_DIRECTORY, 'middleware.js'),
middlewareOutput
)
}
await recursiveCopy( await recursiveCopy(
path.join(distDir, SERVER_DIRECTORY, 'pages'), path.join(distDir, SERVER_DIRECTORY, 'pages'),
path.join( path.join(
...@@ -2324,6 +2343,7 @@ export default async function build( ...@@ -2324,6 +2343,7 @@ export default async function build(
const middlewareFile = rootPaths.find((p) => const middlewareFile = rootPaths.find((p) =>
p.includes(MIDDLEWARE_FILENAME) p.includes(MIDDLEWARE_FILENAME)
) )
let hasNodeMiddleware = false
if (middlewareFile) { if (middlewareFile) {
const staticInfo = await getStaticInfoIncludingLayouts({ const staticInfo = await getStaticInfoIncludingLayouts({
...@@ -2337,6 +2357,7 @@ export default async function build( ...@@ -2337,6 +2357,7 @@ export default async function build(
}) })
if (staticInfo.runtime === 'nodejs') { if (staticInfo.runtime === 'nodejs') {
hasNodeMiddleware = true
functionsConfigManifest.functions['/_middleware'] = { functionsConfigManifest.functions['/_middleware'] = {
runtime: staticInfo.runtime, runtime: staticInfo.runtime,
matchers: staticInfo.middleware?.matchers ?? [ matchers: staticInfo.middleware?.matchers ?? [
...@@ -3543,6 +3564,7 @@ export default async function build( ...@@ -3543,6 +3564,7 @@ export default async function build(
outputFileTracingRoot, outputFileTracingRoot,
requiredServerFilesManifest, requiredServerFilesManifest,
middlewareManifest, middlewareManifest,
hasNodeMiddleware,
hasInstrumentationHook, hasInstrumentationHook,
staticPages, staticPages,
loadedEnvFiles, loadedEnvFiles,
......
...@@ -1467,6 +1467,7 @@ export async function copyTracedFiles( ...@@ -1467,6 +1467,7 @@ export async function copyTracedFiles(
tracingRoot: string, tracingRoot: string,
serverConfig: NextConfigComplete, serverConfig: NextConfigComplete,
middlewareManifest: MiddlewareManifest, middlewareManifest: MiddlewareManifest,
hasNodeMiddleware: boolean,
hasInstrumentationHook: boolean, hasInstrumentationHook: boolean,
staticPages: Set<string> staticPages: Set<string>
) { ) {
...@@ -1581,6 +1582,12 @@ export async function copyTracedFiles( ...@@ -1581,6 +1582,12 @@ export async function copyTracedFiles(
}) })
} }
if (hasNodeMiddleware) {
const middlewareFile = path.join(distDir, 'server', 'middleware.js')
const middlewareTrace = `${middlewareFile}.nft.json`
await handleTraceFiles(middlewareTrace)
}
if (appPageKeys) { if (appPageKeys) {
for (const page of appPageKeys) { for (const page of appPageKeys) {
if (middlewareManifest.functions.hasOwnProperty(page)) { if (middlewareManifest.functions.hasOwnProperty(page)) {
......
import { NextResponse } from 'next/server'
import { ImageResponse } from 'next/og'
import fs from 'fs'
import path from 'path'
export const config = {
runtime: 'nodejs',
}
export async function middleware(req) {
console.log('middleware', req.url)
console.log(
'env',
await fs.promises.readFile(path.join(process.cwd(), '.env'))
)
if (req.nextUrl.pathname === '/a-non-existent-page/to-test-with-middleware') {
return new ImageResponse(<div>Hello world</div>, {
width: 1200,
height: 600,
})
}
return NextResponse.next()
}
process.env.TEST_NODE_MIDDLEWARE = '1'
if (process.env.TURBOPACK) {
it('should skip for now', () => {})
} else {
require('./required-server-files.test')
}
...@@ -36,7 +36,14 @@ describe('required server files', () => { ...@@ -36,7 +36,14 @@ describe('required server files', () => {
files: { files: {
pages: new FileRef(join(__dirname, 'pages')), pages: new FileRef(join(__dirname, 'pages')),
lib: new FileRef(join(__dirname, 'lib')), lib: new FileRef(join(__dirname, 'lib')),
'middleware.js': new FileRef(join(__dirname, 'middleware.js')), 'middleware.js': new FileRef(
join(
__dirname,
process.env.TEST_NODE_MIDDLEWARE
? 'middleware-node.js'
: 'middleware.js'
)
),
'cache-handler.js': new FileRef(join(__dirname, 'cache-handler.js')), 'cache-handler.js': new FileRef(join(__dirname, 'cache-handler.js')),
'data.txt': new FileRef(join(__dirname, 'data.txt')), 'data.txt': new FileRef(join(__dirname, 'data.txt')),
'.env': new FileRef(join(__dirname, '.env')), '.env': new FileRef(join(__dirname, '.env')),
...@@ -49,6 +56,9 @@ describe('required server files', () => { ...@@ -49,6 +56,9 @@ describe('required server files', () => {
eslint: { eslint: {
ignoreDuringBuilds: true, ignoreDuringBuilds: true,
}, },
experimental: {
nodeMiddleware: Boolean(process.env.TEST_NODE_MIDDLEWARE),
},
output: 'standalone', output: 'standalone',
async rewrites() { async rewrites() {
return { return {
...@@ -377,12 +387,17 @@ describe('required server files', () => { ...@@ -377,12 +387,17 @@ describe('required server files', () => {
;(process.env.TURBOPACK ? it.skip : it)( ;(process.env.TURBOPACK ? it.skip : it)(
'should output middleware correctly', 'should output middleware correctly',
async () => { async () => {
// eslint-disable-next-line jest/no-standalone-expect if (!process.env.TEST_NODE_MIDDLEWARE) {
expect( // eslint-disable-next-line jest/no-standalone-expect
await fs.pathExists( expect(
join(next.testDir, 'standalone/.next/server/edge-runtime-webpack.js') await fs.pathExists(
) join(
).toBe(true) next.testDir,
'standalone/.next/server/edge-runtime-webpack.js'
)
)
).toBe(true)
}
// eslint-disable-next-line jest/no-standalone-expect // eslint-disable-next-line jest/no-standalone-expect
expect( expect(
await fs.pathExists( await fs.pathExists(
...@@ -1367,14 +1382,16 @@ describe('required server files', () => { ...@@ -1367,14 +1382,16 @@ describe('required server files', () => {
expect(res.status).toBe(200) expect(res.status).toBe(200)
expect(await res.text()).toContain('index page') expect(await res.text()).toContain('index page')
if (process.env.TURBOPACK) { if (!process.env.TEST_NODE_MIDDLEWARE) {
expect( if (process.env.TURBOPACK) {
fs.existsSync(join(standaloneDir, '.next/server/edge/chunks')) expect(
).toBe(true) fs.existsSync(join(standaloneDir, '.next/server/edge/chunks'))
} else { ).toBe(true)
expect( } else {
fs.existsSync(join(standaloneDir, '.next/server/edge-chunks')) expect(
).toBe(true) fs.existsSync(join(standaloneDir, '.next/server/edge-chunks'))
).toBe(true)
}
} }
const resImageResponse = await fetchViaHTTP( const resImageResponse = await fetchViaHTTP(
......
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