From 8585893b1db3f900b1df861bc64f60982dd0ee74 Mon Sep 17 00:00:00 2001 From: David Hewson Date: Fri, 7 Aug 2020 13:29:29 +0100 Subject: [PATCH] bump yesod version --- yesod/ChangeLog.md | 4 ++++ yesod/Yesod/Default/Util.hs | 1 + yesod/yesod.cabal | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/yesod/ChangeLog.md b/yesod/ChangeLog.md index a55f556c..42a429e2 100644 --- a/yesod/ChangeLog.md +++ b/yesod/ChangeLog.md @@ -1,3 +1,7 @@ +## 1.6.1.0 + +* `widgetFileReload` and `widgetFileNoReload` now use absolute paths via the new `globFilePackage` Q Exp which can provide absolute templates paths within the project [#1691](https://github.com/yesodweb/yesod/pull/1691) + ## 1.6.0.2 * Replace deprecated decodeFile with decodeFileEither. This should have no semantic impact, but silences a deprecation warning. [#1658](https://github.com/yesodweb/yesod/pull/1658) diff --git a/yesod/Yesod/Default/Util.hs b/yesod/Yesod/Default/Util.hs index 6e3f21a4..e0d6ae1a 100644 --- a/yesod/Yesod/Default/Util.hs +++ b/yesod/Yesod/Default/Util.hs @@ -67,6 +67,7 @@ globFile :: String -> String -> FilePath globFile kind x = "templates/" ++ x ++ "." ++ kind -- | `globFile` but returned path is absolute and within the package the Q Exp is evaluated +-- @since 1.6.1.0 globFilePackage :: String -> String -> Q FilePath globFilePackage = (makeRelativeToProject <$>) . globFile diff --git a/yesod/yesod.cabal b/yesod/yesod.cabal index aabb3105..42e36729 100644 --- a/yesod/yesod.cabal +++ b/yesod/yesod.cabal @@ -1,5 +1,5 @@ name: yesod -version: 1.6.0.2 +version: 1.6.1.0 license: MIT license-file: LICENSE author: Michael Snoyman