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`
vercel · Feb 9, 2022 · 52c3d07 · 52c3d07
1 parent 28f65ff
commit 52c3d07
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 10 deletions.
diff --git a/packages/next/build/index.ts b/packages/next/build/index.ts
@@ -572,9 +572,8 @@ export default async function build(
           hasServerComponents
             ? path.join(
                 SERVER_DIRECTORY,
-                MIDDLEWARE_FLIGHT_MANIFEST + runtime === 'edge'
-                  ? '.js'
-                  : '.json'
+                MIDDLEWARE_FLIGHT_MANIFEST +
+                  (runtime === 'edge' ? '.js' : '.json')
               )
             : null,
           REACT_LOADABLE_MANIFEST,

diff --git a/test/integration/react-streaming-and-server-components/test/index.test.js b/test/integration/react-streaming-and-server-components/test/index.test.js
@@ -148,16 +148,25 @@ describe('Edge runtime - prod', () => {
 
   it('should generate middleware SSR manifests for edge runtime', async () => {
     const distServerDir = join(distDir, 'server')
-    const hasFile = (filename) => fs.existsSync(join(distServerDir, filename))
-
     const files = [
       'middleware-build-manifest.js',
       'middleware-flight-manifest.js',
       'middleware-ssr-runtime.js',
       'middleware-manifest.json',
     ]
+
+    const requiredServerFiles = (
+      await fs.readJSON(join(distDir, 'required-server-files.json'))
+    ).files
+
     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 = {
     if (env === 'prod') {
       it('should generate middleware SSR manifests for Node.js', async () => {
         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 = [
           'middleware-build-manifest.js',
           'middleware-flight-manifest.json',
           'middleware-manifest.json',
         ]
+
         files.forEach((file) => {
-          if (!hasFile(file)) console.log(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)
         })
       })
     }