Commit3528fd9

authored

fix(interpolateName): don't interpolatedhashType withouthash orcontenthash (#140)

1 parent809b690 commit3528fd9Copy full SHA for 3528fd9

File tree

-1

lines changed

-1

lines changed

Lines changed: 1 addition & 1 deletion

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`	`)`

Lines changed: 7 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -124,6 +124,13 @@ describe('interpolateName()', () => {`
`124`	`124`	`'test content',`
`125`	`125`	`'modal.1n8osQznuT8jOAwdzg_n.css',`
`126`	`126`	`],`
	`127`	+// Should not interpret without `hash` or `contenthash`
	`128`	`+[`
	`129`	`+'/lib/components/modal/modal.css',`
	`130`	`+'[name].[md5::base64:20].[ext]',`
	`131`	`+'test content',`
	`132`	`+'modal.[md5::base64:20].css',`
	`133`	`+],`
`127`	`134`	`].forEach((test)=>{`
`128`	`135`	`it('should interpolate '+test[0]+' '+test[1],()=>{`
`129`	`136`	`constinterpolatedName=loaderUtils.interpolateName(`

Comments

(0)