fix custom loaders with queries

Author: yyx990803

lib/loader.js

@@ -15,6 +15,7 @@ var defaultLoaders = {
   js: 'babel?optional[]=runtime&loose=all&nonStandard=false'
 }
 
+var rewriterInjectRE = /\b((css|(vue-)?html)(\?[^!]+)?!?)\b/
 var rewriters = {
   template: require.resolve('./template-rewriter'),
   style: require.resolve('./style-rewriter')
@@ -65,17 +66,11 @@ module.exports = function (content) {
     var lang = part.lang || defaultLang[type]
     var loader = loaders[lang]
     var rewriter = getRewriter(type, scoped)
-    var cssRE = /\b(css!?)\b/
-    var htmlRE = /\b((vue-)?html!?)\b/
     if (loader !== undefined) {
       // inject rewriter before css/html loader for
       // extractTextPlugin use cases
-      if (cssRE.test(loader)) {
-        loader = loader.replace(cssRE, function (m, $1) {
-          return ensureBang($1) + rewriter
-        })
-      } else if (htmlRE.test(loader)) {
-        loader = loader.replace(htmlRE, function (m, $1) {
+      if (rewriterInjectRE.test(loader)) {
+        loader = loader.replace(rewriterInjectRE, function (m, $1) {
           return ensureBang($1) + rewriter
         })
       } else {

test/test.js

@@ -177,7 +177,7 @@ describe('vue-loader', function () {
       vue: {
         loaders: {
           css: ExtractTextPlugin.extract('css'),
-          stylus: ExtractTextPlugin.extract('css!stylus')
+          stylus: ExtractTextPlugin.extract('css?sourceMap!stylus')
         }
       },
       plugins: [