Bump loader-utils and use getOptions

Author: erha19

lib/loader.js

@@ -55,9 +55,8 @@ module.exports = function (content) {
   // var isServer = this.options.target === 'node'
   // var isServer = false
   var loaderContext = this
-  var query = loaderUtils.parseQuery(this.query)
-  var params = loaderUtils.parseQuery(this.resourceQuery)
-  var options = this.options.__vueOptions__ = Object.assign({}, this.options.vue, this.vue, query)
+  var params = loaderUtils.getOptions(this)
+  var options = this.options.__vueOptions__ = Object.assign({}, this.options.vue, this.vue, params)
   var filePath = this.resourcePath
   var fileName = path.basename(filePath)
   var moduleId = 'data-v-' + genId(path.relative(process.cwd(), filePath))
@@ -129,7 +128,7 @@ module.exports = function (content) {
     return loader.replace(/((?:^|!)css(?:-loader)?)(\?[^!]*)?/, function (m, $1, $2) {
       // $1: !css-loader
       // $2: ?a=b
-      var query = loaderUtils.parseQuery($2)
+      var query = loaderUtils.getOptions($2)
       Object.assign(query, OPTIONS, option, DEFAULT_OPTIONS)
       if (index !== -1) {
         // Note:
@@ -154,7 +153,7 @@ module.exports = function (content) {
     var lang = part.lang
     var loader = loaders[defaultLang[type]]
     var rewriter = type === 'styles' ? styleRewriter + (scoped ? '&scoped=true!' : '!') : ''
-    var injectString = (type === 'script' && query.inject) ? 'inject!' : ''
+    var injectString = (type === 'script' && params.inject) ? 'inject!' : ''
     if (loader !== undefined) {
       if (Array.isArray(loader)) {
         loader = stringifyLoaders(loader)
@@ -344,7 +343,7 @@ module.exports = function (content) {
   '  __register_static_styles__(__vue_options__._scopeId, __vue_styles__)\n' +
   '}\n'
 
-  if (!query.inject) {
+  if (!params.inject) {
     output += exports
     // hot reload
     // if (

lib/selector.js

@@ -4,7 +4,7 @@ var loaderUtils = require('loader-utils')
 
 module.exports = function (content) {
   this.cacheable()
-  var query = loaderUtils.parseQuery(this.query)
+  var query = loaderUtils.getOptions(this)
   var filename = path.basename(this.resourcePath)
   var parts = parse(content, filename, this.sourceMap)
   var part = parts[query.type]

lib/style-rewriter.js

@@ -41,7 +41,7 @@ module.exports = function (css, map) {
   this.cacheable()
   var cb = this.async()
 
-  loaderUtils.parseQuery(this.query)
+  loaderUtils.getOptions(this)
   var options = this.options.__vueOptions__
   var postcssOptions = options.postcss
 

lib/template-compiler.js

@@ -54,7 +54,7 @@ var beautify = require('js-beautify').js_beautify
 module.exports = function (html) {
   this.cacheable()
   var isProduction = this.minimize || process.env.NODE_ENV === 'production'
-  var query = loaderUtils.parseQuery(this.query)
+  var query = loaderUtils.getOptions(this)
   // var isServer = this.options.target === 'node'
   // var isServer = false
   var vueOptions = this.options.__vueOptions__

lib/template-loader.js

@@ -5,7 +5,7 @@ var extname = require('path').extname
 module.exports = function (content) {
   this.cacheable && this.cacheable()
   var callback = this.async()
-  var opt = loaderUtils.parseQuery(this.query)
+  var opt = loaderUtils.getOptions(this)
   var vue = this.options.__vueOptions__
   if (vue && vue.template) {
     for (var key in vue.template) {