diff --git a/packages/compiler/src/style_url_resolver.ts b/packages/compiler/src/style_url_resolver.ts index 1f2bbb5dd6..1a45ff0ddc 100644 --- a/packages/compiler/src/style_url_resolver.ts +++ b/packages/compiler/src/style_url_resolver.ts @@ -43,5 +43,5 @@ export function extractStyleUrls( } const CSS_IMPORT_REGEXP = /@import\s+(?:url\()?\s*(?:(?:['"]([^'"]*))|([^;\)\s]*))[^;]*;?/g; -const CSS_COMMENT_REGEXP = /\/\*.+?\*\//g; +const CSS_COMMENT_REGEXP = /\/\*[\s\S]+?\*\//g; const URL_WITH_SCHEMA_REGEXP = /^([^:/?#]+):/; diff --git a/packages/compiler/test/style_url_resolver_spec.ts b/packages/compiler/test/style_url_resolver_spec.ts index 5b7b548f1e..3b135e9925 100644 --- a/packages/compiler/test/style_url_resolver_spec.ts +++ b/packages/compiler/test/style_url_resolver_spec.ts @@ -40,11 +40,15 @@ export function main() { const css = ` @import '1.css'; /*@import '2.css';*/ + /* + @import '3.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'); + expect(styleWithImports.styleUrls).not.toContain('http://ng.io/3.css'); }); it('should extract "@import url()" urls', () => {