Zengtudor/Nuxt
1
0
Fork 0
mirror of https://github.com/nuxt/nuxt.git synced 2024-11-11 08:33:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of github.com:Atinux/nuxt.js into dev

Browse Source
This commit is contained in:
Sébastien Chopin 2017-07-09 12:27:08 +02:00
commit fc2c780dd0
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/builder/builder.js
View File

@ -369,18 +369,18 @@ export default class Builder extends Tapable {
debug('Adding webpack middleware...')
// Create webpack dev middleware
this.webpackDevMiddleware = pify(webpackDevMiddleware(this.compiler.client, {
this.webpackDevMiddleware = pify(webpackDevMiddleware(this.compiler.client, Object.assign({
publicPath: this.options.build.publicPath,
stats: this.webpackStats,
noInfo: true,
quiet: true,
watchOptions: this.options.watchers.webpack
}))
}, this.options.build.devMiddleware)))
this.webpackHotMiddleware = pify(webpackHotMiddleware(this.compiler.client, {
this.webpackHotMiddleware = pify(webpackHotMiddleware(this.compiler.client, Object.assign({
log: false,
heartbeat: 2500
}))
}, this.options.build.hotMiddleware)))
// Inject to renderer instance
if (this.nuxt.renderer) {

4
lib/core/options.js
View File

@ -69,7 +69,9 @@ export const defaultOptions = {
babel: {},
postcss: [],
templates: [],
watch: []
watch: [],
devMiddleware: {},
hotMiddleware: {}
},
generate: {
dir: 'dist',