3b6ce36 · typeable/servant-reflex

git.iko.soy/typeable/servant-reflex

Merge pull request #52 from hamishmack/reflex-dom-core

Use reflex-dom-core instead of reflex-dom

commit3b6ce36aaf3db9a7a7fd0a65b854dedcd8a7eb70 authorGreg Hale <ImAlsoGreg@gmail.com> dateThu 25 Jan 2018, 22:58 (9 years ago) parent153d325 ee82402

5 files changed+5−5

compare with master

unifiedsplit

servant-reflex.cabal+1−1 src/Servant/Common/BaseUrl.hs+1−1 src/Servant/Common/Req.hs+1−1 src/Servant/Reflex.hs+1−1 src/Servant/Reflex/Multi.hs+1−1

servant-reflex.cabal+1−1

@@ -39,7 +39,7 @@ library

3939 mtl >= 2.2.1 && < 2.3,

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

4141 reflex >= 0.5 && < 0.6,

42− reflex-dom == 0.4 && < 0.5,

42+ reflex-dom-core == 0.4 && < 0.5,

4343 safe >= 0.3.9 && < 0.4,

4444 servant >= 0.8 && < 0.12,

4545 servant-auth >= 0.2.1 && < 0.3,

src/Servant/Common/BaseUrl.hs+1−1

@@ -28,7 +28,7 @@ import qualified Data.Text as T

2828import GHC.Generics

2929import Language.Javascript.JSaddle.Monad (MonadJSM)

3030import Reflex

31−import Reflex.Dom

31+import Reflex.Dom.Core

3232import Text.Read

3333

3434

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

@@ -29,7 +29,7 @@ import qualified Data.Text.Encoding as TE

2929import Data.Traversable (forM)

3030import Language.Javascript.JSaddle.Monad (JSM, MonadJSM)

3131import qualified Network.URI as N

32−import Reflex.Dom hiding (tag)

32+import Reflex.Dom.Core hiding (tag)

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

3434 SupportsServantReflex)

3535import Servant.API.ContentTypes (MimeUnrender(..), NoContent(..))

src/Servant/Reflex.hs+1−1

@@ -58,7 +58,7 @@ import Servant.API ((:<|>)(..),(:>), BasicAuth,

5858 ToHttpApiData(..), Vault, Verb)

5959import qualified Servant.Auth as Auth

6060

61−import Reflex.Dom (Dynamic, Event, Reflex,

61+import Reflex.Dom.Core (Dynamic, Event, Reflex,

6262 XhrRequest(..),

6363 XhrResponseHeaders(..),

6464 XhrResponse(..), attachPromptlyDynWith, constDyn, ffor, fmapMaybe,

src/Servant/Reflex/Multi.hs+1−1

@@ -55,7 +55,7 @@ import Servant.API ((:<|>) (..), (:>), BasicAuth,

5555 ReqBody, ToHttpApiData (..), Vault,

5656 Verb, contentType)

5757

58−import Reflex.Dom (Dynamic, Event, Reflex,

58+import Reflex.Dom.Core (Dynamic, Event, Reflex,

5959 XhrRequest (..),

6060 XhrResponseHeaders (..),

6161 attachPromptlyDynWith, constDyn)