linting

Author: sokra

.eslintrc

@@ -0,0 +1,10 @@
+{
+	"env": {
+		"node": true
+	},
+	"rules": {
+		"strict": 0,
+		"curly": 0,
+		"quotes": 0
+	}
+}

lib/css-base.js

@@ -3,7 +3,6 @@
 	Author Tobias Koppers @sokra
 */
 // css base code, injected by the css-loader
-// 
 module.exports = function() {
 	var list = [];
 
@@ -31,7 +30,7 @@ module.exports = function() {
 			if(typeof id === "number")
 				alreadyImportedModules[id] = true;
 		}
-		for(var i = 0; i < modules.length; i++) {
+		for(i = 0; i < modules.length; i++) {
 			var item = modules[i];
 			// skip already imported module
 			// this implementation is not 100% perfect for weird media query combinations

lib/getPlaceholderIdent.js

@@ -0,0 +1,13 @@
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+var loaderUtils = require("loader-utils");
+module.exports = function getPlaceholderIdent(loaderContext, placeholderName) {
+	var hash = require("crypto").createHash("md5");
+	hash.update(loaderContext.options && typeof loaderContext.options.context === "string" ?
+		loaderUtils.stringifyRequest({ context: loaderContext.options.context }, loaderContext.request) :
+		loaderContext.request);
+	hash.update(placeholderName);
+	return "z" + hash.digest("hex");
+};

lib/loader.js

@@ -7,11 +7,11 @@ var parseSource = require("./parseSource");
 var ReplaceMany = require("./ReplaceMany");
 var loaderUtils = require("loader-utils");
 var SourceListMap = require("source-list-map").SourceListMap;
-var fromStringWithSourceMap = require("source-list-map").fromStringWithSourceMap;
 var CleanCSS = require("clean-css");
+var getPlaceholderIdent = require("./getPlaceholderIdent");
 
 module.exports = function(content, map) {
-	this.cacheable && this.cacheable();
+	if(this.cacheable) this.cacheable();
 	var query = loaderUtils.parseQuery(this.query);
 	var root = query.root;
 	var forceMinimize = query.minimize;
@@ -49,16 +49,12 @@ module.exports = function(content, map) {
 	});
 	var placeholders = {};
 	stuff.placeholders.forEach(function(placeholder) {
+		var ident;
 		if(!placeholders[placeholder.name]) {
-			var hash = require("crypto").createHash("md5");
-			hash.update(this.options && typeof this.options.context === "string" ?
-				loaderUtils.stringifyRequest({ context: this.options.context }, this.request) :
-				this.request);
-			hash.update(placeholder.name);
-			var ident = "z" + hash.digest("hex");
+			ident = getPlaceholderIdent(this, placeholder.name);
 			placeholders[placeholder.name] = ident;
 		} else {
-			var ident = placeholders[placeholder.name];
+			ident = placeholders[placeholder.name];
 		}
 		replacer.replace(placeholder.start, placeholder.length, placeholder.prefix + ident);
 	}, this);
@@ -77,6 +73,10 @@ module.exports = function(content, map) {
 			map = JSON.stringify(map);
 	}
 
+	function toEmbStr(str) {
+		return JSON.stringify(str).replace(/^"|"$/g, "");
+	}
+
 	var css = JSON.stringify(cssContent);
 
 	var urlRegExp = /__CSSLOADERURL_[0-9]+__/g;
@@ -89,23 +89,19 @@ module.exports = function(content, map) {
 		var url = urlItem.url;
 		if(!loaderUtils.isUrlRequest(url, root))
 			return toEmbStr(urlItem.raw);
-		var idx = url.indexOf("?#");
+		idx = url.indexOf("?#");
 		if(idx < 0) idx = url.indexOf("#");
 		if(idx > 0) {
 			// in cases like url('webfont.eot?#iefix')
-			var request = url.substr(0, idx);
-			return "\"+require(" + loaderUtils.stringifyRequest(this, loaderUtils.urlToRequest(request, root)) + ")+\"" + url.substr(idx);
+			var urlRequest = url.substr(0, idx);
+			return "\"+require(" + loaderUtils.stringifyRequest(this, loaderUtils.urlToRequest(urlRequest, root)) + ")+\"" + url.substr(idx);
 		} else if(idx === 0) {
 			// only hash
 			return toEmbStr(urlItem.raw);
 		}
 		return "\"+require(" + loaderUtils.stringifyRequest(this, loaderUtils.urlToRequest(url, root)) + ")+\"";
 	}.bind(this));
 
-	function toEmbStr(str) {
-		return JSON.stringify(str).replace(/^"|"$/g, "");
-	}
-
 	if(query.sourceMap && !minimize) {
 		var cssRequest = loaderUtils.getRemainingRequest(this);
 		var request = loaderUtils.getCurrentRequest(this);
@@ -137,4 +133,4 @@ module.exports = function(content, map) {
 
 	return "exports = module.exports = require(" + loaderUtils.stringifyRequest(this, require.resolve("./css-base.js")) + ")();\n" +
 		result.join("\n");
-}
+};

lib/parseSource.js

@@ -50,7 +50,7 @@ var parser = new Parser({
 		// placeholder
 		"()\\{\\{([A-Za-z_0-9]+)\\}\\}": placeholderMatch,
 		"(\\.)\\[([A-Za-z_0-9]+)\\]": placeholderMatch,
-		"(#)\\[([A-Za-z_0-9]+)\\]": placeholderMatch,
+		"(#)\\[([A-Za-z_0-9]+)\\]": placeholderMatch
 	},
 	comment: {
 		"\\*/": "source"
@@ -64,4 +64,4 @@ module.exports = function parseSource(source) {
 		placeholders: []
 	};
 	return parser.parse("source", source, context);
-}
+};