Unverified Commit a4084162 authored by Tobias Koppers's avatar Tobias Koppers Committed by GitHub

get files from entrypoints instead of from chunks (#23174)

parent 75c62cb7
...@@ -66,20 +66,16 @@ function generateClientManifest( ...@@ -66,20 +66,16 @@ function generateClientManifest(
}) })
} }
function isJsFile(file: string): boolean { function getEntrypointFiles(entrypoint: any): string[] {
// We don't want to include `.hot-update.js` files into the initial page return (
return !file.endsWith('.hot-update.js') && file.endsWith('.js') entrypoint
} ?.getFiles()
.filter((file: string) => {
function getFilesArray(files: any) { // We don't want to include `.hot-update.js` files into the initial page
if (!files) { return /(?<!\.hot-update)\.(js|css)($|\?)/.test(file)
return [] })
} .map((file: string) => file.replace(/\\/g, '/')) ?? []
if (isWebpack5) { )
return Array.from(files)
}
return files
} }
// This plugin creates a build-manifest.json for all assets that are being output // This plugin creates a build-manifest.json for all assets that are being output
...@@ -109,8 +105,7 @@ export default class BuildManifestPlugin { ...@@ -109,8 +105,7 @@ export default class BuildManifestPlugin {
'NextJsBuildManifest-createassets' 'NextJsBuildManifest-createassets'
) )
return createAssetsSpan?.traceFn(() => { return createAssetsSpan?.traceFn(() => {
const namedChunks: Map<string, webpack.compilation.Chunk> = const entrypoints: Map<string, any> = compilation.entrypoints
compilation.namedChunks
const assetMap: DeepMutable<BuildManifest> = { const assetMap: DeepMutable<BuildManifest> = {
polyfillFiles: [], polyfillFiles: [],
devFiles: [], devFiles: [],
...@@ -132,59 +127,41 @@ export default class BuildManifestPlugin { ...@@ -132,59 +127,41 @@ export default class BuildManifestPlugin {
} }
} }
const mainJsChunk = namedChunks.get(CLIENT_STATIC_FILES_RUNTIME_MAIN) const mainFiles = new Set(
getEntrypointFiles(entrypoints.get(CLIENT_STATIC_FILES_RUNTIME_MAIN))
const mainJsFiles: string[] = getFilesArray(mainJsChunk?.files).filter(
isJsFile
) )
const polyfillChunk = namedChunks.get( assetMap.polyfillFiles = getEntrypointFiles(
CLIENT_STATIC_FILES_RUNTIME_POLYFILLS entrypoints.get(CLIENT_STATIC_FILES_RUNTIME_POLYFILLS)
) ).filter((file) => !mainFiles.has(file))
// Create a separate entry for polyfills assetMap.devFiles = getEntrypointFiles(
assetMap.polyfillFiles = getFilesArray(polyfillChunk?.files).filter( entrypoints.get(CLIENT_STATIC_FILES_RUNTIME_REACT_REFRESH)
isJsFile ).filter((file) => !mainFiles.has(file))
)
const reactRefreshChunk = namedChunks.get( assetMap.ampDevFiles = getEntrypointFiles(
CLIENT_STATIC_FILES_RUNTIME_REACT_REFRESH entrypoints.get(CLIENT_STATIC_FILES_RUNTIME_AMP)
)
assetMap.devFiles = getFilesArray(reactRefreshChunk?.files).filter(
isJsFile
) )
for (const entrypoint of compilation.entrypoints.values()) { const systemEntrypoints = new Set([
const isAmpRuntime = entrypoint.name === CLIENT_STATIC_FILES_RUNTIME_AMP CLIENT_STATIC_FILES_RUNTIME_MAIN,
CLIENT_STATIC_FILES_RUNTIME_POLYFILLS,
CLIENT_STATIC_FILES_RUNTIME_REACT_REFRESH,
CLIENT_STATIC_FILES_RUNTIME_AMP,
])
if (isAmpRuntime) { for (const entrypoint of compilation.entrypoints.values()) {
for (const file of entrypoint.getFiles()) { if (systemEntrypoints.has(entrypoint.name)) continue
if (!(isJsFile(file) || file.endsWith('.css'))) {
continue
}
assetMap.ampDevFiles.push(file.replace(/\\/g, '/'))
}
continue
}
const pagePath = getRouteFromEntrypoint(entrypoint.name) const pagePath = getRouteFromEntrypoint(entrypoint.name)
if (!pagePath) { if (!pagePath) {
continue continue
} }
const filesForEntry: string[] = [] const filesForPage = getEntrypointFiles(entrypoint)
// getFiles() - helper function to read the files for an entrypoint from stats object
for (const file of entrypoint.getFiles()) {
if (!(isJsFile(file) || file.endsWith('.css'))) {
continue
}
filesForEntry.push(file.replace(/\\/g, '/'))
}
assetMap.pages[pagePath] = [...mainJsFiles, ...filesForEntry] assetMap.pages[pagePath] = [...new Set([...mainFiles, ...filesForPage])]
} }
// Add the runtime build manifest file (generated later in this file) // Add the runtime build manifest file (generated later in this file)
......
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