Commit 6104a71a authored by Tim Neutkens's avatar Tim Neutkens Committed by Joe Haddad

Make react-loadable-manifest only have modules that are part of dynamic chunks (#6622)

* Make react-loadable-manifest only have modules that are part of dynamic chunks

* Add manifest sorting
parent 87bd1c3b
...@@ -28,29 +28,64 @@ function buildManifest (compiler, compilation) { ...@@ -28,29 +28,64 @@ function buildManifest (compiler, compilation) {
let manifest = {} let manifest = {}
compilation.chunks.forEach(chunk => { compilation.chunks.forEach(chunk => {
chunk.files.forEach(file => { // If chunk is not an entry point skip them
for (const module of chunk.modulesIterable) { if (chunk.hasEntryModule()) {
let id = module.id const dynamicChunks = chunk.getAllAsyncChunks()
let name = typeof module.libIdent === 'function' ? module.libIdent({ context }) : null if (dynamicChunks.size !== 0) {
// If it doesn't end in `.js` Next.js can't handle it right now. for (const dynamicChunk of dynamicChunks) {
if (!file.match(/\.js$/) || !file.match(/^static\/chunks\//)) { for (const file of dynamicChunk.files) {
return // If it doesn't end in `.js` Next.js can't handle it right now.
} if (!file.match(/\.js$/) || !file.match(/^static\/chunks\//)) {
let publicPath = url.resolve(compilation.outputOptions.publicPath || '', file) continue
}
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] = [] for (const module of dynamicChunk.modulesIterable) {
} let id = module.id
let name =
typeof module.libIdent === 'function'
? module.libIdent({ context })
: null
manifest[currentModule.rawRequest].push({ id, name, file, publicPath }) let currentModule = module
if (module.constructor.name === 'ConcatenatedModule') {
currentModule = module.rootModule
}
if (!manifest[currentModule.rawRequest]) {
manifest[currentModule.rawRequest] = []
}
// Avoid duplicate files
if (
manifest[currentModule.rawRequest].some(
item => item.file === file
)
) {
continue
}
manifest[currentModule.rawRequest].push({
id,
name,
file,
publicPath
})
}
}
}
} }
}) }
}) })
manifest = Object.keys(manifest)
.sort()
// eslint-disable-next-line
.reduce((a, c) => ((a[c] = manifest[c]), a), {})
return manifest return manifest
} }
...@@ -60,18 +95,21 @@ export class ReactLoadablePlugin { ...@@ -60,18 +95,21 @@ export class ReactLoadablePlugin {
} }
apply (compiler) { apply (compiler) {
compiler.hooks.emit.tapAsync('ReactLoadableManifest', (compilation, callback) => { compiler.hooks.emit.tapAsync(
const manifest = buildManifest(compiler, compilation) 'ReactLoadableManifest',
var json = JSON.stringify(manifest, null, 2) (compilation, callback) => {
compilation.assets[this.filename] = { const manifest = buildManifest(compiler, compilation)
source () { var json = JSON.stringify(manifest, null, 2)
return json compilation.assets[this.filename] = {
}, source () {
size () { return json
return json.length },
size () {
return json.length
}
} }
callback()
} }
callback() )
})
} }
} }
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