accept root query parameter for root-relative urls, fixes webpack#11

Author: sokra

index.js

@@ -8,6 +8,8 @@ var loaderUtils = require("loader-utils");
 module.exports = function(content) {
 	this.cacheable && this.cacheable();
 	var result = [];
+	var query = loaderUtils.parseQuery(this.query);
+	var root = query.root;
 	var tree = csso.parse(content, "stylesheet");
 	if(tree && this && this.minimize) {
 		tree = csso.compress(tree);
@@ -37,19 +39,19 @@ module.exports = function(content) {
 	var uriRegExp = /%CSSURL\[%(.*?)%\]CSSURL%/g;
 	css = css.replace(uriRegExp, function(str) {
 		var match = /^%CSSURL\[%(.*?)%\]CSSURL%$/.exec(str);
-		if(/^data:|^(https?:)?\/\//.test(match[1])) return match[1];
+		if(!loaderUtils.isUrlRequest(match[1], root)) return match[1];
 		var idx = match[1].indexOf("?");
 		if(idx < 0) idx = match[1].indexOf("#");
 		if(idx > 0) {
 			// in cases like url('webfont.eot?#iefix')
 			var url = JSON.parse("\"" + match[1].substr(0, idx) + "\"");
-			return "\"+require(" + JSON.stringify(urlToRequire(url)) + ")+\"" + match[1].substr(idx);
+			return "\"+require(" + JSON.stringify(loaderUtils.urlToRequest(url, root)) + ")+\"" + match[1].substr(idx);
 		} else if(idx === 0) {
 			// only hash
 			return match[1];
 		}
 		var url = JSON.parse("\"" + match[1] + "\"");
-		return "\"+require(" + JSON.stringify(urlToRequire(url)) + ")+\"";
+		return "\"+require(" + JSON.stringify(loaderUtils.urlToRequest(url, root)) + ")+\"";
 	});
 	result.push(css);
 	var cssRequest = loaderUtils.getRemainingRequest(this);
@@ -63,12 +65,6 @@ module.exports = function(content) {
 	this.callback(null, stringWithMap.code, stringWithMap.map.toJSON());
 }
 
-function urlToRequire(url) {
-	if(/^~/.test(url))
-		return url.substring(1);
-	else
-		return "./"+url;
-}
 function extractImports(tree) {
 	var results = [];
 	var removes = [];