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

lib/builder/builder.js

@@ -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) {

lib/core/options.js

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