css-loader 0.28.4 → 0.28.5

package/CHANGELOG.md

@@ -2,6 +2,17 @@
 
 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)
 

package/README.md

@@ -27,7 +27,7 @@ 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.js**
 ```js
@@ -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.
 
@@ -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/processCss.js

@@ -42,12 +42,12 @@ 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);
 				if (!url.replace(/\s/g, '').length) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "css-loader",
-  "version": "0.28.4",
+  "version": "0.28.5",
   "author": "Tobias Koppers @sokra",
   "description": "css loader module for webpack",
   "engines": {
@@ -25,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",