Merge pull request #76 from stakx-io/feature/sass-in-themes

CHANGELOG.md

@@ -3,6 +3,7 @@
 **New**
 
 - Add new `serve` command to take the place of the defunct `watch` command
+- Your `*.scss.twig` files now support the `@theme` directive to import partials relative to your theme's `_sass` folder
 
 **Fixes**
 

example/_sass/styles.scss.twig

@@ -2,6 +2,8 @@
 permalink: /assets/css/styles.css
 ---
 
+@import '@theme/card';
+
 @import 'components/utils';
 @import 'components/footer';
 @import 'components/calendar';

example/_themes/bootstrap/_sass/_card.scss

@@ -0,0 +1,3 @@
+.card {
+  border: 1px solid lightgrey;
+}

src/allejo/stakx/AssetEngine/Sass/SassEngine.php

@@ -73,6 +73,8 @@ public function parse($content, array $options = [])
             'sourceMapBasepath' => Service::getWorkingDirectory(),
         ];
 
+        $this->handleThemeImports($content);
+
         // We don't need to write the source map to a file
         if (!$this->fileSourceMap)
         {
@@ -161,6 +163,15 @@ private function getSourceMapTargetFile(StaticPageView $pageView)
         );
     }
 
+    private function handleThemeImports(&$content)
+    {
+        if (($themeName = $this->configuration->getTheme()))
+        {
+            $themePath = "../_themes/${themeName}/_sass";
+            $content = preg_replace("/(@import ['\"])(@theme)(.+)/", "$1${themePath}$3", $content);
+        }
+    }
+
     public static function stringToFormatter($format)
     {
         if ($format == 'nested')