hakyll 4.7.2.3 → 4.7.3.0

raw patch · 4 files changed

+14/−5 lines, 4 filesdep ~HUnitPVP: major bump suggested

API removals or changes: PVP suggests a major version bump

Dependency ranges changed: HUnit

API changes (from Hackage documentation)

- Hakyll.Core.Configuration: deployCommand :: Configuration -> String

- Hakyll.Core.Configuration: deploySite :: Configuration -> Configuration -> IO ExitCode

- Hakyll.Core.Configuration: destinationDirectory :: Configuration -> FilePath

- Hakyll.Core.Configuration: ignoreFile :: Configuration -> FilePath -> Bool

- Hakyll.Core.Configuration: inMemoryCache :: Configuration -> Bool

- Hakyll.Core.Configuration: instance Default Configuration

- Hakyll.Core.Configuration: previewHost :: Configuration -> String

- Hakyll.Core.Configuration: previewPort :: Configuration -> Int

- Hakyll.Core.Configuration: providerDirectory :: Configuration -> FilePath

- Hakyll.Core.Configuration: storeDirectory :: Configuration -> FilePath

- Hakyll.Core.Configuration: tmpDirectory :: Configuration -> FilePath

- Hakyll.Core.Dependencies: instance Binary Dependency

- Hakyll.Core.Dependencies: instance Show Dependency

- Hakyll.Core.Dependencies: instance Show DependencyState

- Hakyll.Core.Dependencies: instance Typeable Dependency

- Hakyll.Core.File: instance Binary CopyFile

- Hakyll.Core.File: instance Binary TmpFile

- Hakyll.Core.File: instance Eq CopyFile

- Hakyll.Core.File: instance Ord CopyFile

- Hakyll.Core.File: instance Show CopyFile

- Hakyll.Core.File: instance Typeable CopyFile

- Hakyll.Core.File: instance Typeable TmpFile

- Hakyll.Core.File: instance Writable CopyFile

- Hakyll.Core.File: instance Writable TmpFile

- Hakyll.Core.Identifier: instance Binary Identifier

- Hakyll.Core.Identifier: instance Eq Identifier

- Hakyll.Core.Identifier: instance IsString Identifier

- Hakyll.Core.Identifier: instance NFData Identifier

- Hakyll.Core.Identifier: instance Ord Identifier

- Hakyll.Core.Identifier: instance Show Identifier

- Hakyll.Core.Identifier: instance Typeable Identifier

- Hakyll.Core.Identifier.Pattern: instance Binary GlobComponent

- Hakyll.Core.Identifier.Pattern: instance Binary Pattern

- Hakyll.Core.Identifier.Pattern: instance Eq GlobComponent

- Hakyll.Core.Identifier.Pattern: instance IsString Pattern

- Hakyll.Core.Identifier.Pattern: instance Monoid Pattern

- Hakyll.Core.Identifier.Pattern: instance Show GlobComponent

- Hakyll.Core.Identifier.Pattern: instance Show Pattern

- Hakyll.Core.Item: instance Binary a => Binary (Item a)

- Hakyll.Core.Item: instance Foldable Item

- Hakyll.Core.Item: instance Functor Item

- Hakyll.Core.Item: instance Show a => Show (Item a)

- Hakyll.Core.Item: instance Traversable Item

- Hakyll.Core.Item: instance Typeable Item

- Hakyll.Core.Item: itemBody :: Item a -> a

- Hakyll.Core.Item: itemIdentifier :: Item a -> Identifier

- Hakyll.Core.Routes: instance Monoid Routes

- Hakyll.Core.Writable: instance Writable ()

- Hakyll.Core.Writable: instance Writable ByteString

- Hakyll.Core.Writable: instance Writable Html

- Hakyll.Core.Writable: instance Writable [Char]

- Hakyll.Core.Writable: instance Writable [Word8]

- Hakyll.Main: instance Data HakyllArgs

- Hakyll.Main: instance Show HakyllArgs

- Hakyll.Main: instance Typeable HakyllArgs

- Hakyll.Web.Feed: feedAuthorEmail :: FeedConfiguration -> String

- Hakyll.Web.Feed: feedAuthorName :: FeedConfiguration -> String

- Hakyll.Web.Feed: feedDescription :: FeedConfiguration -> String

- Hakyll.Web.Feed: feedRoot :: FeedConfiguration -> String

- Hakyll.Web.Feed: feedTitle :: FeedConfiguration -> String

- Hakyll.Web.Feed: instance Eq FeedConfiguration

- Hakyll.Web.Feed: instance Show FeedConfiguration

