Resolve partials properly

Maks-s · Mar 17, 2019 · 9a7ec57 · 9a7ec57
1 parent d4ed8ad
commit 9a7ec57
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/core/src/main.js b/core/src/main.js
@@ -90,7 +90,10 @@ class Comms {
         const sassImporter = async (context, url, prev, inlinedFiles) => {
             let file = path.resolve(path.dirname(prev), url);
 
-            const scss = await FileUtils.readFile(file).catch(err => FileUtils.readFile(file += '.scss'));
+            const scss = await FileUtils.readFile(file)
+                .catch(err => FileUtils.readFile(file += '.scss'))
+                .catch(err => FileUtils.readFile(file = path.join(path.dirname(file), '_' + path.basename(file).substr(0, path.basename(file).length - 5))))
+                .catch(err => FileUtils.readFile(file += '.scss'));
 
             const result = await postcss([postcssUrl({url: 'inline', encodeType: 'base64', optimizeSvgEncode: true})])
                 .process(scss, {from: file, syntax: postcssScss});

diff --git a/tests/ext/themes/Example/vars.scss → tests/ext/themes/Example/_vars.scss b/tests/ext/themes/Example/vars.scss → tests/ext/themes/Example/_vars.scss