css-loader 0.25.0 → 0.26.4

package/lib/processCss.js

@@ -1,251 +1,252 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-var formatCodeFrame = require("babel-code-frame");
-var Tokenizer = require("css-selector-tokenizer");
-var postcss = require("postcss");
-var loaderUtils = require("loader-utils");
-var assign = require("object-assign");
-var getLocalIdent = require("./getLocalIdent");
-
-var localByDefault = require("postcss-modules-local-by-default");
-var extractImports = require("postcss-modules-extract-imports");
-var modulesScope = require("postcss-modules-scope");
-var modulesValues = require("postcss-modules-values");
-var cssnano = require("cssnano");
-
-var parserPlugin = postcss.plugin("css-loader-parser", function(options) {
-	return function(css) {
-		var imports = {};
-		var exports = {};
-		var importItems = [];
-		var urlItems = [];
-
-		function replaceImportsInString(str) {
-			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;
-		}
-
-		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();
-			});
-		}
-
-		css.walkRules(function(rule) {
-			if(rule.selector === ":export") {
-				rule.walkDecls(function(decl) {
-					exports[decl.prop] = decl.value;
-				});
-				rule.remove();
-			} else if(/^:import\(.+\)$/.test(rule.selector)) {
-				var match = /^:import\((.+)\)$/.exec(rule.selector);
-				var url = loaderUtils.parseString(match[1]);
-				rule.walkDecls(function(decl) {
-					imports["$" + decl.prop] = importItems.length;
-					importItems.push({
-						url: url,
-						export: decl.value
-					});
-				});
-				rule.remove();
-			}
-		});
-
-		Object.keys(exports).forEach(function(exportName) {
-			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(processNode);
-			});
-			decl.value = Tokenizer.stringifyValues(values);
-		});
-		css.walkAtRules(function(atrule) {
-			if(typeof atrule.params === "string") {
-				atrule.params = replaceImportsInString(atrule.params);
-			}
-		});
-
-		options.importItems = importItems;
-		options.urlItems = urlItems;
-		options.exports = exports;
-	};
-});
-
-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;
-	var minimize = typeof forceMinimize !== "undefined" ? !!forceMinimize : options.minimize;
-
-	var parserOptions = {
-		root: root,
-		mode: options.mode,
-		url: query.url !== false,
-		import: query.import !== false
-	};
-
-	var pipeline = postcss([
-		localByDefault({
-			mode: options.mode,
-			rewriteUrl: function(global, url) {
-				if(parserOptions.url){
-					if(!loaderUtils.isUrlRequest(url, root)) {
-						return url;
-					}
-					if(global) {
-						return loaderUtils.urlToRequest(url, root);
-					}
-				}
-				return url;
-			}
-		}),
-		extractImports(),
-		modulesValues,
-		modulesScope({
-			generateScopedName: function(exportName) {
-				return getLocalIdent(options.loaderContext, localIdentName, exportName, {
-					regExp: localIdentRegExp,
-					hashPrefix: query.hashPrefix || "",
-					context: context
-				});
-			}
-		}),
-		parserPlugin(parserOptions)
-	]);
-
-	if(minimize) {
-		var minimizeOptions = assign({}, query);
-		["zindex", "normalizeUrl", "discardUnused", "mergeIdents", "reduceIdents"].forEach(function(name) {
-			if(typeof minimizeOptions[name] === "undefined")
-				minimizeOptions[name] = false;
-		});
-		pipeline.use(cssnano(minimizeOptions));
-	}
-
-	pipeline.process(inputSource, {
-		// we need a prefix to avoid path rewriting of PostCSS
-		from: "/css-loader!" + options.from,
-		to: options.to,
-		map: {
-			prev: inputMap,
-			sourcesContent: true,
-			inline: false,
-			annotation: false
-		}
-	}).then(function(result) {
-		callback(null, {
-			source: result.css,
-			map: result.map && result.map.toJSON(),
-			exports: parserOptions.exports,
-			importItems: parserOptions.importItems,
-			importItemRegExpG: /___CSS_LOADER_IMPORT___([0-9]+)___/g,
-			importItemRegExp: /___CSS_LOADER_IMPORT___([0-9]+)___/,
-			urlItems: parserOptions.urlItems,
-			urlItemRegExpG: /___CSS_LOADER_URL___([0-9]+)___/g,
-			urlItemRegExp: /___CSS_LOADER_URL___([0-9]+)___/
-		});
-	}).catch(function(err) {
-		if (err.name === 'CssSyntaxError') {
-			var wrappedError = new CSSLoaderError(
-				'Syntax Error',
-				err.reason,
-				err.line != null && err.column != null
-					? {line: err.line, column: err.column}
-					: null,
-				err.input.source
-			);
-			callback(wrappedError);
-		} else {
-			callback(err);
-		}
-	});
-};
-
-function formatMessage(message, loc, source) {
-	var formatted = message;
-	if (loc) {
-		formatted = formatted
-			+ ' (' + loc.line + ':' + loc.column + ')';
-	}
-	if (loc && source) {
-		formatted = formatted
-			+ '\n\n' + formatCodeFrame(source, loc.line, loc.column) + '\n';
-	}
-	return formatted;
-}
-
-function CSSLoaderError(name, message, loc, source, error) {
-	Error.call(this);
-	Error.captureStackTrace(this, CSSLoaderError);
-	this.name = name;
-	this.error = error;
-	this.message = formatMessage(message, loc, source);
-	this.hideStack = true;
-}
-
-CSSLoaderError.prototype = Object.create(Error.prototype);
-CSSLoaderError.prototype.constructor = CSSLoaderError;
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+var formatCodeFrame = require("babel-code-frame");
+var Tokenizer = require("css-selector-tokenizer");
+var postcss = require("postcss");
+var loaderUtils = require("loader-utils");
+var assign = require("object-assign");
+var getLocalIdent = require("./getLocalIdent");
+
+var localByDefault = require("postcss-modules-local-by-default");
+var extractImports = require("postcss-modules-extract-imports");
+var modulesScope = require("postcss-modules-scope");
+var modulesValues = require("postcss-modules-values");
+var cssnano = require("cssnano");
+
+var parserPlugin = postcss.plugin("css-loader-parser", function(options) {
+	return function(css) {
+		var imports = {};
+		var exports = {};
+		var importItems = [];
+		var urlItems = [];
+
+		function replaceImportsInString(str) {
+			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;
+		}
+
+		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();
+			});
+		}
+
+		css.walkRules(function(rule) {
+			if(rule.selector === ":export") {
+				rule.walkDecls(function(decl) {
+					exports[decl.prop] = decl.value;
+				});
+				rule.remove();
+			} else if(/^:import\(.+\)$/.test(rule.selector)) {
+				var match = /^:import\((.+)\)$/.exec(rule.selector);
+				var url = loaderUtils.parseString(match[1]);
+				rule.walkDecls(function(decl) {
+					imports["$" + decl.prop] = importItems.length;
+					importItems.push({
+						url: url,
+						export: decl.value
+					});
+				});
+				rule.remove();
+			}
+		});
+
+		Object.keys(exports).forEach(function(exportName) {
+			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(processNode);
+			});
+			decl.value = Tokenizer.stringifyValues(values);
+		});
+		css.walkAtRules(function(atrule) {
+			if(typeof atrule.params === "string") {
+				atrule.params = replaceImportsInString(atrule.params);
+			}
+		});
+
+		options.importItems = importItems;
+		options.urlItems = urlItems;
+		options.exports = exports;
+	};
+});
+
+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;
+	var minimize = typeof forceMinimize !== "undefined" ? !!forceMinimize : options.minimize;
+
+	var customGetLocalIdent = query.getLocalIdent || getLocalIdent;
+	
+	var parserOptions = {
+		root: root,
+		mode: options.mode,
+		url: query.url !== false,
+		import: query.import !== false
+	};
+
+	var pipeline = postcss([
+		localByDefault({
+			mode: options.mode,
+			rewriteUrl: function(global, url) {
+				if(parserOptions.url){
+					if(!loaderUtils.isUrlRequest(url, root)) {
+						return url;
+					}
+					if(global) {
+						return loaderUtils.urlToRequest(url, root);
+					}
+				}
+				return url;
+			}
+		}),
+		extractImports(),
+		modulesValues,
+		modulesScope({
+			generateScopedName: function generateScopedName (exportName) {
+				return customGetLocalIdent(options.loaderContext, localIdentName, exportName, {
+					regExp: localIdentRegExp,
+					hashPrefix: query.hashPrefix || "",
+					context: context
+				});
+			}
+		}),
+		parserPlugin(parserOptions)
+	]);
+
+	if(minimize) {
+		var minimizeOptions = assign({}, query);
+		["zindex", "normalizeUrl", "discardUnused", "mergeIdents", "reduceIdents", "autoprefixer"].forEach(function(name) {
+			if(typeof minimizeOptions[name] === "undefined")
+				minimizeOptions[name] = false;
+		});
+		pipeline.use(cssnano(minimizeOptions));
+	}
+
+	pipeline.process(inputSource, {
+		// we need a prefix to avoid path rewriting of PostCSS
+		from: "/css-loader!" + options.from,
+		to: options.to,
+		map: {
+			prev: inputMap,
+			sourcesContent: true,
+			inline: false,
+			annotation: false
+		}
+	}).then(function(result) {
+		callback(null, {
+			source: result.css,
+			map: result.map && result.map.toJSON(),
+			exports: parserOptions.exports,
+			importItems: parserOptions.importItems,
+			importItemRegExpG: /___CSS_LOADER_IMPORT___([0-9]+)___/g,
+			importItemRegExp: /___CSS_LOADER_IMPORT___([0-9]+)___/,
+			urlItems: parserOptions.urlItems,
+			urlItemRegExpG: /___CSS_LOADER_URL___([0-9]+)___/g,
+			urlItemRegExp: /___CSS_LOADER_URL___([0-9]+)___/
+		});
+	}).catch(function(err) {
+		if (err.name === 'CssSyntaxError') {
+			var wrappedError = new CSSLoaderError(
+				'Syntax Error',
+				err.reason,
+				err.line != null && err.column != null
+					? {line: err.line, column: err.column}
+					: null,
+				err.input.source
+			);
+			callback(wrappedError);
+		} else {
+			callback(err);
+		}
+	});
+};
+
+function formatMessage(message, loc, source) {
+	var formatted = message;
+	if (loc) {
+		formatted = formatted
+			+ ' (' + loc.line + ':' + loc.column + ')';
+	}
+	if (loc && source) {
+		formatted = formatted
+			+ '\n\n' + formatCodeFrame(source, loc.line, loc.column) + '\n';
+	}
+	return formatted;
+}
+
+function CSSLoaderError(name, message, loc, source, error) {
+	Error.call(this);
+	Error.captureStackTrace(this, CSSLoaderError);
+	this.name = name;
+	this.error = error;
+	this.message = formatMessage(message, loc, source);
+	this.hideStack = true;
+}
+
+CSSLoaderError.prototype = Object.create(Error.prototype);
+CSSLoaderError.prototype.constructor = CSSLoaderError;

