diff --git a/cabal.project b/cabal.project index e6fdbadb..6210c002 100644 --- a/cabal.project +++ b/cabal.project @@ -1 +1,4 @@ packages: . + +if arch(javascript) + extra-packages: ghci diff --git a/reflex.cabal b/reflex.cabal index 1cc96e18..ef0b397c 100644 --- a/reflex.cabal +++ b/reflex.cabal @@ -71,24 +71,24 @@ library hs-source-dirs: src build-depends: MemoTrie == 0.6.*, - base >= 4.11 && < 4.19, + base >= 4.11 && <= 4.21, bifunctors >= 5.2 && < 5.7, comonad >= 5.0.4 && < 5.1, - commutative-semigroups >= 0.1 && <0.2, - constraints >= 0.10 && <0.14, + commutative-semigroups >= 0.1 && <= 0.2.0.1, + constraints >= 0.10 && <= 0.14.2, constraints-extras >= 0.3 && < 0.5, - containers >= 0.6 && < 0.7, + containers >= 0.6 && <= 0.7, data-default >= 0.5 && < 0.8, dependent-map >= 0.3 && < 0.5, exceptions >= 0.10 && < 0.11, exception-transformers >= 0.4 && < 0.5, - lens >= 4.7 && < 5.3, + lens >= 4.7 && <= 5.3.2, mmorph >= 1.0 && < 1.3, monad-control >= 1.0.1 && < 1.1, mtl >= 2.1 && < 2.4, patch >= 0.0.7 && < 0.1, prim-uniq >= 0.1.0.1 && < 0.3, - primitive >= 0.5 && < 0.8, + primitive >= 0.5 && <= 0.9.1.0, profunctors >= 5.3 && < 5.7, random >= 1.1 && < 1.3, ref-tf >= 0.4 && < 0.6, @@ -189,7 +189,7 @@ library dependent-sum >= 0.6 && < 0.8, haskell-src-exts >= 1.16 && < 1.24, haskell-src-meta >= 0.6 && < 0.9, - template-haskell >= 2.9 && < 2.21 + template-haskell >= 2.9 && <= 2.22.0.0 exposed-modules: Reflex.Dynamic.TH other-extensions: TemplateHaskell @@ -267,7 +267,7 @@ test-suite hlint build-depends: hlint (< 2.1 || >= 2.2.2) && < 3.5 else build-depends: hlint >= 3.5 && < 3.6 - if impl(ghcjs) + if impl(ghcjs) || arch(javascript) buildable: False test-suite EventWriterT @@ -471,6 +471,8 @@ benchmark spider-bench Reflex.TestPlan Reflex.Plan.Reflex Reflex.Bench.Focused + if arch(javascript) + buildable: False benchmark saulzar-bench default-language: Haskell2010 @@ -500,6 +502,8 @@ benchmark saulzar-bench Reflex.TestPlan Reflex.Plan.Reflex Reflex.Bench.Focused + if arch(javascript) + buildable: False source-repository head type: git diff --git a/src/Reflex/PerformEvent/Base.hs b/src/Reflex/PerformEvent/Base.hs index 152460f9..9fae30ae 100644 --- a/src/Reflex/PerformEvent/Base.hs +++ b/src/Reflex/PerformEvent/Base.hs @@ -73,7 +73,7 @@ instance (PrimMonad (HostFrame t), ReflexHost t) => PrimMonad (PerformEventT t m type PrimState (PerformEventT t m) = PrimState (HostFrame t) primitive = PerformEventT . lift . primitive -instance (ReflexHost t, Ref m ~ Ref IO) => PerformEvent t (PerformEventT t m) where +instance (Monad (HostFrame t), ReflexHost t, Ref m ~ Ref IO) => PerformEvent t (PerformEventT t m) where type Performable (PerformEventT t m) = HostFrame t {-# INLINABLE performEvent_ #-} performEvent_ = PerformEventT . requesting_