on master help sign in
Bump reflex-platform; More missing MonadFail
commit358e39750763bfe0a6c1d6e5bfe65edc3d2ffa93 authorAli Abrar <aliabrar@gmail.com> dateMon 26 Aug 2019, 06:37 (7 years ago) parent6ce2fbc
2 files changed+5−4
dep/reflex-platform/github.json+2−2 lib/backend/src/Obelisk/Backend.hs+3−2
dep/reflex-platform/github.json+2−2
@@ -2,6 +2,6 @@
22 "owner": "reflex-frp",
33 "repo": "reflex-platform",
44 "branch": "aa-split-these",
5− "rev": "c6989e20b3dad9c08c38d83cc352b9a82b6664b4",
6− "sha256": "0h1236xb7gqy432409a3n4j32kv7a9xa8fdi9alr722bhw952yf6"
5+ "rev": "4b4a2c8679d6f3042180d2974b31c43bfc506b91",
6+ "sha256": "185i8ccqk0xc05ckd921fs7nnaj88gihmlazny1dk004hxq78cj2"
77}
lib/backend/src/Obelisk/Backend.hs+3−2
@@ -26,6 +26,7 @@ import Prelude hiding (id, (.))
2626import Control.Category
2727import Control.Monad
2828import Control.Monad.Except
29+import Control.Monad.Fail (MonadFail)
2930import Control.Categorical.Bifunctor
3031import Data.ByteString (ByteString)
3132import qualified Data.ByteString.Char8 as BSC8
@@ -144,7 +145,7 @@ serveObeliskApp urlEnc serveStaticAsset frontendApp config = \case
144145 writeText msg
145146 ResourceRoute_Version :=> Identity () -> doNotCache >> serveFileIfExistsAs "text/plain" "version"
146147
147−serveStaticAssets :: MonadSnap m => StaticAssets -> [Text] -> m ()
148+serveStaticAssets :: (MonadSnap m, MonadFail m) => StaticAssets -> [Text] -> m ()
148149serveStaticAssets assets pathSegments = serveAsset (_staticAssets_processed assets) (_staticAssets_unprocessed assets) $ T.unpack $ T.intercalate "/" pathSegments
149150
150151data StaticAssets = StaticAssets
@@ -162,7 +163,7 @@ staticRenderContentType = "text/html; charset=utf-8"
162163
163164--TODO: Don't assume we're being served at "/"
164165serveGhcjsApp
165− :: (MonadSnap m, HasCookies m)
166+ :: (MonadSnap m, HasCookies m, MonadFail m)
166167 => (R appRouteComponent -> Text)
167168 -> GhcjsApp (R appRouteComponent)
168169 -> Map Text ByteString