fix(interpolateName): don't interpolated hashType without hash or contenthash (#140)

evilebottnawi · web-flow · commit 3528fd961c6b · 2018-12-27T15:21:34.000+03:00
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
@@ -124,6 +124,13 @@ describe('interpolateName()', () => {
       'test content',
       'modal.1n8osQznuT8jOAwdzg_n.css',
     ],
+    // Should not interpret without `hash` or `contenthash`
+    [
+      '/lib/components/modal/modal.css',
+      '[name].[md5::base64:20].[ext]',
+      'test content',
+      'modal.[md5::base64:20].css',
+    ],
   ].forEach((test) => {
     it('should interpolate ' + test[0] + ' ' + test[1], () => {
       const interpolatedName = loaderUtils.interpolateName(

Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ function interpolateName(loaderContext, name, options) {`
`91`	`91`	// `hash` and `contenthash` are same in `loader-utils` context
`92`	`92`	// let's keep `hash` for backward compatibility
`93`	`93`	`.replace(`
`94`		`- /\[(?:([^:\]]+):)?(?:hash\|\|contenthash)(?::([a-z]+\d*))?(?::(\d+))?\]/gi,`
	`94`	`+ /\[(?:([^:\]]+):)?(?:hash\|contenthash)(?::([a-z]+\d*))?(?::(\d+))?\]/gi,`
`95`	`95`	`(all, hashType, digestType, maxLength) =>`
`96`	`96`	`getHashDigest(content, hashType, digestType, parseInt(maxLength, 10))`
`97`	`97`	`)`