Merge pull request webpack-contrib#52 from zxcabs/stringifyRequest

Use loaderUtils#stringifyRequest

Author: sokra

url.js

@@ -2,19 +2,20 @@
 	MIT License http://www.opensource.org/licenses/mit-license.php
 	Author Tobias Koppers @sokra
 */
-var path = require("path");
+var loaderUtils = require("loader-utils"),
+	path = require("path");
 module.exports = function() {};
 module.exports.pitch = function(remainingRequest) {
 	this.cacheable && this.cacheable();
 	return [
 		"// style-loader: Adds some reference to a css file to the DOM by adding a <link> tag",
 		"var update = require(" + JSON.stringify("!" + path.join(__dirname, "addStyleUrl.js")) + ")(",
-		"\trequire(" + JSON.stringify("!!" + remainingRequest) + ")",
+		"\trequire(" + loaderUtils.stringifyRequest(this, "!!" + remainingRequest) + ")",
 		");",
 		"// Hot Module Replacement",
 		"if(module.hot) {",
-		"\tmodule.hot.accept(" + JSON.stringify("!!" + remainingRequest) + ", function() {",
-		"\t\tupdate(require(" + JSON.stringify("!!" + remainingRequest) + "));",
+		"\tmodule.hot.accept(" + loaderUtils.stringifyRequest(this, "!!" + remainingRequest) + ", function() {",
+		"\t\tupdate(require(" + loaderUtils.stringifyRequest(this, "!!" + remainingRequest) + "));",
 		"\t});",
 		"\tmodule.hot.dispose(function() { update(); });",
 		"}"

useable.js

@@ -2,7 +2,8 @@
 	MIT License http://www.opensource.org/licenses/mit-license.php
 	Author Tobias Koppers @sokra
 */
-var path = require("path");
+var loaderUtils = require("loader-utils"),
+	path = require("path");
 module.exports = function() {};
 module.exports.pitch = function(remainingRequest) {
 	this.cacheable && this.cacheable();
@@ -11,7 +12,7 @@ module.exports.pitch = function(remainingRequest) {
 		"var dispose;",
 		"exports.use = exports.ref = function() {",
 		"	if(!(refs++)) {",
-		"		var content = require(" + JSON.stringify("!!" + remainingRequest) + ")",
+		"		var content = require(" + loaderUtils.stringifyRequest(this, "!!" + remainingRequest) + ")",
 		"		if(typeof content === 'string') content = [[module.id, content, '']];",
 		"		dispose = require(" + JSON.stringify("!" + path.join(__dirname, "addStyles.js")) + ")(content);",
 		"	}",