package/locals.js

@@ -1,5 +1,5 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-module.exports = require("./lib/localsLoader");
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+module.exports = require("./lib/localsLoader");

package/package.json

@@ -1,35 +1,43 @@
 {
   "name": "css-loader",
-  "version": "0.25.0",
+  "version": "0.26.4",
   "author": "Tobias Koppers @sokra",
   "description": "css loader module for webpack",
   "engines": {
-    "node": ">=0.12.0"
+    "node": ">=0.12.0 || >=4.3.0 <5.0.0 || >=5.10"
   },
+  "files": [
+    "index.js",
+    "locals.js",
+    "lib"
+  ],
   "dependencies": {
     "babel-code-frame": "^6.11.0",
-    "css-selector-tokenizer": "^0.6.0",
+    "css-selector-tokenizer": "^0.7.0",
     "cssnano": ">=2.6.1 <4",
-    "loader-utils": "~0.2.2",
-    "lodash.camelcase": "^3.0.1",
+    "loader-utils": "^1.0.2",
+    "lodash.camelcase": "^4.3.0",
     "object-assign": "^4.0.1",
     "postcss": "^5.0.6",
     "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"
+    "source-list-map": "^0.1.7"
   },
   "devDependencies": {
-    "codecov.io": "^0.1.2",
-    "coveralls": "^2.11.2",
-    "istanbul": "^0.3.13",
-    "mocha": "^2.2.4",
-    "should": "^7.0.1"
+    "codecov": "^1.0.1",
+    "eslint": "3.14.0",
+    "istanbul": "^0.4.5",
+    "mocha": "^3.2.0",
+    "should": "^11.1.2"
   },
   "scripts": {
     "test": "mocha",
-    "travis": "npm run cover -- --report lcovonly",
+    "test:cover": "npm run cover -- --report lcovonly",
+    "lint": "eslint lib test",
+    "travis:test": "npm run cover",
+    "travis:lint": "npm run lint",
     "cover": "istanbul cover node_modules/mocha/bin/_mocha",
     "publish-patch": "mocha && npm version patch && git push && git push --tags && npm publish"
   },

package/.eslintrc

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

package/.npmignore

@@ -1,3 +0,0 @@
-node_modules
-coverage
-test

package/.travis.yml

@@ -1,12 +0,0 @@
-sudo: false
-language: node_js
-node_js:
-  - "0.12"
-  - "node"
-  - "iojs"
-script: npm run travis
-
-after_success:
-  - cat ./coverage/lcov.info | node_modules/.bin/coveralls --verbose
-  - cat ./coverage/coverage.json | node_modules/codecov.io/bin/codecov.io.js
-  - rm -rf ./coverage