Made hakyll function backward-compatible. Version bump.
This commit is contained in:
parent
0ba0eac8d9
commit
715387756e
8 changed files with 20 additions and 15 deletions
|
@ -1,9 +1,9 @@
|
||||||
import Text.Hakyll (hakyll, defaultHakyllConfiguration)
|
import Text.Hakyll (hakyll)
|
||||||
import Text.Hakyll.File (directory)
|
import Text.Hakyll.File (directory)
|
||||||
import Text.Hakyll.Render (css, static, renderChain)
|
import Text.Hakyll.Render (css, static, renderChain)
|
||||||
import Text.Hakyll.Renderables (createPagePath)
|
import Text.Hakyll.Renderables (createPagePath)
|
||||||
|
|
||||||
main = hakyll defaultHakyllConfiguration $ do
|
main = hakyll $ do
|
||||||
directory css "css"
|
directory css "css"
|
||||||
render "about.markdown"
|
render "about.markdown"
|
||||||
render "index.markdown"
|
render "index.markdown"
|
||||||
|
|
|
@ -7,7 +7,7 @@ import Text.Hakyll.Regex
|
||||||
import Control.Monad (mapM_, liftM)
|
import Control.Monad (mapM_, liftM)
|
||||||
import Data.List (sort)
|
import Data.List (sort)
|
||||||
|
|
||||||
main = hakyll defaultHakyllConfiguration $ do
|
main = hakyll $ do
|
||||||
directory css "css"
|
directory css "css"
|
||||||
directory static "images"
|
directory static "images"
|
||||||
directory static "examples"
|
directory static "examples"
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
import Text.Hakyll (hakyll, defaultHakyllConfiguration)
|
import Text.Hakyll (hakyll)
|
||||||
import Text.Hakyll.File (directory)
|
import Text.Hakyll.File (directory)
|
||||||
import Text.Hakyll.Render (css, static, renderChain)
|
import Text.Hakyll.Render (css, static, renderChain)
|
||||||
import Text.Hakyll.Renderables (createPagePath, combine)
|
import Text.Hakyll.Renderables (createPagePath, combine)
|
||||||
|
|
||||||
main = hakyll defaultHakyllConfiguration $ do
|
main = hakyll $ do
|
||||||
directory css "css"
|
directory css "css"
|
||||||
render "about.markdown"
|
render "about.markdown"
|
||||||
render "index.markdown"
|
render "index.markdown"
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
module Main where
|
module Main where
|
||||||
|
|
||||||
import Control.Monad.Reader (liftIO)
|
import Control.Monad.Reader (liftIO)
|
||||||
import Text.Hakyll (hakyll, defaultHakyllConfiguration)
|
import Text.Hakyll (hakyll)
|
||||||
import Text.Hakyll.Render (renderAndConcat, renderChain, css)
|
import Text.Hakyll.Render (renderAndConcat, renderChain, css)
|
||||||
import Text.Hakyll.File (getRecursiveContents, directory)
|
import Text.Hakyll.File (getRecursiveContents, directory)
|
||||||
import Text.Hakyll.Renderables (createPagePath, createCustomPage)
|
import Text.Hakyll.Renderables (createPagePath, createCustomPage)
|
||||||
|
@ -9,7 +9,7 @@ import Data.List (sort)
|
||||||
import Control.Monad (mapM_, liftM)
|
import Control.Monad (mapM_, liftM)
|
||||||
import Data.Either (Either(..))
|
import Data.Either (Either(..))
|
||||||
|
|
||||||
main = hakyll defaultHakyllConfiguration $ do
|
main = hakyll $ do
|
||||||
-- Static directory.
|
-- Static directory.
|
||||||
directory css "css"
|
directory css "css"
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
module Main where
|
module Main where
|
||||||
|
|
||||||
import Text.Hakyll (hakyll, defaultHakyllConfiguration)
|
import Text.Hakyll (hakyll)
|
||||||
import Text.Hakyll.Render
|
import Text.Hakyll.Render
|
||||||
import Text.Hakyll.Context
|
import Text.Hakyll.Context
|
||||||
import Text.Hakyll.File (getRecursiveContents, directory)
|
import Text.Hakyll.File (getRecursiveContents, directory)
|
||||||
|
@ -10,7 +10,7 @@ import Control.Monad (mapM_, liftM)
|
||||||
import Control.Monad.Reader (liftIO)
|
import Control.Monad.Reader (liftIO)
|
||||||
import Data.Either (Either(..))
|
import Data.Either (Either(..))
|
||||||
|
|
||||||
main = hakyll defaultHakyllConfiguration $ do
|
main = hakyll $ do
|
||||||
-- Static directory.
|
-- Static directory.
|
||||||
directory css "css"
|
directory css "css"
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
module Main where
|
module Main where
|
||||||
|
|
||||||
import Text.Hakyll (hakyll, defaultHakyllConfiguration)
|
import Text.Hakyll (hakyll)
|
||||||
import Text.Hakyll.Render
|
import Text.Hakyll.Render
|
||||||
import Text.Hakyll.Tags (readTagMap, renderTagCloud, renderTagLinks)
|
import Text.Hakyll.Tags (readTagMap, renderTagCloud, renderTagLinks)
|
||||||
import Text.Hakyll.File (getRecursiveContents, directory, removeSpaces)
|
import Text.Hakyll.File (getRecursiveContents, directory, removeSpaces)
|
||||||
|
@ -11,7 +11,7 @@ import Data.Map (toList)
|
||||||
import Control.Monad (mapM_, liftM)
|
import Control.Monad (mapM_, liftM)
|
||||||
import Data.Either (Either(..))
|
import Data.Either (Either(..))
|
||||||
|
|
||||||
main = hakyll defaultHakyllConfiguration $ do
|
main = hakyll $ do
|
||||||
-- Static directory.
|
-- Static directory.
|
||||||
directory css "css"
|
directory css "css"
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
Name: hakyll
|
Name: hakyll
|
||||||
Version: 1.0.1
|
Version: 1.1
|
||||||
|
|
||||||
Synopsis: A simple static site generator library.
|
Synopsis: A simple static site generator library.
|
||||||
Description:
|
Description:
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
module Text.Hakyll
|
module Text.Hakyll
|
||||||
( defaultHakyllConfiguration
|
( defaultHakyllConfiguration
|
||||||
, hakyll
|
, hakyll
|
||||||
|
, hakyllWithConfiguration
|
||||||
) where
|
) where
|
||||||
|
|
||||||
import Control.Monad.Reader (runReaderT)
|
import Control.Monad.Reader (runReaderT)
|
||||||
|
@ -18,9 +19,13 @@ defaultHakyllConfiguration = HakyllConfiguration
|
||||||
{ additionalContext = M.empty
|
{ additionalContext = M.empty
|
||||||
}
|
}
|
||||||
|
|
||||||
-- | Main function to run hakyll.
|
-- | Hakyll with a default configuration.
|
||||||
hakyll :: HakyllConfiguration -> Hakyll () -> IO ()
|
hakyll :: Hakyll () -> IO ()
|
||||||
hakyll configuration buildFunction = do
|
hakyll = hakyllWithConfiguration defaultHakyllConfiguration
|
||||||
|
|
||||||
|
-- | Main function to run hakyll with a configuration.
|
||||||
|
hakyllWithConfiguration :: HakyllConfiguration -> Hakyll () -> IO ()
|
||||||
|
hakyllWithConfiguration configuration buildFunction = do
|
||||||
args <- getArgs
|
args <- getArgs
|
||||||
case args of ["build"] -> build'
|
case args of ["build"] -> build'
|
||||||
["clean"] -> clean
|
["clean"] -> clean
|
||||||
|
|
Loading…
Reference in a new issue