From cab78b65c2dfc7bf18e595b7eaa38fd822d43841 Mon Sep 17 00:00:00 2001
From: pythonissam <k0uta120u@icloud.com>
Date: Sun, 26 Nov 2017 04:45:02 +0000
Subject: [PATCH 01/26] Add a failure test case for byLabel

---
 yesod-test/test/main.hs | 11 +++++++++++
 1 file changed, 11 insertions(+)
diff --git a/yesod-test/test/main.hs b/yesod-test/test/main.hs
index 67511ee9..f104bc19 100644
--- a/yesod-test/test/main.hs
+++ b/yesod-test/test/main.hs
@@ -215,6 +215,15 @@ main = hspec $ do
                     setMethod "POST"
                     setUrl ("/labels" :: Text)
                     byLabel "Foo Bar" "yes"
+        ydescribe "labels2" $ do
+            yit "fails with \"More than one label contained\" error" $ do
+                get ("/labels2" :: Text)
+                (bad :: Either SomeException ()) <- try (request $ do
+                    setMethod "POST"
+                    setUrl ("labels2" :: Text)
+                    byLabel "hobby" "fishing")
+                assertEq "failure wasn't called" (isLeft bad) True
+
         ydescribe "Content-Type handling" $ do
             yit "can set a content-type" $ do
                 request $ do
@@ -362,6 +371,8 @@ app = liteApp $ do
         return ("<html><head><title>A link</title></head><body><a href=\"/html\" id=\"thelink\">Link!</a></body></html>" :: Text)
     onStatic "labels" $ dispatchTo $
         return ("<html><label><input type='checkbox' name='fooname' id='foobar'>Foo Bar</label></html>" :: Text)
+    onStatic "labels2" $ dispatchTo $
+        return ("<html><label for='hobby'>hobby</label><label for='hobby2'>hobby2</label><input type='text' name='hobby' id='hobby'><input type='text' name='hobby2' id='hobby2'></html>" :: Text)
 
     onStatic "checkContentType" $ dispatchTo $ do
         headers <- requestHeaders <$> waiRequest

From 80aa45cf1837107a1ab5eb54c4bb431ef73ae19f Mon Sep 17 00:00:00 2001
From: pythonissam <k0uta120u@icloud.com>
Date: Sun, 26 Nov 2017 07:22:25 +0000
Subject: [PATCH 02/26] Simply, create the exact version of byLabel

---
 yesod-test/Yesod/Test.hs | 73 ++++++++++++++++++++++++++++++++++++++++
 yesod-test/test/main.hs  |  7 ++++
 2 files changed, 80 insertions(+)

diff --git a/yesod-test/Yesod/Test.hs b/yesod-test/Yesod/Test.hs
index e359896b..e736ddd3 100644
--- a/yesod-test/Yesod/Test.hs
+++ b/yesod-test/Yesod/Test.hs
@@ -73,6 +73,7 @@ module Yesod.Test
     -- These functions let you add parameters to your request based
     -- on currently displayed label names.
     , byLabel
+    , byLabelExact
     , fileByLabel
 
     -- *** CSRF Tokens
@@ -563,6 +564,46 @@ nameFromLabel label = do
         name:_ -> return name
     _ -> failure $ "More than one label contained " <> label
 
+-- This looks up the name of a field based on the contents of the label pointing to it (exact).
+nameFromLabelExact :: T.Text -> RequestBuilder site T.Text
+nameFromLabelExact label = do
+  mres <- fmap rbdResponse ST.get
+  res <-
+    case mres of
+      Nothing -> failure "nameFromLabel: No response available"
+      Just res -> return res
+  let
+    body = simpleBody res
+    mlabel = parseHTML body
+                $// C.element "label"
+                >=> contentIs label
+    mfor = mlabel >>= attribute "for"
+
+    contentIs x c
+        | x == T.concat (c $// content) = [c]
+        | otherwise = []
+
+  case mfor of
+    for:[] -> do
+      let mname = parseHTML body
+                    $// attributeIs "id" for
+                    >=> attribute "name"
+      case mname of
+        "":_ -> failure $ T.concat
+            [ "Label "
+            , label
+            , " resolved to id "
+            , for
+            , " which was not found. "
+            ]
+        name:_ -> return name
+        [] -> failure $ "No input with id " <> for
+    [] ->
+      case filter (/= "") $ mlabel >>= (child >=> C.element "input" >=> attribute "name") of
+        [] -> failure $ "No label contained: " <> label
+        name:_ -> return name
+    _ -> failure $ "More than one label contained " <> label
+
 (<>) :: T.Text -> T.Text -> T.Text
 (<>) = T.append
 
@@ -598,6 +639,38 @@ byLabel label value = do
   name <- nameFromLabel label
   addPostParam name value
 
+-- How does this work for the alternate <label><input></label> syntax?
+
+-- | Finds the @\<label>@ with the given value, finds its corresponding @\<input>@, then adds a parameter
+-- for that input to the request body.
+--
+-- ==== __Examples__
+--
+-- Given this HTML, we want to submit @f1=Michael@ to the server:
+--
+-- > <form method="POST">
+-- >   <label for="user">Username</label>
+-- >   <input id="user" name="f1" />
+-- > </form>
+--
+-- You can set this parameter like so:
+--
+-- > request $ do
+-- >   byLabel "Username" "Michael"
+--
+-- This function also supports the implicit label syntax, in which
+-- the @\<input>@ is nested inside the @\<label>@ rather than specified with @for@:
+--
+-- > <form method="POST">
+-- >   <label>Username <input name="f1"> </label>
+-- > </form>
+byLabelExact :: T.Text -- ^ The text contained in the @\<label>@.
+             -> T.Text -- ^ The value to set the parameter to.
+             -> RequestBuilder site ()
+byLabelExact label value = do
+  name <- nameFromLabelExact label
+  addPostParam name value
+
 -- | Finds the @\<label>@ with the given value, finds its corresponding @\<input>@, then adds a file for that input to the request body.
 --
 -- ==== __Examples__
diff --git a/yesod-test/test/main.hs b/yesod-test/test/main.hs
index f104bc19..6d43d790 100644
--- a/yesod-test/test/main.hs
+++ b/yesod-test/test/main.hs
@@ -223,6 +223,13 @@ main = hspec $ do
                     setUrl ("labels2" :: Text)
                     byLabel "hobby" "fishing")
                 assertEq "failure wasn't called" (isLeft bad) True
+            yit "byLabelExact performs an exact match over the given label name" $ do
+                get ("/labels2" :: Text)
+                (bad :: Either SomeException ()) <- try (request $ do
+                    setMethod "POST"
+                    setUrl ("labels2" :: Text)
+                    byLabelExact "hobby" "fishing")
+                assertEq "failure was called" (isRight bad) True
 
         ydescribe "Content-Type handling" $ do
             yit "can set a content-type" $ do

From 70ec8c6823ca8bf044e44476a50e73aef38152e5 Mon Sep 17 00:00:00 2001
From: pythonissam <k0uta120u@icloud.com>
Date: Sat, 2 Dec 2017 08:00:31 +0000
Subject: [PATCH 03/26] new function genericNameFromLabel which abstracts the
 match methods

---
 yesod-test/Yesod/Test.hs | 38 +++++++++++++++++++++-----------------
 1 file changed, 21 insertions(+), 17 deletions(-)

diff --git a/yesod-test/Yesod/Test.hs b/yesod-test/Yesod/Test.hs
index e736ddd3..21fae9c3 100644
--- a/yesod-test/Yesod/Test.hs
+++ b/yesod-test/Yesod/Test.hs
@@ -564,23 +564,23 @@ nameFromLabel label = do
         name:_ -> return name
     _ -> failure $ "More than one label contained " <> label
 
--- This looks up the name of a field based on the contents of the label pointing to it (exact).
-nameFromLabelExact :: T.Text -> RequestBuilder site T.Text
-nameFromLabelExact label = do
+-- This looks up the name of a field based on the contents of the label pointing to it.
+genericNameFromLabel :: (T.Text -> T.Text -> Bool) -> T.Text -> RequestBuilder site T.Text
+genericNameFromLabel match label = do
   mres <- fmap rbdResponse ST.get
   res <-
     case mres of
-      Nothing -> failure "nameFromLabel: No response available"
+      Nothing -> failure "genericNameFromLabel: No response available"
       Just res -> return res
   let
     body = simpleBody res
     mlabel = parseHTML body
                 $// C.element "label"
-                >=> contentIs label
+                >=> contentMatches label
     mfor = mlabel >>= attribute "for"
 