- Hakyll.Web.Paginate: instance Show Paginate

- Hakyll.Web.Paginate: paginateDependency :: Paginate -> Dependency

- Hakyll.Web.Paginate: paginateMakeId :: Paginate -> PageNumber -> Identifier

- Hakyll.Web.Paginate: paginateMap :: Paginate -> Map PageNumber [Identifier]

- Hakyll.Web.Pandoc.Biblio: instance Binary Biblio

- Hakyll.Web.Pandoc.Biblio: instance Binary CSL

- Hakyll.Web.Pandoc.Biblio: instance Show Biblio

- Hakyll.Web.Pandoc.Biblio: instance Show CSL

- Hakyll.Web.Pandoc.Biblio: instance Typeable Biblio

- Hakyll.Web.Pandoc.Biblio: instance Typeable CSL

- Hakyll.Web.Pandoc.Biblio: instance Writable Biblio

- Hakyll.Web.Pandoc.Biblio: instance Writable CSL

- Hakyll.Web.Pandoc.FileType: instance Eq FileType

- Hakyll.Web.Pandoc.FileType: instance Ord FileType

- Hakyll.Web.Pandoc.FileType: instance Read FileType

- Hakyll.Web.Pandoc.FileType: instance Show FileType

- Hakyll.Web.Tags: instance Show Tags

- Hakyll.Web.Tags: tagsDependency :: Tags -> Dependency

- Hakyll.Web.Tags: tagsMakeId :: Tags -> String -> Identifier

- Hakyll.Web.Tags: tagsMap :: Tags -> [(String, [Identifier])]

- Hakyll.Web.Template.Context: instance Monoid (Context a)

- Hakyll.Web.Template.Context: unContext :: Context a -> String -> [String] -> Item a -> Compiler ContextField

+ Hakyll.Core.Configuration: [deployCommand] :: Configuration -> String

+ Hakyll.Core.Configuration: [deploySite] :: Configuration -> Configuration -> IO ExitCode

+ Hakyll.Core.Configuration: [destinationDirectory] :: Configuration -> FilePath

+ Hakyll.Core.Configuration: [ignoreFile] :: Configuration -> FilePath -> Bool

+ Hakyll.Core.Configuration: [inMemoryCache] :: Configuration -> Bool

+ Hakyll.Core.Configuration: [previewHost] :: Configuration -> String

+ Hakyll.Core.Configuration: [previewPort] :: Configuration -> Int

+ Hakyll.Core.Configuration: [providerDirectory] :: Configuration -> FilePath

+ Hakyll.Core.Configuration: [storeDirectory] :: Configuration -> FilePath

+ Hakyll.Core.Configuration: [tmpDirectory] :: Configuration -> FilePath

+ Hakyll.Core.Configuration: instance Data.Default.Class.Default Hakyll.Core.Configuration.Configuration

+ Hakyll.Core.Dependencies: instance Data.Binary.Class.Binary Hakyll.Core.Dependencies.Dependency

+ Hakyll.Core.Dependencies: instance GHC.Show.Show Hakyll.Core.Dependencies.Dependency

+ Hakyll.Core.Dependencies: instance GHC.Show.Show Hakyll.Core.Dependencies.DependencyState

+ Hakyll.Core.File: instance Data.Binary.Class.Binary Hakyll.Core.File.CopyFile

+ Hakyll.Core.File: instance Data.Binary.Class.Binary Hakyll.Core.File.TmpFile

+ Hakyll.Core.File: instance GHC.Classes.Eq Hakyll.Core.File.CopyFile

+ Hakyll.Core.File: instance GHC.Classes.Ord Hakyll.Core.File.CopyFile

+ Hakyll.Core.File: instance GHC.Show.Show Hakyll.Core.File.CopyFile

+ Hakyll.Core.File: instance Hakyll.Core.Writable.Writable Hakyll.Core.File.CopyFile

+ Hakyll.Core.File: instance Hakyll.Core.Writable.Writable Hakyll.Core.File.TmpFile

+ Hakyll.Core.Identifier: instance Control.DeepSeq.NFData Hakyll.Core.Identifier.Identifier

+ Hakyll.Core.Identifier: instance Data.Binary.Class.Binary Hakyll.Core.Identifier.Identifier

+ Hakyll.Core.Identifier: instance Data.String.IsString Hakyll.Core.Identifier.Identifier

+ Hakyll.Core.Identifier: instance GHC.Classes.Eq Hakyll.Core.Identifier.Identifier

+ Hakyll.Core.Identifier: instance GHC.Classes.Ord Hakyll.Core.Identifier.Identifier

