fix support for inline loader requests (fix #469)

yyx990803 · yyx990803 · commit ddc233114919 · 2016-11-15T20:43:21.000-05:00
diff --git a/lib/loader.js b/lib/loader.js
@@ -159,12 +159,15 @@ module.exports = function (content) {
     }
   }
 
+  // sass => sass-loader
+  // sass-loader => sass-loader
+  // sass?indentedsyntax!css => sass-loader?indentedSyntax!css-loader
   function ensureLoader (lang) {
-    if (!/-loader$/.test(lang)) {
-      return lang + '-loader'
-    } else {
-      return lang
-    }
+    return lang.split('!').map(loader => {
+      return loader.replace(/^([\w-]+)(\?.*)?/, (_, $1, $2) => {
+        return (/-loader$/.test($1) ? $1 : ($1 + '-loader')) + ($2 || '')
+      })
+    }).join('!')
   }
 
   function getSelectorString (type, index) {

Original file line number	Diff line number	Diff line change
`@@ -159,12 +159,15 @@ module.exports = function (content) {`
`159`	`159`	`}`
`160`	`160`	`}`
`161`	`161`
	`162`	`+ // sass => sass-loader`
	`163`	`+ // sass-loader => sass-loader`
	`164`	`+ // sass?indentedsyntax!css => sass-loader?indentedSyntax!css-loader`
`162`	`165`	`function ensureLoader (lang) {`
`163`		`- if (!/-loader$/.test(lang)) {`
`164`		`- return lang + '-loader'`
`165`		`- } else {`
`166`		`- return lang`
`167`		`- }`
	`166`	`+ return lang.split('!').map(loader => {`
	`167`	`+ return loader.replace(/^([\w-]+)(\?.*)?/, (_, $1, $2) => {`
	`168`	`+ return (/-loader$/.test($1) ? $1 : ($1 + '-loader')) + ($2 \|\| '')`
	`169`	`+ })`
	`170`	`+ }).join('!')`
`168`	`171`	`}`
`169`	`172`
`170`	`173`	`function getSelectorString (type, index) {`