Graham/angular-cli
1
0
Fork 0
mirror of https://github.com/angular/angular-cli.git synced 2025-05-28 02:58:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(@angular/cli): favor CSS import local files over modules

Browse Source
This commit is contained in:
Charles Lyding 2018-01-31 09:15:45 -05:00 committed by Filipe Silva
parent ee40dc3f86
commit 8ac2d15d86
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
packages/@angular/cli/models/webpack-configs/styles.ts
View File

@ -58,13 +58,25 @@ export function getStylesConfig(wco: WebpackConfigOptions) {
postcssImports({ postcssImports({
resolve: (url: string, context: string) => { resolve: (url: string, context: string) => {
return new Promise<string>((resolve, reject) => { return new Promise<string>((resolve, reject) => {
let hadTilde = false;
if (url && url.startsWith('~')) { if (url && url.startsWith('~')) {
url = url.substr(1); url = url.substr(1);
hadTilde = true;
} }
loader.resolve(context, url, (err: Error, result: string) => { loader.resolve(context, (hadTilde ? '' : './') + url, (err: Error, result: string) => {
if (err) { if (err) {
reject(err); if (hadTilde) {
return; reject(err);
return;
}
loader.resolve(context, url, (err: Error, result: string) => {
if (err) {
reject(err);
return;
}
resolve(result);
});
} }
resolve(result); resolve(result);