accept root query parameter for root-relative urls

sokra · sokra · commit d92c0f84f92c · 2014-03-31T09:40:37.000+02:00
diff --git a/index.js b/index.js
@@ -26,14 +26,15 @@ module.exports = function(content) {
 		else
 			throw new Error("Invalid value to query parameter attrs");
 	}
+	var root = query.root;
 	var links = attrParse(content, function(tag, attr) {
 		return attributes.indexOf(tag + ":" + attr) >= 0;
 	});
 	links.reverse();
 	var data = {};
 	content = [content];
 	links.forEach(function(link) {
-		if(/^data:|^(https?:)?\/\/|^[\{\}\[\]#*;,'§\$%&\(=?`´\^°<>]/.test(link.value)) return;
+		if(!loaderUtils.isUrlRequest(link.value, root)) return;
 		do {
 			var ident = randomIdent();
 		} while(data[ident]);
@@ -59,14 +60,6 @@ module.exports = function(content) {
 	}
 	return "module.exports = " + JSON.stringify(content).replace(/xxxHTMLLINKxxx[0-9\.]+xxx/g, function(match) {
 		if(!data[match]) return match;
-		return '" + require(' + JSON.stringify(urlToRequire(data[match])) + ') + "';
+		return '" + require(' + JSON.stringify(loaderUtils.urlToRequest(data[match], root)) + ') + "';
 	}) + ";";
 }
-
-function urlToRequire(url) {
-	if(/^~/.test(url))
-		return url.substring(1);
-	else
-		return "./"+url;
-}
-
diff --git a/package.json b/package.json
@@ -6,7 +6,7 @@
 	"dependencies": {
 		"html-minifier": "0.5.x",
 		"source-map": "0.1.x",
-		"loader-utils": "0.2.x"
+		"loader-utils": "~0.2.2"
 	},
 	"devDependencies": {
 		"mocha": "1.17.x",
diff --git a/test/loaderTest.js b/test/loaderTest.js
@@ -48,7 +48,7 @@ describe("loader", function() {
 	});
 	it("should accept root from query", function() {
 		loader.call({
-			query: "?root=/test/"
+			query: "?root=/test"
 		}, 'Text <img src="/image.png">').should.be.eql(
 			'module.exports = "Text <img src=\\"" + require("/test/image.png") + "\\">";'
 		);
