Merge branch 'develop'

meoblast001 · Dec 17, 2018 · 495060d · 495060d
2 parents 21fc322 + b9c08af
commit 495060d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/hakyll-sass.cabal b/hakyll-sass.cabal
@@ -1,5 +1,5 @@
 name: hakyll-sass
-version: 0.2.3
+version: 0.2.4
 synopsis: Hakyll SASS compiler over hsass
 license: MIT
 license-file: LICENSE

diff --git a/src/Hakyll/Web/Sass.hs b/src/Hakyll/Web/Sass.hs
@@ -20,7 +20,9 @@ import Control.Monad (join)
 import Data.Default.Class
 import Hakyll.Core.Compiler
 import Hakyll.Core.Identifier
+import Hakyll.Core.Compiler.Internal
 import Hakyll.Core.Item
+import Hakyll.Core.Provider
 import System.FilePath (takeExtension)
 import Text.Sass.Compilation
 import Text.Sass.Options
@@ -48,9 +50,10 @@ renderSass item =
 -- | Compiles a SASS file item into CSS with options. The file extension will
 -- not be used to determine SCSS from SASS formatting.
 renderSassWith :: SassOptions -> Item String -> Compiler (Item String)
-renderSassWith options item =
-  let filePath = toFilePath $ itemIdentifier item
-  in join $ unsafeCompiler $ do
+renderSassWith options item = join $ do
+  provider <- compilerProvider <$> compilerAsk
+  let filePath = resourceFilePath provider (itemIdentifier item)
+  unsafeCompiler $ do
     resultOrErr <- compileFile filePath options
     case resultOrErr of
       Left sassError -> errorMessage sassError >>= fail