-    contentIs x c
-        | x == T.concat (c $// content) = [c]
+    contentMatches x c
+        | x `match` T.concat (c $// content) = [c]
         | otherwise = []
 
   case mfor of
@@ -632,11 +632,12 @@ nameFromLabelExact label = do
 -- > <form method="POST">
 -- >   <label>Username <input name="f1"> </label>
 -- > </form>
-byLabel :: T.Text -- ^ The text contained in the @\<label>@.
-        -> T.Text -- ^ The value to set the parameter to.
-        -> RequestBuilder site ()
-byLabel label value = do
-  name <- nameFromLabel label
+byLabelWithMatch :: (T.Text -> T.Text -> Bool)
+                 -> T.Text -- ^ The text contained in the @\<label>@.
+                 -> T.Text -- ^ The value to set the parameter to.
+                 -> RequestBuilder site ()
+byLabelWithMatch match label value = do
+  name <- genericNameFromLabel match label
   addPostParam name value
 
 -- How does this work for the alternate <label><input></label> syntax?
@@ -664,12 +665,15 @@ byLabel label value = do
 -- > <form method="POST">
 -- >   <label>Username <input name="f1"> </label>
 -- > </form>
-byLabelExact :: T.Text -- ^ The text contained in the @\<label>@.
+byLabel :: T.Text -- ^ The text contained in the @\<label>@.
+        -> T.Text -- ^ The value to set the parameter to.
+        -> RequestBuilder site ()
+byLabel = byLabelWithMatch T.isInfixOf
+
+byLabelExact :: T.Text
              -> T.Text -- ^ The value to set the parameter to.
              -> RequestBuilder site ()
-byLabelExact label value = do
-  name <- nameFromLabelExact label
-  addPostParam name value
+byLabelExact = byLabelWithMatch (==)
 
 -- | Finds the @\<label>@ with the given value, finds its corresponding @\<input>@, then adds a file for that input to the request body.
 --
@@ -698,7 +702,7 @@ fileByLabel :: T.Text -- ^ The text contained in the @\<label>@.
             -> T.Text -- ^ The MIME type of the file, e.g. "image/png".
             -> RequestBuilder site ()
 fileByLabel label path mime = do
-  name <- nameFromLabel label
+  name <- genericNameFromLabel T.isInfixOf label
   addFile name path mime
 
 -- | Lookups the hidden input named "_token" and adds its value to the params.

From 8693c72c41d704944750d2ea4b5bd30efb20e3a0 Mon Sep 17 00:00:00 2001
From: pythonissam <k0uta120u@icloud.com>
Date: Sat, 2 Dec 2017 08:05:59 +0000
Subject: [PATCH 04/26] Remove the original nameFromLabel

---
 yesod-test/Yesod/Test.hs | 40 ----------------------------------------
 1 file changed, 40 deletions(-)

diff --git a/yesod-test/Yesod/Test.hs b/yesod-test/Yesod/Test.hs
index 21fae9c3..8c4cdedd 100644
--- a/yesod-test/Yesod/Test.hs
+++ b/yesod-test/Yesod/Test.hs
@@ -524,46 +524,6 @@ addFile name path mimetype = do
           addPostData (MultipleItemsPostData posts) contents =
             MultipleItemsPostData $ ReqFilePart name path contents mimetype : posts
 
--- This looks up the name of a field based on the contents of the label pointing to it.
-nameFromLabel :: T.Text -> RequestBuilder site T.Text
-nameFromLabel label = do
-  mres <- fmap rbdResponse ST.get
-  res <-
-    case mres of
-      Nothing -> failure "nameFromLabel: No response available"
-      Just res -> return res
-  let
-    body = simpleBody res
-    mlabel = parseHTML body
-                $// C.element "label"
-                >=> contentContains label
-    mfor = mlabel >>= attribute "for"
-
-    contentContains x c
-        | x `T.isInfixOf` T.concat (c $// content) = [c]
-        | otherwise = []
-
-  case mfor of
-    for:[] -> do
-      let mname = parseHTML body
-                    $// attributeIs "id" for
-                    >=> attribute "name"
-      case mname of
-        "":_ -> failure $ T.concat
-            [ "Label "
-            , label
-            , " resolved to id "
-            , for
-            , " which was not found. "
-            ]
-        name:_ -> return name
-        [] -> failure $ "No input with id " <> for
-    [] ->
-      case filter (/= "") $ mlabel >>= (child >=> C.element "input" >=> attribute "name") of
-        [] -> failure $ "No label contained: " <> label
-        name:_ -> return name
-    _ -> failure $ "More than one label contained " <> label
-
 -- This looks up the name of a field based on the contents of the label pointing to it.
 genericNameFromLabel :: (T.Text -> T.Text -> Bool) -> T.Text -> RequestBuilder site T.Text
 genericNameFromLabel match label = do

From 57e25eaf398457658669f70e59421ec9d95b0078 Mon Sep 17 00:00:00 2001
From: pythonissam <k0uta120u@icloud.com>
Date: Sat, 2 Dec 2017 09:44:49 +0000
Subject: [PATCH 05/26] Improve the document

---
 yesod-test/Yesod/Test.hs | 75 ++++++++++++++++++++++++----------------
 1 file changed, 46 insertions(+), 29 deletions(-)

diff --git a/yesod-test/Yesod/Test.hs b/yesod-test/Yesod/Test.hs
index 8c4cdedd..82b92e42 100644
--- a/yesod-test/Yesod/Test.hs
+++ b/yesod-test/Yesod/Test.hs
@@ -567,34 +567,11 @@ genericNameFromLabel match label = do
 (<>) :: T.Text -> T.Text -> T.Text
 (<>) = T.append
 
--- How does this work for the alternate <label><input></label> syntax?
-
--- | Finds the @\<label>@ with the given value, finds its corresponding @\<input>@, then adds a parameter
--- for that input to the request body.
---
--- ==== __Examples__
---
--- Given this HTML, we want to submit @f1=Michael@ to the server:
---
--- > <form method="POST">
--- >   <label for="user">Username</label>
--- >   <input id="user" name="f1" />
--- > </form>
---
--- You can set this parameter like so:
---
--- > request $ do
--- >   byLabel "Username" "Michael"
---
--- This function also supports the implicit label syntax, in which
--- the @\<input>@ is nested inside the @\<label>@ rather than specified with @for@:
---
--- > <form method="POST">
--- >   <label>Username <input name="f1"> </label>
--- > </form>
-byLabelWithMatch :: (T.Text -> T.Text -> Bool)
-                 -> T.Text -- ^ The text contained in the @\<label>@.
-                 -> T.Text -- ^ The value to set the parameter to.
+-- |
+-- @since 1.5.9
+byLabelWithMatch :: (T.Text -> T.Text -> Bool) -- ^ The matching method which is used to find labels (i.e. exact, contains)
+                 -> T.Text                     -- ^ The text contained in the @\<label>@.
+                 -> T.Text                     -- ^ The value to set the parameter to.
                  -> RequestBuilder site ()
 byLabelWithMatch match label value = do
   name <- genericNameFromLabel match label
@@ -625,12 +602,52 @@ byLabelWithMatch match label value = do
 -- > <form method="POST">
 -- >   <label>Username <input name="f1"> </label>
 -- > </form>
+--
+-- Note that this function finds the labels in which contain the given word.
+-- It might choice labels unexpectedly or just fail in the circumstances like below:
+--
+-- > <form method="POST">
+-- >   <label for="nickname">Nickname</label>
+-- >   <input id="nickname" name="f1" />
+--
+-- >   <label for="nickname2">Nickname2</label>
+-- >   <input id="nickname2" name="f2" />
+-- > </form>
+--
+-- > request $ do
+-- >   byLabel "Nickname" "Snoyberger"
+--
+-- Therefore, this function is deprecated. Please consider using 'byLabelExact',
+-- which performs the exact match over the given word.
 byLabel :: T.Text -- ^ The text contained in the @\<label>@.
         -> T.Text -- ^ The value to set the parameter to.
         -> RequestBuilder site ()
 byLabel = byLabelWithMatch T.isInfixOf
 
-byLabelExact :: T.Text
+-- | Finds the @\<label>@ with the given value, finds its corresponding @\<input>@, then adds a parameter
+-- for that input to the request body.
+--
+-- ==== __Examples__
+--
+-- Given this HTML, we want to submit @f1=Michael@ to the server:
+--
+-- > <form method="POST">
+-- >   <label for="user">Username</label>
+-- >   <input id="user" name="f1" />
+-- > </form>
+--
+-- You can set this parameter like so:
+--
+-- > request $ do
+-- >   byLabel "Username" "Michael"
+--
+-- This function also supports the implicit label syntax, in which
+-- the @\<input>@ is nested inside the @\<label>@ rather than specified with @for@:
+--
+-- > <form method="POST">
+-- >   <label>Username <input name="f1"> </label>
+-- > </form>
+byLabelExact :: T.Text -- ^ The text in the @\<label>@.
              -> T.Text -- ^ The value to set the parameter to.
              -> RequestBuilder site ()
 byLabelExact = byLabelWithMatch (==)

From 8f218307be3ebd53dc2da89ef912f020833d7f9b Mon Sep 17 00:00:00 2001
From: pythonissam <k0uta120u@icloud.com>
Date: Sat, 2 Dec 2017 09:46:41 +0000
Subject: [PATCH 06/26] Improve the function name

---
 yesod-test/Yesod/Test.hs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/yesod-test/Yesod/Test.hs b/yesod-test/Yesod/Test.hs
index 82b92e42..5ea789e2 100644
--- a/yesod-test/Yesod/Test.hs
+++ b/yesod-test/Yesod/Test.hs
@@ -536,10 +536,10 @@ genericNameFromLabel match label = do
     body = simpleBody res
     mlabel = parseHTML body
                 $// C.element "label"
-                >=> contentMatches label
+                >=> isContentMatch label
     mfor = mlabel >>= attribute "for"
 
-    contentMatches x c
+    isContentMatch x c
         | x `match` T.concat (c $// content) = [c]
         | otherwise = []
 

From db87b768166334744b9a21bde98e1ccd0ef41bed Mon Sep 17 00:00:00 2001
From: pythonissam <k0uta120u@icloud.com>
Date: Sat, 2 Dec 2017 09:56:56 +0000
Subject: [PATCH 07/26] Add version info

---
 yesod-test/Yesod/Test.hs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/yesod-test/Yesod/Test.hs b/yesod-test/Yesod/Test.hs
index 5ea789e2..bf8689a6 100644
--- a/yesod-test/Yesod/Test.hs
+++ b/yesod-test/Yesod/Test.hs
@@ -524,7 +524,10 @@ addFile name path mimetype = do
           addPostData (MultipleItemsPostData posts) contents =
             MultipleItemsPostData $ ReqFilePart name path contents mimetype : posts
 
+-- |
 -- This looks up the name of a field based on the contents of the label pointing to it.
+--
+-- @since 1.5.9
 genericNameFromLabel :: (T.Text -> T.Text -> Bool) -> T.Text -> RequestBuilder site T.Text
 genericNameFromLabel match label = do
   mres <- fmap rbdResponse ST.get
@@ -647,6 +650,8 @@ byLabel = byLabelWithMatch T.isInfixOf
 -- > <form method="POST">
 -- >   <label>Username <input name="f1"> </label>
 -- > </form>
+--
+-- @since 1.5.9
 byLabelExact :: T.Text -- ^ The text in the @\<label>@.
              -> T.Text -- ^ The value to set the parameter to.
              -> RequestBuilder site ()

From e5c04a0b8ee7c668a69ddc8a496ebe93418ed258 Mon Sep 17 00:00:00 2001
From: pythonissam <k0uta120u@icloud.com>
Date: Sat, 2 Dec 2017 09:57:40 +0000
Subject: [PATCH 08/26] Version bump

---
 yesod-test/yesod-test.cabal | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/yesod-test/yesod-test.cabal b/yesod-test/yesod-test.cabal
index d2df283d..57f48170 100644
--- a/yesod-test/yesod-test.cabal
+++ b/yesod-test/yesod-test.cabal
@@ -1,5 +1,5 @@
 name:               yesod-test
-version:            1.5.8
+version:            1.5.9
 license:            MIT
 license-file:       LICENSE
 author:             Nubis <nubis@woobiz.com.ar>

From 699203f5afb366d77165f001090904930e378d83 Mon Sep 17 00:00:00 2001
From: pythonissam <k0uta120u@icloud.com>
Date: Sat, 2 Dec 2017 10:14:24 +0000
Subject: [PATCH 09/26] Update the Changelog

---
 yesod-test/ChangeLog.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/yesod-test/ChangeLog.md b/yesod-test/ChangeLog.md
index 41acb0c8..1a03a169 100644
--- a/yesod-test/ChangeLog.md
+++ b/yesod-test/ChangeLog.md
@@ -1,3 +1,7 @@
+## 1.5.9
+* Add byLabelExact and related functions
+[#1459](https://github.com/yesodweb/yesod/pull/1459)
+
 ## 1.5.8
 * Added implicit parameter HasCallStack to assertions.
 [#1421](https://github.com/yesodweb/yesod/pull/1421)

From baf30d0c9d9deac50feb7ee21fbdbee86387ae51 Mon Sep 17 00:00:00 2001
From: kotaro <k0uta120u@gmail.com>
Date: Mon, 4 Dec 2017 17:12:51 +0900
Subject: [PATCH 10/26] Improve comments

---
 yesod-test/Yesod/Test.hs | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/yesod-test/Yesod/Test.hs b/yesod-test/Yesod/Test.hs
index bf8689a6..74874f6a 100644
--- a/yesod-test/Yesod/Test.hs
+++ b/yesod-test/Yesod/Test.hs
@@ -526,8 +526,6 @@ addFile name path mimetype = do
 
 -- |
 -- This looks up the name of a field based on the contents of the label pointing to it.
---
--- @since 1.5.9
 genericNameFromLabel :: (T.Text -> T.Text -> Bool) -> T.Text -> RequestBuilder site T.Text
 genericNameFromLabel match label = do
   mres <- fmap rbdResponse ST.get
@@ -570,8 +568,6 @@ genericNameFromLabel match label = do
 (<>) :: T.Text -> T.Text -> T.Text
 (<>) = T.append
 
--- |
--- @since 1.5.9
 byLabelWithMatch :: (T.Text -> T.Text -> Bool) -- ^ The matching method which is used to find labels (i.e. exact, contains)
                  -> T.Text                     -- ^ The text contained in the @\<label>@.
                  -> T.Text                     -- ^ The value to set the parameter to.
@@ -606,8 +602,9 @@ byLabelWithMatch match label value = do
 -- >   <label>Username <input name="f1"> </label>
 -- > </form>
 --
--- Note that this function finds the labels in which contain the given word.
--- It might choice labels unexpectedly or just fail in the circumstances like below:
+-- Warning: This function looks for any label that contains the provided text.
+-- If multiple labels contain that text, this function will throw an error,
+-- as in the example below:
 --
 -- > <form method="POST">
 -- >   <label for="nickname">Nickname</label>
@@ -620,8 +617,10 @@ byLabelWithMatch match label value = do
 -- > request $ do
 -- >   byLabel "Nickname" "Snoyberger"
 --
+-- Then, it throws "More than one label contained" error.
+--
 -- Therefore, this function is deprecated. Please consider using 'byLabelExact',
--- which performs the exact match over the given word.
+-- which performs the exact match over the provided text.
 byLabel :: T.Text -- ^ The text contained in the @\<label>@.
         -> T.Text -- ^ The value to set the parameter to.
         -> RequestBuilder site ()

From f7f2c1edbd94f6f357a70291a128e6ebb48d8d39 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Wed, 6 Dec 2017 16:02:01 +0200
Subject: [PATCH 11/26] Switch CoC to Contributor Covenant

---
 CODE_OF_CONDUCT.md | 77 +++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 69 insertions(+), 8 deletions(-)

diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
index 1210bef0..b819c716 100644
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -1,13 +1,74 @@
-# Contributor Code of Conduct
+# Contributor Covenant Code of Conduct
 
-Always be nice.
+## Our Pledge
 
-When communicating online treat people the way you would if
-they were standing next to you.
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, gender identity and expression, level of experience,
+education, socio-economic status, nationality, personal appearance, race,
+religion, or sexual identity and orientation.
 
-Don't forget to be nice whenever representing the
-project to others outside the project.
+## Our Standards
 
-If you are not nice, apologize.
+Examples of behavior that contributes to creating a positive environment
+include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or
+  advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic
+  address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting the project team at `michael at snoyman dot com`. All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. The project team is
+obligated to maintain confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
+
+[homepage]: https://www.contributor-covenant.org
 
-If someone is not being nice, tell them in a respectful way or tell a project maintainer: we care about fostering a welcoming community.

From 663220f3344bd331812d12d2084b099fc1b7b4d2 Mon Sep 17 00:00:00 2001
From: Sibi Prabakaran <sibi@psibi.in>
Date: Fri, 8 Dec 2017 15:30:32 +0530
Subject: [PATCH 12/26] Fix exposed version number and also haddock syntax

---
 yesod-auth/Yesod/Auth.hs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/yesod-auth/Yesod/Auth.hs b/yesod-auth/Yesod/Auth.hs
index 4a0eb390..2e15cdc2 100644
--- a/yesod-auth/Yesod/Auth.hs
+++ b/yesod-auth/Yesod/Auth.hs
@@ -184,7 +184,8 @@ class (Yesod master, PathPiece (AuthId master), RenderMessage master FormMessage
 
     -- | When being redirected to the login page should the current page
     -- be set to redirect back to. Default is 'True'.
-    -- @since 1.4.18
+    --                      
+    -- @since 1.4.21
     redirectToCurrent :: master -> Bool
     redirectToCurrent _ = True
 

From aff72a7365f6741a93377488ee3b9205cafec3d6 Mon Sep 17 00:00:00 2001
From: Sibi Prabakaran <sibi@psibi.in>
Date: Fri, 8 Dec 2017 15:33:15 +0530
Subject: [PATCH 13/26] Fix since markup

---
 yesod-auth/Yesod/Auth.hs | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/yesod-auth/Yesod/Auth.hs b/yesod-auth/Yesod/Auth.hs
index 2e15cdc2..b382630a 100644
--- a/yesod-auth/Yesod/Auth.hs
+++ b/yesod-auth/Yesod/Auth.hs
@@ -85,7 +85,7 @@ type Piece = Text
 
 -- | The result of an authentication based on credentials
 --
--- Since 1.4.4
+-- @since 1.4.4
 data AuthenticationResult master
     = Authenticated (AuthId master) -- ^ Authenticated successfully
     | UserError AuthMessage         -- ^ Invalid credentials provided by user
@@ -126,7 +126,7 @@ class (Yesod master, PathPiece (AuthId master), RenderMessage master FormMessage
     --
     -- Default implementation is in terms of @'getAuthId'@
     --
-    -- Since: 1.4.4
+    -- @since 1.4.4
     authenticate :: Creds master -> HandlerT master IO (AuthenticationResult master)
     authenticate creds = do
         muid <- getAuthId creds
@@ -212,7 +212,7 @@ class (Yesod master, PathPiece (AuthId master), RenderMessage master FormMessage
     -- especially useful for creating an API to be accessed via some means
     -- other than a browser.
     --
-    -- Since 1.2.0
+    -- @since 1.2.0
     maybeAuthId :: HandlerT master IO (Maybe (AuthId master))
 
     default maybeAuthId
@@ -243,7 +243,7 @@ class (Yesod master, PathPiece (AuthId master), RenderMessage master FormMessage
 
 -- | Internal session key used to hold the authentication information.
 --
--- Since 1.2.3
+-- @since 1.2.3
 credsKey :: Text
 credsKey = "_ID"
 
@@ -253,7 +253,7 @@ credsKey = "_ID"
 -- 'maybeAuthIdRaw' for more information. The first call in a request
 -- does a database request to make sure that the account is still in the database.
 --
--- Since 1.1.2
+-- @since 1.1.2
 defaultMaybeAuthId
     :: (YesodAuthPersist master, Typeable (AuthEntity master))
     => HandlerT master IO (Maybe (AuthId master))
@@ -278,7 +278,7 @@ cachedAuth
 -- This is the default 'loginHandler'.  It concatenates plugin widgets and
 -- wraps the result in 'authLayout'.  See 'loginHandler' for more details.
 --
--- Since 1.4.9
+-- @since 1.4.9
 defaultLoginHandler :: AuthHandler master Html
 defaultLoginHandler = do
     tp <- getRouteToParent
@@ -399,7 +399,7 @@ authLayoutJson w json = selectRep $ do
 
 -- | Clears current user credentials for the session.
 --
--- Since 1.1.7
+-- @since 1.1.7
 clearCreds :: YesodAuth master
            => Bool -- ^ if HTTP redirect to 'logoutDest' should be done
            -> HandlerT master IO ()
@@ -458,7 +458,7 @@ handlePluginR plugin pieces = do
 -- with the user\'s database identifier to get the value in the database. This
 -- assumes that you are using a Persistent database.
 --
--- Since 1.1.0
+-- @since 1.1.0
 maybeAuth :: ( YesodAuthPersist master
              , val ~ AuthEntity master
              , Key val ~ AuthId master
@@ -472,7 +472,7 @@ maybeAuth = runMaybeT $ do
 -- | Similar to 'maybeAuth', but doesn’t assume that you are using a
 -- Persistent database.
 --
--- Since 1.4.0
+-- @since 1.4.0
 maybeAuthPair :: (YesodAuthPersist master, Typeable (AuthEntity master))
               => HandlerT master IO (Maybe (AuthId master, AuthEntity master))
 maybeAuthPair = runMaybeT $ do
@@ -493,7 +493,7 @@ newtype CachedMaybeAuth val = CachedMaybeAuth { unCachedMaybeAuth :: Maybe val }
 -- given value.  This is the common case in Yesod, and means that you can
 -- easily look up the full information on a given user.
 --
--- Since 1.4.0
+-- @since 1.4.0
 class (YesodAuth master, YesodPersist master) => YesodAuthPersist master where
     -- | If the @AuthId@ for a given site is a persistent ID, this will give the
     -- value for that entity. E.g.:
@@ -501,7 +501,7 @@ class (YesodAuth master, YesodPersist master) => YesodAuthPersist master where
     -- > type AuthId MySite = UserId
     -- > AuthEntity MySite ~ User
     --
-    -- Since 1.2.0
+    -- @since 1.2.0
     type AuthEntity master :: *
     type AuthEntity master = KeyEntity (AuthId master)
 
@@ -534,14 +534,14 @@ type instance KeyEntity (Key x) = x
 -- | Similar to 'maybeAuthId', but redirects to a login page if user is not
 -- authenticated or responds with error 401 if this is an API client (expecting JSON).
 --
--- Since 1.1.0
+-- @since 1.1.0
 requireAuthId :: YesodAuth master => HandlerT master IO (AuthId master)
 requireAuthId = maybeAuthId >>= maybe handleAuthLack return
 
 -- | Similar to 'maybeAuth', but redirects to a login page if user is not
 -- authenticated or responds with error 401 if this is an API client (expecting JSON).
 --
--- Since 1.1.0
+-- @since 1.1.0
 requireAuth :: ( YesodAuthPersist master
                , val ~ AuthEntity master
                , Key val ~ AuthId master
@@ -553,7 +553,7 @@ requireAuth = maybeAuth >>= maybe handleAuthLack return
 -- | Similar to 'requireAuth', but not tied to Persistent's 'Entity' type.
 -- Instead, the 'AuthId' and 'AuthEntity' are returned in a tuple.
 --
--- Since 1.4.0
+-- @since 1.4.0
 requireAuthPair :: (YesodAuthPersist master, Typeable (AuthEntity master))
                 => HandlerT master IO (AuthId master, AuthEntity master)
 requireAuthPair = maybeAuthPair >>= maybe handleAuthLack return

From 323d7f432296772284f781e554d986a0968b2d51 Mon Sep 17 00:00:00 2001
From: Sibi Prabakaran <sibi@psibi.in>
Date: Wed, 13 Dec 2017 02:33:37 +0530
Subject: [PATCH 14/26] Fix haddock doc for the Yesod.Core.Unsafe module

---
 yesod-core/Yesod/Core/Unsafe.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/yesod-core/Yesod/Core/Unsafe.hs b/yesod-core/Yesod/Core/Unsafe.hs
index ea15e7b3..45dd3c13 100644
--- a/yesod-core/Yesod/Core/Unsafe.hs
+++ b/yesod-core/Yesod/Core/Unsafe.hs
@@ -1,7 +1,7 @@
 {-# LANGUAGE CPP #-}
 -- | This is designed to be used as
 --
--- > qualified import Yesod.Core.Unsafe as Unsafe
+-- > import qualified Yesod.Core.Unsafe as Unsafe
 --
 -- This serves as a reminder that the functions are unsafe to use in many situations.
 module Yesod.Core.Unsafe (runFakeHandler, fakeHandlerGetLogger) where

From 31903c34f8c37319e69fab80f43b53c2cf835a15 Mon Sep 17 00:00:00 2001
From: pythonissam <k0uta120u@icloud.com>
Date: Sun, 17 Dec 2017 08:50:48 +0000
Subject: [PATCH 15/26] fileByLabelExact: Created the exact version of
 fileByLabel

---
 yesod-test/Yesod/Test.hs | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/yesod-test/Yesod/Test.hs b/yesod-test/Yesod/Test.hs
index 74874f6a..2762f42d 100644
--- a/yesod-test/Yesod/Test.hs
+++ b/yesod-test/Yesod/Test.hs
@@ -75,6 +75,7 @@ module Yesod.Test
     , byLabel
     , byLabelExact
     , fileByLabel
+    , fileByLabelExact
 
     -- *** CSRF Tokens
     -- | In order to prevent CSRF exploits, yesod-form adds a hidden input
@@ -678,6 +679,8 @@ byLabelExact = byLabelWithMatch (==)
 -- > <form method="POST">
 -- >   <label>Please submit an image <input type="file" name="f1"> </label>
 -- > </form>
+--
+-- Warning: There exists the same issue of 'byLabel'. Please use 'fileByLabelExact' instead.
 fileByLabel :: T.Text -- ^ The text contained in the @\<label>@.
             -> FilePath -- ^ The path to the file.
             -> T.Text -- ^ The MIME type of the file, e.g. "image/png".
@@ -686,6 +689,38 @@ fileByLabel label path mime = do
   name <- genericNameFromLabel T.isInfixOf label
   addFile name path mime
 
+  -- | Finds the @\<label>@ with the given value, finds its corresponding @\<input>@, then adds a file for that input to the request body.
+--
+-- ==== __Examples__
+--
+-- Given this HTML, we want to submit a file with the parameter name @f1@ to the server:
+--
+-- > <form method="POST">
+-- >   <label for="imageInput">Please submit an image</label>
+-- >   <input id="imageInput" type="file" name="f1" accept="image/*">
+-- > </form>
+--
+-- You can set this parameter like so:
+--
+-- > request $ do
+-- >   fileByLabel "Please submit an image" "static/img/picture.png" "img/png"
+--
+-- This function also supports the implicit label syntax, in which
+-- the @\<input>@ is nested inside the @\<label>@ rather than specified with @for@:
+--
+-- > <form method="POST">
+-- >   <label>Please submit an image <input type="file" name="f1"> </label>
+-- > </form>
+--
+-- @since 1.5.9
+fileByLabelExact :: T.Text -- ^ The text contained in the @\<label>@.
+                 -> FilePath -- ^ The path to the file.
+                 -> T.Text -- ^ The MIME type of the file, e.g. "image/png".
+                 -> RequestBuilder site ()
+fileByLabelExact label path mime = do
+  name <- genericNameFromLabel (==) label
+  addFile name path mime
+
 -- | Lookups the hidden input named "_token" and adds its value to the params.
 -- Receives a CSS selector that should resolve to the form element containing the token.
 --

From 8cf44ff7c843a38b2ef983dd12d9f2ba6279da7f Mon Sep 17 00:00:00 2001
From: kotaro <k0uta120u@gmail.com>
Date: Mon, 18 Dec 2017 13:34:16 +0900
Subject: [PATCH 16/26] Small fix of haddock

---
 yesod-test/Yesod/Test.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/yesod-test/Yesod/Test.hs b/yesod-test/Yesod/Test.hs
index 2762f42d..9b0d0640 100644
--- a/yesod-test/Yesod/Test.hs
+++ b/yesod-test/Yesod/Test.hs
@@ -680,7 +680,7 @@ byLabelExact = byLabelWithMatch (==)
 -- >   <label>Please submit an image <input type="file" name="f1"> </label>
 -- > </form>
 --
--- Warning: There exists the same issue of 'byLabel'. Please use 'fileByLabelExact' instead.
+-- Warning: This function has the same issue as 'byLabel'. Please use 'fileByLabelExact' instead.
 fileByLabel :: T.Text -- ^ The text contained in the @\<label>@.
             -> FilePath -- ^ The path to the file.
             -> T.Text -- ^ The MIME type of the file, e.g. "image/png".

From 8e52b490fee45df9bd160df5b0e61dc19bfa8022 Mon Sep 17 00:00:00 2001
From: kotaro <k0uta120u@gmail.com>
Date: Mon, 18 Dec 2017 14:10:12 +0900
Subject: [PATCH 17/26] Insert deprecated pragmas for byLabel and fileByLabel

---
 yesod-test/Yesod/Test.hs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/yesod-test/Yesod/Test.hs b/yesod-test/Yesod/Test.hs
index 9b0d0640..3234db5e 100644
--- a/yesod-test/Yesod/Test.hs
+++ b/yesod-test/Yesod/Test.hs
@@ -164,6 +164,8 @@ import GHC.Exts (Constraint)
 type HasCallStack = (() :: Constraint)
 #endif
 
+{-# DEPRECATED byLabel "This function seems to have multiple bugs. Use byLabelExact instead" #-}
+{-# DEPRECATED fileByLabel "This function seems to have multiple bugs. Use fileByLabelExact instead" #-}
 
 -- | The state used in a single test case defined using 'yit'
 --

From 5a5cd8127607b034cb032baf9b404938454b1f4e Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Tue, 19 Dec 2017 11:53:41 +0200
Subject: [PATCH 18/26] Support typed-process-0.2.0.0 (fixes #1467)

---
 stack.yaml                | 4 ++++
 yesod-bin/ChangeLog.md    | 4 ++++
 yesod-bin/Devel.hs        | 2 +-
 yesod-bin/yesod-bin.cabal | 5 ++---
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/stack.yaml b/stack.yaml
index 213e9db3..043ac48d 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -13,3 +13,7 @@ packages:
   - ./yesod
   - ./yesod-eventsource
   - ./yesod-websockets
+extra-deps:
+- conduit-extra-1.2.2
+- unliftio-core-0.1.0.0
+- typed-process-0.2.0.0
diff --git a/yesod-bin/ChangeLog.md b/yesod-bin/ChangeLog.md
index 1380e9af..0020b34a 100644
--- a/yesod-bin/ChangeLog.md
+++ b/yesod-bin/ChangeLog.md
@@ -1,3 +1,7 @@
+## 1.5.3
+
+* Support typed-process-0.2.0.0
+
 ## 1.5.2.6
 
 * Drop an upper bound
diff --git a/yesod-bin/Devel.hs b/yesod-bin/Devel.hs
index 18de9347..4579064b 100644
--- a/yesod-bin/Devel.hs
+++ b/yesod-bin/Devel.hs
@@ -61,7 +61,7 @@ import           System.FilePath                       (takeDirectory,
 import           System.FSNotify
 import           System.IO                             (stdout, stderr)
 import           System.IO.Error                       (isDoesNotExistError)
-import           System.Process.Typed
+import           Data.Conduit.Process.Typed
 
 -- We have two special files:
 --
diff --git a/yesod-bin/yesod-bin.cabal b/yesod-bin/yesod-bin.cabal
index cb8acaa0..64f9b818 100644
--- a/yesod-bin/yesod-bin.cabal
+++ b/yesod-bin/yesod-bin.cabal
@@ -1,5 +1,5 @@
 name:            yesod-bin
-version:         1.5.2.6
+version:         1.5.3
 license:         MIT
 license-file:    LICENSE
 author:          Michael Snoyman <michael@snoyman.com>
@@ -49,7 +49,7 @@ executable             yesod
                      , split              >= 0.2          && < 0.3
                      , file-embed
                      , conduit            >= 1.2
-                     , conduit-extra
+                     , conduit-extra      >= 1.2.2
                      , resourcet          >= 0.3          && < 1.2
                      , base64-bytestring
                      , lifted-base
@@ -71,7 +71,6 @@ executable             yesod
                      , warp-tls           >= 3.0.1
                      , async
                      , deepseq
-                     , typed-process
 
     ghc-options:       -Wall -threaded -rtsopts
     main-is:           main.hs

From 8a0778a58a7842cc384ced0dbd6c625e9d1bbeee Mon Sep 17 00:00:00 2001
From: Andrey Dyagel <AndreyDyagel@coherentsolutions.com>
Date: Fri, 22 Dec 2017 16:15:13 +0300
Subject: [PATCH 19/26] Fix typo breaking some parsers

---
 yesod-form/Yesod/Form/MassInput.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/yesod-form/Yesod/Form/MassInput.hs b/yesod-form/Yesod/Form/MassInput.hs
index a87b804c..e794ff27 100644
--- a/yesod-form/Yesod/Form/MassInput.hs
+++ b/yesod-form/Yesod/Form/MassInput.hs
@@ -2,7 +2,7 @@
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE TypeFamilies #-}
 {-# LANGUAGE FlexibleContexts #-}
-{-# LANGUAGE CPP#-}
+{-# LANGUAGE CPP #-}
 -- | A module providing a means of creating multiple input forms, such as a
 -- list of 0 or more recipients.
 module Yesod.Form.MassInput

From daa953ed1f9a5c1ee9901db8064add1c6ea9c439 Mon Sep 17 00:00:00 2001
From: kotaro <k0uta120u@gmail.com>
Date: Wed, 27 Dec 2017 09:47:57 +0900
Subject: [PATCH 20/26] Add PR link into the deprecated pragmas

---
 yesod-test/Yesod/Test.hs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/yesod-test/Yesod/Test.hs b/yesod-test/Yesod/Test.hs
index 3234db5e..a9e474d3 100644
--- a/yesod-test/Yesod/Test.hs
+++ b/yesod-test/Yesod/Test.hs
@@ -164,8 +164,8 @@ import GHC.Exts (Constraint)
 type HasCallStack = (() :: Constraint)
 #endif
 
-{-# DEPRECATED byLabel "This function seems to have multiple bugs. Use byLabelExact instead" #-}
-{-# DEPRECATED fileByLabel "This function seems to have multiple bugs. Use fileByLabelExact instead" #-}
+{-# DEPRECATED byLabel "This function seems to have multiple bugs (ref: https://github.com/yesodweb/yesod/pull/1459). Use byLabelExact instead" #-}
+{-# DEPRECATED fileByLabel "This function seems to have multiple bugs (ref: https://github.com/yesodweb/yesod/pull/1459). Use fileByLabelExact instead" #-}
 
 -- | The state used in a single test case defined using 'yit'
 --

From 3bf6a8959559c8d881953186a15f5cb9aac8f523 Mon Sep 17 00:00:00 2001
From: Maximilian Tagher <feedback.tagher@gmail.com>
Date: Fri, 29 Dec 2017 20:17:48 -0500
Subject: [PATCH 21/26] Update PULL_REQUEST_TEMPLATE.md

---
 .github/PULL_REQUEST_TEMPLATE.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index c9839a31..e704b0be 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -2,7 +2,7 @@ Before submitting your PR, check that you've:
 
 - [ ] Bumped the version number
 - [ ] Documented new APIs with [Haddock markup](https://www.haskell.org/haddock/doc/html/index.html)
-- [ ] Added [`@since` declarations](http://haskell-haddock.readthedocs.io/en/latest/markup.html#since) to the Haddock
+- [ ] Added [`@since` declarations](http://haskell-haddock.readthedocs.io/en/latest/markup.html#since) to the Haddocks for new, public APIs
 
 After submitting your PR:
 
@@ -11,4 +11,4 @@ After submitting your PR:
 
 <!---Thanks so much for contributing! :)
 
-_If these checkboxes don't apply to your PR, you can delete them_-->
\ No newline at end of file
+_If these checkboxes don't apply to your PR, you can delete them_-->

From 51bdb6625226fdbc1036c661e538328619939615 Mon Sep 17 00:00:00 2001
From: Maximilian Tagher <feedback.tagher@gmail.com>
Date: Fri, 29 Dec 2017 20:14:09 -0500
Subject: [PATCH 22/26] Fix Haddock syntax error and test failures introduced
 by #1459

---
 yesod-test/ChangeLog.md     | 3 +++
 yesod-test/Yesod/Test.hs    | 2 +-
 yesod-test/test/main.hs     | 3 +++
 yesod-test/yesod-test.cabal | 2 +-
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/yesod-test/ChangeLog.md b/yesod-test/ChangeLog.md
index 1a03a169..fafe86c5 100644
--- a/yesod-test/ChangeLog.md
+++ b/yesod-test/ChangeLog.md
@@ -1,3 +1,6 @@
+## 1.5.9.1
+* Fixes a Haddock syntax error in 1.5.9 [#1473](https://github.com/yesodweb/yesod/pull/1473)
+
 ## 1.5.9
 * Add byLabelExact and related functions
 [#1459](https://github.com/yesodweb/yesod/pull/1459)
diff --git a/yesod-test/Yesod/Test.hs b/yesod-test/Yesod/Test.hs
index a9e474d3..307619cc 100644
--- a/yesod-test/Yesod/Test.hs
+++ b/yesod-test/Yesod/Test.hs
@@ -691,7 +691,7 @@ fileByLabel label path mime = do
   name <- genericNameFromLabel T.isInfixOf label
   addFile name path mime
 
-  -- | Finds the @\<label>@ with the given value, finds its corresponding @\<input>@, then adds a file for that input to the request body.
+-- | Finds the @\<label>@ with the given value, finds its corresponding @\<input>@, then adds a file for that input to the request body.
 --
 -- ==== __Examples__
 --
diff --git a/yesod-test/test/main.hs b/yesod-test/test/main.hs
index 6d43d790..e6756d7d 100644
--- a/yesod-test/test/main.hs
+++ b/yesod-test/test/main.hs
@@ -1,3 +1,6 @@
+-- Ignore warnings about using deprecated byLabel/fileByLabel functions
+{-# OPTIONS_GHC -fno-warn-warnings-deprecations #-}
+
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE CPP #-}
diff --git a/yesod-test/yesod-test.cabal b/yesod-test/yesod-test.cabal
index 57f48170..c49e12fe 100644
--- a/yesod-test/yesod-test.cabal
+++ b/yesod-test/yesod-test.cabal
@@ -1,5 +1,5 @@
 name:               yesod-test
-version:            1.5.9
+version:            1.5.9.1
 license:            MIT
 license-file:       LICENSE
 author:             Nubis <nubis@woobiz.com.ar>

From ed40b136ea180f9dfa98708722e9472a79e39ae8 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Sat, 30 Dec 2017 18:06:31 +0200
Subject: [PATCH 23/26] Fix broken Haddocks

---
 yesod-test/ChangeLog.md     | 4 ++++
 yesod-test/Yesod/Test.hs    | 2 +-
 yesod-test/yesod-test.cabal | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/yesod-test/ChangeLog.md b/yesod-test/ChangeLog.md
index 1a03a169..eb33c23a 100644
--- a/yesod-test/ChangeLog.md
+++ b/yesod-test/ChangeLog.md
@@ -1,3 +1,7 @@
+## 1.5.9.1
+
+* Fix broken Haddocks
+
 ## 1.5.9
 * Add byLabelExact and related functions
 [#1459](https://github.com/yesodweb/yesod/pull/1459)
diff --git a/yesod-test/Yesod/Test.hs b/yesod-test/Yesod/Test.hs
index a9e474d3..307619cc 100644
--- a/yesod-test/Yesod/Test.hs
+++ b/yesod-test/Yesod/Test.hs
@@ -691,7 +691,7 @@ fileByLabel label path mime = do
   name <- genericNameFromLabel T.isInfixOf label
   addFile name path mime
 
-  -- | Finds the @\<label>@ with the given value, finds its corresponding @\<input>@, then adds a file for that input to the request body.
+-- | Finds the @\<label>@ with the given value, finds its corresponding @\<input>@, then adds a file for that input to the request body.
 --
 -- ==== __Examples__
 --
diff --git a/yesod-test/yesod-test.cabal b/yesod-test/yesod-test.cabal
index 57f48170..c49e12fe 100644
--- a/yesod-test/yesod-test.cabal
+++ b/yesod-test/yesod-test.cabal
@@ -1,5 +1,5 @@
 name:               yesod-test
-version:            1.5.9
+version:            1.5.9.1
 license:            MIT
 license-file:       LICENSE
 author:             Nubis <nubis@woobiz.com.ar>

From eac95935e6fff7f01634b56d41960b4b4577ae8b Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Sat, 30 Dec 2017 22:47:56 +0200
Subject: [PATCH 24/26] Switch over to WIP conduit 1.3

---
 yesod-bin/yesod-bin.cabal                 | 6 +++---
 yesod-core/yesod-core.cabal               | 4 ++--
 yesod-eventsource/yesod-eventsource.cabal | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/yesod-bin/yesod-bin.cabal b/yesod-bin/yesod-bin.cabal
index 64f9b818..3bb4f2b5 100644
--- a/yesod-bin/yesod-bin.cabal
+++ b/yesod-bin/yesod-bin.cabal
@@ -48,9 +48,9 @@ executable             yesod
                      , fsnotify           >= 0.0          && < 0.3
                      , split              >= 0.2          && < 0.3
                      , file-embed
-                     , conduit            >= 1.2
-                     , conduit-extra      >= 1.2.2
-                     , resourcet          >= 0.3          && < 1.2
+                     , conduit            >= 1.3
+                     , conduit-extra      >= 1.3
+                     , resourcet          >= 1.2
                      , base64-bytestring
                      , lifted-base
                      , http-reverse-proxy >= 0.4
diff --git a/yesod-core/yesod-core.cabal b/yesod-core/yesod-core.cabal
index 84ae5ab0..dd5306ec 100644
--- a/yesod-core/yesod-core.cabal
+++ b/yesod-core/yesod-core.cabal
@@ -51,8 +51,8 @@ library
                    , fast-logger           >= 2.2
                    , wai-logger            >= 0.2
                    , monad-logger          >= 0.3.10   && < 0.4
-                   , conduit               >= 1.2
-                   , resourcet             >= 0.4.9    && < 1.2
+                   , conduit               >= 1.3
+                   , resourcet             >= 1.2
                    , lifted-base           >= 0.1.2
                    , blaze-html            >= 0.5
                    , blaze-markup          >= 0.7.1
diff --git a/yesod-eventsource/yesod-eventsource.cabal b/yesod-eventsource/yesod-eventsource.cabal
index bb64a9e3..db77ea47 100644
--- a/yesod-eventsource/yesod-eventsource.cabal
+++ b/yesod-eventsource/yesod-eventsource.cabal
@@ -16,7 +16,7 @@ extra-source-files: README.md ChangeLog.md
 library
     build-depends:   base                  >= 4        && < 5
                    , yesod-core            == 1.4.*
-                   , conduit               >= 0.5      && < 1.3
+                   , conduit               >= 1.3
                    , wai                   >= 1.3
                    , wai-eventsource       >= 1.3
                    , wai-extra

From a16e75249a0c61359664c5b3b410802b2f28bab8 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Sun, 31 Dec 2017 09:20:02 +0200
Subject: [PATCH 25/26] More moving over to unliftio

---
 yesod-auth/Yesod/Auth/GoogleEmail.hs          | 89 -------------------
 yesod-auth/Yesod/Auth/OpenId.hs               |  2 +-
 yesod-auth/yesod-auth.cabal                   |  3 +-
 yesod-core/Yesod/Core.hs                      |  7 +-
 yesod-core/Yesod/Core/Class/Handler.hs        | 14 ++-
 yesod-core/Yesod/Core/Content.hs              |  2 +-
 yesod-core/Yesod/Core/Handler.hs              | 18 ++--
 yesod-core/Yesod/Core/Json.hs                 |  2 +-
 yesod-core/Yesod/Core/Types.hs                | 56 +-----------
 yesod-core/test/YesodCoreTest/Cache.hs        |  2 +-
 .../test/YesodCoreTest/ErrorHandling.hs       |  6 +-
 yesod-core/yesod-core.cabal                   |  7 +-
 yesod-static/Yesod/Static.hs                  |  2 +-
 yesod-websockets/Yesod/WebSockets.hs          | 49 ++--------
 yesod-websockets/yesod-websockets.cabal       |  4 +-
 15 files changed, 39 insertions(+), 224 deletions(-)
 delete mode 100644 yesod-auth/Yesod/Auth/GoogleEmail.hs

diff --git a/yesod-auth/Yesod/Auth/GoogleEmail.hs b/yesod-auth/Yesod/Auth/GoogleEmail.hs
deleted file mode 100644
index eb0b6cee..00000000
--- a/yesod-auth/Yesod/Auth/GoogleEmail.hs
+++ /dev/null
@@ -1,89 +0,0 @@
-{-# LANGUAGE QuasiQuotes #-}
-{-# LANGUAGE FlexibleContexts #-}
-{-# LANGUAGE OverloadedStrings #-}
-{-# LANGUAGE CPP #-}
-{-# LANGUAGE RankNTypes #-}
--- | Use an email address as an identifier via Google's OpenID login system.
---
--- This backend will not use the OpenID identifier at all. It only uses OpenID
--- as a login system. By using this plugin, you are trusting Google to validate
--- an email address, and requiring users to have a Google account. On the plus
--- side, you get to use email addresses as the identifier, many users have
--- existing Google accounts, the login system has been long tested (as opposed
--- to BrowserID), and it requires no credential managing or setup (as opposed
--- to Email).
-module Yesod.Auth.GoogleEmail
-    {-# DEPRECATED "Google no longer provides OpenID support, please use Yesod.Auth.GoogleEmail2" #-}
-    ( authGoogleEmail
-    , forwardUrl
-    ) where
-
-import Yesod.Auth
-import qualified Web.Authenticate.OpenId as OpenId
-
-import Yesod.Core
-import Data.Text (Text)
-import qualified Yesod.Auth.Message as Msg
-import qualified Data.Text as T
-import Control.Exception.Lifted (try, SomeException)
-
-pid :: Text
-pid = "googleemail"
-
-forwardUrl :: AuthRoute
-forwardUrl = PluginR pid ["forward"]
-
-googleIdent :: Text
-googleIdent = "https://www.google.com/accounts/o8/id"
-
-authGoogleEmail :: YesodAuth m => AuthPlugin m
-authGoogleEmail =
-    AuthPlugin pid dispatch login
-  where
-    complete = PluginR pid ["complete"]
-    login tm =
-        [whamlet|<a href=@{tm forwardUrl}>_{Msg.LoginGoogle}|]
-    dispatch "GET" ["forward"] = do
-        render <- getUrlRender
-        let complete' = render complete
-        master <- lift getYesod
-        eres <- lift $ try $ OpenId.getForwardUrl googleIdent complete' Nothing
-            [ ("openid.ax.type.email", "http://schema.openid.net/contact/email")
-            , ("openid.ns.ax", "http://openid.net/srv/ax/1.0")
-            , ("openid.ns.ax.required", "email")
-            , ("openid.ax.mode", "fetch_request")
-            , ("openid.ax.required", "email")
-            , ("openid.ui.icon", "true")
-            ] (authHttpManager master)
-        either
-          (\err -> do
-            tm <- getRouteToParent
-            lift $ loginErrorMessage (tm LoginR) $ T.pack $ show (err :: SomeException))
-          redirect
-          eres
-    dispatch "GET" ["complete", ""] = dispatch "GET" ["complete"] -- compatibility issues
-    dispatch "GET" ["complete"] = do
-        rr <- getRequest
-        completeHelper $ reqGetParams rr
-    dispatch "POST" ["complete", ""] = dispatch "POST" ["complete"] -- compatibility issues
-    dispatch "POST" ["complete"] = do
-        (posts, _) <- runRequestBody
-        completeHelper posts
-    dispatch _ _ = notFound
-
-completeHelper :: [(Text, Text)] -> AuthHandler master TypedContent
-completeHelper gets' = do
-      master <- lift getYesod
-      eres <- lift $ try $ OpenId.authenticateClaimed gets' (authHttpManager master)
-      tm <- getRouteToParent
-      either (onFailure tm) (onSuccess tm) eres
-    where
-      onFailure tm err =
-        lift $ loginErrorMessage (tm LoginR) $ T.pack $ show (err :: SomeException)
-      onSuccess tm oir = do
-              let OpenId.Identifier ident = OpenId.oirOpLocal oir
-              memail <- lookupGetParam "openid.ext1.value.email"
-              case (memail, "https://www.google.com/accounts/o8/id" `T.isPrefixOf` ident) of
-                  (Just email, True) -> lift $ setCredsRedirect $ Creds pid email []
-                  (_, False)   -> lift $ loginErrorMessage (tm LoginR) "Only Google login is supported"
-                  (Nothing, _) -> lift $ loginErrorMessage (tm LoginR) "No email address provided"
diff --git a/yesod-auth/Yesod/Auth/OpenId.hs b/yesod-auth/Yesod/Auth/OpenId.hs
index f32ff747..fce1f1bf 100644
--- a/yesod-auth/Yesod/Auth/OpenId.hs
+++ b/yesod-auth/Yesod/Auth/OpenId.hs
@@ -19,7 +19,7 @@ import Yesod.Form
 import Yesod.Core
 import Data.Text (Text, isPrefixOf)
 import qualified Yesod.Auth.Message as Msg
-import Control.Exception.Lifted (SomeException, try)
+import UnliftIO.Exception (SomeException, try)
 import Data.Maybe (fromMaybe)
 import qualified Data.Text as T
 
diff --git a/yesod-auth/yesod-auth.cabal b/yesod-auth/yesod-auth.cabal
index 1de994a2..21f78a81 100644
--- a/yesod-auth/yesod-auth.cabal
+++ b/yesod-auth/yesod-auth.cabal
@@ -43,7 +43,7 @@ library
                    , http-client
                    , http-conduit            >= 2.1
                    , aeson                   >= 0.7
-                   , lifted-base             >= 0.1
+                   , unliftio
                    , blaze-html              >= 0.5
                    , blaze-markup            >= 0.5.1
                    , http-types
@@ -74,7 +74,6 @@ library
                      Yesod.Auth.OpenId
                      Yesod.Auth.Rpxnow
                      Yesod.Auth.Message
-                     Yesod.Auth.GoogleEmail
                      Yesod.Auth.GoogleEmail2
                      Yesod.Auth.Hardcoded
                      Yesod.Auth.Util.PasswordStore
diff --git a/yesod-core/Yesod/Core.hs b/yesod-core/Yesod/Core.hs
index 1d5de1d1..2f81a9ba 100644
--- a/yesod-core/Yesod/Core.hs
+++ b/yesod-core/Yesod/Core.hs
@@ -95,8 +95,7 @@ module Yesod.Core
     , module Text.Blaze.Html
     , MonadTrans (..)
     , MonadIO (..)
-    , MonadBase (..)
-    , MonadBaseControl
+    , MonadUnliftIO (..)
     , MonadResource (..)
     , MonadLogger
       -- * Commonly referenced functions/datatypes
@@ -143,9 +142,7 @@ import qualified Yesod.Core.Internal.Run
 import qualified Paths_yesod_core
 import Data.Version (showVersion)
 import Yesod.Routes.Class
-import Control.Monad.IO.Class (MonadIO (..))
-import Control.Monad.Base (MonadBase (..))
-import Control.Monad.Trans.Control (MonadBaseControl (..))
+import Control.Monad.IO.Unlift (MonadIO (..), MonadUnliftIO (..))
 
 import Control.Monad.Trans.Resource (MonadResource (..))
 import Yesod.Core.Internal.LiteApp
diff --git a/yesod-core/Yesod/Core/Class/Handler.hs b/yesod-core/Yesod/Core/Class/Handler.hs
index 8e447eab..6e979c2e 100644
--- a/yesod-core/Yesod/Core/Class/Handler.hs
+++ b/yesod-core/Yesod/Core/Class/Handler.hs
@@ -5,15 +5,14 @@
 {-# LANGUAGE FlexibleInstances #-}
 {-# LANGUAGE FlexibleContexts #-}
 {-# LANGUAGE UndecidableInstances #-}
-{-# OPTIONS_GHC -fno-warn-warnings-deprecations #-} -- Because of ErrorT
 module Yesod.Core.Class.Handler
     ( MonadHandler (..)
     , MonadWidget (..)
     ) where
 
 import Yesod.Core.Types
-import Control.Monad.IO.Class (liftIO)
-import Control.Monad.Trans.Resource (MonadResource, MonadResourceBase)
+import Control.Monad.IO.Unlift (liftIO, MonadUnliftIO, MonadIO)
+import Control.Monad.Trans.Resource (MonadResource)
 import Control.Monad.Trans.Class (lift)
 #if __GLASGOW_HASKELL__ < 710
 import Data.Monoid (Monoid)
@@ -23,7 +22,6 @@ import Data.Conduit.Internal (Pipe, ConduitM)
 import Control.Monad.Trans.Identity ( IdentityT)
 import Control.Monad.Trans.List     ( ListT    )
 import Control.Monad.Trans.Maybe    ( MaybeT   )
-import Control.Monad.Trans.Error    ( ErrorT, Error)
 import Control.Monad.Trans.Except   ( ExceptT  )
 import Control.Monad.Trans.Reader   ( ReaderT  )
 import Control.Monad.Trans.State    ( StateT   )
@@ -40,12 +38,12 @@ class MonadResource m => MonadHandler m where
 replaceToParent :: HandlerData site route -> HandlerData site ()
 replaceToParent hd = hd { handlerToParent = const () }
 
-instance MonadResourceBase m => MonadHandler (HandlerT site m) where
+instance MonadIO m => MonadHandler (HandlerT site m) where
     type HandlerSite (HandlerT site m) = site
     liftHandlerT (HandlerT f) = HandlerT $ liftIO . f . replaceToParent
 {-# RULES "liftHandlerT (HandlerT site IO)" liftHandlerT = id #-}
 
-instance MonadResourceBase m => MonadHandler (WidgetT site m) where
+instance MonadIO m => MonadHandler (WidgetT site m) where
     type HandlerSite (WidgetT site m) = site
     liftHandlerT (HandlerT f) = WidgetT $ \_ref env -> liftIO $ f $ replaceToParent env
 {-# RULES "liftHandlerT (WidgetT site IO)" forall f. liftHandlerT (HandlerT f) = WidgetT $ const f #-}
@@ -55,7 +53,6 @@ instance MonadResourceBase m => MonadHandler (WidgetT site m) where
 GO(IdentityT)
 GO(ListT)
 GO(MaybeT)
-GOX(Error e, ErrorT e)
 GO(ExceptT e)
 GO(ReaderT r)
 GO(StateT s)
@@ -71,7 +68,7 @@ GO(ConduitM i o)
 
 class MonadHandler m => MonadWidget m where
     liftWidgetT :: WidgetT (HandlerSite m) IO a -> m a
-instance MonadResourceBase m => MonadWidget (WidgetT site m) where
+instance MonadIO m => MonadWidget (WidgetT site m) where
     liftWidgetT (WidgetT f) = WidgetT $ \ref env -> liftIO $ f ref $ replaceToParent env
 
 #define GO(T) instance MonadWidget m => MonadWidget (T m) where liftWidgetT = lift . liftWidgetT
@@ -79,7 +76,6 @@ instance MonadResourceBase m => MonadWidget (WidgetT site m) where
 GO(IdentityT)
 GO(ListT)
 GO(MaybeT)
-GOX(Error e, ErrorT e)
 GO(ExceptT e)
 GO(ReaderT r)
 GO(StateT s)
diff --git a/yesod-core/Yesod/Core/Content.hs b/yesod-core/Yesod/Core/Content.hs
index d98d967e..d33d87ad 100644
--- a/yesod-core/Yesod/Core/Content.hs
+++ b/yesod-core/Yesod/Core/Content.hs
@@ -117,7 +117,7 @@ instance ToContent Javascript where
     toContent = toContent . toLazyText . unJavascript
 
 instance ToFlushBuilder builder => ToContent (CI.Pipe () () builder () (ResourceT IO) ()) where
-    toContent src = ContentSource $ CI.ConduitM (CI.mapOutput toFlushBuilder src >>=)
+    toContent src = ContentSource $ CI.ConduitT (CI.mapOutput toFlushBuilder src >>=)
 
 instance ToFlushBuilder builder => ToContent (Source (ResourceT IO) builder) where
     toContent src = ContentSource $ mapOutput toFlushBuilder src
diff --git a/yesod-core/Yesod/Core/Handler.hs b/yesod-core/Yesod/Core/Handler.hs
index bfd254d0..3395b3bd 100644
--- a/yesod-core/Yesod/Core/Handler.hs
+++ b/yesod-core/Yesod/Core/Handler.hs
@@ -194,12 +194,12 @@ import           Data.Monoid                   (mempty, mappend)
 #endif
 import           Control.Applicative           ((<|>))
 import           Control.Exception             (evaluate, SomeException, throwIO)
-import           Control.Exception.Lifted      (handle)
+import           Control.Exception             (handle)
 
 import           Control.Monad                 (void, liftM, unless)
 import qualified Control.Monad.Trans.Writer    as Writer
 
-import           Control.Monad.IO.Class        (MonadIO, liftIO)
+import           Control.Monad.IO.Unlift       (MonadIO, liftIO, MonadUnliftIO, withRunInIO)
 
 import qualified Network.HTTP.Types            as H
 import qualified Network.Wai                   as W
@@ -233,7 +233,7 @@ import           Yesod.Core.Content            (ToTypedContent (..), simpleConte
 import           Yesod.Core.Internal.Util      (formatRFC1123)
 import           Text.Blaze.Html               (preEscapedToHtml, toHtml)
 
-import qualified Data.IORef.Lifted             as I
+import qualified Data.IORef                    as I
 import           Data.Maybe                    (listToMaybe, mapMaybe)
 import           Data.Typeable                 (Typeable)
 import           Web.PathPieces                (PathPiece(..))
@@ -246,7 +246,6 @@ import           Data.CaseInsensitive (CI, original)
 import qualified Data.Conduit.List as CL
 import           Control.Monad.Trans.Resource  (MonadResource, InternalState, runResourceT, withInternalState, getInternalState, liftResourceT, resourceForkIO)
 import qualified System.PosixCompat.Files as PC
-import           Control.Monad.Trans.Control (control, MonadBaseControl)
 import           Data.Conduit (Source, transPipe, Flush (Flush), yield, Producer, Sink)
 import qualified Yesod.Core.TypeCache as Cache
 import qualified Data.Word8 as W8
@@ -447,7 +446,8 @@ forkHandler :: (SomeException -> HandlerT site IO ()) -- ^ error handler
               -> HandlerT site IO ()
 forkHandler onErr handler = do
     yesRunner <- handlerToIO
-    void $ liftResourceT $ resourceForkIO $ yesRunner $ handle onErr handler
+    void $ liftResourceT $ resourceForkIO $
+      liftIO $ handle (yesRunner . onErr) (yesRunner handler)
 
 -- | Redirect to the given route.
 -- HTTP status code 303 for HTTP 1.1 clients and 302 for HTTP 1.0
@@ -664,10 +664,10 @@ sendWaiApplication = handlerError . HCWaiApp
 --
 -- @since 1.2.16
 sendRawResponseNoConduit
-    :: (MonadHandler m, MonadBaseControl IO m)
+    :: (MonadHandler m, MonadUnliftIO m)
     => (IO S8.ByteString -> (S8.ByteString -> IO ()) -> m ())
     -> m a
-sendRawResponseNoConduit raw = control $ \runInIO ->
+sendRawResponseNoConduit raw = withRunInIO $ \runInIO ->
     liftIO $ throwIO $ HCWai $ flip W.responseRaw fallback
     $ \src sink -> void $ runInIO (raw src sink)
   where
@@ -679,10 +679,10 @@ sendRawResponseNoConduit raw = control $ \runInIO ->
 -- Warp).
 --
 -- @since 1.2.7
-sendRawResponse :: (MonadHandler m, MonadBaseControl IO m)
+sendRawResponse :: (MonadHandler m, MonadUnliftIO m)
                 => (Source IO S8.ByteString -> Sink S8.ByteString IO () -> m ())
                 -> m a
-sendRawResponse raw = control $ \runInIO ->
+sendRawResponse raw = withRunInIO $ \runInIO ->
     liftIO $ throwIO $ HCWai $ flip W.responseRaw fallback
     $ \src sink -> void $ runInIO $ raw (src' src) (CL.mapM_ sink)
   where
diff --git a/yesod-core/Yesod/Core/Json.hs b/yesod-core/Yesod/Core/Json.hs
index 245aad90..94c1e1b9 100644
--- a/yesod-core/Yesod/Core/Json.hs
+++ b/yesod-core/Yesod/Core/Json.hs
@@ -104,7 +104,7 @@ provideJson = provideRep . return . J.toEncoding
 -- @since 0.3.0
 parseJsonBody :: (MonadHandler m, J.FromJSON a) => m (J.Result a)
 parseJsonBody = do
-    eValue <- rawRequestBody $$ runCatchC (sinkParser JP.value')
+    eValue <- runConduit $ rawRequestBody .| runCatchC (sinkParser JP.value')
     return $ case eValue of
         Left e -> J.Error $ show e
         Right value -> J.fromJSON value
diff --git a/yesod-core/Yesod/Core/Types.hs b/yesod-core/Yesod/Core/Types.hs
index fd4572de..680c13b8 100644
--- a/yesod-core/Yesod/Core/Types.hs
+++ b/yesod-core/Yesod/Core/Types.hs
@@ -19,13 +19,10 @@ import           Data.Monoid                        (Monoid (..))
 import           Control.Arrow                      (first)
 import           Control.Exception                  (Exception)
 import           Control.Monad                      (liftM, ap)
-import           Control.Monad.Base                 (MonadBase (liftBase))
-import           Control.Monad.Catch                (MonadMask (..), MonadCatch (..))
 import           Control.Monad.IO.Class             (MonadIO (liftIO))
 import           Control.Monad.Logger               (LogLevel, LogSource,
                                                      MonadLogger (..))
-import           Control.Monad.Trans.Control        (MonadBaseControl (..))
-import           Control.Monad.Trans.Resource       (MonadResource (..), InternalState, runInternalState, MonadThrow (..), monadThrow, ResourceT)
+import           Control.Monad.Trans.Resource       (MonadResource (..), InternalState, runInternalState, MonadThrow (..), throwM, ResourceT)
 import           Data.ByteString                    (ByteString)
 import qualified Data.ByteString.Lazy               as L
 import           Data.Conduit                       (Flush, Source)
@@ -417,14 +414,6 @@ instance Monad m => Monad (WidgetT site m) where
         unWidgetT (f a) ref r
 instance MonadIO m => MonadIO (WidgetT site m) where
     liftIO = lift . liftIO
-instance MonadBase b m => MonadBase b (WidgetT site m) where
-    liftBase = WidgetT . const . const . liftBase
-instance MonadBaseControl b m => MonadBaseControl b (WidgetT site m) where
-    type StM (WidgetT site m) a = StM m a
-    liftBaseWith f = WidgetT $ \ref reader' ->
-        liftBaseWith $ \runInBase ->
-            f $ runInBase . (\(WidgetT w) -> w ref reader')
-    restoreM = WidgetT . const . const . restoreM
 -- | @since 1.4.38
 instance MonadUnliftIO m => MonadUnliftIO (WidgetT site m) where
   {-# INLINE askUnliftIO #-}
@@ -444,29 +433,8 @@ instance MonadTrans (WidgetT site) where
 instance MonadThrow m => MonadThrow (WidgetT site m) where
     throwM = lift . throwM
 
-instance MonadCatch m => MonadCatch (HandlerT site m) where
-  catch (HandlerT m) c = HandlerT $ \r -> m r `catch` \e -> unHandlerT (c e) r
-instance MonadMask m => MonadMask (HandlerT site m) where
-  mask a = HandlerT $ \e -> mask $ \u -> unHandlerT (a $ q u) e
-    where q u (HandlerT b) = HandlerT (u . b)
-  uninterruptibleMask a =
-    HandlerT $ \e -> uninterruptibleMask $ \u -> unHandlerT (a $ q u) e
-      where q u (HandlerT b) = HandlerT (u . b)
-instance MonadCatch m => MonadCatch (WidgetT site m) where
-  catch (WidgetT m) c = WidgetT $ \ref r -> m ref r `catch` \e -> unWidgetT (c e) ref r
-instance MonadMask m => MonadMask (WidgetT site m) where
-  mask a = WidgetT $ \ref e -> mask $ \u -> unWidgetT (a $ q u) ref e
-    where q u (WidgetT b) = WidgetT (\ref e -> u $ b ref e)
-  uninterruptibleMask a =
-    WidgetT $ \ref e -> uninterruptibleMask $ \u -> unWidgetT (a $ q u) ref e
-      where q u (WidgetT b) = WidgetT (\ref e -> u $ b ref e)
-
 -- CPP to avoid a redundant constraints warning
-#if MIN_VERSION_base(4,9,0)
-instance (MonadIO m, MonadBase IO m, MonadThrow m) => MonadResource (WidgetT site m) where
-#else
-instance (Applicative m, MonadIO m, MonadBase IO m, MonadThrow m) => MonadResource (WidgetT site m) where
-#endif
+instance MonadIO m => MonadResource (WidgetT site m) where
     liftResourceT f = WidgetT $ \_ hd -> liftIO $ runInternalState f (handlerResource hd)
 
 instance MonadIO m => MonadLogger (WidgetT site m) where
@@ -495,8 +463,6 @@ instance Monad m => Monad (HandlerT site m) where
     HandlerT x >>= f = HandlerT $ \r -> x r >>= \x' -> unHandlerT (f x') r
 instance MonadIO m => MonadIO (HandlerT site m) where
     liftIO = lift . liftIO
-instance MonadBase b m => MonadBase b (HandlerT site m) where
-    liftBase = lift . liftBase
 instance Monad m => MonadReader site (HandlerT site m) where
     ask = HandlerT $ return . rheSite . handlerEnv
     local f (HandlerT g) = HandlerT $ \hd -> g hd
@@ -504,20 +470,6 @@ instance Monad m => MonadReader site (HandlerT site m) where
             { rheSite = f $ rheSite $ handlerEnv hd
             }
         }
--- | Note: although we provide a @MonadBaseControl@ instance, @lifted-base@'s
--- @fork@ function is incompatible with the underlying @ResourceT@ system.
--- Instead, if you must fork a separate thread, you should use
--- @resourceForkIO@.
---
--- Using fork usually leads to an exception that says
--- \"Control.Monad.Trans.Resource.register\': The mutable state is being accessed
--- after cleanup. Please contact the maintainers.\"
-instance MonadBaseControl b m => MonadBaseControl b (HandlerT site m) where
-    type StM (HandlerT site m) a = StM m a
-    liftBaseWith f = HandlerT $ \reader' ->
-        liftBaseWith $ \runInBase ->
-            f $ runInBase . (\(HandlerT r) -> r reader')
-    restoreM = HandlerT . const . restoreM
 -- | @since 1.4.38
 instance MonadUnliftIO m => MonadUnliftIO (HandlerT site m) where
   {-# INLINE askUnliftIO #-}
@@ -526,9 +478,9 @@ instance MonadUnliftIO m => MonadUnliftIO (HandlerT site m) where
                 return (UnliftIO (unliftIO u . flip unHandlerT r))
 
 instance MonadThrow m => MonadThrow (HandlerT site m) where
-    throwM = lift . monadThrow
+    throwM = lift . throwM
 
-instance (MonadIO m, MonadBase IO m, MonadThrow m) => MonadResource (HandlerT site m) where
+instance MonadIO m => MonadResource (HandlerT site m) where
     liftResourceT f = HandlerT $ \hd -> liftIO $ runInternalState f (handlerResource hd)
 
 instance MonadIO m => MonadLogger (HandlerT site m) where
diff --git a/yesod-core/test/YesodCoreTest/Cache.hs b/yesod-core/test/YesodCoreTest/Cache.hs
index 04282f81..e1ba9204 100644
--- a/yesod-core/test/YesodCoreTest/Cache.hs
+++ b/yesod-core/test/YesodCoreTest/Cache.hs
@@ -15,7 +15,7 @@ import Network.Wai
 import Network.Wai.Test
 
 import Yesod.Core
-import Data.IORef.Lifted
+import UnliftIO.IORef
 import Data.Typeable (Typeable)
 import qualified Data.ByteString.Lazy.Char8 as L8
 
diff --git a/yesod-core/test/YesodCoreTest/ErrorHandling.hs b/yesod-core/test/YesodCoreTest/ErrorHandling.hs
index f8517b36..db8dfe1c 100644
--- a/yesod-core/test/YesodCoreTest/ErrorHandling.hs
+++ b/yesod-core/test/YesodCoreTest/ErrorHandling.hs
@@ -18,7 +18,9 @@ import Blaze.ByteString.Builder (Builder, fromByteString, toLazyByteString)
 import Data.Monoid (mconcat)
 import Data.Text (Text, pack)
 import Control.Monad (forM_)
-import qualified Control.Exception.Lifted as E
+import Control.Monad.Trans.State (StateT (..))
+import Control.Monad.Trans.Reader (ReaderT (..))
+import qualified UnliftIO.Exception as E
 
 data App = App
 
@@ -217,6 +219,6 @@ caseGoodBuilder = runner $ do
 caseError :: Int -> IO ()
 caseError i = runner $ do
     res <- request defaultRequest { pathInfo = ["error", pack $ show i] }
-    assertStatus 500 res `E.catch` \e -> do
+    ReaderT $ \r -> StateT $ \s -> runStateT (runReaderT (assertStatus 500 res) r) s `E.catch` \e -> do
         liftIO $ print res
         E.throwIO (e :: E.SomeException)
diff --git a/yesod-core/yesod-core.cabal b/yesod-core/yesod-core.cabal
index dd5306ec..44e35973 100644
--- a/yesod-core/yesod-core.cabal
+++ b/yesod-core/yesod-core.cabal
@@ -39,8 +39,6 @@ library
                    , old-locale            >= 1.0.0.2  && < 1.1
                    , containers            >= 0.2
                    , unordered-containers  >= 0.2
-                   , monad-control         >= 1.0      && < 1.1
-                   , transformers-base     >= 0.4
                    , cookie                >= 0.4.2    && < 0.5
                    , http-types            >= 0.7
                    , case-insensitive      >= 0.2
@@ -53,15 +51,14 @@ library
                    , monad-logger          >= 0.3.10   && < 0.4
                    , conduit               >= 1.3
                    , resourcet             >= 1.2
-                   , lifted-base           >= 0.1.2
                    , blaze-html            >= 0.5
                    , blaze-markup          >= 0.7.1
+                   -- FIXME remove!
                    , data-default
                    , safe
                    , warp                  >= 3.0.2
                    , unix-compat
                    , conduit-extra
-                   , exceptions            >= 0.6
                    , deepseq               >= 1.3
                    , deepseq-generics
                    , mwc-random
@@ -196,7 +193,6 @@ test-suite tests
                   ,transformers
                   , conduit
                   , containers
-                  , lifted-base
                   , resourcet
                   , network
                   , async
@@ -206,6 +202,7 @@ test-suite tests
                   , wai-extra
                   , mwc-random
                   , cookie >= 0.4.1    && < 0.5
+                  , unliftio
     ghc-options:     -Wall
     extensions: TemplateHaskell
 
diff --git a/yesod-static/Yesod/Static.hs b/yesod-static/Yesod/Static.hs
index 636bd333..883bf62e 100644
--- a/yesod-static/Yesod/Static.hs
+++ b/yesod-static/Yesod/Static.hs
@@ -175,7 +175,7 @@ instance RenderRoute Static where
 instance ParseRoute Static where
     parseRoute (x, y) = Just $ StaticRoute x y
 
-instance (MonadThrow m, MonadIO m, MonadBaseControl IO m)
+instance (MonadThrow m, MonadUnliftIO m)
   => YesodSubDispatch Static (HandlerT master m) where
     yesodSubDispatch YesodSubRunnerEnv {..} req =
         ysreParentRunner base ysreParentEnv (fmap ysreToParentRoute route) req
diff --git a/yesod-websockets/Yesod/WebSockets.hs b/yesod-websockets/Yesod/WebSockets.hs
index 243d854f..2346b03c 100644
--- a/yesod-websockets/Yesod/WebSockets.hs
+++ b/yesod-websockets/Yesod/WebSockets.hs
@@ -34,19 +34,14 @@ module Yesod.WebSockets
     , WS.ConnectionOptions (..)
     ) where
 
-import qualified Control.Concurrent.Async       as A
 import           Control.Monad                  (forever, void, when)
-import           Control.Monad.IO.Class         (MonadIO (liftIO))
-import           Control.Monad.Trans.Control    (control)
-import           Control.Monad.Trans.Control    (MonadBaseControl (liftBaseWith, restoreM))
 import           Control.Monad.Trans.Reader     (ReaderT (ReaderT, runReaderT))
 import qualified Data.Conduit                   as C
 import qualified Data.Conduit.List              as CL
 import qualified Network.Wai.Handler.WebSockets as WaiWS
 import qualified Network.WebSockets             as WS
 import qualified Yesod.Core                     as Y
-import           Control.Exception (SomeException)
-import           Control.Exception.Enclosed (tryAny)
+import           UnliftIO (SomeException, tryAny, MonadIO, liftIO, MonadUnliftIO, withRunInIO, race, race_, concurrently, concurrently_)
 
 -- | A transformer for a WebSockets handler.
 --
@@ -60,14 +55,14 @@ type WebSocketsT = ReaderT WS.Connection
 -- instead.
 --
 -- Since 0.1.0
-webSockets :: (Y.MonadBaseControl IO m, Y.MonadHandler m) => WebSocketsT m () -> m ()
+webSockets :: (Y.MonadUnliftIO m, Y.MonadHandler m) => WebSocketsT m () -> m ()
 webSockets = webSocketsOptions WS.defaultConnectionOptions
 
 -- | Varient of 'webSockets' which allows you to specify
 -- the WS.ConnectionOptions setttings when upgrading to a websocket connection.
 --
 -- Since 0.2.5
-webSocketsOptions :: (Y.MonadBaseControl IO m, Y.MonadHandler m)
+webSocketsOptions :: (Y.MonadUnliftIO m, Y.MonadHandler m)
                => WS.ConnectionOptions
                -> WebSocketsT m ()
                -> m ()
@@ -81,7 +76,7 @@ webSocketsOptions opts = webSocketsOptionsWith opts $ const $ return $ Just $ WS
 -- setttings when upgrading to a websocket connection.
 --
 -- Since 0.2.4
-webSocketsWith :: (Y.MonadBaseControl IO m, Y.MonadHandler m)
+webSocketsWith :: (Y.MonadUnliftIO m, Y.MonadHandler m)
                => (WS.RequestHead -> m (Maybe WS.AcceptRequest))
                -- ^ A Nothing indicates that the websocket upgrade request should not happen
                -- and instead the rest of the handler will be called instead.  This allows
@@ -98,7 +93,7 @@ webSocketsWith = webSocketsOptionsWith WS.defaultConnectionOptions
 -- setttings when upgrading to a websocket connection.
 --
 -- Since 0.2.5
-webSocketsOptionsWith :: (Y.MonadBaseControl IO m, Y.MonadHandler m)
+webSocketsOptionsWith :: (Y.MonadUnliftIO m, Y.MonadHandler m)
                => WS.ConnectionOptions
                -- ^ Custom websockets options
                -> (WS.RequestHead -> m (Maybe WS.AcceptRequest))
@@ -119,7 +114,7 @@ webSocketsOptionsWith wsConnOpts buildAr inner = do
             Nothing -> return ()
             Just ar ->
                 Y.sendRawResponseNoConduit
-                  $ \src sink -> control $ \runInIO -> WaiWS.runWebSockets
+                  $ \src sink -> withRunInIO $ \runInIO -> WaiWS.runWebSockets
                     wsConnOpts
                     rhead
                     (\pconn -> do
@@ -227,35 +222,3 @@ sinkWSText = CL.mapM_ sendTextData
 -- Since 0.1.0
 sinkWSBinary :: (MonadIO m, WS.WebSocketsData a) => C.Consumer a (WebSocketsT m) ()
 sinkWSBinary = CL.mapM_ sendBinaryData
-
--- | Generalized version of 'A.race'.
---
--- Since 0.1.0
-race :: MonadBaseControl IO m => m a -> m b -> m (Either a b)
-race x y = liftBaseWith (\run -> A.race (run x) (run y))
-    >>= either (fmap Left . restoreM) (fmap Right . restoreM)
-
--- | Generalized version of 'A.race_'.
---
--- Since 0.1.0
-race_ :: MonadBaseControl IO m => m a -> m b -> m ()
-race_ x y = void $ race x y
-
--- | Generalized version of 'A.concurrently'. Note that if your underlying
--- monad has some kind of mutable state, the state from the second action will
--- overwrite the state from the first.
---
--- Since 0.1.0
-concurrently :: MonadBaseControl IO m => m a -> m b -> m (a, b)
-concurrently x y = do
-    (resX, resY) <- liftBaseWith $ \run -> A.concurrently (run x) (run y)
-    x' <- restoreM resX
-    y' <- restoreM resY
-    return (x', y')
-
--- | Run two actions concurrently (like 'A.concurrently'), but discard their
--- results and any modified monadic state.
---
--- Since 0.1.0
-concurrently_ :: MonadBaseControl IO m => m a -> m b -> m ()
-concurrently_ x y = void $ liftBaseWith $ \run -> A.concurrently (run x) (run y)
diff --git a/yesod-websockets/yesod-websockets.cabal b/yesod-websockets/yesod-websockets.cabal
index 81a9f147..70bfc00b 100644
--- a/yesod-websockets/yesod-websockets.cabal
+++ b/yesod-websockets/yesod-websockets.cabal
@@ -24,10 +24,8 @@ library
                      , websockets        >= 0.9
                      , transformers      >= 0.2
                      , yesod-core        >= 1.4
-                     , monad-control     >= 0.3
+                     , unliftio
                      , conduit           >= 1.0.15.1
-                     , async             >= 2.0.1.5
-                     , enclosed-exceptions >= 1.0
 
 source-repository head
   type:     git

From 103c098cf84ac9a47f300c0ec5f1665c36f238a4 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Wed, 10 Jan 2018 12:16:31 -0800
Subject: [PATCH 26/26] Catch up with Data.Conduit.Combinators

---
 yesod-auth/yesod-auth.cabal                   |  2 +-
 yesod-bin/Devel.hs                            | 11 +++--
 yesod-bin/HsFile.hs                           | 16 ++++----
 yesod-core/Yesod/Core/Class/Yesod.hs          | 18 ++++----
 yesod-core/Yesod/Core/Content.hs              | 41 ++++++++++---------
 yesod-core/Yesod/Core/Dispatch.hs             |  7 ++--
 yesod-core/Yesod/Core/Handler.hs              | 31 +++++++-------
 yesod-core/Yesod/Core/Internal/Request.hs     |  6 +--
 yesod-core/Yesod/Core/Internal/Response.hs    |  8 ++--
 yesod-core/Yesod/Core/Internal/Run.hs         |  5 ++-
 yesod-core/Yesod/Core/Types.hs                | 21 ++++------
 yesod-core/test/YesodCoreTest/CleanPath.hs    |  4 +-
 .../test/YesodCoreTest/ErrorHandling.hs       |  4 +-
 yesod-core/test/YesodCoreTest/Links.hs        |  4 +-
 yesod-core/test/YesodCoreTest/RawResponse.hs  |  9 ++--
 yesod-core/yesod-core.cabal                   |  5 +--
 .../Yesod/EmbeddedStatic/Generators.hs        | 12 +++---
 yesod-static/Yesod/Static.hs                  | 18 ++++----
 yesod-static/yesod-static.cabal               |  4 +-
 yesod/Yesod/Default/Util.hs                   |  8 ++--
 yesod/yesod.cabal                             |  3 +-
 21 files changed, 110 insertions(+), 127 deletions(-)

diff --git a/yesod-auth/yesod-auth.cabal b/yesod-auth/yesod-auth.cabal
index 21f78a81..194638f5 100644
--- a/yesod-auth/yesod-auth.cabal
+++ b/yesod-auth/yesod-auth.cabal
@@ -58,7 +58,7 @@ library
                    , binary
                    , http-client
                    , blaze-builder
-                   , conduit
+                   , conduit                 >= 1.3
                    , conduit-extra
                    , nonce                   >= 1.0.2     && < 1.1
 
diff --git a/yesod-bin/Devel.hs b/yesod-bin/Devel.hs
index 4579064b..c60b17d6 100644
--- a/yesod-bin/Devel.hs
+++ b/yesod-bin/Devel.hs
@@ -17,9 +17,7 @@ import           Control.Monad                         (forever, unless, void,
                                                         when)
 import Data.ByteString (ByteString, isInfixOf)
 import qualified Data.ByteString.Lazy                  as LB
-import           Data.Conduit                          (($$), (=$))
-import qualified Data.Conduit.Binary                   as CB
-import qualified Data.Conduit.List                     as CL
+import           Conduit
 import           Data.Default.Class                    (def)
 import           Data.FileEmbed                        (embedFile)
 import qualified Data.Map                              as Map
@@ -368,9 +366,10 @@ devel opts passThroughArgs = do
         -- process is piped to the actual stdout and stderr handles.
         withProcess_ procConfig $ \p -> do
             let helper getter h =
-                      getter p
-                   $$ CL.iterM (\(str :: ByteString) -> atomically (updateAppPort str buildStarted appPortVar))
-                   =$ CB.sinkHandle h
+                      runConduit
+                    $ getter p
+                   .| iterMC (\(str :: ByteString) -> atomically (updateAppPort str buildStarted appPortVar))
+                   .| sinkHandle h
             race_ (helper getStdout stdout) (helper getStderr stderr)
 
     -- Run the inner action with a TVar which will be set to True
diff --git a/yesod-bin/HsFile.hs b/yesod-bin/HsFile.hs
index 38093a51..18868c24 100644
--- a/yesod-bin/HsFile.hs
+++ b/yesod-bin/HsFile.hs
@@ -2,20 +2,18 @@
 {-# LANGUAGE OverloadedStrings #-}
 module HsFile (mkHsFile) where
 import Text.ProjectTemplate (createTemplate)
-import Data.Conduit 
-    ( ($$), (=$), awaitForever)
-import Data.Conduit.Filesystem (sourceDirectory)
+import Conduit
 import Control.Monad.Trans.Resource (runResourceT)
-import qualified Data.Conduit.List as CL
 import qualified Data.ByteString as BS
 import Control.Monad.IO.Class (liftIO)
 import Data.String (fromString)
 
 mkHsFile :: IO ()
-mkHsFile = runResourceT $ sourceDirectory "."
-        $$ readIt
-        =$ createTemplate 
-        =$ awaitForever (liftIO . BS.putStr)
+mkHsFile = runConduitRes
+         $ sourceDirectory "."
+        .| readIt
+        .| createTemplate
+        .| mapM_C (liftIO . BS.putStr)
   where
     -- Reads a filepath from upstream and dumps a pair of (filepath, filecontents)
-    readIt = CL.map $ \i -> (fromString i, liftIO $ BS.readFile i)
+    readIt = mapC $ \i -> (fromString i, liftIO $ BS.readFile i)
diff --git a/yesod-core/Yesod/Core/Class/Yesod.hs b/yesod-core/Yesod/Core/Class/Yesod.hs
index 5e169d7e..2903654c 100644
--- a/yesod-core/Yesod/Core/Class/Yesod.hs
+++ b/yesod-core/Yesod/Core/Class/Yesod.hs
@@ -10,9 +10,8 @@ import           Yesod.Core.Handler
 
 import           Yesod.Routes.Class
 
-import           Blaze.ByteString.Builder           (Builder, toByteString)
-import           Blaze.ByteString.Builder.ByteString (copyByteString)
-import           Blaze.ByteString.Builder.Char.Utf8 (fromText, fromChar)
+import           Data.ByteString.Builder            (Builder, toLazyByteString)
+import           Data.Text.Encoding                 (encodeUtf8Builder)
 import           Control.Arrow                      ((***), second)
 import           Control.Exception                  (bracket)
 #if __GLASGOW_HASKELL__ < 710
@@ -25,6 +24,7 @@ import           Control.Monad.Logger               (LogLevel (LevelInfo, LevelO
 import           Control.Monad.Trans.Resource       (InternalState, createInternalState, closeInternalState)
 import qualified Data.ByteString.Char8              as S8
 import qualified Data.ByteString.Lazy               as L
+import qualified Data.ByteString.Lazy.Char8         as BL8
 import Data.Aeson (object, (.=))
 import           Data.List                          (foldl', nub)
 import qualified Data.Map                           as Map
@@ -113,10 +113,10 @@ class RenderRoute site => Yesod site where
     -- | Override the rendering function for a particular URL and query string
     -- parameters. One use case for this is to offload static hosting to a
     -- different domain name to avoid sending cookies.
-    -- 
+    --
     -- For backward compatibility default implementation is in terms of
     -- 'urlRenderOverride', probably ineffective
-    -- 
+    --
     -- Since 1.4.23
     urlParamRenderOverride :: site
                            -> Route site
@@ -126,11 +126,11 @@ class RenderRoute site => Yesod site where
       where
         addParams [] routeBldr = routeBldr
         addParams nonEmptyParams routeBldr =
-            let routeBS = toByteString routeBldr
-                qsSeparator = fromChar $ if S8.elem '?' routeBS then '&' else '?'
+            let routeBS = toLazyByteString routeBldr
+                qsSeparator = if BL8.elem '?' routeBS then "&" else "?"
                 valueToMaybe t = if t == "" then Nothing else Just t
                 queryText = map (id *** valueToMaybe) nonEmptyParams
-            in copyByteString routeBS `mappend` qsSeparator `mappend` renderQueryText False queryText
+            in routeBldr `mappend` qsSeparator `mappend` renderQueryText False queryText
 
     -- | Determine if a request is authorized or not.
     --
@@ -192,7 +192,7 @@ class RenderRoute site => Yesod site where
              -> [(T.Text, T.Text)] -- ^ query string
              -> Builder
     joinPath _ ar pieces' qs' =
-        fromText ar `mappend` encodePath pieces qs
+        encodeUtf8Builder ar `mappend` encodePath pieces qs
       where
         pieces = if null pieces' then [""] else map addDash pieces'
         qs = map (TE.encodeUtf8 *** go) qs'
diff --git a/yesod-core/Yesod/Core/Content.hs b/yesod-core/Yesod/Core/Content.hs
index d33d87ad..8a01309a 100644
--- a/yesod-core/Yesod/Core/Content.hs
+++ b/yesod-core/Yesod/Core/Content.hs
@@ -53,20 +53,21 @@ import qualified Data.ByteString as B
 import qualified Data.ByteString.Lazy as L
 import Data.Text.Lazy (Text, pack)
 import qualified Data.Text as T
-import Blaze.ByteString.Builder (Builder, fromByteString, fromLazyByteString)
+import Data.Text.Encoding (encodeUtf8Builder)
+import qualified Data.Text.Lazy as TL
+import Data.ByteString.Builder (Builder, byteString, lazyByteString, stringUtf8)
 #if __GLASGOW_HASKELL__ < 710
 import Data.Monoid (mempty)
 #endif
 import Text.Hamlet (Html)
 import Text.Blaze.Html.Renderer.Utf8 (renderHtmlBuilder)
-import Data.Conduit (Source, Flush (Chunk), ResumableSource, mapOutput)
+import Data.Conduit (Flush (Chunk), ResumableSource, mapOutput)
 import Control.Monad (liftM)
 import Control.Monad.Trans.Resource (ResourceT)
 import Data.Conduit.Internal (ResumableSource (ResumableSource))
 import qualified Data.Conduit.Internal as CI
 
 import qualified Data.Aeson as J
-import qualified Blaze.ByteString.Builder.Char.Utf8 as Blaze
 import Data.Text.Lazy.Builder (toLazyText)
 import Yesod.Core.Types
 import Text.Lucius (Css, renderCss)
@@ -93,15 +94,15 @@ instance ToContent Content where
 instance ToContent Builder where
     toContent = flip ContentBuilder Nothing
 instance ToContent B.ByteString where
-    toContent bs = ContentBuilder (fromByteString bs) $ Just $ B.length bs
+    toContent bs = ContentBuilder (byteString bs) $ Just $ B.length bs
 instance ToContent L.ByteString where
-    toContent = flip ContentBuilder Nothing . fromLazyByteString
+    toContent = flip ContentBuilder Nothing . lazyByteString
 instance ToContent T.Text where
-    toContent = toContent . Blaze.fromText
+    toContent = toContent . encodeUtf8Builder
 instance ToContent Text where
-    toContent = toContent . Blaze.fromLazyText
+    toContent = toContent . foldMap encodeUtf8Builder . TL.toChunks
 instance ToContent String where
-    toContent = toContent . Blaze.fromString
+    toContent = toContent . stringUtf8
 instance ToContent Html where
     toContent bs = ContentBuilder (renderHtmlBuilder bs) Nothing
 instance ToContent () where
@@ -119,10 +120,10 @@ instance ToContent Javascript where
 instance ToFlushBuilder builder => ToContent (CI.Pipe () () builder () (ResourceT IO) ()) where
     toContent src = ContentSource $ CI.ConduitT (CI.mapOutput toFlushBuilder src >>=)
 
-instance ToFlushBuilder builder => ToContent (Source (ResourceT IO) builder) where
+instance ToFlushBuilder builder => ToContent (CI.ConduitT () builder (ResourceT IO) ()) where
     toContent src = ContentSource $ mapOutput toFlushBuilder src
 instance ToFlushBuilder builder => ToContent (ResumableSource (ResourceT IO) builder) where
-    toContent (ResumableSource src _) = toContent src
+    toContent (ResumableSource src) = toContent src
 
 -- | A class for all data which can be sent in a streaming response. Note that
 -- for textual data, instances must use UTF-8 encoding.
@@ -131,16 +132,16 @@ instance ToFlushBuilder builder => ToContent (ResumableSource (ResourceT IO) bui
 class ToFlushBuilder a where toFlushBuilder :: a -> Flush Builder
 instance ToFlushBuilder (Flush Builder) where toFlushBuilder = id
 instance ToFlushBuilder Builder where toFlushBuilder = Chunk
-instance ToFlushBuilder (Flush B.ByteString) where toFlushBuilder = fmap fromByteString
-instance ToFlushBuilder B.ByteString where toFlushBuilder = Chunk . fromByteString
-instance ToFlushBuilder (Flush L.ByteString) where toFlushBuilder = fmap fromLazyByteString
-instance ToFlushBuilder L.ByteString where toFlushBuilder = Chunk . fromLazyByteString
-instance ToFlushBuilder (Flush Text) where toFlushBuilder = fmap Blaze.fromLazyText
-instance ToFlushBuilder Text where toFlushBuilder = Chunk . Blaze.fromLazyText
-instance ToFlushBuilder (Flush T.Text) where toFlushBuilder = fmap Blaze.fromText
-instance ToFlushBuilder T.Text where toFlushBuilder = Chunk . Blaze.fromText
-instance ToFlushBuilder (Flush String) where toFlushBuilder = fmap Blaze.fromString
-instance ToFlushBuilder String where toFlushBuilder = Chunk . Blaze.fromString
+instance ToFlushBuilder (Flush B.ByteString) where toFlushBuilder = fmap byteString
+instance ToFlushBuilder B.ByteString where toFlushBuilder = Chunk . byteString
+instance ToFlushBuilder (Flush L.ByteString) where toFlushBuilder = fmap lazyByteString
+instance ToFlushBuilder L.ByteString where toFlushBuilder = Chunk . lazyByteString
+instance ToFlushBuilder (Flush Text) where toFlushBuilder = fmap (foldMap encodeUtf8Builder . TL.toChunks)
+instance ToFlushBuilder Text where toFlushBuilder = Chunk . foldMap encodeUtf8Builder . TL.toChunks
+instance ToFlushBuilder (Flush T.Text) where toFlushBuilder = fmap encodeUtf8Builder
+instance ToFlushBuilder T.Text where toFlushBuilder = Chunk . encodeUtf8Builder
+instance ToFlushBuilder (Flush String) where toFlushBuilder = fmap stringUtf8
+instance ToFlushBuilder String where toFlushBuilder = Chunk . stringUtf8
 instance ToFlushBuilder (Flush Html) where toFlushBuilder = fmap renderHtmlBuilder
 instance ToFlushBuilder Html where toFlushBuilder = Chunk . renderHtmlBuilder
 
diff --git a/yesod-core/Yesod/Core/Dispatch.hs b/yesod-core/Yesod/Core/Dispatch.hs
index d13a154d..e8895cee 100644
--- a/yesod-core/Yesod/Core/Dispatch.hs
+++ b/yesod-core/Yesod/Core/Dispatch.hs
@@ -53,8 +53,9 @@ import Data.Text (Text)
 import Data.Monoid (mappend)
 #endif
 import qualified Data.ByteString as S
+import qualified Data.ByteString.Lazy as BL
 import qualified Data.ByteString.Char8 as S8
-import qualified Blaze.ByteString.Builder
+import Data.ByteString.Builder (byteString, toLazyByteString)
 import Network.HTTP.Types (status301, status307)
 import Yesod.Routes.Parse
 import Yesod.Core.Types
@@ -115,7 +116,7 @@ toWaiAppYre yre req =
     sendRedirect y segments' env sendResponse =
          sendResponse $ W.responseLBS status
                 [ ("Content-Type", "text/plain")
-                , ("Location", Blaze.ByteString.Builder.toByteString dest')
+                , ("Location", BL.toStrict $ toLazyByteString dest')
                 ] "Redirecting"
       where
         -- Ensure that non-GET requests get redirected correctly. See:
@@ -129,7 +130,7 @@ toWaiAppYre yre req =
             if S.null (W.rawQueryString env)
                 then dest
                 else dest `mappend`
-                     Blaze.ByteString.Builder.fromByteString (W.rawQueryString env)
+                     byteString (W.rawQueryString env)
 
 -- | Same as 'toWaiAppPlain', but provides a default set of middlewares. This
 -- set may change with future releases, but currently covers:
diff --git a/yesod-core/Yesod/Core/Handler.hs b/yesod-core/Yesod/Core/Handler.hs
index 3395b3bd..93bee351 100644
--- a/yesod-core/Yesod/Core/Handler.hs
+++ b/yesod-core/Yesod/Core/Handler.hs
@@ -240,13 +240,13 @@ import           Web.PathPieces                (PathPiece(..))
 import           Yesod.Core.Class.Handler
 import           Yesod.Core.Types
 import           Yesod.Routes.Class            (Route)
-import           Blaze.ByteString.Builder (Builder)
+import           Data.ByteString.Builder (Builder)
 import           Safe (headMay)
 import           Data.CaseInsensitive (CI, original)
 import qualified Data.Conduit.List as CL
 import           Control.Monad.Trans.Resource  (MonadResource, InternalState, runResourceT, withInternalState, getInternalState, liftResourceT, resourceForkIO)
 import qualified System.PosixCompat.Files as PC
-import           Data.Conduit (Source, transPipe, Flush (Flush), yield, Producer, Sink)
+import           Data.Conduit (ConduitT, transPipe, Flush (Flush), yield, Void)
 import qualified Yesod.Core.TypeCache as Cache
 import qualified Data.Word8 as W8
 import qualified Data.Foldable as Fold
@@ -679,9 +679,10 @@ sendRawResponseNoConduit raw = withRunInIO $ \runInIO ->
 -- Warp).
 --
 -- @since 1.2.7
-sendRawResponse :: (MonadHandler m, MonadUnliftIO m)
-                => (Source IO S8.ByteString -> Sink S8.ByteString IO () -> m ())
-                -> m a
+sendRawResponse
+  :: (MonadHandler m, MonadUnliftIO m)
+  => (ConduitT () S8.ByteString IO () -> ConduitT S8.ByteString Void IO () -> m ())
+  -> m a
 sendRawResponse raw = withRunInIO $ \runInIO ->
     liftIO $ throwIO $ HCWai $ flip W.responseRaw fallback
     $ \src sink -> void $ runInIO $ raw (src' src) (CL.mapM_ sink)
@@ -1337,7 +1338,7 @@ provideRepType ct handler =
 -- | Stream in the raw request body without any parsing.
 --
 -- @since 1.2.0
-rawRequestBody :: MonadHandler m => Source m S.ByteString
+rawRequestBody :: MonadHandler m => ConduitT i S.ByteString m ()
 rawRequestBody = do
     req <- lift waiRequest
     let loop = do
@@ -1349,7 +1350,7 @@ rawRequestBody = do
 
 -- | Stream the data from the file. Since Yesod 1.2, this has been generalized
 -- to work in any @MonadResource@.
-fileSource :: MonadResource m => FileInfo -> Source m S.ByteString
+fileSource :: MonadResource m => FileInfo -> ConduitT () S.ByteString m ()
 fileSource = transPipe liftResourceT . fileSourceRaw
 
 -- | Provide a pure value for the response body.
@@ -1370,7 +1371,7 @@ respond ct = return . TypedContent ct . toContent
 --
 -- @since 1.2.0
 respondSource :: ContentType
-              -> Source (HandlerT site IO) (Flush Builder)
+              -> ConduitT () (Flush Builder) (HandlerT site IO) ()
               -> HandlerT site IO TypedContent
 respondSource ctype src = HandlerT $ \hd ->
     -- Note that this implementation relies on the fact that the ResourceT
@@ -1383,44 +1384,44 @@ respondSource ctype src = HandlerT $ \hd ->
 -- on most datatypes, such as @ByteString@ and @Html@.
 --
 -- @since 1.2.0
-sendChunk :: Monad m => ToFlushBuilder a => a -> Producer m (Flush Builder)
+sendChunk :: Monad m => ToFlushBuilder a => a -> ConduitT i (Flush Builder) m ()
 sendChunk = yield . toFlushBuilder
 
 -- | In a streaming response, send a flush command, causing all buffered data
 -- to be immediately sent to the client.
 --
 -- @since 1.2.0
-sendFlush :: Monad m => Producer m (Flush Builder)
+sendFlush :: Monad m => ConduitT i (Flush Builder) m ()
 sendFlush = yield Flush
 
 -- | Type-specialized version of 'sendChunk' for strict @ByteString@s.
 --
 -- @since 1.2.0
-sendChunkBS :: Monad m => S.ByteString -> Producer m (Flush Builder)
+sendChunkBS :: Monad m => S.ByteString -> ConduitT i (Flush Builder) m ()
 sendChunkBS = sendChunk
 
 -- | Type-specialized version of 'sendChunk' for lazy @ByteString@s.
 --
 -- @since 1.2.0
-sendChunkLBS :: Monad m => L.ByteString -> Producer m (Flush Builder)
+sendChunkLBS :: Monad m => L.ByteString -> ConduitT i (Flush Builder) m ()
 sendChunkLBS = sendChunk
 
 -- | Type-specialized version of 'sendChunk' for strict @Text@s.
 --
 -- @since 1.2.0
-sendChunkText :: Monad m => T.Text -> Producer m (Flush Builder)
+sendChunkText :: Monad m => T.Text -> ConduitT i (Flush Builder) m ()
 sendChunkText = sendChunk
 
 -- | Type-specialized version of 'sendChunk' for lazy @Text@s.
 --
 -- @since 1.2.0
-sendChunkLazyText :: Monad m => TL.Text -> Producer m (Flush Builder)
+sendChunkLazyText :: Monad m => TL.Text -> ConduitT i (Flush Builder) m ()
 sendChunkLazyText = sendChunk
 
 -- | Type-specialized version of 'sendChunk' for @Html@s.
 --
 -- @since 1.2.0
-sendChunkHtml :: Monad m => Html -> Producer m (Flush Builder)
+sendChunkHtml :: Monad m => Html -> ConduitT i (Flush Builder) m ()
 sendChunkHtml = sendChunk
 
 -- | Converts a child handler to a parent handler
diff --git a/yesod-core/Yesod/Core/Internal/Request.hs b/yesod-core/Yesod/Core/Internal/Request.hs
index b7e4e3ca..65201b19 100644
--- a/yesod-core/Yesod/Core/Internal/Request.hs
+++ b/yesod-core/Yesod/Core/Internal/Request.hs
@@ -33,9 +33,7 @@ import qualified Data.Set as Set
 import qualified Data.Text as T
 import Data.Text.Encoding (decodeUtf8With, decodeUtf8)
 import Data.Text.Encoding.Error (lenientDecode)
-import Data.Conduit
-import Data.Conduit.List (sourceList)
-import Data.Conduit.Binary (sourceFile, sinkFile)
+import Conduit
 import Data.Word (Word8, Word64)
 import Control.Monad.Trans.Resource (runResourceT, ResourceT)
 import Control.Exception (throwIO)
@@ -176,7 +174,7 @@ fromByteVector v =
 
 mkFileInfoLBS :: Text -> Text -> L.ByteString -> FileInfo
 mkFileInfoLBS name ct lbs =
-    FileInfo name ct (sourceList $ L.toChunks lbs) (`L.writeFile` lbs)
+    FileInfo name ct (sourceLazy lbs) (`L.writeFile` lbs)
 
 mkFileInfoFile :: Text -> Text -> FilePath -> FileInfo
 mkFileInfoFile name ct fp = FileInfo name ct (sourceFile fp) (\dst -> runResourceT $ sourceFile fp $$ sinkFile dst)
diff --git a/yesod-core/Yesod/Core/Internal/Response.hs b/yesod-core/Yesod/Core/Internal/Response.hs
index a7263b61..a4be46bd 100644
--- a/yesod-core/Yesod/Core/Internal/Response.hs
+++ b/yesod-core/Yesod/Core/Internal/Response.hs
@@ -6,6 +6,7 @@ module Yesod.Core.Internal.Response where
 import           Data.ByteString              (ByteString)
 import qualified Data.ByteString              as S
 import qualified Data.ByteString.Char8        as S8
+import qualified Data.ByteString.Lazy         as BL
 import           Data.CaseInsensitive         (CI)
 import qualified Data.CaseInsensitive         as CI
 import           Network.Wai
@@ -18,8 +19,7 @@ import           Yesod.Core.Types
 import qualified Network.HTTP.Types           as H
 import qualified Data.Text                    as T
 import           Control.Exception            (SomeException, handle)
-import           Blaze.ByteString.Builder     (fromLazyByteString,
-                                               toLazyByteString, toByteString)
+import           Data.ByteString.Builder      (lazyByteString, toLazyByteString)
 import qualified Data.ByteString.Lazy         as L
 import qualified Data.Map                     as Map
 import           Yesod.Core.Internal.Request  (tokenKey)
@@ -83,7 +83,7 @@ defaultStatus = H.mkStatus (-1) "INVALID DEFAULT STATUS"
 headerToPair :: Header
              -> (CI ByteString, ByteString)
 headerToPair (AddCookie sc) =
-    ("Set-Cookie", toByteString $ renderSetCookie sc)
+    ("Set-Cookie", BL.toStrict $ toLazyByteString $ renderSetCookie sc)
 headerToPair (DeleteCookie key path) =
     ( "Set-Cookie"
     , S.concat
@@ -100,7 +100,7 @@ evaluateContent (ContentBuilder b mlen) = handle f $ do
     let lbs = toLazyByteString b
         len = L.length lbs
         mlen' = mlen `mplus` Just (fromIntegral len)
-    len `seq` return (Right $ ContentBuilder (fromLazyByteString lbs) mlen')
+    len `seq` return (Right $ ContentBuilder (lazyByteString lbs) mlen')
   where
     f :: SomeException -> IO (Either ErrorResponse Content)
     f = return . Left . InternalError . T.pack . show
diff --git a/yesod-core/Yesod/Core/Internal/Run.hs b/yesod-core/Yesod/Core/Internal/Run.hs
index 668e8604..0989b025 100644
--- a/yesod-core/Yesod/Core/Internal/Run.hs
+++ b/yesod-core/Yesod/Core/Internal/Run.hs
@@ -14,7 +14,8 @@ import           Data.Monoid                  (Monoid, mempty)
 import           Control.Applicative          ((<$>))
 #endif
 import Yesod.Core.Internal.Response
-import           Blaze.ByteString.Builder     (toByteString)
+import           Data.ByteString.Builder      (toLazyByteString)
+import qualified Data.ByteString.Lazy         as BL
 import           Control.Exception            (fromException, evaluate)
 import qualified Control.Exception            as E
 import           Control.Monad.IO.Class       (MonadIO, liftIO)
@@ -372,7 +373,7 @@ yesodRender :: Yesod y
             -> [(Text, Text)] -- ^ url query string
             -> Text
 yesodRender y ar url params =
-    decodeUtf8With lenientDecode $ toByteString $
+    decodeUtf8With lenientDecode $ BL.toStrict $ toLazyByteString $
     fromMaybe
         (joinPath y ar ps
           $ params ++ params')
diff --git a/yesod-core/Yesod/Core/Types.hs b/yesod-core/Yesod/Core/Types.hs
index 680c13b8..2382f6a6 100644
--- a/yesod-core/Yesod/Core/Types.hs
+++ b/yesod-core/Yesod/Core/Types.hs
@@ -9,8 +9,7 @@
 {-# LANGUAGE UndecidableInstances #-}
 module Yesod.Core.Types where
 
-import qualified Blaze.ByteString.Builder           as BBuilder
-import qualified Blaze.ByteString.Builder.Char.Utf8
+import qualified Data.ByteString.Builder            as BB
 #if __GLASGOW_HASKELL__ < 710
 import           Control.Applicative                (Applicative (..))
 import           Control.Applicative                ((<$>))
@@ -25,7 +24,7 @@ import           Control.Monad.Logger               (LogLevel, LogSource,
 import           Control.Monad.Trans.Resource       (MonadResource (..), InternalState, runInternalState, MonadThrow (..), throwM, ResourceT)
 import           Data.ByteString                    (ByteString)
 import qualified Data.ByteString.Lazy               as L
-import           Data.Conduit                       (Flush, Source)
+import           Data.Conduit                       (Flush, ConduitT)
 import           Data.IORef                         (IORef, modifyIORef')
 import           Data.Map                           (Map, unionWith)
 import qualified Data.Map                           as Map
@@ -59,7 +58,6 @@ import           Control.Monad.Reader               (MonadReader (..))
 import           Data.Monoid                        ((<>))
 import Control.DeepSeq (NFData (rnf))
 import Control.DeepSeq.Generics (genericRnf)
-import Data.Conduit.Lazy (MonadActive, monadActive)
 import Yesod.Core.TypeCache (TypeMap, KeyedTypeMap)
 import Control.Monad.Logger (MonadLoggerIO (..))
 import Data.Semigroup (Semigroup)
@@ -134,13 +132,13 @@ type RequestBodyContents =
 data FileInfo = FileInfo
     { fileName        :: !Text
     , fileContentType :: !Text
-    , fileSourceRaw   :: !(Source (ResourceT IO) ByteString)
+    , fileSourceRaw   :: !(ConduitT () ByteString (ResourceT IO) ())
     , fileMove        :: !(FilePath -> IO ())
     }
 
 data FileUpload = FileUploadMemory !(NWP.BackEnd L.ByteString)
                 | FileUploadDisk !(InternalState -> NWP.BackEnd FilePath)
-                | FileUploadSource !(NWP.BackEnd (Source (ResourceT IO) ByteString))
+                | FileUploadSource !(NWP.BackEnd (ConduitT () ByteString (ResourceT IO) ()))
 
 -- | How to determine the root of the application for constructing URLs.
 --
@@ -288,8 +286,8 @@ data PageContent url = PageContent
     , pageBody  :: HtmlUrl url
     }
 
-data Content = ContentBuilder !BBuilder.Builder !(Maybe Int) -- ^ The content and optional content length.
-             | ContentSource !(Source (ResourceT IO) (Flush BBuilder.Builder))
+data Content = ContentBuilder !BB.Builder !(Maybe Int) -- ^ The content and optional content length.
+             | ContentSource !(ConduitT () (Flush BB.Builder) (ResourceT IO) ())
              | ContentFile !FilePath !(Maybe FilePart)
              | ContentDontEvaluate !Content
 
@@ -444,11 +442,6 @@ instance MonadIO m => MonadLogger (WidgetT site m) where
 instance MonadIO m => MonadLoggerIO (WidgetT site m) where
     askLoggerIO = WidgetT $ \_ hd -> return $ rheLog $ handlerEnv hd
 
-instance MonadActive m => MonadActive (WidgetT site m) where
-    monadActive = lift monadActive
-instance MonadActive m => MonadActive (HandlerT site m) where
-    monadActive = lift monadActive
-
 instance MonadTrans (HandlerT site) where
     lift = HandlerT . const
 
@@ -496,7 +489,7 @@ instance Monoid (UniqueList x) where
 instance Semigroup (UniqueList x)
 
 instance IsString Content where
-    fromString = flip ContentBuilder Nothing . Blaze.ByteString.Builder.Char.Utf8.fromString
+    fromString = flip ContentBuilder Nothing . BB.stringUtf8
 
 instance RenderRoute WaiSubsite where
     data Route WaiSubsite = WaiSubsiteRoute [Text] [(Text, Text)]
diff --git a/yesod-core/test/YesodCoreTest/CleanPath.hs b/yesod-core/test/YesodCoreTest/CleanPath.hs
index 8decc03a..b60a3156 100644
--- a/yesod-core/test/YesodCoreTest/CleanPath.hs
+++ b/yesod-core/test/YesodCoreTest/CleanPath.hs
@@ -22,7 +22,7 @@ import qualified Data.Text.Encoding as TE
 import Control.Arrow ((***))
 import Network.HTTP.Types (encodePath)
 import Data.Monoid (mappend)
-import Blaze.ByteString.Builder.Char.Utf8 (fromText)
+import Data.Text.Encoding (encodeUtf8Builder)
 
 data Subsite = Subsite
 
@@ -64,7 +64,7 @@ instance Yesod Y where
         corrected = filter (not . TS.null) s
 
     joinPath Y ar pieces' qs' =
-        fromText ar `Data.Monoid.mappend` encodePath pieces qs
+        encodeUtf8Builder ar `Data.Monoid.mappend` encodePath pieces qs
       where
         pieces = if null pieces' then [""] else pieces'
         qs = map (TE.encodeUtf8 *** go) qs'
diff --git a/yesod-core/test/YesodCoreTest/ErrorHandling.hs b/yesod-core/test/YesodCoreTest/ErrorHandling.hs
index db8dfe1c..f6fb6bb4 100644
--- a/yesod-core/test/YesodCoreTest/ErrorHandling.hs
+++ b/yesod-core/test/YesodCoreTest/ErrorHandling.hs
@@ -14,7 +14,7 @@ import qualified Data.ByteString.Lazy as L
 import qualified Data.ByteString.Char8 as S8
 import Control.Exception (SomeException, try)
 import Network.HTTP.Types (Status, mkStatus)
-import Blaze.ByteString.Builder (Builder, fromByteString, toLazyByteString)
+import Data.ByteString.Builder (Builder, toLazyByteString)
 import Data.Monoid (mconcat)
 import Data.Text (Text, pack)
 import Control.Monad (forM_)
@@ -101,7 +101,7 @@ getFileBadNameR :: Handler TypedContent
 getFileBadNameR = return $ TypedContent "ignored" $ ContentFile (error "filebadname") Nothing
 
 goodBuilderContent :: Builder
-goodBuilderContent = Data.Monoid.mconcat $ replicate 100 $ fromByteString "This is a test\n"
+goodBuilderContent = Data.Monoid.mconcat $ replicate 100 $ "This is a test\n"
 
 getGoodBuilderR :: Handler TypedContent
 getGoodBuilderR = return $ TypedContent "text/plain" $ toContent goodBuilderContent
diff --git a/yesod-core/test/YesodCoreTest/Links.hs b/yesod-core/test/YesodCoreTest/Links.hs
index f195368d..d461704d 100644
--- a/yesod-core/test/YesodCoreTest/Links.hs
+++ b/yesod-core/test/YesodCoreTest/Links.hs
@@ -13,7 +13,7 @@ import Yesod.Core
 import Network.Wai
 import Network.Wai.Test
 import Data.Text (Text)
-import Blaze.ByteString.Builder (toByteString)
+import Data.ByteString.Builder (toLazyByteString)
 
 data Y = Y
 mkYesod "Y" [parseRoutes|
@@ -86,7 +86,7 @@ case_blanks = runner $ do
     liftIO $ do
         let go r =
                 let (ps, qs) = renderRoute r
-                 in toByteString $ joinPath Y "" ps qs
+                 in toLazyByteString $ joinPath Y "" ps qs
         (go $ TextR "-") `shouldBe` "/single/--"
         (go $ TextR "") `shouldBe` "/single/-"
         (go $ TextsR ["", "-", "foo", "", "bar"]) `shouldBe` "/multi/-/--/foo/-/bar"
diff --git a/yesod-core/test/YesodCoreTest/RawResponse.hs b/yesod-core/test/YesodCoreTest/RawResponse.hs
index b55688d5..79f69900 100644
--- a/yesod-core/test/YesodCoreTest/RawResponse.hs
+++ b/yesod-core/test/YesodCoreTest/RawResponse.hs
@@ -22,7 +22,6 @@ import Control.Monad.Trans.Resource (register)
 import Data.IORef
 import Data.Streaming.Network (bindPortTCP)
 import Network.HTTP.Types (status200)
-import Blaze.ByteString.Builder (fromByteString)
 
 mkYesod "App" [parseRoutes|
 / HomeR GET
@@ -46,16 +45,16 @@ getHomeR = do
 getWaiStreamR :: Handler ()
 getWaiStreamR = sendWaiResponse $ responseStream status200 [] $ \send flush -> do
     flush
-    send $ fromByteString "hello"
+    send "hello"
     flush
-    send $ fromByteString " world"
+    send " world"
 
 getWaiAppStreamR :: Handler ()
 getWaiAppStreamR = sendWaiApplication $ \_ f -> f $ responseStream status200 [] $ \send flush -> do
     flush
-    send $ fromByteString "hello"
+    send "hello"
     flush
-    send $ fromByteString " world"
+    send " world"
 
 getFreePort :: IO Int
 getFreePort = do
diff --git a/yesod-core/yesod-core.cabal b/yesod-core/yesod-core.cabal
index 44e35973..bf61c3d6 100644
--- a/yesod-core/yesod-core.cabal
+++ b/yesod-core/yesod-core.cabal
@@ -25,12 +25,11 @@ library
                    , time                  >= 1.5
                    , wai                   >= 3.0
                    , wai-extra             >= 3.0.7
-                   , bytestring            >= 0.10
+                   , bytestring            >= 0.10.2
                    , text                  >= 0.7
                    , template-haskell
                    , path-pieces           >= 0.1.2    && < 0.3
                    , shakespeare           >= 2.0
-                   , blaze-builder         >= 0.2.1.4  && < 0.5
                    , transformers          >= 0.4
                    , mtl
                    , clientsession         >= 0.9.1    && < 0.10
@@ -61,6 +60,7 @@ library
                    , conduit-extra
                    , deepseq               >= 1.3
                    , deepseq-generics
+                   -- FIXME remove
                    , mwc-random
                    , primitive
                    , word8
@@ -187,7 +187,6 @@ test-suite tests
                   ,text
                   ,http-types
                   , random
-                  , blaze-builder
                   ,HUnit
                   ,QuickCheck >= 2 && < 3
                   ,transformers
diff --git a/yesod-static/Yesod/EmbeddedStatic/Generators.hs b/yesod-static/Yesod/EmbeddedStatic/Generators.hs
index 2d8aeab1..b5c760e1 100644
--- a/yesod-static/Yesod/EmbeddedStatic/Generators.hs
+++ b/yesod-static/Yesod/EmbeddedStatic/Generators.hs
@@ -24,9 +24,9 @@ module Yesod.EmbeddedStatic.Generators (
 
   -- * Util
   , pathToName
-  
+
   -- * Custom Generators
-  
+
   -- $example
 ) where
 
@@ -34,7 +34,6 @@ import Control.Applicative as A ((<$>), (<*>))
 import Control.Exception (try, SomeException)
 import Control.Monad (forM, when)
 import Data.Char (isDigit, isLower)
-import Data.Conduit (($$))
 import Data.Default (def)
 import Data.Maybe (isNothing)
 import Language.Haskell.TH
@@ -44,8 +43,7 @@ import System.FilePath ((</>))
 import Text.Jasmine (minifym)
 import qualified Data.ByteString as BS
 import qualified Data.ByteString.Lazy as BL
-import qualified Data.Conduit.List as C
-import Data.Conduit.Binary (sourceHandle)
+import Conduit
 import qualified Data.Text as T
 import qualified System.Process as Proc
 import System.Exit (ExitCode (ExitSuccess))
@@ -208,13 +206,13 @@ compressTool f opts ct = do
                 }
     (Just hin, Just hout, _, ph) <- Proc.createProcess p
     (compressed, (), code) <- runConcurrently $ (,,)
-        A.<$> Concurrently (sourceHandle hout $$ C.consume)
+        A.<$> Concurrently (runConduit $ sourceHandle hout .| sinkLazy)
         A.<*> Concurrently (BL.hPut hin ct >> hClose hin)
         A.<*> Concurrently (Proc.waitForProcess ph)
     if code == ExitSuccess
         then do
             putStrLn $ "Compressed successfully with " ++ f
-            return $ BL.fromChunks compressed
+            return compressed
         else error $ "compressTool: compression failed with " ++ f
 
 
diff --git a/yesod-static/Yesod/Static.hs b/yesod-static/Yesod/Static.hs
index 883bf62e..fd5f8a70 100644
--- a/yesod-static/Yesod/Static.hs
+++ b/yesod-static/Yesod/Static.hs
@@ -94,10 +94,7 @@ import Data.List (foldl')
 import qualified Data.ByteString as S
 import System.PosixCompat.Files (getFileStatus, modificationTime)
 import System.Posix.Types (EpochTime)
-import Data.Conduit
-import Data.Conduit.List (sourceList, consume)
-import Data.Conduit.Binary (sourceFile)
-import qualified Data.Conduit.Text as CT
+import Conduit
 import Data.Functor.Identity (runIdentity)
 import System.FilePath ((</>), (<.>), takeDirectory)
 import qualified System.FilePath as F
@@ -425,8 +422,8 @@ base64md5File = fmap (base64 . encode) . hashFile
 base64md5 :: L.ByteString -> String
 base64md5 lbs =
             base64 $ encode
-          $ runIdentity
-          $ sourceList (L.toChunks lbs) $$ sinkHash
+          $ runConduitPure
+          $ Conduit.sourceLazy lbs .| sinkHash
   where
     encode d = ByteArray.convert (d :: Digest MD5)
 
@@ -461,8 +458,11 @@ combineStatics' :: CombineType
                 -> [Route Static] -- ^ files to combine
                 -> Q Exp
 combineStatics' combineType CombineSettings {..} routes = do
-    texts <- qRunIO $ runResourceT $ mapM_ yield fps $$ awaitForever readUTFFile =$ consume
-    ltext <- qRunIO $ preProcess $ TL.fromChunks texts
+    texts <- qRunIO $ runConduitRes
+                    $ yieldMany fps
+                   .| awaitForever readUTFFile
+                   .| sinkLazy
+    ltext <- qRunIO $ preProcess texts
     bs    <- qRunIO $ postProcess fps $ TLE.encodeUtf8 ltext
     let hash' = base64md5 bs
         suffix = csCombinedFolder </> hash' <.> extension
@@ -476,7 +476,7 @@ combineStatics' combineType CombineSettings {..} routes = do
     fps :: [FilePath]
     fps = map toFP routes
     toFP (StaticRoute pieces _) = csStaticDir </> F.joinPath (map T.unpack pieces)
-    readUTFFile fp = sourceFile fp =$= CT.decode CT.utf8
+    readUTFFile fp = sourceFile fp .| decodeUtf8C
     postProcess =
         case combineType of
             JS -> csJsPostProcess
diff --git a/yesod-static/yesod-static.cabal b/yesod-static/yesod-static.cabal
index 2a9c8506..8ddf0dbc 100644
--- a/yesod-static/yesod-static.cabal
+++ b/yesod-static/yesod-static.cabal
@@ -42,8 +42,7 @@ library
                    , file-embed            >= 0.0.4.1  && < 0.5
                    , http-types            >= 0.7
                    , unix-compat           >= 0.2
-                   , conduit               >= 0.5
-                   , conduit-extra
+                   , conduit               >= 1.3
                    , cryptonite-conduit    >= 0.1
                    , cryptonite            >= 0.11
                    , memory
@@ -124,7 +123,6 @@ test-suite tests
                    , unordered-containers
                    , async
                    , process
-                   , conduit-extra
                    , exceptions
 
     ghc-options:     -Wall -threaded
diff --git a/yesod/Yesod/Default/Util.hs b/yesod/Yesod/Default/Util.hs
index 897031b0..4b12326c 100644
--- a/yesod/Yesod/Default/Util.hs
+++ b/yesod/Yesod/Default/Util.hs
@@ -18,9 +18,7 @@ import qualified Data.ByteString.Lazy as L
 import Data.Text (Text, pack, unpack)
 import Yesod.Core -- purposely using complete import so that Haddock will see addStaticContent
 import Control.Monad (when, unless)
-import Control.Monad.Trans.Resource (runResourceT)
-import Data.Conduit (($$))
-import Data.Conduit.Binary (sourceLbs, sinkFileCautious)
+import Conduit
 import System.Directory (doesFileExist, createDirectoryIfMissing)
 import Language.Haskell.TH.Syntax
 import Text.Lucius (luciusFile, luciusFileReload)
@@ -46,8 +44,8 @@ addStaticContentExternal
 addStaticContentExternal minify hash staticDir toRoute ext' _ content = do
     liftIO $ createDirectoryIfMissing True statictmp
     exists <- liftIO $ doesFileExist fn'
-    unless exists $
-        liftIO $ runResourceT $ sourceLbs content' $$ sinkFileCautious fn'
+    unless exists $ withSinkFileCautious fn' $ \sink ->
+        runConduit $ sourceLazy content' .| sink
     return $ Just $ Right (toRoute ["tmp", pack fn], [])
   where
     fn, statictmp, fn' :: FilePath
diff --git a/yesod/yesod.cabal b/yesod/yesod.cabal
index fdde1f0e..5eb0f06e 100644
--- a/yesod/yesod.cabal
+++ b/yesod/yesod.cabal
@@ -38,8 +38,7 @@ library
                    , bytestring
                    , monad-logger
                    , fast-logger
-                   , conduit
-                   , conduit-extra             >= 1.1.14
+                   , conduit                   >= 1.3
                    , resourcet
                    , shakespeare
                    , streaming-commons
