javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-08-17 04:41:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Check for .css files when .less, .scss etc. are queried in style-scope (#5128)

Browse Source
This commit is contained in:
Panayot Cankov
2017-12-05 08:59:21 +02:00
committed by GitHub
parent ec2ce7fe45
commit cb4691b061
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tns-core-modules/ui/styling/style-scope.ts
View File

@ -99,6 +99,15 @@ class CSSSource {
} }
public static fromFile(url: string, keyframes: KeyframesMap): 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); const file = CSSSource.resolveCSSPathFromURL(url);
return new CSSSource(undefined, url, file, keyframes, undefined); return new CSSSource(undefined, url, file, keyframes, undefined);
} }
@ -619,6 +628,9 @@ export function resolveFileNameFromUrl(url: string, appDirectory: string, fileEx
} }
if (!isAbsolutePath) { if (!isAbsolutePath) {
if (fileName[0] === "~" && fileName[1] !== "/" && fileName[1] !== "\"") {
fileName = fileName.substr(1);
}
const external = path.join(appDirectory, "tns_modules", fileName); const external = path.join(appDirectory, "tns_modules", fileName);
if (fileExists(external)) { if (fileExists(external)) {
return external; return external;