fix: fixed a hash type extracting in interpolateName (#137)

webpack · Dec 27, 2018 · f8a71f4 · f8a71f4
1 parent 489ef12
commit f8a71f4
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
+.idea
 node_modules
 coverage
diff --git a/lib/interpolateName.js b/lib/interpolateName.js
@@ -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))
       )

diff --git a/test/interpolateName.test.js b/test/interpolateName.test.js
@@ -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(