From 8ac2d15d86236bb5964d45a19d1db019ed058ec7 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Wed, 31 Jan 2018 09:15:45 -0500
Subject: [PATCH] fix(@angular/cli): favor CSS import local files over modules

---
 .../cli/models/webpack-configs/styles.ts       | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/packages/@angular/cli/models/webpack-configs/styles.ts b/packages/@angular/cli/models/webpack-configs/styles.ts
index 858c3d6775..aca17b1b29 100644
--- a/packages/@angular/cli/models/webpack-configs/styles.ts
+++ b/packages/@angular/cli/models/webpack-configs/styles.ts
@@ -58,13 +58,25 @@ export function getStylesConfig(wco: WebpackConfigOptions) {
       postcssImports({
         resolve: (url: string, context: string) => {
           return new Promise<string>((resolve, reject) => {
+            let hadTilde = false;
             if (url && url.startsWith('~')) {
               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) {
-                reject(err);
-                return;
+                if (hadTilde) {
+                  reject(err);
+                  return;
+                }
+                loader.resolve(context, url, (err: Error, result: string) => {
+                  if (err) {
+                    reject(err);
+                    return;
+                  }
+
+                  resolve(result);
+                });
               }
 
               resolve(result);