Merge pull request JsSucks#321 from samuelthomas2774/scss-urls

client/src/modules/thememanager.js

@@ -113,7 +113,7 @@ export default class ThemeManager extends ContentManager {
         const name = setting.id.replace(/[^a-zA-Z0-9-]/g, '-').replace(/--/g, '-');
         const scss = await setting.toSCSS();
 
-        if (scss) return [name, scss];
+        if (typeof scss !== 'undefined') return [name, scss];
     }
 
     /**

core/src/main.js

@@ -54,6 +54,10 @@ import deepmerge from 'deepmerge';
 import ContentSecurityPolicy from 'csp-parse';
 import keytar from 'keytar';
 
+import postcss from 'postcss';
+import postcssUrl from 'postcss-url';
+import postcssScss from 'postcss-scss';
+
 import { FileUtils, BDIpc, Config, WindowUtils, Updater, Editor, Database } from './modules';
 
 const sparkplug = path.resolve(__dirname, 'sparkplug.js');
@@ -91,15 +95,41 @@ 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'))
+                .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});
+
+            for (const message of result.messages) {
+                if (message.type !== 'dependency') continue;
+                inlinedFiles.push(message.file);
+            }
+
+            return {file, contents: result.css};
+        };
+
         BDIpc.on('bd-compileSass', (event, options) => {
             if (typeof options.path === 'string' && typeof options.data === 'string') {
                 options.data = `${options.data} @import '${options.path.replace(/\\/g, '\\\\').replace(/'/g, '\\\'')}';`;
                 options.path = undefined;
             }
 
+            const inlinedFiles = [];
+
+            options.importer = function (url, prev, done) {
+                sassImporter(this, url, prev, inlinedFiles).then(done, done);
+            };
+
             sass.render(options, (err, result) => {
-                if (err) event.reject(err);
-                else event.reply(result);
+                if (err) return event.reject(err);
+                result.stats.includedFiles = result.stats.includedFiles.concat(inlinedFiles);
+                event.reply(result);
             });
         });
 

package.json

@@ -26,6 +26,9 @@
     "nedb": "^1.8.0",
     "node-sass": "4.11.0",
     "original-fs": "^1.0.0",
+    "postcss": "^7.0.14",
+    "postcss-scss": "^2.0.0",
+    "postcss-url": "^8.0.0",
     "semver": "^5.6.0",
     "tar-fs": "^2.0.0"
   },

tests/ext/themes/Example/index.scss

@@ -35,3 +35,7 @@ $index: 0;
 
     $index: $index + 1;
 }
+
+.bd-scroller {
+    background-image: url('icon.svg');
+}