css-loader 0.26.0 → 0.26.1

package/.eslintrc

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

package/.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,15 @@
+<!-- Before creating an issue please make sure you are using the latest version of css-loader. -->
+
+**Do you want to request a *feature* or report a *bug*?**
+<!-- Please ask questions on StackOverflow or the webpack Gitter (https://gitter.im/webpack/webpack). Questions will be closed. -->
+
+**What is the current behavior?**
+
+**If the current behavior is a bug, please provide the steps to reproduce.**
+<!-- A great way to do this is to provide your configuration via a GitHub gist. -->
+
+**What is the expected behavior?**
+
+**If this is a feature request, what is motivation or use case for changing the behavior?**
+
+**Please mention other relevant information such as your webpack version, Node.js version and Operating System.**

package/.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,18 @@
+<!-- Thanks for submitting a pull request! Please provide enough information so that others can review your pull request. -->
+
+**What kind of change does this PR introduce?**
+<!-- E.g. a bugfix, feature, refactoring, build related change, etc… -->
+
+**Did you add tests for your changes?**
+
+**If relevant, did you update the README?**
+
+**Summary**
+
+<!-- Explain the **motivation** for making this change. What existing problem does the pull request solve? -->
+<!-- Try to link to an open issue for more information. -->
+
+**Does this PR introduce a breaking change?**
+<!-- If this PR introduces a breaking change, please describe the impact and a migration path for existing applications. -->
+
+**Other information**

package/.travis.yml

@@ -1,12 +1,12 @@
-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
+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

package/README.md

@@ -108,6 +108,27 @@ You can use `:local(#someId)`, but this is not recommended. Use classes instead
 
 You can configure the generated ident with the `localIdentName` query parameter (default `[hash:base64]`). Example: `css-loader?localIdentName=[path][name]---[local]---[hash:base64:5]` for easier debugging.
 
+You can also specify the absolute path to your custom `getLocalIdent` function to generate classname based on a different schema. Note that this requires `webpack@2` since to be able to pass function in. For example:
+
+```js
+{
+    test: /\.css$/,
+    loaders: [
+        {
+            loader: 'css-loader',
+            query: {
+                modules: true,
+                importLoaders: 1,
+                getLocalIdent: function (loaderContext, localIdentName, localName, options) {
+                  return 'whatever_random_class_name'
+                }
+            }
+        }
+    ]
+},
+```
+
+
 Note: For prerendering with extract-text-webpack-plugin you should use `css-loader/locals` instead of `style-loader!css-loader` **in the prerendering bundle**. It doesn't embed CSS but only exports the identifier mappings.
 
 ### CSS Modules
@@ -204,9 +225,9 @@ The query parameter `importLoaders` allow to configure which loaders should be a
 Examples:
 
 ``` js
-require("style-loader!css-loader?importLoaders=1!autoprefixer-loader!...")
+require("style-loader!css-loader?importLoaders=1!postcss-loader!...")
 // => imported resources are handled this way:
-require("css-loader?importLoaders=1!autoprefixer-loader!...")
+require("css-loader?importLoaders=1!postcss-loader!...")
 
 require("style-loader!css-loader!stylus-loader!...")
 // => imported resources are handled this way:
@@ -219,7 +240,7 @@ This may change in the future, when the module system (i. e. webpack) supports l
 
 By default the css-loader minimizes the css if specified by the module system.
 
-In some cases the minification is destructive to the css, so you can provide some options to it. cssnano is used for minification and you find a [list of options here](http://cssnano.co/options/). Just provide them as query parameter: i. e. `require("css-loader?-autoprefixer")` to disable removing of deprecated vendor prefixes.
+In some cases the minification is destructive to the css, so you can provide some options to it. cssnano is used for minification and you find a [list of options here](http://cssnano.co/options/). Just provide them as query parameter: i. e. `require("css-loader?-colormin")` to disable making color values as small as possible.
 
 You can also disable or enforce minification with the `minimize` query parameter.
 

package/index.js

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

package/lib/compile-exports.js

@@ -1,29 +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}";
-};
+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/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,124 @@
-/*
-	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 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));
+};

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.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));
+};

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", "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;
+/*
+	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,6 +1,6 @@
 {
   "name": "css-loader",
-  "version": "0.26.0",
+  "version": "0.26.1",
   "author": "Tobias Koppers @sokra",
   "description": "css loader module for webpack",
   "engines": {