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

This commit is contained in:
Sebastien Chopin 2017-07-26 18:14:54 +02:00
commit 1ce7d42403

View File

@ -49,7 +49,7 @@ export default class Builder extends Tapable {
get plugins () {
return this.options.plugins.map((p, i) => {
if (typeof p === 'string') p = { src: p }
p.src = this.nuxt.resolvePath(this.options.srcDir, p.src)
p.src = this.nuxt.resolvePath(p.src)
return { src: p.src, ssr: (p.ssr !== false), name: `plugin${i}` }
})
}