fix(loader): interpolate sprite filename properly

ISSUES CLOSED: #174

README.md

@@ -89,8 +89,8 @@ yarn add svg-sprite-loader -D
 
 ### `symbolId` (default `[name]`)
 
-How `<symbol>` `id` attribute should be named.
-Complete list of supported patterns: [loader-utils#interpolatename docs](https://github.com/webpack/loader-utils#interpolatename).
+How `<symbol>` `id` attribute should be named. All patterns from [loader-utils#interpolateName](https://github.com/webpack/loader-utils#interpolatename) 
+are supported.
 
 ### `symbolRegExp` (default `''`)
 Passed to the symbolId interpolator to support the [N] pattern in the loader-utils name interpolator
@@ -221,8 +221,8 @@ module: {
 }
 ```
 
-It is also possible to generate sprite for each chunk by using `[chunkname]` pattern in spriteFilename option. 
-This is experimental feature, so use with caution!
+All patterns from [loader-utils#interpolateName](https://github.com/webpack/loader-utils#interpolatename) are supported.
+It is also possible to generate sprite for each chunk by using `[chunkname]` pattern in spriteFilename option. This is experimental feature, use it with caution!
 
 ## Examples
 

lib/utils/index.js

@@ -8,7 +8,6 @@ module.exports.getMatchedRule = require('./get-matched-rule');
 module.exports.getMatchedRules = require('./get-matched-rules');
 module.exports.getModuleChunk = require('./get-module-chunk');
 module.exports.getWebpackVersion = require('./get-webpack-version');
-module.exports.hashTokens = require('./hash-tokens');
 module.exports.isModuleShouldBeExtracted = require('./is-module-should-be-extracted');
 module.exports.interpolate = require('./interpolate');
 module.exports.isWebpack1 = require('./is-webpack-1');

lib/utils/mapped-list.js

@@ -108,7 +108,7 @@ class MappedList {
     const filenames = Object.keys(itemsBySpriteFilename);
 
     filenames.forEach((filename) => {
-      if (!filename.includes('[hash')) {
+      if (!filename.includes('hash')) {
         return;
       }
 

test/loader.test.js

@@ -361,12 +361,12 @@ describe('loader and plugin', () => {
       const { assets } = await compile({
         entry: './entry',
         module: rules(
-          svgRule({ extract: true, spriteFilename: 'sprite-[hash:8].svg' })
+          svgRule({ extract: true, spriteFilename: '[sha1:hash:base36:10].svg' })
         ),
         plugins: [new SpritePlugin()]
       });
 
-      assets.should.have.property('sprite-55f2b4ab.svg');
+      assets.should.have.property('lvn29bpor3.svg');
     });
 
     // Fails when webpack buildin runtime will change

test/utils.test.js

@@ -108,11 +108,4 @@ describe('utils', () => {
       getLoadersRules(compilerMock).should.be.deep.equal(rules);
     });
   });
-
-  describe('hashTokens', () => {
-    it('should work', () => {
-      const result = hashTokens('content-[customhash:6]', { customhash: '123' });
-      result.should.be.equals('content-202cb9');
-    });
-  });
 });