css-loader 0.25.0 → 0.26.4

package/lib/css-base.js

@@ -1,50 +1,50 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-// css base code, injected by the css-loader
-module.exports = function() {
-	var list = [];
-
-	// return the list of modules as css string
-	list.toString = function toString() {
-		var result = [];
-		for(var i = 0; i < this.length; i++) {
-			var item = this[i];
-			if(item[2]) {
-				result.push("@media " + item[2] + "{" + item[1] + "}");
-			} else {
-				result.push(item[1]);
-			}
-		}
-		return result.join("");
-	};
-
-	// import a list of modules into the list
-	list.i = function(modules, mediaQuery) {
-		if(typeof modules === "string")
-			modules = [[null, modules, ""]];
-		var alreadyImportedModules = {};
-		for(var i = 0; i < this.length; i++) {
-			var id = this[i][0];
-			if(typeof id === "number")
-				alreadyImportedModules[id] = true;
-		}
-		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
-			//  when a module is imported multiple times with different media queries.
-			//  I hope this will never occur (Hey this way we have smaller bundles)
-			if(typeof item[0] !== "number" || !alreadyImportedModules[item[0]]) {
-				if(mediaQuery && !item[2]) {
-					item[2] = mediaQuery;
-				} else if(mediaQuery) {
-					item[2] = "(" + item[2] + ") and (" + mediaQuery + ")";
-				}
-				list.push(item);
-			}
-		}
-	};
-	return list;
-};
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+// css base code, injected by the css-loader
+module.exports = function() {
+	var list = [];
+
+	// return the list of modules as css string
+	list.toString = function toString() {
+		var result = [];
+		for(var i = 0; i < this.length; i++) {
+			var item = this[i];
+			if(item[2]) {
+				result.push("@media " + item[2] + "{" + item[1] + "}");
+			} else {
+				result.push(item[1]);
+			}
+		}
+		return result.join("");
+	};
+
+	// import a list of modules into the list
+	list.i = function(modules, mediaQuery) {
+		if(typeof modules === "string")
+			modules = [[null, modules, ""]];
+		var alreadyImportedModules = {};
+		for(var i = 0; i < this.length; i++) {
+			var id = this[i][0];
+			if(typeof id === "number")
+				alreadyImportedModules[id] = true;
+		}
+		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
+			//  when a module is imported multiple times with different media queries.
+			//  I hope this will never occur (Hey this way we have smaller bundles)
+			if(typeof item[0] !== "number" || !alreadyImportedModules[item[0]]) {
+				if(mediaQuery && !item[2]) {
+					item[2] = mediaQuery;
+				} else if(mediaQuery) {
+					item[2] = "(" + item[2] + ") and (" + mediaQuery + ")";
+				}
+				list.push(item);
+			}
+		}
+	};
+	return list;
+};

package/lib/getImportPrefix.js

@@ -1,14 +1,14 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-module.exports = function getImportPrefix(loaderContext, query) {
-	if(query.importLoaders === false)
-		return "";
-	var importLoaders = parseInt(query.importLoaders, 10) || 0;
-	var loadersRequest = loaderContext.loaders.slice(
-		loaderContext.loaderIndex,
-		loaderContext.loaderIndex + 1 + importLoaders
-	).map(function(x) { return x.request; }).join("!");
-	return "-!" + loadersRequest + "!";
-};
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+module.exports = function getImportPrefix(loaderContext, query) {
+	if(query.importLoaders === false)
+		return "";
+	var importLoaders = parseInt(query.importLoaders, 10) || 0;
+	var loadersRequest = loaderContext.loaders.slice(
+		loaderContext.loaderIndex,
+		loaderContext.loaderIndex + 1 + importLoaders
+	).map(function(x) { return x.request; }).join("!");
+	return "-!" + loadersRequest + "!";
+};

package/lib/getLocalIdent.js

@@ -1,16 +1,16 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-var loaderUtils = require("loader-utils");
-var path = require("path");
-
-module.exports = function getLocalIdent(loaderContext, localIdentName, localName, options) {
-	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(/^((-?[0-9])|--)/, "_$1");
-};
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+var loaderUtils = require("loader-utils");
+var path = require("path");
+
+module.exports = function getLocalIdent(loaderContext, localIdentName, localName, options) {
+	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(/^((-?[0-9])|--)/, "_$1");
+};

package/lib/loader.js

