css-loader 0.26.2 → 0.26.4

package/README.md

@@ -23,6 +23,8 @@ npm install --save-dev css-loader
 
 <h2 align="center">Usage</h2>
 
+The `css-loader` interprets `@import` and `url()` like `requires`.
+
 Use the loader either via your webpack config, CLI or inline.
 
 ### Via webpack config (recommended)
@@ -88,7 +90,7 @@ To be compatible with existing css files (if not in CSS Module mode):
 |**`camelCase`**|`false`|Export Classnames in CamelCase|
 |**`importLoaders`**|`0`|Number of loaders applied before CSS loader|
 
-This webpack config can load CSS files, embed small png images as Data URLs and JPG images as files.
+The following webpack config can load CSS files, embed small PNG/JPG/GIF/SVG images as well as fonts as [Data URLs](https://tools.ietf.org/html/rfc2397) and copy larger files to the output directory.
 
 **webpack.config.js**
 ```js
@@ -100,12 +102,11 @@ module.exports = {
         use: [ 'style-loader', 'css-loader' ]
       },
       {
-        test: /\.png$/,
-        use: { loader: 'url-loader', options: { limit: 100000 } },
-      },
-      {
-        test: /\.jpg$/,
-        use: [ 'file-loader' ]
+        test: /\.(png|jpg|gif|svg|eot|ttf|woff|woff2)$/,
+        loader: 'url-loader',
+        options: {
+          limit: 10000
+        }
       }
     ]
   }

package/lib/compile-exports.js

@@ -14,14 +14,23 @@ module.exports = function compileExports(result, importItemMatcher, camelCaseKey
   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);
+    function addEntry(k) {
+      res.push("\t" + JSON.stringify(k) + ": " + valueAsString);
+    }
+    addEntry(key);
 
+    var targetKey;
     if (camelCaseKeys === true) {
-      res.push("\t" + JSON.stringify(camelCase(key)) + ": " + valueAsString);
+      targetKey = camelCase(key);
+      if (targetKey !== key) {
+        addEntry(targetKey);
+      }
     } else if (camelCaseKeys === 'dashes') {
-      res.push("\t" + JSON.stringify(dashesCamelCase(key)) + ": " + valueAsString);
+      targetKey = dashesCamelCase(key);
+      if (targetKey !== key) {
+        addEntry(targetKey);
+      }
     }
-
     return res;
   }, []).join(",\n");
 

package/lib/loader.js

@@ -2,7 +2,6 @@
 	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");
@@ -97,13 +96,9 @@ module.exports = function(content, map) {
 			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;
+					return source.split("!").pop();
 				}, this);
-				map.sourceRoot = "webpack://";
+				map.sourceRoot = "";
 			}
 			map.file = map.file.split("!").pop();
 			map = JSON.stringify(map);

package/package.json

@@ -1,12 +1,16 @@
 {
   "name": "css-loader",
-  "version": "0.26.2",
+  "version": "0.26.4",
   "author": "Tobias Koppers @sokra",
   "description": "css loader module for webpack",
   "engines": {
     "node": ">=0.12.0 || >=4.3.0 <5.0.0 || >=5.10"
   },
-  "files": ["index.js", "locals.js", "lib"],
+  "files": [
+    "index.js",
+    "locals.js",
+    "lib"
+  ],
   "dependencies": {
     "babel-code-frame": "^6.11.0",
     "css-selector-tokenizer": "^0.7.0",