From 0a6742f8f24b7053e870eada3301eef14341c260 Mon Sep 17 00:00:00 2001 From: "John C. Lavelle" Date: Sat, 17 Oct 2020 23:04:45 -0400 Subject: [PATCH] Update dependencies --- examples/cattron/src/CatTron/State.purs | 7 +++--- examples/routing/src/Routing/State.purs | 4 ++-- examples/routing/src/Routing/UI.purs | 4 ++-- packages.dhall | 32 ++++++++++++------------- spago.dhall | 1 + 5 files changed, 24 insertions(+), 24 deletions(-) diff --git a/examples/cattron/src/CatTron/State.purs b/examples/cattron/src/CatTron/State.purs index cee536e..da27d2f 100644 --- a/examples/cattron/src/CatTron/State.purs +++ b/examples/cattron/src/CatTron/State.purs @@ -2,10 +2,10 @@ module Examples.CatTron.State where import Prelude -import Affjax (printError) +import Affjax (printError, Error) import Affjax as AX import Affjax.ResponseFormat (json) -import Data.Argonaut (Json, decodeJson, (.:)) +import Data.Argonaut (Json, decodeJson, (.:), JsonDecodeError) import Data.Either (Either(..), either) import Data.Generic.Rep (class Generic) import Data.Generic.Rep.Show (genericShow) @@ -14,6 +14,7 @@ import Effect.Aff (Aff) import Effect.Aff.Class (class MonadAff) import Snap (Snapper') import Snap.React (affSnapper_) +import Data.Bifunctor as Bifunctor data State = Loading | Error String | Gif String @@ -38,7 +39,7 @@ randomGifUrl = do baseUrl = "https://api.giphy.com/v1/gifs/random?api_key=dc6zaTOxFJmzC&tag=" decodeImageUrl :: Json -> Either String String -decodeImageUrl s = do +decodeImageUrl s = Bifunctor.lmap show $ do obj <- decodeJson s dat <- obj .: "data" url <- dat .: "image_url" diff --git a/examples/routing/src/Routing/State.purs b/examples/routing/src/Routing/State.purs index 58b5aed..1149ad3 100644 --- a/examples/routing/src/Routing/State.purs +++ b/examples/routing/src/Routing/State.purs @@ -3,7 +3,7 @@ module Examples.Routing.State (module Examples.Routing.State, module ST) where import Prelude import Data.Profunctor.Monoidal (mono) -import Data.Profunctor.Traverse (foldSplice) +import Data.Profunctor.Traverse (sequenceSplice) import Data.Variant (Variant) import Effect.AVar (AVar) import Effect.Aff (Aff) @@ -27,4 +27,4 @@ snapper av = ado transact <- Transactional.snapper av reducer <- Reducer.snapper av in - foldSplice { nav, root, todomvc, cattron, transact, reducer } + sequenceSplice { nav, root, todomvc, cattron, transact, reducer } diff --git a/examples/routing/src/Routing/UI.purs b/examples/routing/src/Routing/UI.purs index b7be0d8..f0f523d 100644 --- a/examples/routing/src/Routing/UI.purs +++ b/examples/routing/src/Routing/UI.purs @@ -4,7 +4,7 @@ import Prelude import Data.Either (Either(..)) import Data.Newtype (un) -import Data.Profunctor.Traverse (foldDemux) +import Data.Profunctor.Traverse (sequenceDemux) import Data.Record.Choose (choose) import Data.Symbol (SProxy(..)) import Data.Tuple.Nested ((/\)) @@ -51,7 +51,7 @@ _404 :: Cmp Aff (Aff JSX) RouteError Route _404 put err = pure $ R.text $ "Invalid route: \"" <> show err <> "\". Redirecting in 5 seconds..." page :: Cmp Aff (Aff JSX) (Variant (PageState ())) (Variant (PageUpdate ())) -page = un ρ $ foldDemux +page = un ρ $ sequenceDemux { root: ρ $ root # C.map pure , todomvc: ρ $ TodoMvc.app # C.map pure # contraHoist launchAff_ , cattron: ρ $ CatTron.app # contraHoist launchAff_ diff --git a/packages.dhall b/packages.dhall index 5527e96..2db3345 100644 --- a/packages.dhall +++ b/packages.dhall @@ -112,43 +112,41 @@ let mkPackage = https://raw.githubusercontent.com/purescript/package-sets/psc-0.13.0-20190626/src/mkPackage.dhall sha256:0b197efa1d397ace6eb46b243ff2d73a3da5638d8d0ac8473e8e4a8fc528cf57 let upstream = - https://github.com/purescript/package-sets/releases/download/psc-0.13.4-20191110/packages.dhall sha256:563a7f694e18e6399f7f6d01f5b7e3c3345781655d99945768f48e458feb93a4 + https://github.com/purescript/package-sets/releases/download/psc-0.13.8-20201007/packages.dhall sha256:35633f6f591b94d216392c9e0500207bb1fec42dd355f4fecdfd186956567b6b let overrides = { effect = upstream.effect - // { repo = - "https://github.com/masaeedu/purescript-effect.git" - , version = - "semigroup" + // { repo = "https://github.com/mcneissue/purescript-effect.git" + , version = "semigroup" } } let additions = { record-optics-extra = let manifest = - https://raw.githubusercontent.com/masaeedu/purescript-record-optics-extra/master/spago.dhall sha256:bba75d2ecde08251b3ae35c647d316bc51bb0aa98a04bd8d58573e77ea55977d - + https://raw.githubusercontent.com/mcneissue/purescript-record-optics-extra/v0.1.0/spago.dhall sha256:eb00c7cd61401d760b4645899b8d692e623caa475653ded7b8a6dafe2d15e292 + in mkPackage manifest.dependencies - "https://github.com/masaeedu/purescript-record-optics-extra.git" - "master" + "https://github.com/mcneissue/purescript-record-optics-extra.git" + "v0.1.0" , profunctor-traverse = let manifest = - https://raw.githubusercontent.com/jlavelle/purescript-profunctor-traverse/master/spago.dhall sha256:bba75d2ecde08251b3ae35c647d316bc51bb0aa98a04bd8d58573e77ea55977d - + https://raw.githubusercontent.com/mcneissue/purescript-profunctor-traverse/v0.1.0/spago.dhall sha256:7136013475629bdb7a1e260a218eee5ed51b3cbb79d3ee82ef82db57a2f42a1b + in mkPackage manifest.dependencies - "https://github.com/jlavelle/purescript-profunctor-traverse.git" - "5068e90b723a784ca60753c301b46cd4c1fe77bd" + "https://github.com/mcneissue/purescript-profunctor-traverse.git" + "v0.1.0" , profunctor-extra = let manifest = - https://raw.githubusercontent.com/masaeedu/purescript-profunctor-extra/master/spago.dhall sha256:bba75d2ecde08251b3ae35c647d316bc51bb0aa98a04bd8d58573e77ea55977d - + https://raw.githubusercontent.com/mcneissue/purescript-profunctor-extra/v0.1.0/spago.dhall sha256:9052f2ac1e76d2d564da57333276ad2d7e83c8ff0b21d94dbebacfe5dce42489 + in mkPackage manifest.dependencies - "https://github.com/masaeedu/purescript-profunctor-extra.git" - "691eef88ceb830c04f025305d37457f8c048c4bf" + "https://github.com/mcneissue/purescript-profunctor-extra.git" + "v0.1.0" } in upstream // overrides // additions diff --git a/spago.dhall b/spago.dhall index 1b13077..807116b 100644 --- a/spago.dhall +++ b/spago.dhall @@ -12,6 +12,7 @@ You can edit this file as you like. , "profunctor-lenses" , "react" , "react-basic" + , "react-basic-dom" , "avar" , "variant" , "typelevel-prelude"