Fix path resolution

Maks-s · Mar 17, 2019 · 6a38e8e · 6a38e8e
1 parent 90035c0
commit 6a38e8e
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/core/src/main.js b/core/src/main.js
@@ -88,18 +88,16 @@ class Comms {
         });
 
         const sassImporter = async (context, url, prev) => {
-            const file = path.resolve(prev, url);
+            let file = path.resolve(path.dirname(prev), url);
 
-            console.log('Importing', file, url, prev, context);
-
-            const scss = await FileUtils.readFile(file);
+            const scss = await FileUtils.readFile(file).catch(err => FileUtils.readFile(file += '.scss'));
 
             const result = await postcss([postcssUrl({url: 'inline', encodeType: 'base64', optimizeSvgEncode: true})])
                 .process(scss, {from: file, syntax: postcssScss});
 
             console.log('Processed', file, result);
 
-            return {contents: result.css};
+            return {file, contents: result.css};
         };
 
         BDIpc.on('bd-compileSass', (event, options) => {