css-loader 0.20.2 → 0.23.1

package/README.md

@@ -227,6 +227,12 @@ You can also disable or enforce minification with the `minimize` query parameter
 
 `require("css-loader?-minimize!./file.css")` (disabled)
 
+### Disable behavior
+
+`css-loader?-url` disables `url(...)` handling.
+
+`css-loader?-import` disables `@import` handling.
+
 ## License
 
 MIT (http://www.opensource.org/licenses/mit-license.php)

package/lib/compile-exports.js

@@ -0,0 +1,29 @@
+var camelCase = require("lodash.camelcase");
+
+function dashesCamelCase(str) {
+  return str.replace(/-(\w)/g, function(match, firstLetter) {
+    return firstLetter.toUpperCase();
+  });
+}
+
+module.exports = function compileExports(result, importItemMatcher, camelCaseKeys) {
+  if (!Object.keys(result.exports).length) {
+    return "";
+  }
+
+  var exportJs = Object.keys(result.exports).reduce(function(res, key) {
+    var valueAsString = JSON.stringify(result.exports[key]);
+    valueAsString = valueAsString.replace(result.importItemRegExpG, importItemMatcher);
+    res.push("\t" + JSON.stringify(key) + ": " + valueAsString);
+
+    if (camelCaseKeys === true) {
+      res.push("\t" + JSON.stringify(camelCase(key)) + ": " + valueAsString);
+    } else if (camelCaseKeys === 'dashes') {
+      res.push("\t" + JSON.stringify(dashesCamelCase(key)) + ": " + valueAsString);
+    }
+
+    return res;
+  }, []).join(",\n");
+
+  return "{\n" + exportJs + "\n}";
+};

package/lib/getLocalIdent.js

@@ -3,12 +3,13 @@
 	Author Tobias Koppers @sokra
 */
 var loaderUtils = require("loader-utils");
+var path = require("path");
+
 module.exports = function getLocalIdent(loaderContext, localIdentName, localName, options) {
-	var request = loaderContext.options && typeof loaderContext.options.context === "string" ?
-		loaderUtils.stringifyRequest({ context: loaderContext.options.context }, loaderUtils.getRemainingRequest(loaderContext)) :
-		loaderContext.request;
-	options.content = localName + " " + request;
-	options.context = loaderContext.options && typeof loaderContext.options.context === "string" ? loaderContext.options.context : loaderContext.context;
+	if(!options.context)
+		options.context = loaderContext.options && typeof loaderContext.options.context === "string" ? loaderContext.options.context : loaderContext.context;
+	var request = path.relative(options.context, loaderContext.resourcePath);
+	options.content = options.hashPrefix + request + "+" + localName;
 	localIdentName = localIdentName.replace(/\[local\]/gi, localName);
 	var hash = loaderUtils.interpolateName(loaderContext, localIdentName, options);
 	return hash.replace(new RegExp("[^a-zA-Z0-9\\-_\u00A0-\uFFFF]", "g"), "-").replace(/^([^a-zA-Z_])/, "_$1");

package/lib/loader.js

@@ -4,9 +4,9 @@
 */
 var path = require("path");
 var loaderUtils = require("loader-utils");
-var camelCase = require("lodash.camelcase");
 var processCss = require("./processCss");
 var getImportPrefix = require("./getImportPrefix");
+var compileExports = require("./compile-exports");
 
 
 module.exports = function(content, map) {
@@ -64,40 +64,33 @@ module.exports = function(content, map) {
 				"[" + JSON.stringify(importItem.export) + "] + \"";
 		}
 
-		cssAsString = cssAsString.replace(result.importItemRegExpG, importItemMatcher.bind(this)).replace(result.urlItemRegExpG, function(item) {
-			var match = result.urlItemRegExp.exec(item);
-			var idx = +match[1];
-			var urlItem = result.urlItems[idx];
-			var url = urlItem.url;
-			idx = url.indexOf("?#");
-			if(idx < 0) idx = url.indexOf("#");
-			var urlRequest;
-			if(idx > 0) { // idx === 0 is catched by isUrlRequest
-				// in cases like url('webfont.eot?#iefix')
-				urlRequest = url.substr(0, idx);
-				return "\" + require(" + loaderUtils.stringifyRequest(this, urlRequest) + ") + \"" +
-					url.substr(idx);
-			}
-			urlRequest = url;
-			return "\" + require(" + loaderUtils.stringifyRequest(this, urlRequest) + ") + \"";
-		}.bind(this));
-
-		var exportJs = "";
-		if(Object.keys(result.exports).length > 0) {
-			var boundImportItemMatcher = importItemMatcher.bind(this);
-			exportJs = Object.keys(result.exports).reduce(function(res, key) {
-				var valueAsString = JSON.stringify(result.exports[key]);
-				valueAsString = valueAsString.replace(result.importItemRegExpG, boundImportItemMatcher);
-				res.push("\t" + JSON.stringify(key) + ": " + valueAsString);
-				if (camelCaseKeys) {
-					res.push("\t" + JSON.stringify(camelCase(key)) + ": " + valueAsString);
+		cssAsString = cssAsString.replace(result.importItemRegExpG, importItemMatcher.bind(this));
+		if(query.url !== false) {
+			cssAsString = cssAsString.replace(result.urlItemRegExpG, function(item) {
+				var match = result.urlItemRegExp.exec(item);
+				var idx = +match[1];
+				var urlItem = result.urlItems[idx];
+				var url = urlItem.url;
+				idx = url.indexOf("?#");
+				if(idx < 0) idx = url.indexOf("#");
+				var urlRequest;
+				if(idx > 0) { // idx === 0 is catched by isUrlRequest
+					// in cases like url('webfont.eot?#iefix')
+					urlRequest = url.substr(0, idx);
+					return "\" + require(" + loaderUtils.stringifyRequest(this, urlRequest) + ") + \"" +
+							url.substr(idx);
 				}
-				return res;
-			}, []).join(",\n");
-			exportJs = "exports.locals = {\n" + exportJs + "\n};";
+				urlRequest = url;
+				return "\" + require(" + loaderUtils.stringifyRequest(this, urlRequest) + ") + \"";
+			}.bind(this));
 		}
 
 
+		var exportJs = compileExports(result, importItemMatcher.bind(this), camelCaseKeys);
+		if (exportJs) {
+			exportJs = "exports.locals = " + exportJs + ";";
+		}
+
 		var moduleJs;
 		if(query.sourceMap && result.map) {
 			// add a SourceMap

package/lib/localsLoader.js

@@ -5,6 +5,7 @@
 var loaderUtils = require("loader-utils");
 var processCss = require("./processCss");
 var getImportPrefix = require("./getImportPrefix");
+var compileExports = require("./compile-exports");
 
 
 module.exports = function(content) {
@@ -12,6 +13,7 @@ module.exports = function(content) {
 	var callback = this.async();
 	var query = loaderUtils.parseQuery(this.query);
 	var moduleMode = query.modules || query.module;
+	var camelCaseKeys = query.camelCase || query.camelcase;
 
 	processCss(content, null, {
 		mode: moduleMode ? "local" : "global",
@@ -33,16 +35,12 @@ module.exports = function(content) {
 				"[" + JSON.stringify(importItem.export) + "] + \"";
 		}
 
-		var exportJs = "";
-		if(Object.keys(result.exports).length > 0) {
-			exportJs = Object.keys(result.exports).map(function(key) {
-				var valueAsString = JSON.stringify(result.exports[key]);
-				valueAsString = valueAsString.replace(result.importItemRegExpG, importItemMatcher.bind(this));
-				return "\t" + JSON.stringify(key) + ": " + valueAsString;
-			}.bind(this)).join(",\n");
-			exportJs = "module.exports = {\n" + exportJs + "\n};";
+		var exportJs = compileExports(result, importItemMatcher.bind(this), camelCaseKeys);
+		if (exportJs) {
+			exportJs = "module.exports = " + exportJs + ";";
 		}
 
+
 		callback(null, exportJs);
 	}.bind(this));
 };

package/lib/processCss.js

@@ -22,36 +22,41 @@ var parserPlugin = postcss.plugin("css-loader-parser", function(options) {
 		var urlItems = [];
 
 		function replaceImportsInString(str) {
-			var tokens = str.split(/(\S+)/);
-			tokens = tokens.map(function(token) {
-				var importIndex = imports["$" + token];
-				if(typeof importIndex === "number") {
-					return "___CSS_LOADER_IMPORT___" + importIndex + "___";
-				}
-				return token;
-			});
-			return tokens.join("");
+			if(options.import) {
+				var tokens = str.split(/(\S+)/);
+				tokens = tokens.map(function (token) {
+					var importIndex = imports["$" + token];
+					if(typeof importIndex === "number") {
+						return "___CSS_LOADER_IMPORT___" + importIndex + "___";
+					}
+					return token;
+				});
+				return tokens.join("");
+			}
+			return str;
 		}
 
-		css.walkAtRules("import", function(rule) {
-			var values = Tokenizer.parseValues(rule.params);
-			var url = values.nodes[0].nodes[0];
-			if(url.type === "url") {
-				url = url.url;
-			} else if(url.type === "string") {
-				url = url.value;
-			} else throw rule.error("Unexpected format" + rule.params);
-			values.nodes[0].nodes.shift();
-			var mediaQuery = Tokenizer.stringifyValues(values);
-			if(loaderUtils.isUrlRequest(url, options.root) && options.mode === "global") {
-				url = loaderUtils.urlToRequest(url, options.root);
-			}
-			importItems.push({
-				url: url,
-				mediaQuery: mediaQuery
+		if(options.import) {
+			css.walkAtRules("import", function(rule) {
+				var values = Tokenizer.parseValues(rule.params);
+				var url = values.nodes[0].nodes[0];
+				if(url.type === "url") {
+					url = url.url;
+				} else if(url.type === "string") {
+					url = url.value;
+				} else throw rule.error("Unexpected format" + rule.params);
+				values.nodes[0].nodes.shift();
+				var mediaQuery = Tokenizer.stringifyValues(values);
+				if(loaderUtils.isUrlRequest(url, options.root) && options.mode === "global") {
+					url = loaderUtils.urlToRequest(url, options.root);
+				}
+				importItems.push({
+					url: url,
+					mediaQuery: mediaQuery
+				});
+				rule.remove();
 			});
-			rule.remove();
-		});
+		}
 
 		css.walkRules(function(rule) {
 			if(rule.selector === ":export") {
@@ -77,31 +82,39 @@ var parserPlugin = postcss.plugin("css-loader-parser", function(options) {
 			exports[exportName] = replaceImportsInString(exports[exportName]);
 		});
 
+		function processNode(item) {
+			switch (item.type) {
+				case "value":
+					item.nodes.forEach(processNode);
+					break;
+				case "nested-item":
+					item.nodes.forEach(processNode);
+					break;
+				case "item":
+					var importIndex = imports["$" + item.name];
+					if (typeof importIndex === "number") {
+						item.name = "___CSS_LOADER_IMPORT___" + importIndex + "___";
+					}
+					break;
+				case "url":
+					if (options.url && !/^#/.test(item.url) && loaderUtils.isUrlRequest(item.url, options.root)) {
+						item.stringType = "";
+						delete item.innerSpacingBefore;
+						delete item.innerSpacingAfter;
+						var url = item.url;
+						item.url = "___CSS_LOADER_URL___" + urlItems.length + "___";
+						urlItems.push({
+							url: url
+						});
+					}
+					break;
+			}
+		}
+
 		css.walkDecls(function(decl) {
 			var values = Tokenizer.parseValues(decl.value);
 			values.nodes.forEach(function(value) {
-				value.nodes.forEach(function(item) {
-					switch(item.type) {
-					case "item":
-						var importIndex = imports["$" + item.name];
-						if(typeof importIndex === "number") {
-							item.name = "___CSS_LOADER_IMPORT___" + importIndex + "___";
-						}
-						break;
-					case "url":
-						if(!/^#/.test(item.url) && loaderUtils.isUrlRequest(item.url, options.root)) {
-							item.stringType = "";
-							delete item.innerSpacingBefore;
-							delete item.innerSpacingAfter;
-							var url = item.url;
-							item.url = "___CSS_LOADER_URL___" + urlItems.length + "___";
-							urlItems.push({
-								url: url
-							});
-						}
-						break;
-					}
-				});
+				value.nodes.forEach(processNode);
 			});
 			decl.value = Tokenizer.stringifyValues(values);
 		});
@@ -121,6 +134,7 @@ module.exports = function processCss(inputSource, inputMap, options, callback) {
 
 	var query = options.query;
 	var root = query.root;
+	var context = query.context;
 	var localIdentName = query.localIdentName || "[hash:base64]";
 	var localIdentRegExp = query.localIdentRegExp;
 	var forceMinimize = query.minimize;
@@ -128,18 +142,22 @@ module.exports = function processCss(inputSource, inputMap, options, callback) {
 
 	var parserOptions = {
 		root: root,
-		mode: options.mode
+		mode: options.mode,
+		url: query.url !== false,
+		import: query.import !== false
 	};
 
 	var pipeline = postcss([
 		localByDefault({
 			mode: options.mode,
 			rewriteUrl: function(global, url) {
-				if(!loaderUtils.isUrlRequest(url, root)) {
-					return url;
-				}
-				if(global) {
-					return loaderUtils.urlToRequest(url, root);
+				if(parserOptions.url){
+					if(!loaderUtils.isUrlRequest(url, root)) {
+						return url;
+					}
+					if(global) {
+						return loaderUtils.urlToRequest(url, root);
+					}
 				}
 				return url;
 			}
@@ -149,7 +167,9 @@ module.exports = function processCss(inputSource, inputMap, options, callback) {
 		modulesScope({
 			generateScopedName: function(exportName) {
 				return getLocalIdent(options.loaderContext, localIdentName, exportName, {
-					regExp: localIdentRegExp
+					regExp: localIdentRegExp,
+					hashPrefix: query.hashPrefix || "",
+					context: context
 				});
 			}
 		}),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "css-loader",
-  "version": "0.20.2",
+  "version": "0.23.1",
   "author": "Tobias Koppers @sokra",
   "description": "css loader module for webpack",
   "dependencies": {
@@ -10,9 +10,9 @@
     "object-assign": "^4.0.1",
     "lodash.camelcase": "^3.0.1",
     "postcss": "^5.0.6",
-    "postcss-modules-extract-imports": "1.0.0-beta2",
-    "postcss-modules-local-by-default": "^1.0.0",
-    "postcss-modules-scope": "1.0.0-beta2",
+    "postcss-modules-extract-imports": "^1.0.0",
+    "postcss-modules-local-by-default": "^1.0.1",
+    "postcss-modules-scope": "^1.0.0",
     "postcss-modules-values": "^1.1.0",
     "source-list-map": "^0.1.4"
   },