cargdev/angular
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(compiler): ignore @import in comments (#13368)

Browse Source 
* refactor(compiler): clean up style url resolver
* fix(compiler): ignore @import in css comments

Closes #12196
This commit is contained in:
Dzmitry Shylovich
2016-12-21 04:51:02 +03:00
committed by Chuck Jazdzewski
parent bcd37f52fb
commit c0f750af4e
2 changed files with 27 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
modules/@angular/compiler/test/style_url_resolver_spec.ts
View File

@ -36,6 +36,17 @@ export function main() {
expect(styleWithImports.styleUrls).toEqual(['http://ng.io/1.css', 'http://ng.io/2.css']);
});
it('should ignore "@import" in comments', () => {
const css = `
@import '1.css';
/*@import '2.css';*/
`;
const styleWithImports = extractStyleUrls(urlResolver, 'http://ng.io', css);
expect(styleWithImports.style.trim()).toEqual('');
expect(styleWithImports.styleUrls).toContain('http://ng.io/1.css');
expect(styleWithImports.styleUrls).not.toContain('http://ng.io/2.css');
});
it('should extract "@import url()" urls', () => {
const css = `
@import url('3.css');