+ Hakyll.Core.Identifier: instance GHC.Show.Show Hakyll.Core.Identifier.Identifier

+ Hakyll.Core.Identifier.Pattern: instance Data.Binary.Class.Binary Hakyll.Core.Identifier.Pattern.GlobComponent

+ Hakyll.Core.Identifier.Pattern: instance Data.Binary.Class.Binary Hakyll.Core.Identifier.Pattern.Pattern

+ Hakyll.Core.Identifier.Pattern: instance Data.String.IsString Hakyll.Core.Identifier.Pattern.Pattern

+ Hakyll.Core.Identifier.Pattern: instance GHC.Base.Monoid Hakyll.Core.Identifier.Pattern.Pattern

+ Hakyll.Core.Identifier.Pattern: instance GHC.Classes.Eq Hakyll.Core.Identifier.Pattern.GlobComponent

+ Hakyll.Core.Identifier.Pattern: instance GHC.Show.Show Hakyll.Core.Identifier.Pattern.GlobComponent

+ Hakyll.Core.Identifier.Pattern: instance GHC.Show.Show Hakyll.Core.Identifier.Pattern.Pattern

+ Hakyll.Core.Item: [itemBody] :: Item a -> a

+ Hakyll.Core.Item: [itemIdentifier] :: Item a -> Identifier

+ Hakyll.Core.Item: instance Data.Binary.Class.Binary a => Data.Binary.Class.Binary (Hakyll.Core.Item.Item a)

+ Hakyll.Core.Item: instance Data.Foldable.Foldable Hakyll.Core.Item.Item

+ Hakyll.Core.Item: instance Data.Traversable.Traversable Hakyll.Core.Item.Item

+ Hakyll.Core.Item: instance GHC.Base.Functor Hakyll.Core.Item.Item

+ Hakyll.Core.Item: instance GHC.Show.Show a => GHC.Show.Show (Hakyll.Core.Item.Item a)

+ Hakyll.Core.Routes: instance GHC.Base.Monoid Hakyll.Core.Routes.Routes

+ Hakyll.Core.Writable: instance Hakyll.Core.Writable.Writable ()

+ Hakyll.Core.Writable: instance Hakyll.Core.Writable.Writable Data.ByteString.Internal.ByteString

+ Hakyll.Core.Writable: instance Hakyll.Core.Writable.Writable Data.ByteString.Lazy.Internal.ByteString

+ Hakyll.Core.Writable: instance Hakyll.Core.Writable.Writable Text.Blaze.Html.Html

+ Hakyll.Core.Writable: instance Hakyll.Core.Writable.Writable [GHC.Types.Char]

+ Hakyll.Core.Writable: instance Hakyll.Core.Writable.Writable [GHC.Word.Word8]

+ Hakyll.Main: instance Data.Data.Data Hakyll.Main.HakyllArgs

+ Hakyll.Main: instance GHC.Show.Show Hakyll.Main.HakyllArgs

+ Hakyll.Web.Feed: [feedAuthorEmail] :: FeedConfiguration -> String

+ Hakyll.Web.Feed: [feedAuthorName] :: FeedConfiguration -> String

+ Hakyll.Web.Feed: [feedDescription] :: FeedConfiguration -> String

+ Hakyll.Web.Feed: [feedRoot] :: FeedConfiguration -> String

+ Hakyll.Web.Feed: [feedTitle] :: FeedConfiguration -> String

+ Hakyll.Web.Feed: instance GHC.Classes.Eq Hakyll.Web.Feed.FeedConfiguration

+ Hakyll.Web.Feed: instance GHC.Show.Show Hakyll.Web.Feed.FeedConfiguration

+ Hakyll.Web.Paginate: [paginateDependency] :: Paginate -> Dependency

+ Hakyll.Web.Paginate: [paginateMakeId] :: Paginate -> PageNumber -> Identifier

+ Hakyll.Web.Paginate: [paginateMap] :: Paginate -> Map PageNumber [Identifier]

+ Hakyll.Web.Paginate: instance GHC.Show.Show Hakyll.Web.Paginate.Paginate

+ Hakyll.Web.Pandoc.Biblio: instance Data.Binary.Class.Binary Hakyll.Web.Pandoc.Biblio.Biblio

+ Hakyll.Web.Pandoc.Biblio: instance Data.Binary.Class.Binary Hakyll.Web.Pandoc.Biblio.CSL

+ Hakyll.Web.Pandoc.Biblio: instance GHC.Show.Show Hakyll.Web.Pandoc.Biblio.Biblio

