Skip to content

Commit

Permalink
fix: fixed a hash type extracting in interpolateName (#137)
Browse files Browse the repository at this point in the history
  • Loading branch information
webschik authored and evilebottnawi committed Dec 27, 2018
1 parent 489ef12 commit f8a71f4
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 1 deletion.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
.idea
node_modules
coverage
2 changes: 1 addition & 1 deletion lib/interpolateName.js
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ function interpolateName(loaderContext, name, options) {
// `hash` and `contenthash` are same in `loader-utils` context
// let's keep `hash` for backward compatibility
.replace(
/\[(?:([^:]+):)?(?:hash||contenthash)(?::([a-z]+\d*))?(?::(\d+))?\]/gi,
/\[(?:([^:\]]+):)?(?:hash||contenthash)(?::([a-z]+\d*))?(?::(\d+))?\]/gi,
(all, hashType, digestType, maxLength) =>
getHashDigest(content, hashType, digestType, parseInt(maxLength, 10))
)
Expand Down
6 changes: 6 additions & 0 deletions test/interpolateName.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,12 @@ describe('interpolateName()', () => {
'test content',
'js/filenameWithoutExt.bin',
],
[
'/lib/components/modal/modal.css',
'[name]__modalTitle___[sha1:hash:hex:4]',
'test content',
'modal__modalTitle___1eeb',
],
].forEach((test) => {
it('should interpolate ' + test[0] + ' ' + test[1], () => {
const interpolatedName = loaderUtils.interpolateName(
Expand Down

0 comments on commit f8a71f4

Please sign in to comment.