Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fixed a hash type extracting in interpolateName #137

Merged
merged 1 commit into from Dec 27, 2018
Merged

fixed a hash type extracting in interpolateName #137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
@@ -1,2 +1,3 @@
.idea
node_modules
coverage
2 changes: 1 addition & 1 deletion lib/interpolateName.js
View file
Open in desktop
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
View file
Open in desktop
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