Merge branch 'martnu-fix-non-url-requests-in-module-mode'

Author: sokra

lib/loader.js

@@ -114,19 +114,16 @@ module.exports = function(content, map) {
 		if(!stuff.urls[idx]) return str;
 		var urlItem = stuff.urls[idx];
 		var url = urlItem.url;
-		if(!moduleMode && !loaderUtils.isUrlRequest(url, root))
+		if(!loaderUtils.isUrlRequest(url, root))
 			return toEmbStr(urlItem.raw);
 		idx = url.indexOf("?#");
 		if(idx < 0) idx = url.indexOf("#");
 		var urlRequest;
-		if(idx > 0) {
+		if(idx > 0) { // idx === 0 is catched by isUrlRequest
 			// in cases like url('webfont.eot?#iefix')
 			urlRequest = url.substr(0, idx);
 			if(!moduleMode) urlRequest = loaderUtils.urlToRequest(urlRequest, root);
 			return "\"+require(" + loaderUtils.stringifyRequest(this, urlRequest) + ")+\"" + url.substr(idx);
-		} else if(idx === 0) {
-			// only hash
-			return toEmbStr(urlItem.raw);
 		}
 		urlRequest = url;
 		if(!moduleMode) urlRequest = loaderUtils.urlToRequest(url, root);

test/moduleTestCases/urls/expected.css

@@ -5,4 +5,8 @@
 	background: url({./module}#?iefix);
 	background: url("#hash");
 	background: url("#");
+	background: url(data:image/png;base64,AAA);
+	background: url(http://example.com/image.jpg);
+	background: url(//example.com/image.png);
+	background: green url(data:image/png;base64,AAA) url(http://example.com/image.jpg) url(//example.com/image.png) url({./module}) xyz;
 }

test/moduleTestCases/urls/source.css

@@ -5,4 +5,8 @@
 	background: url("./module#?iefix");
 	background: url("#hash");
 	background: url("#");
+	background: url(data:image/png;base64,AAA);
+	background: url(http://example.com/image.jpg);
+	background: url(//example.com/image.png);
+	background: green url(data:image/png;base64,AAA) url(http://example.com/image.jpg) url(//example.com/image.png) url(./module) xyz;
 }