Skip to content

Commit 4917d73

Browse files
cseufertkazupon
authored andcommitted
Read options in a way that works even for Webpack 2.2 (vuejs#538)
This was ported from the master branch (Vue 2.x Loader)
1 parent a5fa5e2 commit 4917d73

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

lib/loader.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ module.exports = function (content) {
2828

2929
this.cacheable()
3030
var loaderContext = this
31-
var options = this.vue || this.options.vue || {}
3231
var query = loaderUtils.parseQuery(this.query)
32+
var options = Object.assign({}, this.options.vue, this.vue, query)
3333
var filePath = this.resourcePath
3434
var fileName = path.basename(filePath)
3535
var moduleId = '_v-' + hash(filePath)

0 commit comments

Comments
 (0)