@@ -1,124 +1,119 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-var path = require("path");
-var loaderUtils = require("loader-utils");
-var processCss = require("./processCss");
-var getImportPrefix = require("./getImportPrefix");
-var compileExports = require("./compile-exports");
-
-
-module.exports = function(content, map) {
-	if(this.cacheable) this.cacheable();
-	var callback = this.async();
-	var query = loaderUtils.parseQuery(this.query);
-	var root = query.root;
-	var moduleMode = query.modules || query.module;
-	var camelCaseKeys = query.camelCase || query.camelcase;
-
-	if(map !== null && typeof map !== "string") {
-		map = JSON.stringify(map);
-	}
-
-	processCss(content, map, {
-		mode: moduleMode ? "local" : "global",
-		from: loaderUtils.getRemainingRequest(this),
-		to: loaderUtils.getCurrentRequest(this),
-		query: query,
-		minimize: this.minimize,
-		loaderContext: this
-	}, function(err, result) {
-		if(err) return callback(err);
-
-		var cssAsString = JSON.stringify(result.source);
-
-		// for importing CSS
-		var importUrlPrefix = getImportPrefix(this, query);
-
-		var alreadyImported = {};
-		var importJs = result.importItems.filter(function(imp) {
-			if(!imp.mediaQuery) {
-				if(alreadyImported[imp.url])
-					return false;
-				alreadyImported[imp.url] = true;
-			}
-			return true;
-		}).map(function(imp) {
-			if(!loaderUtils.isUrlRequest(imp.url, root)) {
-				return "exports.push([module.id, " +
-					JSON.stringify("@import url(" + imp.url + ");") + ", " +
-					JSON.stringify(imp.mediaQuery) + "]);";
-			} else {
-				var importUrl = importUrlPrefix + imp.url;
-				return "exports.i(require(" + loaderUtils.stringifyRequest(this, importUrl) + "), " + JSON.stringify(imp.mediaQuery) + ");";
-			}
-		}, this).join("\n");
-
-		function importItemMatcher(item) {
-			var match = result.importItemRegExp.exec(item);
-			var idx = +match[1];
-			var importItem = result.importItems[idx];
-			var importUrl = importUrlPrefix + importItem.url;
-			return "\" + require(" + loaderUtils.stringifyRequest(this, importUrl) + ").locals" +
-				"[" + JSON.stringify(importItem.export) + "] + \"";
-		}
-
-		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);
-				}
-				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
-			map = result.map;
-			if(map.sources) {
-				map.sources = map.sources.map(function(source) {
-					source = source.split("!").pop();
-					var p = path.relative(query.context || this.options.context, source).replace(/\\/g, "/");
-					if(p.indexOf("../") !== 0)
-						p = "./" + p;
-					return "/" + p;
-				}, this);
-				map.sourceRoot = "webpack://";
-			}
-			map.file = map.file.split("!").pop();
-			map = JSON.stringify(map);
-			moduleJs = "exports.push([module.id, " + cssAsString + ", \"\", " + map + "]);";
-		} else {
-			moduleJs = "exports.push([module.id, " + cssAsString + ", \"\"]);";
-		}
-
-		// embed runtime
-		callback(null, "exports = module.exports = require(" + loaderUtils.stringifyRequest(this, require.resolve("./css-base.js")) + ")();\n" +
-			"// imports\n" +
-			importJs + "\n\n" +
-			"// module\n" +
-			moduleJs + "\n\n" +
-			"// exports\n" +
-			exportJs);
-	}.bind(this));
-};
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+var loaderUtils = require("loader-utils");
+var processCss = require("./processCss");
+var getImportPrefix = require("./getImportPrefix");
+var compileExports = require("./compile-exports");
+
+
+module.exports = function(content, map) {
+	if(this.cacheable) this.cacheable();
+	var callback = this.async();
+	var query = loaderUtils.getOptions(this) || {};
+	var root = query.root;
+	var moduleMode = query.modules || query.module;
+	var camelCaseKeys = query.camelCase || query.camelcase;
+
+	if(map !== null && typeof map !== "string") {
+		map = JSON.stringify(map);
+	}
+
+	processCss(content, map, {
+		mode: moduleMode ? "local" : "global",
+		from: loaderUtils.getRemainingRequest(this),
+		to: loaderUtils.getCurrentRequest(this),
+		query: query,
+		minimize: this.minimize,
+		loaderContext: this
+	}, function(err, result) {
+		if(err) return callback(err);
+
+		var cssAsString = JSON.stringify(result.source);
+
+		// for importing CSS
+		var importUrlPrefix = getImportPrefix(this, query);
+
+		var alreadyImported = {};
+		var importJs = result.importItems.filter(function(imp) {
+			if(!imp.mediaQuery) {
+				if(alreadyImported[imp.url])
+					return false;
+				alreadyImported[imp.url] = true;
+			}
+			return true;
+		}).map(function(imp) {
+			if(!loaderUtils.isUrlRequest(imp.url, root)) {
+				return "exports.push([module.id, " +
+					JSON.stringify("@import url(" + imp.url + ");") + ", " +
+					JSON.stringify(imp.mediaQuery) + "]);";
+			} else {
+				var importUrl = importUrlPrefix + imp.url;
+				return "exports.i(require(" + loaderUtils.stringifyRequest(this, importUrl) + "), " + JSON.stringify(imp.mediaQuery) + ");";
+			}
+		}, this).join("\n");
+
+		function importItemMatcher(item) {
+			var match = result.importItemRegExp.exec(item);
+			var idx = +match[1];
+			var importItem = result.importItems[idx];
+			var importUrl = importUrlPrefix + importItem.url;
+			return "\" + require(" + loaderUtils.stringifyRequest(this, importUrl) + ").locals" +
+				"[" + JSON.stringify(importItem.export) + "] + \"";
+		}
+
+		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);
+				}
+				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
+			map = result.map;
+			if(map.sources) {
+				map.sources = map.sources.map(function(source) {
+					return source.split("!").pop();
+				}, this);
+				map.sourceRoot = "";
+			}
+			map.file = map.file.split("!").pop();
+			map = JSON.stringify(map);
+			moduleJs = "exports.push([module.id, " + cssAsString + ", \"\", " + map + "]);";
+		} else {
+			moduleJs = "exports.push([module.id, " + cssAsString + ", \"\"]);";
+		}
+
+		// embed runtime
+		callback(null, "exports = module.exports = require(" + loaderUtils.stringifyRequest(this, require.resolve("./css-base.js")) + ")();\n" +
+			"// imports\n" +
+			importJs + "\n\n" +
+			"// module\n" +
+			moduleJs + "\n\n" +
+			"// exports\n" +
+			exportJs);
+	}.bind(this));
+};

