From 2cf0f32b39df7b4297cc211e27d283f64bcac7b2 Mon Sep 17 00:00:00 2001 From: Chris Seufert Date: Fri, 16 Dec 2016 12:26:36 +1100 Subject: [PATCH] Read options in a way that works even for Webpack 2.2 This was ported from the master branch (Vue 2.x Loader) --- lib/loader.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/loader.js b/lib/loader.js index e3756f69f..bb78486d6 100644 --- a/lib/loader.js +++ b/lib/loader.js @@ -28,8 +28,8 @@ module.exports = function (content) { this.cacheable() var loaderContext = this - var options = this.vue || this.options.vue || {} var query = loaderUtils.parseQuery(this.query) + var options = Object.assign({}, this.options.vue, this.vue, query) var filePath = this.resourcePath var fileName = path.basename(filePath) var moduleId = '_v-' + hash(filePath)