Commit 53a2c5a7 authored by Kevin Decker's avatar Kevin Decker Committed by Tim Neutkens

Combine source maps (#3178)

* Propagate source maps through combine assets step

* Use constant development build id

* Move combine assets step before uglify step

This ensures that uglify will catch these changes.

* Move dynamic chunks step before uglify step

This ensures that uglify will catch these changes.

* Use chunk templates for page and dynamic chunks

This is a little more in line with how webpack generates its bootstrap and should have better compatibility with other plugins and source map generation.

* Register combined source map with chunks

This ensures that a sourcemap is fully generated.

* Do not minimize combined map inputs
parent 4c18678d
import { ConcatSource } from 'webpack-sources'
// This plugin combines a set of assets into a single asset // This plugin combines a set of assets into a single asset
// This should be only used with text assets, // This should be only used with text assets,
// otherwise the result is unpredictable. // otherwise the result is unpredictable.
...@@ -8,23 +10,28 @@ export default class CombineAssetsPlugin { ...@@ -8,23 +10,28 @@ export default class CombineAssetsPlugin {
} }
apply (compiler) { apply (compiler) {
compiler.plugin('after-compile', (compilation, callback) => { compiler.plugin('compilation', (compilation) => {
let newSource = '' compilation.plugin('additional-chunk-assets', (chunks) => {
this.input.forEach((name) => { const concat = new ConcatSource()
const asset = compilation.assets[name]
if (!asset) return
newSource += `${asset.source()}\n` this.input.forEach((name) => {
const asset = compilation.assets[name]
if (!asset) return
// We keep existing assets since that helps when analyzing the bundle concat.add(asset)
})
compilation.assets[this.output] = { // We keep existing assets since that helps when analyzing the bundle
source: () => newSource, })
size: () => newSource.length
}
callback() compilation.additionalChunkAssets.push(this.output)
compilation.assets[this.output] = concat
// Register the combined file as an output of the associated chunks
chunks.filter((chunk) => {
return chunk.files.reduce((prev, file) => prev || this.input.includes(file), false)
})
.forEach((chunk) => chunk.files.push(this.output))
})
}) })
} }
} }
export default class PagesPlugin { import { ConcatSource } from 'webpack-sources'
const isImportChunk = /^chunks[/\\].*\.js$/
const matchChunkName = /^chunks[/\\](.*)$/
class DynamicChunkTemplatePlugin {
apply (chunkTemplate) {
chunkTemplate.plugin('render', function (modules, chunk) {
if (!isImportChunk.test(chunk.name)) {
return modules
}
const chunkName = matchChunkName.exec(chunk.name)[1]
const source = new ConcatSource()
source.add(`
__NEXT_REGISTER_CHUNK('${chunkName}', function() {
`)
source.add(modules)
source.add(`
})
`)
return source
})
}
}
export default class DynamicChunksPlugin {
apply (compiler) { apply (compiler) {
const isImportChunk = /^chunks[/\\].*\.js$/ compiler.plugin('compilation', (compilation) => {
const matchChunkName = /^chunks[/\\](.*)$/ compilation.chunkTemplate.apply(new DynamicChunkTemplatePlugin())
compiler.plugin('after-compile', (compilation, callback) => { compilation.plugin('additional-chunk-assets', (chunks) => {
const chunks = Object chunks = chunks.filter(chunk =>
.keys(compilation.namedChunks) isImportChunk.test(chunk.name) && compilation.assets[chunk.name]
.map(key => compilation.namedChunks[key]) )
.filter(chunk => isImportChunk.test(chunk.name))
chunks.forEach((chunk) => {
chunks.forEach((chunk) => { // This is to support, webpack dynamic import support with HMR
const asset = compilation.assets[chunk.name] const copyFilename = `chunks/${chunk.name}`
if (!asset) return compilation.additionalChunkAssets.push(copyFilename)
compilation.assets[copyFilename] = compilation.assets[chunk.name]
const chunkName = matchChunkName.exec(chunk.name)[1] })
const content = asset.source()
const newContent = `
window.__NEXT_REGISTER_CHUNK('${chunkName}', function() {
${content}
})
`
// Replace the exisiting chunk with the new content
compilation.assets[chunk.name] = {
source: () => newContent,
size: () => newContent.length
}
// This is to support, webpack dynamic import support with HMR
compilation.assets[`chunks/${chunk.id}`] = {
source: () => newContent,
size: () => newContent.length
}
}) })
callback()
}) })
} }
} }
import { ConcatSource } from 'webpack-sources'
import { import {
IS_BUNDLED_PAGE, IS_BUNDLED_PAGE,
MATCH_ROUTE_NAME MATCH_ROUTE_NAME
} from '../../utils' } from '../../utils'
export default class PagesPlugin { class PageChunkTemplatePlugin {
apply (compiler) { apply (chunkTemplate) {
compiler.plugin('after-compile', (compilation, callback) => { chunkTemplate.plugin('render', function (modules, chunk) {
const pages = Object if (!IS_BUNDLED_PAGE.test(chunk.name)) {
.keys(compilation.namedChunks) return modules
.map(key => compilation.namedChunks[key]) }
.filter(chunk => IS_BUNDLED_PAGE.test(chunk.name))
pages.forEach((chunk) => { let routeName = MATCH_ROUTE_NAME.exec(chunk.name)[1]
const page = compilation.assets[chunk.name]
const pageName = MATCH_ROUTE_NAME.exec(chunk.name)[1]
let routeName = pageName
// We need to convert \ into / when we are in windows // We need to convert \ into / when we are in windows
// to get the proper route name // to get the proper route name
...@@ -22,26 +19,33 @@ export default class PagesPlugin { ...@@ -22,26 +19,33 @@ export default class PagesPlugin {
// to have "\" in the filename in unix. // to have "\" in the filename in unix.
// Anyway if someone did that, he'll be having issues here. // Anyway if someone did that, he'll be having issues here.
// But that's something we cannot avoid. // But that's something we cannot avoid.
if (/^win/.test(process.platform)) { if (/^win/.test(process.platform)) {
routeName = routeName.replace(/\\/g, '/') routeName = routeName.replace(/\\/g, '/')
} }
routeName = `/${routeName.replace(/(^|\/)index$/, '')}` routeName = `/${routeName.replace(/(^|\/)index$/, '')}`
const content = page.source() const source = new ConcatSource()
const newContent = `
window.__NEXT_REGISTER_PAGE('${routeName}', function() { source.add(`
var comp = ${content} __NEXT_REGISTER_PAGE('${routeName}', function() {
return { page: comp.default } var comp =
}) `)
` source.add(modules)
// Replace the exisiting chunk with the new content source.add(`
compilation.assets[chunk.name] = { return { page: comp.default }
source: () => newContent, })
size: () => newContent.length `)
}
}) return source
callback() })
}
}
export default class PagesPlugin {
apply (compiler) {
compiler.plugin('compilation', (compilation) => {
compilation.chunkTemplate.apply(new PageChunkTemplatePlugin())
}) })
} }
} }
...@@ -149,6 +149,7 @@ export default async function createCompiler (dir, { buildId, dev = false, quiet ...@@ -149,6 +149,7 @@ export default async function createCompiler (dir, { buildId, dev = false, quiet
output: 'app.js' output: 'app.js'
}), }),
new webpack.optimize.UglifyJsPlugin({ new webpack.optimize.UglifyJsPlugin({
exclude: ['manifest.js', 'commons.js', 'main.js'],
compress: { warnings: false }, compress: { warnings: false },
sourceMap: false sourceMap: false
}) })
......
...@@ -408,7 +408,11 @@ export default class Server { ...@@ -408,7 +408,11 @@ export default class Server {
} }
handleBuildId (buildId, res) { handleBuildId (buildId, res) {
if (this.dev) return true if (this.dev) {
res.setHeader('Cache-Control', 'no-store, must-revalidate')
return true
}
if (buildId !== this.renderOpts.buildId) { if (buildId !== this.renderOpts.buildId) {
return false return false
} }
...@@ -428,13 +432,17 @@ export default class Server { ...@@ -428,13 +432,17 @@ export default class Server {
} }
handleBuildHash (filename, hash, res) { handleBuildHash (filename, hash, res) {
if (this.dev) return if (this.dev) {
res.setHeader('Cache-Control', 'no-store, must-revalidate')
return true
}
if (hash !== this.buildStats[filename].hash) { if (hash !== this.buildStats[filename].hash) {
throw new Error(`Invalid Build File Hash(${hash}) for chunk: ${filename}`) throw new Error(`Invalid Build File Hash(${hash}) for chunk: ${filename}`)
} }
res.setHeader('Cache-Control', 'max-age=365000000, immutable') res.setHeader('Cache-Control', 'max-age=365000000, immutable')
return true
} }
send404 (res) { send404 (res) {
......
...@@ -96,11 +96,6 @@ async function doRender (req, res, pathname, query, { ...@@ -96,11 +96,6 @@ async function doRender (req, res, pathname, query, {
} }
const docProps = await loadGetInitialProps(Document, { ...ctx, renderPage }) const docProps = await loadGetInitialProps(Document, { ...ctx, renderPage })
// While developing, we should not cache any assets.
// So, we use a different buildId for each page load.
// With that we can ensure, we have unique URL for assets per every page load.
// So, it'll prevent issues like this: https://git.io/vHLtb
const devBuildId = Date.now()
if (res.finished) return if (res.finished) return
...@@ -110,7 +105,7 @@ async function doRender (req, res, pathname, query, { ...@@ -110,7 +105,7 @@ async function doRender (req, res, pathname, query, {
props, props,
pathname, pathname,
query, query,
buildId: dev ? devBuildId : buildId, buildId,
buildStats, buildStats,
assetPrefix, assetPrefix,
nextExport, nextExport,
......
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