Skip to content

Commit

Permalink
Revert "Move all NPM modules into a single chunk in dev mode. (#1505)"
Browse files Browse the repository at this point in the history
This reverts commit a879f47.
  • Loading branch information
rauchg committed Mar 26, 2017
1 parent 0a452ba commit 5027495
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 22 deletions.
19 changes: 4 additions & 15 deletions server/build/webpack.js
Original file line number Diff line number Diff line change
Expand Up @@ -93,26 +93,15 @@ export default async function createCompiler (dir, { dev = false, quiet = false,
name: 'commons',
filename: 'commons.js',
minChunks (module, count) {
// In the dev we use on-demand-entries.
// So, it makes no sense to use commonChunks based on the minChunks count.
// Instead, we move all the code in node_modules into this chunk.
// With that, we could gain better performance for page-rebuild process.
if (dev) {
return module.context && module.context.indexOf('node_modules') >= 0
}
// In the dev we use on-deman-entries.
// So, it makes no sense to use commonChunks with that.
if (dev) return false

// NOTE: it depends on the fact that the entry funtion is always called
// before applying CommonsChunkPlugin
return count >= minChunks
}
}),
// This chunk contains all the webpack related code. So, all the changes
// related to that happens to this chunk.
// It won't touch commons.js and that gives us much better re-build perf.
new webpack.optimize.CommonsChunkPlugin({
name: 'manifest',
filename: 'manifest.js'
}),
new webpack.DefinePlugin({
'process.env.NODE_ENV': JSON.stringify(dev ? 'development' : 'production')
}),
Expand All @@ -132,7 +121,7 @@ export default async function createCompiler (dir, { dev = false, quiet = false,
} else {
plugins.push(
new CombineAssetsPlugin({
input: ['manifest.js', 'commons.js', 'main.js'],
input: ['commons.js', 'main.js'],
output: 'app.js'
}),
new webpack.optimize.UglifyJsPlugin({
Expand Down
1 change: 0 additions & 1 deletion server/document.js
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,6 @@ export class NextScript extends Component {
if (dev) {
return (
<div>
{ this.getChunkScript('manifest.js') }
{ this.getChunkScript('commons.js') }
{ this.getChunkScript('main.js') }
</div>
Expand Down
6 changes: 0 additions & 6 deletions server/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -90,12 +90,6 @@ export default class Server {
await this.serveStatic(req, res, p)
},

'/_next/:hash/manifest.js': async (req, res, params) => {
this.handleBuildHash('manifest.js', params.hash, res)
const p = join(this.dir, '.next/manifest.js')
await this.serveStatic(req, res, p)
},

'/_next/:hash/main.js': async (req, res, params) => {
this.handleBuildHash('main.js', params.hash, res)
const p = join(this.dir, '.next/main.js')
Expand Down

0 comments on commit 5027495

Please sign in to comment.