Fix: Watcher for sass files

CarbonPackages · Jul 27, 2021 · 0435f3f · 0435f3f
1 parent f5f6a11
commit 0435f3f
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 2 deletions.
diff --git a/Lib/sass.mjs b/Lib/sass.mjs
@@ -10,7 +10,9 @@ function render(key) {
         sourceMapContents: true,
         sourceMapEmbed: true,
     });
-    return result.css?.toString();
+    const css = result.css.toString();
+    const importedFiles = [...result.stats.includedFiles].filter((file) => file != key);
+    return { css, importedFiles };
 }
 
 export { render };
diff --git a/postcss.mjs b/postcss.mjs
@@ -30,7 +30,9 @@ function renderFiles(keys) {
                 print(cyan(`Processing ${bold(file.from)}...`));
 
                 if (file.sass) {
-                    content = sassFunction.render(key);
+                    const result = sassFunction.render(key);
+                    files[key].importedFiles = result.importedFiles;
+                    content = result.css;
                 }
                 return css(content, file, time);
             });
@@ -54,6 +56,15 @@ function build() {
                         pollInterval: 10,
                     },
                 });
+
+                // Add files from sass
+                const importedFiles = files[input].importedFiles;
+                let importedFilesLength = importedFiles?.length || 0;
+
+                if (importedFilesLength) {
+                    watcher.add(importedFiles);
+                }
+
                 if (configFile) {
                     watcher.add(configFile);
                 }
@@ -69,6 +80,14 @@ function build() {
                     if (!recompile.length) {
                         recompile = input;
                     }
+
+                    // Add new files from sass
+                    const importedFiles = files[input].importedFiles;
+                    if (importedFilesLength < importedFiles?.length) {
+                        importedFilesLength = importedFiles.length;
+                        watcher.add(importedFiles);
+                    }
+
                     return renderFiles([...new Set(recompile)])
                         .then((results) => watcher.add(dependencies(results)))
                         .then(printMessage)