Merge branch 'master' of github.com:jeerbl/webfonts-loader

.editorconfig

@@ -0,0 +1,18 @@
+# http://editorconfig.org
+
+root = true
+
+[*]
+charset = utf-8
+indent_style = space
+indent_size = 2
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.md]
+insert_final_newline = false
+trim_trailing_whitespace = false
+
+[*.sh]
+indent_size = 4

README.md

@@ -100,7 +100,12 @@ You also can use a module like `glob` to pick up a variable set of icons, too. M
 ## Loader parameters
 
 - `embed`, Boolean
-Should the fonts be embedded in the CSS? By default the fonts are written to disk. If `embed` is specified the font is base64 encoded and embedded inside the `@font-face` declaration. Example configuration: `loader: "style!css!webfonts?embed&types=woff"`.
+Should the fonts be embedded in the CSS? By default the fonts are written to disk. If `embed` is specified the font is base64 encoded and embedded inside the `@font-face` declaration.
+
+- `hashLength`, Number
+Optional. The length of hash in fileName, maximum value: 32, minimal value: 8.
+
+Example configuration: `loader: "style!css!webfonts?embed&types=woff&hashLength=8"`.
 
 ## Font configuration (`*.font.js` or `*.font.json`)
 
@@ -130,3 +135,4 @@ There is one special configuration optin that exists in both, the actual font co
 - `[fontname]`: The name of the font. I.e. "Awesomefont".
 - `[ext]`: The extension. I.e.: `.woff`.
 - `[hash]`: The hash of your current compilation.
+- `[chunkhash]`: The hash of your source svg files.

index.js

@@ -4,6 +4,7 @@ var path = require('path');
 var glob = require('glob');
 var isUrl = require('is-url');
 var url = require('url');
+var hashFiles = require('./utils').hashFiles;
 
 var mimeTypes = {
   'eot': 'application/vnd.ms-fontobject',
@@ -168,8 +169,10 @@ module.exports = function (content) {
     for (var i in formats) {
       var format = formats[i];
       if (!embed) {
-        var filename = config.fileName || params.fileName || '[hash]-[fontname].[ext]';
+        var filename = config.fileName || params.fileName || '[chunkhash]-[fontname].[ext]';
+        var chunkHash = filename.indexOf('[chunkhash]') !== -1 ? hashFiles(generatorConfiguration.files, params.hashLength) : '';
         filename = filename
+          .replace('[chunkhash]', chunkHash)
           .replace('[fontname]', generatorConfiguration.fontName)
           .replace('[ext]', format);
         var formatUrl = loaderUtils.interpolateName(this,

package.json

@@ -21,6 +21,7 @@
   "license": "Unlicense",
   "dependencies": {
     "glob": "^7.1.1",
+    "hash-files": "^1.1.1",
     "is-url": "^1.2.2",
     "loader-utils": "^1.0.2",
     "webfonts-generator": "^0.4.0"

test/ava.js

@@ -0,0 +1,26 @@
+var test = require('ava');
+var glob = require('glob').sync;
+var hashFiles = require('../utils').hashFiles;
+
+test('check consistency of files hash without hash length option', function (t) {
+  var files = glob('./test/test-svg/*.svg');
+  var expected = 'da39a3ee5e6b4b0d3255';
+
+  t.is(hashFiles(files), expected);
+});
+
+test('check consistency of files hash with min hash length option', function (t) {
+  var files = glob('./test/test-svg/*.svg');
+  var expected = 'da39a3ee';
+  var minHashLength = 8;
+
+  t.is(hashFiles(files, minHashLength), expected);
+});
+
+test('check consistency of files hash with max hash length option', function (t) {
+  var files = glob('./test/test-svg/*.svg');
+  var expected = 'da39a3ee5e6b4b0d3255bfef95601890';
+  var maxHashLength = 32;
+
+  t.is(hashFiles(files, maxHashLength), expected);
+});

test/octicons.font.js

@@ -1,6 +1,6 @@
 module.exports = {
   'files': [
-    'node_modules/octicons/build/svg/*.svg'
+    './test-svg/*.svg'
   ],
   'fontName': 'octicons',
   'classPrefix': 'octicon-',

test/package.json

@@ -3,12 +3,10 @@
   "private": true,
   "main": "entry.js",
   "scripts": {
-    "test": "rimraf ./dist && webpack"
-  },
-  "dependencies": {
-    "octicons": "^5.0.1"
+    "test": "rimraf ./dist && webpack && ava -v ./ava.js"
   },
   "devDependencies": {
+    "ava": "^0.21.0",
     "css-loader": "^0.28.0",
     "rimraf": "^2.6.1",
     "style-loader": "^0.18.1",