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,16 +27,18 @@ function buildManifest (compiler, compilation) { ...@@ -27,16 +27,18 @@ 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) { chunkGroup.origins.forEach(chunkGroupOrigin => {
for (const file of dynamicChunk.files) { const { request } = chunkGroupOrigin
// If it doesn't end in `.js` Next.js can't handle it right now.
chunkGroup.chunks.forEach(chunk => {
chunk.files.forEach(file => {
if (!file.match(/\.js$/) || !file.match(/^static\/chunks\//)) { if (!file.match(/\.js$/) || !file.match(/^static\/chunks\//)) {
continue return
} }
let publicPath = url.resolve( let publicPath = url.resolve(
...@@ -44,41 +46,32 @@ function buildManifest (compiler, compilation) { ...@@ -44,41 +46,32 @@ function buildManifest (compiler, compilation) {
file file
) )
for (const module of dynamicChunk.modulesIterable) { for (const module of chunk.modulesIterable) {
let id = module.id let id = module.id
let name = let name =
typeof module.libIdent === 'function' typeof module.libIdent === 'function'
? module.libIdent({ context }) ? module.libIdent({ context })
: null : null
let currentModule = module if (!manifest[request]) {
if (module.constructor.name === 'ConcatenatedModule') { manifest[request] = []
currentModule = module.rootModule
}
if (!manifest[currentModule.rawRequest]) {
manifest[currentModule.rawRequest] = []
} }
// Avoid duplicate files // Avoid duplicate files
if ( if (manifest[request].some(item => item.file === file)) {
manifest[currentModule.rawRequest].some(
item => item.file === file
)
) {
continue continue
} }
manifest[currentModule.rawRequest].push({ manifest[request].push({
id, id,
name, name,
file, file,
publicPath 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