358e397 · obelisk · git.iko.soy

git.iko.soy/obelisk

on master help sign in

Bump reflex-platform; More missing MonadFail

358e397Ali Abrar7 years ago

dep/reflex-platform/github.json+2−2

compare with master

unifiedsplit

@@ -2,6 +2,6 @@

2 "owner": "reflex-frp",

3 "repo": "reflex-platform",

4 "branch": "aa-split-these",

5− "rev": "c6989e20b3dad9c08c38d83cc352b9a82b6664b4",

5+ "rev": "4b4a2c8679d6f3042180d2974b31c43bfc506b91",

6− "sha256": "0h1236xb7gqy432409a3n4j32kv7a9xa8fdi9alr722bhw952yf6"

6+ "sha256": "185i8ccqk0xc05ckd921fs7nnaj88gihmlazny1dk004hxq78cj2"

lib/backend/src/Obelisk/Backend.hs+3−2

@@ -26,6 +26,7 @@ import Prelude hiding (id, (.))

26import Control.Category

27import Control.Monad

28import Control.Monad.Except

29+import Control.Monad.Fail (MonadFail)

29import Control.Categorical.Bifunctor

30import Control.Categorical.Bifunctor

30import Data.ByteString (ByteString)

31import Data.ByteString (ByteString)

31import qualified Data.ByteString.Char8 as BSC8

32import qualified Data.ByteString.Char8 as BSC8

@@ -144,7 +145,7 @@ serveObeliskApp urlEnc serveStaticAsset frontendApp config = \case

144 writeText msg

145 writeText msg

145 ResourceRoute_Version :=> Identity () -> doNotCache >> serveFileIfExistsAs "text/plain" "version"

146 ResourceRoute_Version :=> Identity () -> doNotCache >> serveFileIfExistsAs "text/plain" "version"

146

147

147−serveStaticAssets :: MonadSnap m => StaticAssets -> [Text] -> m ()

148+serveStaticAssets :: (MonadSnap m, MonadFail m) => StaticAssets -> [Text] -> m ()

148serveStaticAssets assets pathSegments = serveAsset (_staticAssets_processed assets) (_staticAssets_unprocessed assets) $ T.unpack $ T.intercalate "/" pathSegments

149serveStaticAssets assets pathSegments = serveAsset (_staticAssets_processed assets) (_staticAssets_unprocessed assets) $ T.unpack $ T.intercalate "/" pathSegments

149

150

150data StaticAssets = StaticAssets

151data StaticAssets = StaticAssets

@@ -162,7 +163,7 @@ staticRenderContentType = "text/html; charset=utf-8"

162

163

163--TODO: Don't assume we're being served at "/"

164--TODO: Don't assume we're being served at "/"

164serveGhcjsApp

165serveGhcjsApp

165− :: (MonadSnap m, HasCookies m)

166+ :: (MonadSnap m, HasCookies m, MonadFail m)

166 => (R appRouteComponent -> Text)

167 => (R appRouteComponent -> Text)

167 -> GhcjsApp (R appRouteComponent)

168 -> GhcjsApp (R appRouteComponent)

168 -> Map Text ByteString

169 -> Map Text ByteString