Skip to content

Commit

Permalink
fix(@angular-devkit/build-angular): correctly handle parenthesis in url
Browse files Browse the repository at this point in the history
PR #23691 introduced a regression that caused paranthesis in url not to be handled correctly.

This change correct this behaviour and adds a test case to valid this.

Closes #23773

(cherry picked from commit 147f8c3)
  • Loading branch information
alan-agius4 authored and dgp1130 committed Aug 22, 2022
1 parent 1c06181 commit c4402b1
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 3 deletions.
Expand Up @@ -706,4 +706,20 @@ describe('Browser Builder styles', () => {
const result = await browserBuild(architect, host, target, { styles: ['src/styles.css'] });
expect(await result.files['styles.css']).toContain(svgData);
});

it('works when Data URI has parenthesis', async () => {
const svgData =
'"data:image/svg+xml;charset=utf-8,<svg>' +
`<mask id='clip'><g><circle mask='url(%23clip)' cx='11.5' cy='11.5' r='9.25'/><use xlink:href='#text' mask='url(#clip)'/></g>` +
'</svg>"';

host.writeMultipleFiles({
'src/styles.css': `
div { background: url(${svgData}) }
`,
});

const result = await browserBuild(architect, host, target, { styles: ['src/styles.css'] });
expect(await result.files['styles.css']).toContain(svgData);
});
});
Expand Up @@ -155,7 +155,7 @@ export default function (options?: PostcssCliResourcesOptions): Plugin {
}

const value = decl.value;
const urlRegex = /url(?:\(\s*['"]?)(.*?)(?:['"]?\s*\))/g;
const urlRegex = /url(?:\(\s*(['"]?))(.*?)(?:\1\s*\))/g;
const segments: string[] = [];

let match;
Expand All @@ -166,9 +166,8 @@ export default function (options?: PostcssCliResourcesOptions): Plugin {
const inputFile = decl.source && decl.source.input.file;
const context = (inputFile && path.dirname(inputFile)) || loader.context;

// eslint-disable-next-line no-cond-assign
while ((match = urlRegex.exec(value))) {
const originalUrl = match[1];
const originalUrl = match[2];
let processedUrl;
try {
processedUrl = await process(originalUrl, context, resourceCache);
Expand Down

0 comments on commit c4402b1

Please sign in to comment.