Unverified Commit 52c3d07c authored by Jiachi Liu's avatar Jiachi Liu Committed by GitHub

Fix required files matching in rsc (#34137)

Fix the wrong filename evaluation of `MIDDLEWARE_FLIGHT_MANIFEST` in required files. Besides checking the generated files, check if they're declared correctly in `required-server-files.json`
parent 28f65ff4
...@@ -572,9 +572,8 @@ export default async function build( ...@@ -572,9 +572,8 @@ export default async function build(
hasServerComponents hasServerComponents
? path.join( ? path.join(
SERVER_DIRECTORY, SERVER_DIRECTORY,
MIDDLEWARE_FLIGHT_MANIFEST + runtime === 'edge' MIDDLEWARE_FLIGHT_MANIFEST +
? '.js' (runtime === 'edge' ? '.js' : '.json')
: '.json'
) )
: null, : null,
REACT_LOADABLE_MANIFEST, REACT_LOADABLE_MANIFEST,
......
...@@ -148,16 +148,25 @@ describe('Edge runtime - prod', () => { ...@@ -148,16 +148,25 @@ describe('Edge runtime - prod', () => {
it('should generate middleware SSR manifests for edge runtime', async () => { it('should generate middleware SSR manifests for edge runtime', async () => {
const distServerDir = join(distDir, 'server') const distServerDir = join(distDir, 'server')
const hasFile = (filename) => fs.existsSync(join(distServerDir, filename))
const files = [ const files = [
'middleware-build-manifest.js', 'middleware-build-manifest.js',
'middleware-flight-manifest.js', 'middleware-flight-manifest.js',
'middleware-ssr-runtime.js', 'middleware-ssr-runtime.js',
'middleware-manifest.json', 'middleware-manifest.json',
] ]
const requiredServerFiles = (
await fs.readJSON(join(distDir, 'required-server-files.json'))
).files
files.forEach((file) => { files.forEach((file) => {
expect(hasFile(file)).toBe(true) const filepath = join(distServerDir, file)
expect(fs.existsSync(filepath)).toBe(true)
})
requiredServerFiles.forEach((file) => {
const requiredFilePath = join(appDir, file)
expect(fs.existsSync(requiredFilePath)).toBe(true)
}) })
}) })
...@@ -250,17 +259,25 @@ const nodejsRuntimeBasicSuite = { ...@@ -250,17 +259,25 @@ const nodejsRuntimeBasicSuite = {
if (env === 'prod') { if (env === 'prod') {
it('should generate middleware SSR manifests for Node.js', async () => { it('should generate middleware SSR manifests for Node.js', async () => {
const distServerDir = join(distDir, 'server') const distServerDir = join(distDir, 'server')
const hasFile = (filename) =>
fs.existsSync(join(distServerDir, filename)) const requiredServerFiles = (
await fs.readJSON(join(distDir, 'required-server-files.json'))
).files
const files = [ const files = [
'middleware-build-manifest.js', 'middleware-build-manifest.js',
'middleware-flight-manifest.json', 'middleware-flight-manifest.json',
'middleware-manifest.json', 'middleware-manifest.json',
] ]
files.forEach((file) => { files.forEach((file) => {
if (!hasFile(file)) console.log(file) const filepath = join(distServerDir, file)
expect(hasFile(file)).toBe(true) expect(fs.existsSync(filepath)).toBe(true)
})
requiredServerFiles.forEach((file) => {
const requiredFilePath = join(appDir, file)
expect(fs.existsSync(requiredFilePath)).toBe(true)
}) })
}) })
} }
......
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