Land reverted fix for chunk file names (#48625)

This PR re-adds #48583, which was accidentally reverted in #48589 (unrelated) somehow.
vercel · Apr 20, 2023 · 1f6a45d · 1f6a45d
1 parent 82a01c1
commit 1f6a45d
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/packages/next/src/build/webpack/plugins/flight-manifest-plugin.ts b/packages/next/src/build/webpack/plugins/flight-manifest-plugin.ts
@@ -135,7 +135,6 @@ export class ClientReferenceManifestPlugin {
       cssFiles: {},
       clientModules: {},
     }
-    const dev = this.dev
 
     const clientRequestsSet = new Set()
 
@@ -256,13 +255,18 @@ export class ClientReferenceManifestPlugin {
                 return null
               }
 
-              return (
-                requiredChunk.id +
-                ':' +
-                (requiredChunk.name || requiredChunk.id) +
-                (dev ? '' : '-' + requiredChunk.hash)
-              )
+              // Get the actual chunk file names from the chunk file list.
+              // It's possible that the chunk is generated via `import()`, in
+              // that case the chunk file name will be '[name].[contenthash]'
+              // instead of '[name]-[chunkhash]'.
+              return [...requiredChunk.files].map((file) => {
+                // It's possible that a chunk also emits CSS files, that will
+                // be handled separatedly.
+                if (!file.endsWith('.js')) return null
+                return requiredChunk.id + ':' + file
+              })
             })
+            .flat()
             .filter(nonNullable)
         }
         const requiredChunks = getAppPathRequiredChunks()

diff --git a/packages/next/src/client/app-index.tsx b/packages/next/src/client/app-index.tsx
@@ -69,8 +69,8 @@ self.__next_require__ =
 // eslint-disable-next-line no-undef
 ;(self as any).__next_chunk_load__ = (chunk: string) => {
   if (!chunk) return Promise.resolve()
-  const [chunkId, chunkFileName] = chunk.split(':')
-  chunkFilenameMap[chunkId] = `static/chunks/${chunkFileName}.js`
+  const [chunkId, chunkFilePath] = chunk.split(':')
+  chunkFilenameMap[chunkId] = chunkFilePath
 
   // @ts-ignore
   // eslint-disable-next-line no-undef