0fefa3e · reflex-dom · git.iko.soy

git.iko.soy/reflex-dom

Merge commit 'dd294c1' into develop

commit0fefa3e4b12b8cb80762e29105072d38b8983194 authorRyan Trinkle <ryan.trinkle@gmail.com> dateMon 29 Apr 2019, 12:08 (7 years ago) parentfed9a7c dd294c1

8 files changed+5−13

compare with develop

unifiedsplit

reflex-dom-core/reflex-dom-core.cabal+2−2 reflex-dom-core/src/Foreign/JavaScript/TH.hs−2 reflex-dom-core/src/Reflex/Dom/Builder/Class.hs+1−2 reflex-dom-core/src/Reflex/Dom/Builder/Class/Events.hs−1 reflex-dom-core/src/Reflex/Dom/Builder/Immediate.hs+2−2 reflex-dom-core/src/Reflex/Dom/Old.hs−1 reflex-dom-core/src/Reflex/Dom/Prerender.hs−2 reflex-dom-core/src/Reflex/Dom/Xhr/Foreign.hs−1

reflex-dom-core/reflex-dom-core.cabal+2−2

@@ -42,7 +42,7 @@ flag profile-reflex

4242library

4343 hs-source-dirs: src

4444 build-depends:

45− aeson >= 0.8 && < 1.4,

45+ aeson >= 0.8 && < 1.5,

4646 base >= 4.7 && < 4.12,

4747 bifunctors >= 4.2 && < 6,

4848 bimap >= 0.3 && < 0.4,

@@ -50,7 +50,7 @@ library

5050 bytestring == 0.10.*,

5151 containers == 0.5.*,

5252 constraints >= 0.9 && < 0.11,

53− contravariant >= 1.4 && < 1.5,

53+ contravariant >= 1.4 && < 1.6,

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

5555 dependent-map == 0.2.*,

5656 dependent-sum >= 0.3 && < 0.5,

reflex-dom-core/src/Foreign/JavaScript/TH.hs−2

@@ -6,11 +6,9 @@

66{-# LANGUAGE FlexibleInstances #-}

77{-# LANGUAGE FunctionalDependencies #-}

88{-# LANGUAGE GeneralizedNewtypeDeriving #-}

9−{-# LANGUAGE MultiParamTypeClasses #-}

109{-# LANGUAGE RankNTypes #-}

1110{-# LANGUAGE StandaloneDeriving #-}

1211{-# LANGUAGE TypeFamilies #-}

13−{-# LANGUAGE TypeSynonymInstances #-}

1412{-# LANGUAGE UndecidableInstances #-}

1513#ifdef USE_TEMPLATE_HASKELL

1614{-# LANGUAGE TemplateHaskell #-}

reflex-dom-core/src/Reflex/Dom/Builder/Class.hs+1−2

@@ -11,10 +11,9 @@

1111{-# LANGUAGE ImpredicativeTypes #-}

1212#endif

1313{-# LANGUAGE LambdaCase #-}

14−{-# LANGUAGE MultiParamTypeClasses #-}

1514{-# LANGUAGE OverloadedStrings #-}

1615{-# LANGUAGE PolyKinds #-}

17−{-# LANGUAGE RankNTypes #-}

16+{-# LANGUAGE Rank2Types #-}

1817{-# LANGUAGE RecursiveDo #-}

1918{-# LANGUAGE ScopedTypeVariables #-}

2019{-# LANGUAGE StandaloneDeriving #-}

reflex-dom-core/src/Reflex/Dom/Builder/Class/Events.hs−1

@@ -1,7 +1,6 @@

11{-# LANGUAGE CPP #-}

22{-# LANGUAGE DataKinds #-}

33{-# LANGUAGE GADTs #-}

4−{-# LANGUAGE KindSignatures #-}

54{-# LANGUAGE PolyKinds #-}

65#ifdef USE_TEMPLATE_HASKELL

76{-# LANGUAGE TemplateHaskell #-}

reflex-dom-core/src/Reflex/Dom/Builder/Immediate.hs+2−2

@@ -347,7 +347,7 @@ runDomRenderHookT (DomRenderHookT a) events = do

347347 flip runTriggerEventT events $ do

348348 rec (result, req) <- runRequesterT a rsp

349349 rsp <- performEventAsync $ ffor req $ \rm f -> liftJSM $ runInAnimationFrame f $

350− traverseRequesterData (\r -> Identity <$> r) rm

350+ traverseRequesterData (fmap Identity) rm

351351 return result

352352 where

353353 runInAnimationFrame f x = void . DOM.inAnimationFrame' $ \_ -> do

@@ -362,7 +362,7 @@ instance (Reflex t, MonadFix m) => DomRenderHook t (DomRenderHookT t m) where

362362 withRenderHook hook (DomRenderHookT a) = do

363363 DomRenderHookT $ withRequesting $ \rsp -> do

364364 (x, req) <- lift $ runRequesterT a $ runIdentity <$> rsp

365− return (ffor req $ \rm -> hook $ traverseRequesterData (\r -> Identity <$> r) rm, x)

365+ return (ffor req $ \rm -> hook $ traverseRequesterData (fmap Identity) rm, x)

366366 requestDomAction = DomRenderHookT . requestingIdentity

367367 requestDomAction_ = DomRenderHookT . requesting_

368368

reflex-dom-core/src/Reflex/Dom/Old.hs−1

@@ -1,6 +1,5 @@

11{-# LANGUAGE CPP #-}

22{-# LANGUAGE ConstraintKinds #-}

3−{-# LANGUAGE ExplicitForAll #-}

43{-# LANGUAGE FlexibleContexts #-}

54{-# LANGUAGE FlexibleInstances #-}

65{-# LANGUAGE MultiParamTypeClasses #-}

reflex-dom-core/src/Reflex/Dom/Prerender.hs−2

@@ -5,12 +5,10 @@

55{-# LANGUAGE FunctionalDependencies #-}

66{-# LANGUAGE LambdaCase #-}

77{-# LANGUAGE OverloadedStrings #-}

8−{-# LANGUAGE MultiParamTypeClasses #-}

98{-# LANGUAGE Rank2Types #-}

109{-# LANGUAGE RecursiveDo #-}

1110{-# LANGUAGE ScopedTypeVariables #-}

1211{-# LANGUAGE TypeFamilies #-}

13−{-# LANGUAGE TypeSynonymInstances #-}

1412{-# LANGUAGE UndecidableInstances #-}

1513

1614-- | Render the first widget on the server, and the second on the client.

reflex-dom-core/src/Reflex/Dom/Xhr/Foreign.hs−1

@@ -1,7 +1,6 @@

11{-# LANGUAGE FlexibleInstances #-}

22{-# LANGUAGE JavaScriptFFI #-}

33{-# LANGUAGE OverloadedStrings #-}

4−{-# LANGUAGE TypeSynonymInstances #-}

65module Reflex.Dom.Xhr.Foreign (

76 XMLHttpRequest