From cb4691b06172ee08b2ceac06703169ff3751a9cf Mon Sep 17 00:00:00 2001
From: Panayot Cankov <Panayot.Cankov@telerik.com>
Date: Tue, 5 Dec 2017 08:59:21 +0200
Subject: [PATCH] Check for .css files when .less, .scss etc. are queried in
 style-scope (#5128)

---
 tns-core-modules/ui/styling/style-scope.ts | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/tns-core-modules/ui/styling/style-scope.ts b/tns-core-modules/ui/styling/style-scope.ts
index aaacb618f..c2400ab71 100644
--- a/tns-core-modules/ui/styling/style-scope.ts
+++ b/tns-core-modules/ui/styling/style-scope.ts
@@ -99,6 +99,15 @@ class CSSSource {
     }
 
     public static fromFile(url: string, keyframes: KeyframesMap): CSSSource {
+        // .scss, .sass, etc. css files in vanilla app are usually compiled to .css so we will try to load a compiled file first.
+        let cssFileUrl = url.replace(/\..\w+$/, ".css");
+        if (cssFileUrl !== url) {
+            const cssFile = CSSSource.resolveCSSPathFromURL(cssFileUrl);
+            if (cssFile) {
+                return new CSSSource(undefined, url, cssFile, keyframes, undefined);
+            }
+        }
+
         const file = CSSSource.resolveCSSPathFromURL(url);
         return new CSSSource(undefined, url, file, keyframes, undefined);
     }
@@ -619,6 +628,9 @@ export function resolveFileNameFromUrl(url: string, appDirectory: string, fileEx
     }
 
     if (!isAbsolutePath) {
+        if (fileName[0] === "~" && fileName[1] !== "/" && fileName[1] !== "\"") {
+            fileName = fileName.substr(1);
+        }
         const external = path.join(appDirectory, "tns_modules", fileName);
         if (fileExists(external)) {
             return external;