git.iko.soy/typeable/reflex-dom-nested-routing
on master help sign in
Merge pull request #9 from alexfmpe/reflex-dom-core-0.7

Drop support for reflex-dom-core pre-0.7

commit57b7971256fbb6c0216aab5aad94bbfbaeb434a2 authorElliot Cameron <3noch@users.noreply.github.com> dateMon 6 Jun 2022, 22:27 (4 years ago) parent43067ed095d0e0
2 files changed+3−18
unifiedsplit
Reflex/Dom/Routing/Nested.hs+2−9 Reflex/Dom/Routing/Writer.hs+1−9
Reflex/Dom/Routing/Nested.hs+2−9
@@ -32,7 +32,6 @@ import Data.Maybe (listToMaybe)
3232import Data.Text (Text)
3333import qualified Data.Text as T
3434import Data.Text.Encoding (decodeUtf8, encodeUtf8)
35−import Foreign.JavaScript.TH
3635import Language.Javascript.JSaddle (MonadJSM)
3736import Reflex
3837import Reflex.Dom.Builder.Class
@@ -137,20 +136,14 @@ instance DynamicWriter t w m => DynamicWriter t w (RouteT t segment m) where
137136 tellDyn = lift . tellDyn
138137
139138instance HasDocument m => HasDocument (RouteT t segment m)
140−instance HasJSContext m => HasJSContext (RouteT t segment m) where
141− type JSContextPhantom (RouteT t segment m) = JSContextPhantom m
142− askJSContext = RouteT askJSContext
139+
143140#ifndef ghcjs_HOST_OS
144141instance MonadJSM m => MonadJSM (RouteT t segment m)
145142#endif
146143
147144deriving instance DomRenderHook t m => DomRenderHook t (RouteT t segment m)
148145
149−instance HasJS x m => HasJS x (RouteT t segment m) where
150− type JSX (RouteT t segment m) = JSX m
151− liftJS = lift . liftJS
152−
153−instance (Prerender js t m, Monad m, Reflex t) => Prerender js t (RouteT t segment m) where
146+instance (Prerender t m, Monad m, Reflex t) => Prerender t (RouteT t segment m) where
154147 type Client (RouteT t segment m) = RouteT t segment (Client m)
155148 prerender (RouteT a) (RouteT b) = RouteT $ prerender a b
156149
Reflex/Dom/Routing/Writer.hs+1−9
@@ -20,7 +20,6 @@ import Control.Monad.Reader
2020import Control.Monad.Ref
2121import qualified Control.Monad.State.Strict as StrictState
2222import Data.Coerce (coerce)
23−import Foreign.JavaScript.TH
2423import Language.Javascript.JSaddle (MonadJSM)
2524import Reflex
2625import Reflex.Dom.Builder.Class
@@ -45,11 +44,7 @@ instance (MonadWidget t m) => RouteWriter t segment (RouteWriterT t segment m) w
4544
4645deriving instance DomRenderHook t m => DomRenderHook t (RouteWriterT t segment m)
4746
48−instance HasJS x m => HasJS x (RouteWriterT t segment m) where
49− type JSX (RouteWriterT t segment m) = JSX m
50− liftJS = lift . liftJS
51−
52−instance (Prerender js t m, Monad m, Reflex t) => Prerender js t (RouteWriterT t segment m) where
47+instance (Prerender t m, Monad m, Reflex t) => Prerender t (RouteWriterT t segment m) where
5348 type Client (RouteWriterT t segment m) = RouteWriterT t segment (Client m)
5449 prerender (RouteWriterT a) (RouteWriterT b) = RouteWriterT $ prerender a b
5550
@@ -116,9 +111,6 @@ instance DynamicWriter t w m => DynamicWriter t w (RouteWriterT t segment m) whe
116111
117112
118113instance HasDocument m => HasDocument (RouteWriterT t segment m)
119−instance HasJSContext m => HasJSContext (RouteWriterT t segment m) where
120− type JSContextPhantom (RouteWriterT t segment m) = JSContextPhantom m
121− askJSContext = RouteWriterT askJSContext
122114#ifndef ghcjs_HOST_OS
123115instance MonadJSM m => MonadJSM (RouteWriterT segment t m)
124116#endif