fix vue options in template compiler and style rewriter

yyx990803 · yyx990803 · commit 75a2b33cdf8c · 2016-09-28T19:21:50.000-04:00
diff --git a/lib/style-rewriter.js b/lib/style-rewriter.js
@@ -42,7 +42,7 @@ module.exports = function (css, map) {
   var cb = this.async()
 
   var query = loaderUtils.parseQuery(this.query)
-  var options = this.options.vue || {}
+  var options = this.vue || this.options.vue || {}
   var postcssOptions = options.postcss
 
   // postcss plugins
diff --git a/lib/template-compiler.js b/lib/template-compiler.js
@@ -49,8 +49,9 @@ module.exports = function (html) {
   this.cacheable()
   var query = loaderUtils.parseQuery(this.query)
   var isServer = this.options.target === 'node'
-  if (this.options.vue && this.options.vue.transformToRequire) {
-    Object.assign(transformToRequire, this.options.vue.transformToRequire)
+  var vueOptions = this.vue || this.options.vue || {}
+  if (vueOptions.transformToRequire) {
+    Object.assign(transformToRequire, vueOptions.transformToRequire)
   }
   var compiled = compiler.compile(html, options)
   var code
