iSharkFly-Docs
/
angular-docs-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(compiler): Don't strip CSS source maps 

Fix CSS source mapping for component by keeping `/*# sourceMappingURL= ... */` and  `/*# sourceURL= ... */` comments.

Relates to <https://github.com/angular/angular-cli/issues/4199>.
This commit is contained in:
Zhicheng Wang 2017-08-12 10:14:25 +08:00 committed by Hans
parent 77747e10c0
commit 64b4be9670
2 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
packages/compiler/src/style_url_resolver.ts
View File

@ -29,19 +29,20 @@ export function extractStyleUrls(
resolver: UrlResolver, baseUrl: string, cssText: string): StyleWithImports { resolver: UrlResolver, baseUrl: string, cssText: string): StyleWithImports {
const foundUrls: string[] = []; const foundUrls: string[] = [];
const modifiedCssText = const modifiedCssText = cssText.replace(CSS_STRIPPABLE_COMMENT_REGEXP, '')
cssText.replace(CSS_COMMENT_REGEXP, '').replace(CSS_IMPORT_REGEXP, (...m: string[]) => { .replace(CSS_IMPORT_REGEXP, (...m: string[]) => {
const url = m[1] || m[2]; const url = m[1] || m[2];
if (!isStyleUrlResolvable(url)) { if (!isStyleUrlResolvable(url)) {
// Do not attempt to resolve non-package absolute URLs with URI scheme // Do not attempt to resolve non-package absolute URLs with URI
return m[0]; // scheme
} return m[0];
foundUrls.push(resolver.resolve(baseUrl, url)); }
return ''; foundUrls.push(resolver.resolve(baseUrl, url));
}); return '';
});
return new StyleWithImports(modifiedCssText, foundUrls); return new StyleWithImports(modifiedCssText, foundUrls);
} }
const CSS_IMPORT_REGEXP = /@import\s+(?:url\()?\s*(?:(?:['"]([^'"]*))|([^;\)\s]*))[^;]*;?/g; const CSS_IMPORT_REGEXP = /@import\s+(?:url\()?\s*(?:(?:['"]([^'"]*))|([^;\)\s]*))[^;]*;?/g;
const CSS_COMMENT_REGEXP = /\/\*[\s\S]+?\*\//g; const CSS_STRIPPABLE_COMMENT_REGEXP = /\/\*(?!#\s*(?:sourceURL|sourceMappingURL)=)[\s\S]+?\*\//g;
const URL_WITH_SCHEMA_REGEXP = /^([^:/?#]+):/; const URL_WITH_SCHEMA_REGEXP = /^([^:/?#]+):/;

8
packages/compiler/test/style_url_resolver_spec.ts
View File

@ -51,6 +51,14 @@ export function main() {
expect(styleWithImports.styleUrls).not.toContain('http://ng.io/3.css'); expect(styleWithImports.styleUrls).not.toContain('http://ng.io/3.css');
}); });
it('should keep /*# sourceURL... */ and /*# sourceMappingURL... */ comments', () => {
const css =
`/*regular comment*/\n/*# sourceURL=.... */\n/*# sourceMappingURL=... *//*#sourceMappingURL=... */`;
const styleWithSourceMaps = extractStyleUrls(urlResolver, 'http://ng.io', css);
expect(styleWithSourceMaps.style.trim())
.toEqual('/*# sourceURL=.... */\n/*# sourceMappingURL=... *//*#sourceMappingURL=... */');
});
it('should extract "@import url()" urls', () => { it('should extract "@import url()" urls', () => {
const css = ` const css = `
@import url('3.css'); @import url('3.css');