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

fix(ivy): check the presence of .css resource for styleUrls (#28770)

Browse Source 
Prior to this change, Ivy and VE CSS resource resolution was different: in addition to specified styleUrl (with .scss, .less and .styl extensions), VE also makes an attempt to resolve resource with .css extension. This change introduces similar logic for Ivy to make sure Ivy behavior is backwards compatible.

PR Close #28770
This commit is contained in:
Andrew Kushnir
2019-02-15 15:57:05 -08:00
committed by Igor Minar
parent be121bba85
commit 72d043f669
2 changed files with 32 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
packages/compiler-cli/src/ngtsc/resource_loader.ts
View File

@ -11,6 +11,8 @@ import * as ts from 'typescript';
import {CompilerHost} from '../transformers/api';
import {ResourceLoader} from './annotations/src/api';
const CSS_PREPROCESSOR_EXT = /(\.scss|\.less|\.styl)$/;
/**
* `ResourceLoader` which delegates to a `CompilerHost` resource loading method.
*/
@ -123,6 +125,16 @@ export class HostResourceLoader implements ResourceLoader {
for (const candidate of candidateLocations) {
if (fs.existsSync(candidate)) {
return candidate;
} else if (CSS_PREPROCESSOR_EXT.test(candidate)) {
/**
* If the user specified styleUrl points to *.scss, but the Sass compiler was run before
* Angular, then the resource may have been generated as *.css. Simply try the resolution
* again.
*/
const cssFallbackUrl = candidate.replace(CSS_PREPROCESSOR_EXT, '.css');
if (fs.existsSync(cssFallbackUrl)) {
return cssFallbackUrl;
}
}
}
return null;