7acb477 · typeable/servant-reflex

git.iko.soy/typeable/servant-reflex

Fix types for jsaddle, bump deps

commit7acb4778b99afef955aaae5f85443462d74fb616 authorGreg Hale <imalsogreg@gmail.com> dateWed 29 Mar 2017, 12:14 (10 years ago) parente708bcf

6 files changed+10−29

compare with master

unifiedsplit

deps/servant-snap+1−1 exec/Example.hs+1−1 overrides.nix−23 servant-reflex.cabal+2−1 src/Servant/Common/BaseUrl.hs+3−2 src/Servant/Common/Req.hs+3−1

deps/servant-snap+1−1

Submodule changed.

exec/Example.hs+1−1

@@ -19,7 +19,7 @@ import Servant.API

1919import API

2020import Data.Proxy

2121import Text.Read (readMaybe)

22−import Reflex.Dom

22+import Reflex.Dom hiding (run)

2323------------------------------------------------------------------------------

2424import Servant.Reflex

2525import Servant.Reflex.Multi

overrides.nix−23

@@ -8,28 +8,5 @@ let

88in

99reflex-platform.ghcjs.override {

1010 overrides = self: super: {

11− servant = dontCheck (self.callPackage (cabal2nixResult deps/servant/servant) {});

12− http-api-data = dontCheck (self.callPackage (cabal2nixResult deps/http-api-data) {});

13− natural-transformation = self.callPackage (

14− { mkDerivation, base, containers, fetchgit, quickcheck-instances

15− , stdenv, tasty, tasty-quickcheck

16− }:

17− mkDerivation {

18− pname = "natural-transformation";

19− version = "0.4";

20− src = fetchgit {

21− url = "https://github.com/ku-fpg/natural-transformation";

22− sha256 = "0xbnnxbf5ydszbhf7h5ra3mrqy4mcyqc3zb2k8bwm1zyqrz6v0fs";

23− rev = "b1200c09dcafd034e32846413913b74735c8ba56";

24− };

25− libraryHaskellDepends = [ base ];

26− testHaskellDepends = [

27− base containers quickcheck-instances tasty tasty-quickcheck

28− ];

29− homepage = "https://github.com/ku-fpg/natural-transformation";

30− description = "A natural transformation package";

31− license = stdenv.lib.licenses.bsd3;

32− }

33− ) {};

3411 };

3512}

servant-reflex.cabal+2−1

@@ -32,9 +32,10 @@ library

3232 containers >= 0.5.6 && < 0.6,

3333 data-default >= 0.5 && < 0.8,

3434 exceptions >= 0.8 && < 0.9,

35− ghcjs-dom >= 0.2 && < 0.3,

35+ ghcjs-dom >= 0.2 && < 0.8,

3636 http-api-data >= 0.2 && < 0.4,

3737 http-media >= 0.6 && < 0.7,

38+ jsaddle >= 0.8.1 && < 0.9,

3839 mtl >= 2.2.1 && < 2.3,

3940 network-uri >= 2.6 && < 2.7,

4041 reflex >= 0.5 && < 0.6,

src/Servant/Common/BaseUrl.hs+3−2

@@ -20,18 +20,19 @@ module Servant.Common.BaseUrl (

2020) where

2121

2222import Control.Monad (join)

23−import Control.Monad.IO.Class (MonadIO)

23+-- import Control.Monad.IO.Class (MonadIO)

2424import Control.Monad.Fix (MonadFix)

2525import Data.Monoid ((<>))

2626import Data.Text (Text)

2727import qualified Data.Text as T

2828import GHC.Generics

29+import Language.Javascript.JSaddle.Monad (MonadJSM)

2930import Reflex

3031import Reflex.Dom

3132import Text.Read

3233

3334

34−type SupportsServantReflex t m = (Reflex t, TriggerEvent t m, PerformEvent t m, HasWebView (Performable m), MonadIO (Performable m))

35+type SupportsServantReflex t m = (Reflex t, TriggerEvent t m, PerformEvent t m, HasWebView (Performable m), MonadJSM (Performable m))

3536

3637-- | URI scheme to use

3738data Scheme =

src/Servant/Common/Req.hs+3−1

@@ -25,6 +25,7 @@ import Data.Text (Text)

2525import qualified Data.Text as T

2626import qualified Data.Text.Encoding as TE

2727import Data.Traversable (forM)

28+import Language.Javascript.JSaddle.Monad (JSM, MonadJSM)

2829import Reflex.Dom hiding (tag)

2930import Servant.Common.BaseUrl (BaseUrl, showBaseUrl,

3031 SupportsServantReflex)

@@ -255,6 +256,7 @@ performRequests reqMeth rs reqHost trigger = do

255256-- | Issues a collection of requests when the supplied Event fires. When ALL requests from a given firing complete, the results are collected and returned via the return Event.

256257performSomeRequestsAsync

257258 :: (MonadIO (Performable m),

259+ MonadJSM (Performable m),

258260 HasWebView (Performable m),

259261 PerformEvent t m,

260262 TriggerEvent t m,

@@ -270,7 +272,7 @@ performSomeRequestsAsync = performSomeRequestsAsync' newXMLHttpRequest . fmap re

270272-- that accepts 'f (Either e (XhrRequestb))' events

271273performSomeRequestsAsync'

272274 :: (MonadIO (Performable m), PerformEvent t m, TriggerEvent t m, Traversable f)

273− => (XhrRequest b -> (a -> IO ()) -> Performable m XMLHttpRequest)

275+ => (XhrRequest b -> (a -> JSM ()) -> Performable m XMLHttpRequest)

274276 -> Event t (Performable m (f (Either Text (XhrRequest b)))) -> m (Event t (f (Either Text a)))

275277performSomeRequestsAsync' newXhr req = performEventAsync $ ffor req $ \hrs cb -> do

276278 rs <- hrs