+ Hakyll.Web.Pandoc.Biblio: instance GHC.Show.Show Hakyll.Web.Pandoc.Biblio.CSL

+ Hakyll.Web.Pandoc.Biblio: instance Hakyll.Core.Writable.Writable Hakyll.Web.Pandoc.Biblio.Biblio

+ Hakyll.Web.Pandoc.Biblio: instance Hakyll.Core.Writable.Writable Hakyll.Web.Pandoc.Biblio.CSL

+ Hakyll.Web.Pandoc.FileType: instance GHC.Classes.Eq Hakyll.Web.Pandoc.FileType.FileType

+ Hakyll.Web.Pandoc.FileType: instance GHC.Classes.Ord Hakyll.Web.Pandoc.FileType.FileType

+ Hakyll.Web.Pandoc.FileType: instance GHC.Read.Read Hakyll.Web.Pandoc.FileType.FileType

+ Hakyll.Web.Pandoc.FileType: instance GHC.Show.Show Hakyll.Web.Pandoc.FileType.FileType

+ Hakyll.Web.Tags: [tagsDependency] :: Tags -> Dependency

+ Hakyll.Web.Tags: [tagsMakeId] :: Tags -> String -> Identifier

+ Hakyll.Web.Tags: [tagsMap] :: Tags -> [(String, [Identifier])]

+ Hakyll.Web.Tags: instance GHC.Show.Show Hakyll.Web.Tags.Tags

+ Hakyll.Web.Template.Context: [unContext] :: Context a -> String -> [String] -> Item a -> Compiler ContextField

+ Hakyll.Web.Template.Context: instance GHC.Base.Monoid (Hakyll.Web.Template.Context.Context a)

Files

hakyll.cabal +2/−2
src/Hakyll/Init.hs +8/−2
src/Hakyll/Web/Html.hs +1/−1
tests/Hakyll/Web/Html/RelativizeUrls/Tests.hs +3/−0

hakyll.cabal view

@@ -1,5 +1,5 @@ Name:    hakyll-Version: 4.7.2.3+Version: 4.7.3.0  Synopsis: A static website compiler library Description:@@ -220,7 +220,7 @@     TestSuite.Util    Build-Depends:-    HUnit                      >= 1.2 && < 1.3,+    HUnit                      >= 1.2 && < 1.4,     QuickCheck                 >= 2.4 && < 2.9,     test-framework             >= 0.4 && < 0.9,     test-framework-hunit       >= 0.3 && < 0.4,

src/Hakyll/Init.hs view

@@ -9,7 +9,7 @@ import           Control.Monad         (forM_) import           Data.Char             (isAlphaNum, isNumber) import           Data.List             (foldl')-import           Data.List             (intercalate)+import           Data.List             (intercalate, isPrefixOf) import           Data.Version          (Version (..)) import           System.Directory      (canonicalizePath, copyFile) import           System.Environment    (getArgs, getProgName)@@ -31,7 +31,13 @@     files    <- getRecursiveContents (const $ return False) srcDir      case args of-        [dstDir] -> do+        -- When the argument begins with hyphens, it's more likely that the user+        -- intends to attempt some arguments like ("--help", "-h", "--version", etc.)+        -- rather than create directory with that name.+        -- If dstDir begins with hyphens, the guard will prevent it from creating+        -- directory with that name so we can fall to the second alternative+        -- which prints a usage info for user.+        [dstDir] | not ("-" `isPrefixOf` dstDir) -> do             forM_ files $ \file -> do                 let dst = dstDir </> file                     src = srcDir </> file

src/Hakyll/Web/Html.hs view

@@ -55,7 +55,7 @@  -------------------------------------------------------------------------------- isUrlAttribute :: String -> Bool-isUrlAttribute = (`elem` ["src", "href", "data"])+isUrlAttribute = (`elem` ["src", "href", "data", "poster"])   --------------------------------------------------------------------------------

tests/Hakyll/Web/Html/RelativizeUrls/Tests.hs view

@@ -22,6 +22,9 @@             relativizeUrlsWith ".." "<a href=\"/foo\">bar</a>"         , "<img src=\"../../images/lolcat.png\" />" @=?             relativizeUrlsWith "../.." "<img src=\"/images/lolcat.png\" />"+        , "<video poster=\"../../images/lolcat.png\"></video>" @=?+            relativizeUrlsWith "../.."+                "<video poster=\"/images/lolcat.png\"></video>"         , "<a href=\"http://haskell.org\">Haskell</a>" @=?             relativizeUrlsWith "../.."                 "<a href=\"http://haskell.org\">Haskell</a>"