css-loader 0.28.1 → 0.28.5

package/CHANGELOG.md

@@ -2,6 +2,47 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+<a name="0.28.5"></a>
+## [0.28.5](https://github.com/webpack/css-loader/compare/v0.28.4...v0.28.5) (2017-08-17)
+
+
+### Bug Fixes
+
+* match mutliple dashes (`options.camelCase`) ([#556](https://github.com/webpack/css-loader/issues/556)) ([1fee601](https://github.com/webpack/css-loader/commit/1fee601))
+* stricter `[@import](https://github.com/import)` tolerance ([#593](https://github.com/webpack/css-loader/issues/593)) ([2e4ec09](https://github.com/webpack/css-loader/commit/2e4ec09))
+
+
+
+<a name="0.28.4"></a>
+## [0.28.4](https://github.com/webpack/css-loader/compare/v0.28.3...v0.28.4) (2017-05-30)
+
+
+### Bug Fixes
+
+* preserve leading underscore in class names ([#543](https://github.com/webpack/css-loader/issues/543)) ([f6673c8](https://github.com/webpack/css-loader/commit/f6673c8))
+
+
+
+<a name="0.28.3"></a>
+## [0.28.3](https://github.com/webpack/css-loader/compare/v0.28.2...v0.28.3) (2017-05-25)
+
+
+### Bug Fixes
+
+* correct plugin order for CSS Modules ([#534](https://github.com/webpack/css-loader/issues/534)) ([b90f492](https://github.com/webpack/css-loader/commit/b90f492))
+
+
+
+<a name="0.28.2"></a>
+## [0.28.2](https://github.com/webpack/css-loader/compare/v0.28.1...v0.28.2) (2017-05-22)
+
+
+### Bug Fixes
+
+* source maps path on `windows` ([#532](https://github.com/webpack/css-loader/issues/532)) ([c3d0d91](https://github.com/webpack/css-loader/commit/c3d0d91))
+
+
+
 <a name="0.28.1"></a>
 ## [0.28.1](https://github.com/webpack/css-loader/compare/v0.28.0...v0.28.1) (2017-05-02)
 

package/README.md

@@ -27,9 +27,9 @@ The `css-loader` interprets `@import` and `url()` like `import/require()`
 and will resolve them.
 
 Good loaders for requiring your assets are the [file-loader](https://github.com/webpack/file-loader)
-and the [url-loader](https://github.com/webpack/url-loader) which you should specify in your config (see [below](https://github.com/michael-ciniawsky/css-loader#assets)).
+and the [url-loader](https://github.com/webpack/url-loader) which you should specify in your config (see [below](https://github.com/webpack-contrib/css-loader#assets)).
 
-**file.css**
+**file.js**
 ```js
 import css from 'file.css';
 ```
@@ -103,6 +103,7 @@ It's useful when you, for instance, need to post process the CSS as a string.
 |**`sourceMap`**|`{Boolean}`|`false`|Enable/Disable Sourcemaps|
 |**`camelCase`**|`{Boolean\|String}`|`false`|Export Classnames in CamelCase|
 |**`importLoaders`**|`{Number}`|`0`|Number of loaders applied before CSS loader|
+|**`localIdentName`**|`{String}`|`[hash:base64]`|Configure the generated ident|
 
 ### `root`
 
@@ -342,7 +343,7 @@ To import from multiple modules use multiple `composes:` rules.
 
 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 your own options to the minifier if needed. cssnano is used for minification and you find a [list of options here](http://cssnano.co/options/).
+In some cases the minification is destructive to the css, so you can provide your own options to the cssnano-based minifier if needed. See [cssnano's documentation](http://cssnano.co/guides/) for more information on the available options.
 
 You can also disable or enforce minification with the `minimize` query parameter.
 
@@ -473,7 +474,7 @@ module.exports = {
         test: /\.css$/,
         use: env === 'production'
           ? ExtractTextPlugin.extract({
-              fallback: 'style-loader'
+              fallback: 'style-loader',
               use: [ 'css-loader' ]
           })
           : [ 'style-loader', 'css-loader' ]
@@ -487,7 +488,6 @@ module.exports = {
         })
       ]
     : []
-  ]
 }
 ```
 

package/lib/compile-exports.js

@@ -1,7 +1,7 @@
 var camelCase = require("lodash.camelcase");
 
 function dashesCamelCase(str) {
-  return str.replace(/-(\w)/g, function(match, firstLetter) {
+  return str.replace(/-+(\w)/g, function(match, firstLetter) {
     return firstLetter.toUpperCase();
   });
 }

package/lib/loader.js

@@ -20,8 +20,17 @@ module.exports = function(content, map) {
 	var resolve = createResolver(query.alias);
 
 	if(sourceMap) {
-		if (map && typeof map !== "string") {
-			map = JSON.stringify(map);
+		if (map) {
+			if (typeof map === "string") {
+				map = JSON.stringify(map);
+			}
+
+			if (map.sources) {
+				map.sources = map.sources.map(function (source) {
+					return source.replace(/\\/g, '/');
+				});
+				map.sourceRoot = '';
+			}
 		}
 	} else {
 		// Some loaders (example `"postcss-loader": "1.x.x"`) always generates source map, we should remove it
@@ -30,8 +39,8 @@ module.exports = function(content, map) {
 
 	processCss(content, map, {
 		mode: moduleMode ? "local" : "global",
-		from: loaderUtils.getRemainingRequest(this),
-		to: loaderUtils.getCurrentRequest(this),
+		from: loaderUtils.getRemainingRequest(this).split("!").pop(),
+		to: loaderUtils.getCurrentRequest(this).split("!").pop(),
 		query: query,
 		minimize: this.minimize,
 		loaderContext: this,
@@ -105,11 +114,11 @@ module.exports = function(content, map) {
 			map = result.map;
 			if(map.sources) {
 				map.sources = map.sources.map(function(source) {
-					return source.split("!").pop();
+					return source.split("!").pop().replace(/\\/g, '/');
 				}, this);
 				map.sourceRoot = "";
 			}
-			map.file = map.file.split("!").pop();
+			map.file = map.file.split("!").pop().replace(/\\/g, '/');
 			map = JSON.stringify(map);
 			moduleJs = "exports.push([module.id, " + cssAsString + ", \"\", " + map + "]);";
 		} else {

package/lib/processCss.js

@@ -9,6 +9,7 @@ var loaderUtils = require("loader-utils");
 var assign = require("object-assign");
 var getLocalIdent = require("./getLocalIdent");
 
+var icssUtils = require('icss-utils');
 var localByDefault = require("postcss-modules-local-by-default");
 var extractImports = require("postcss-modules-extract-imports");
 var modulesScope = require("postcss-modules-scope");
@@ -41,14 +42,14 @@ var parserPlugin = postcss.plugin("css-loader-parser", function(options) {
 		}
 
 		if(options.import) {
-			css.walkAtRules(/import/i, function(rule) {
+			css.walkAtRules(/^import$/i, function(rule) {
 				var values = Tokenizer.parseValues(rule.params);
 				var url = values.nodes[0].nodes[0];
-				if(url.type === "url") {
+				if(url && url.type === "url") {
 					url = url.url;
-				} else if(url.type === "string") {
+				} else if(url && url.type === "string") {
 					url = url.value;
-				} else throw rule.error("Unexpected format" + rule.params);
+				} else throw rule.error("Unexpected format " + rule.params);
 				if (!url.replace(/\s/g, '').length) {
 					return;
 				}
@@ -65,24 +66,17 @@ var parserPlugin = postcss.plugin("css-loader-parser", function(options) {
 			});
 		}
 
-		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
-					});
+		var icss = icssUtils.extractICSS(css);
+		exports = icss.icssExports;
+		Object.keys(icss.icssImports).forEach(function(key) {
+			var url = loaderUtils.parseString(key);
+			Object.keys(icss.icssImports[key]).forEach(function(prop) {
+				imports["$" + prop] = importItems.length;
+				importItems.push({
+					url: url,
+					export: icss.icssImports[key][prop]
 				});
-				rule.remove();
-			}
+			})
 		});
 
 		Object.keys(exports).forEach(function(exportName) {
@@ -159,6 +153,7 @@ module.exports = function processCss(inputSource, inputMap, options, callback) {
 	};
 
 	var pipeline = postcss([
+		modulesValues,
 		localByDefault({
 			mode: options.mode,
 			rewriteUrl: function(global, url) {
@@ -176,7 +171,6 @@ module.exports = function processCss(inputSource, inputMap, options, callback) {
 			}
 		}),
 		extractImports(),
-		modulesValues,
 		modulesScope({
 			generateScopedName: function generateScopedName (exportName) {
 				return customGetLocalIdent(options.loaderContext, localIdentName, exportName, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "css-loader",
-  "version": "0.28.1",
+  "version": "0.28.5",
   "author": "Tobias Koppers @sokra",
   "description": "css loader module for webpack",
   "engines": {
@@ -15,6 +15,7 @@
     "babel-code-frame": "^6.11.0",
     "css-selector-tokenizer": "^0.7.0",
     "cssnano": ">=2.6.1 <4",
+    "icss-utils": "^2.1.0",
     "loader-utils": "^1.0.2",
     "lodash.camelcase": "^4.3.0",
     "object-assign": "^4.0.1",
@@ -24,7 +25,7 @@
     "postcss-modules-scope": "^1.0.0",
     "postcss-modules-values": "^1.1.0",
     "postcss-value-parser": "^3.3.0",
-    "source-list-map": "^0.1.7"
+    "source-list-map": "^2.0.0"
   },
   "devDependencies": {
     "codecov": "^1.0.1",