package/lib/localsLoader.js

@@ -1,46 +1,46 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-var loaderUtils = require("loader-utils");
-var processCss = require("./processCss");
-var getImportPrefix = require("./getImportPrefix");
-var compileExports = require("./compile-exports");
-
-
-module.exports = function(content) {
-	if(this.cacheable) this.cacheable();
-	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",
-		query: query,
-		minimize: this.minimize,
-		loaderContext: this
-	}, function(err, result) {
-		if(err) return callback(err);
-
-		// for importing CSS
-		var importUrlPrefix = getImportPrefix(this, query);
-
-		function importItemMatcher(item) {
-			var match = result.importItemRegExp.exec(item);
-			var idx = +match[1];
-			var importItem = result.importItems[idx];
-			var importUrl = importUrlPrefix + importItem.url;
-			return "\" + require(" + loaderUtils.stringifyRequest(this, importUrl) + ")" +
-				"[" + JSON.stringify(importItem.export) + "] + \"";
-		}
-
-		var exportJs = compileExports(result, importItemMatcher.bind(this), camelCaseKeys);
-		if (exportJs) {
-			exportJs = "module.exports = " + exportJs + ";";
-		}
-
-
-		callback(null, exportJs);
-	}.bind(this));
-};
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+var loaderUtils = require("loader-utils");
+var processCss = require("./processCss");
+var getImportPrefix = require("./getImportPrefix");
+var compileExports = require("./compile-exports");
+
+
+module.exports = function(content) {
+	if(this.cacheable) this.cacheable();
+	var callback = this.async();
+	var query = loaderUtils.getOptions(this) || {};
+	var moduleMode = query.modules || query.module;
+	var camelCaseKeys = query.camelCase || query.camelcase;
+
+	processCss(content, null, {
+		mode: moduleMode ? "local" : "global",
+		query: query,
+		minimize: this.minimize,
+		loaderContext: this
+	}, function(err, result) {
+		if(err) return callback(err);
+
+		// for importing CSS
+		var importUrlPrefix = getImportPrefix(this, query);
+
+		function importItemMatcher(item) {
+			var match = result.importItemRegExp.exec(item);
+			var idx = +match[1];
+			var importItem = result.importItems[idx];
+			var importUrl = importUrlPrefix + importItem.url;
+			return "\" + require(" + loaderUtils.stringifyRequest(this, importUrl) + ")" +
+				"[" + JSON.stringify(importItem.export) + "] + \"";
+		}
+
+		var exportJs = compileExports(result, importItemMatcher.bind(this), camelCaseKeys);
+		if (exportJs) {
+			exportJs = "module.exports = " + exportJs + ";";
+		}
+
+
+		callback(null, exportJs);
+	}.bind(this));
+};