Some convenience re-exports

yesod-core/Yesod/Core.hs

@@ -64,6 +64,7 @@ module Yesod.Core
     , module Yesod.Core.Json
     , module Text.Shakespeare.I18N
     , module Yesod.Core.Internal.Util
+    , lift
     ) where
 
 import Yesod.Core.Content
@@ -77,6 +78,7 @@ import Text.Shakespeare.I18N
 import Yesod.Core.Internal.Util (formatW3 , formatRFC1123 , formatRFC822)
 
 import Control.Monad.Logger
+import Control.Monad.Trans.Class (lift)
 import Yesod.Core.Internal.Session
 import Yesod.Core.Class.Yesod
 import Yesod.Core.Class.Dispatch

yesod-core/Yesod/Core/Json.hs

@@ -12,6 +12,7 @@ module Yesod.Core.Json
       -- * Produce JSON values
     , J.Value (..)
     , array
+    , object
     , (.=)
 
       -- * Convenience functions
@@ -28,7 +29,7 @@ import Yesod.Routes.Class
 import Control.Monad (join)
 import qualified Data.Aeson as J
 import qualified Data.Aeson.Parser as JP
-import Data.Aeson ((.=))
+import Data.Aeson ((.=), object)
 import Data.Conduit.Attoparsec (sinkParser)
 import Data.Text (pack)
 import qualified Data.Vector as V

yesod-static/Yesod/Static.hs

@@ -58,7 +58,7 @@ import Yesod.Core.Types
 
 import Data.List (intercalate)
 import Language.Haskell.TH
-import Language.Haskell.TH.Syntax
+import Language.Haskell.TH.Syntax as TH
 
 import Crypto.Conduit (hashFile, sinkHash)
 import Crypto.Hash.MD5 (MD5)
@@ -299,12 +299,12 @@ mkStaticFilesList fp fs routeConName makeHash = do
                         | isDigit (head name') -> '_' : name'
                         | isLower (head name') -> name'
                         | otherwise -> '_' : name'
-        f' <- [|map pack $(lift f)|]
+        f' <- [|map pack $(TH.lift f)|]
         let route = mkName routeConName
         pack' <- [|pack|]
         qs <- if makeHash
                     then do hash <- qRunIO $ base64md5File $ pathFromRawPieces fp f
-                            [|[(pack "etag", pack $(lift hash))]|]
+                            [|[(pack "etag", pack $(TH.lift hash))]|]
                     else return $ ListE []
         return
             [ SigD routeName $ ConT route