on master help sign in
Merge branch 'develop' into route-classes-dynamicwritert
commitfbd6546b9a27d76e1b35c99b38e76beb8f279e85 authorElliot Cameron <3noch@users.noreply.github.com> dateMon 29 Jun 2020, 11:04 (6 years ago) parenta9d8c819d2a7a8
2 files changed+19−1
lib/route/obelisk-route.cabal+1 lib/route/src/Obelisk/Route/Frontend.hs+18−1
lib/route/obelisk-route.cabal+1
@@ -20,6 +20,7 @@ library
2020 http-types,
2121 jsaddle,
2222 lens,
23+ mmorph,
2324 monad-control,
2425 mtl,
2526 network-uri,
lib/route/src/Obelisk/Route/Frontend.hs+18−1
@@ -62,6 +62,7 @@ import Control.Category.Cartesian ((&&&))
6262import Control.Lens hiding (Bifunctor, bimap, universe, element)
6363import Control.Monad ((<=<))
6464import Control.Monad.Fix
65+import Control.Monad.Morph
6566import Control.Monad.Primitive
6667import Control.Monad.Reader
6768import Control.Monad.Ref
@@ -108,7 +109,23 @@ instance Monad m => Routed t r (RoutedT t r m) where
108109instance (Monad m, Routed t r m) => Routed t r (ReaderT r' m)
109110
110111newtype RoutedT t r m a = RoutedT { unRoutedT :: ReaderT (Dynamic t r) m a }
111− deriving (Functor, Applicative, Monad, MonadFix, MonadTrans, NotReady t, MonadHold t, MonadSample t, PostBuild t, TriggerEvent t, MonadIO, MonadReflexCreateTrigger t, HasDocument, DomRenderHook t)
112+ deriving
113+ ( Functor
114+ , Applicative
115+ , Monad
116+ , MonadFix
117+ , MonadTrans
118+ , MFunctor
119+ , NotReady t
120+ , MonadHold t
121+ , MonadSample t
122+ , PostBuild t
123+ , TriggerEvent t
124+ , MonadIO
125+ , MonadReflexCreateTrigger t
126+ , HasDocument
127+ , DomRenderHook t
128+ )
112129
113130instance MonadReader r' m => MonadReader r' (RoutedT t r m) where
114131 ask = lift ask