Commitf1304b3

authored and

committed

fix(@angular/cli): prevent greedy CSS url function capture

1 parent3ba6cd8 commitf1304b3Copy full SHA for f1304b3

File tree

+23

-1

lines changed

+23

-1

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,7 @@ export default postcss.plugin('postcss-cli-resources', (options: PostcssCliResou`
`121`	`121`
`122`	`122`	`returnPromise.all(urlDeclarations.map(asyncdecl=>{`
`123`	`123`	`constvalue=decl.value;`
`124`		`-consturlRegex=/url\(\s(?:"([^"]+)"\|'([^']+)'\|(.+))\s\)/g;`
	`124`	`+consturlRegex=/url\(\s(?:"([^"]+)"\|'([^']+)'\|(.+?))\s\)/g;`
`125`	`125`	`constsegments:string[]=[];`
`126`	`126`
`127`	`127`	`letmatch;`

Lines changed: 22 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,22 @@`
	`1`	`+import{silentNpm,ng}from'../../utils/process';`
	`2`	`+import{updateJsonFile}from'../../utils/project';`
	`3`	`+import{expectFileToMatch}from'../../utils/fs';`
	`4`	`+`
	`5`	`+`
	`6`	`+exportdefaultfunction(){`
	`7`	`+returnPromise.resolve()`
	`8`	`+.then(()=>silentNpm('install','material-design-icons@3.0.1'))`
	`9`	`+.then(()=>updateJsonFile('.angular-cli.json',configJson=>{`
	`10`	`+constapp=configJson['apps'][0];`
	`11`	`+app['styles'].push('../node_modules/material-design-icons/iconfont/material-icons.css');`
	`12`	`+}))`
	`13`	`+.then(()=>ng('build','--extract-css'))`
	`14`	`+.then(()=>expectFileToMatch('dist/styles.bundle.css','Material Icons'))`
	`15`	`+.then(()=>ng(`
	`16`	`+'build',`
	`17`	`+'--prod',`
	`18`	`+'--extract-css',`
	`19`	`+'--output-hashing=none'`
	`20`	`+))`
	`21`	`+.then(()=>expectFileToMatch('dist/styles.bundle.css','Material Icons'));`
	`22`	`+}`

Comments

(0)