Unverified Commit c2c634ca authored by Joe Haddad's avatar Joe Haddad Committed by GitHub

Use `chunkGroup` request over `rawRequest` for loadable manifest (#6993)

parent a863a720
...@@ -27,58 +27,51 @@ function buildManifest (compiler, compilation) { ...@@ -27,58 +27,51 @@ function buildManifest (compiler, compilation) {
let context = compiler.options.context let context = compiler.options.context
let manifest = {} let manifest = {}
compilation.chunks.forEach(chunk => { compilation.chunkGroups.forEach(chunkGroup => {
// If chunk is not an entry point skip them if (chunkGroup.isInitial()) {
if (chunk.hasEntryModule()) { return
const dynamicChunks = chunk.getAllAsyncChunks() }
if (dynamicChunks.size !== 0) {
for (const dynamicChunk of dynamicChunks) {
for (const file of dynamicChunk.files) {
// If it doesn't end in `.js` Next.js can't handle it right now.
if (!file.match(/\.js$/) || !file.match(/^static\/chunks\//)) {
continue
}
let publicPath = url.resolve( chunkGroup.origins.forEach(chunkGroupOrigin => {
compilation.outputOptions.publicPath || '', const { request } = chunkGroupOrigin
file
)
for (const module of dynamicChunk.modulesIterable) { chunkGroup.chunks.forEach(chunk => {
let id = module.id chunk.files.forEach(file => {
let name = if (!file.match(/\.js$/) || !file.match(/^static\/chunks\//)) {
typeof module.libIdent === 'function' return
? module.libIdent({ context }) }
: null
let currentModule = module let publicPath = url.resolve(
if (module.constructor.name === 'ConcatenatedModule') { compilation.outputOptions.publicPath || '',
currentModule = module.rootModule file
} )
if (!manifest[currentModule.rawRequest]) {
manifest[currentModule.rawRequest] = []
}
// Avoid duplicate files for (const module of chunk.modulesIterable) {
if ( let id = module.id
manifest[currentModule.rawRequest].some( let name =
item => item.file === file typeof module.libIdent === 'function'
) ? module.libIdent({ context })
) { : null
continue
}
manifest[currentModule.rawRequest].push({ if (!manifest[request]) {
id, manifest[request] = []
name,
file,
publicPath
})
} }
// Avoid duplicate files
if (manifest[request].some(item => item.file === file)) {
continue
}
manifest[request].push({
id,
name,
file,
publicPath
})
} }
} })
} })
} })
}) })
manifest = Object.keys(manifest) manifest = Object.keys(manifest)
......
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