Skip to content

Commit

Permalink
Merge pull request #280 from ptrfrncsmrph/pm/bump-purescript-0-14-3
Browse files Browse the repository at this point in the history
* Bump repo and most recipes to PureScript v0.14.3 
* Move not-yet-migrated recipes to `broken`
  • Loading branch information
JordanMartinez authored Jul 17, 2021
2 parents 2b83541 + 1616b74 commit a69f835
Show file tree
Hide file tree
Showing 135 changed files with 191 additions and 197 deletions.
14 changes: 0 additions & 14 deletions README.md

Large diffs are not rendered by default.

File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ _ace = SProxy :: SProxy "ace"
containerComponent
:: forall unusedQuery unusedInput unusedOutput anyMonad
. MonadAff anyMonad
=> H.Component HH.HTML unusedQuery unusedInput unusedOutput anyMonad
=> H.Component unusedQuery unusedInput unusedOutput anyMonad
containerComponent = Hooks.component \rec _ -> Hooks.do
msg /\ msgIdx <- Hooks.useState ""
Hooks.pure $
Expand Down Expand Up @@ -71,7 +71,7 @@ aceElemLabel = H.RefLabel "ace"
aceComponent
:: forall unusedInput anyMonad
. MonadAff anyMonad
=> H.Component HH.HTML AceQuery unusedInput AceOutput anyMonad
=> H.Component AceQuery unusedInput AceOutput anyMonad
aceComponent = Hooks.component \rec _ -> Hooks.do
state /\ stateIdx <- Hooks.useState (Nothing :: Maybe Editor)
Hooks.useLifecycleEffect do
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ _button = SProxy
containerComponent
:: forall unusedQuery unusedInput unusedOutput anyMonad
. MonadEffect anyMonad
=> H.Component HH.HTML unusedQuery unusedInput unusedOutput anyMonad
=> H.Component unusedQuery unusedInput unusedOutput anyMonad
containerComponent = Hooks.component \rec _ -> Hooks.do
parentRenders <- useRenderCount
toggleCount /\ toggleCountIdx <- Hooks.useState 0
Expand Down Expand Up @@ -62,7 +62,7 @@ data ButtonQuery a = IsOn (Boolean -> a)

buttonComponent
:: forall unusedInput anyMonad
. H.Component HH.HTML ButtonQuery unusedInput ButtonMessage anyMonad
. H.Component ButtonQuery unusedInput ButtonMessage anyMonad
buttonComponent = Hooks.component \rec _ -> Hooks.do
enabled /\ enabledIdx <- Hooks.useState false
Hooks.useQuery rec.queryToken case _ of
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ _button = SProxy
containerComponent
:: forall unusedQuery unusedInput unusedOutput anyMonad
. MonadEffect anyMonad
=> H.Component HH.HTML unusedQuery unusedInput unusedOutput anyMonad
=> H.Component unusedQuery unusedInput unusedOutput anyMonad
containerComponent = Hooks.component \_ _ -> Hooks.do
parentRenders <- useRenderCount
state /\ stateIdx <- Hooks.useState 0
Expand Down Expand Up @@ -56,7 +56,7 @@ _display = SProxy :: SProxy "display"
displayComponent
:: forall unusedQuery unusedOutput anyMonad
. MonadEffect anyMonad
=> H.Component HH.HTML unusedQuery Int unusedOutput anyMonad
=> H.Component unusedQuery Int unusedOutput anyMonad
displayComponent = Hooks.component \_ input -> Hooks.do
Hooks.pure $
HH.div_
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ _button = SProxy
containerComponent
:: forall unusedQuery unusedInput unusedOutput anyMonad
. MonadEffect anyMonad
=> H.Component HH.HTML unusedQuery unusedInput unusedOutput anyMonad
=> H.Component unusedQuery unusedInput unusedOutput anyMonad
containerComponent = Hooks.component \rec _ -> Hooks.do
parentRenders <- useRenderCount
state /\ stateIdx <- Hooks.useState { a: Nothing, b: Nothing, c: Nothing }
Expand Down Expand Up @@ -78,7 +78,7 @@ data QueryA a = IsOn (Boolean -> a)

componentA
:: forall unusedInput unusedOutput anyMonad
. H.Component HH.HTML QueryA unusedInput unusedOutput anyMonad
. H.Component QueryA unusedInput unusedOutput anyMonad
componentA = Hooks.component \rec _ -> Hooks.do
enabled /\ enabledIdx <- Hooks.useState false
Hooks.useQuery rec.queryToken case _ of
Expand All @@ -98,7 +98,7 @@ data QueryB a = GetCount (Int -> a)

componentB
:: forall unusedInput unusedOutput anyMonad
. H.Component HH.HTML QueryB unusedInput unusedOutput anyMonad
. H.Component QueryB unusedInput unusedOutput anyMonad
componentB = Hooks.component \rec _ -> Hooks.do
count /\ countIdx <- Hooks.useState 0
Hooks.useQuery rec.queryToken case _ of
Expand All @@ -120,7 +120,7 @@ data QueryC a = GetValue (String -> a)

componentC
:: forall unusedInput unusedOutput anyMonad
. H.Component HH.HTML QueryC unusedInput unusedOutput anyMonad
. H.Component QueryC unusedInput unusedOutput anyMonad
componentC = Hooks.component \rec _ -> Hooks.do
state /\ stateIdx <- Hooks.useState "Hello"
Hooks.useQuery rec.queryToken case _ of
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ data Toggled = Toggled Boolean

buttonComponent
:: forall unusedInput anyMonad
. H.Component HH.HTML ButtonQuery unusedInput Toggled anyMonad
. H.Component ButtonQuery unusedInput Toggled anyMonad
buttonComponent = Hooks.component \rec _ -> Hooks.do
enabled /\ enabledIdx <- Hooks.useState false
Hooks.useQuery rec.queryToken case _ of
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ data Query a = ChangeRoute String a

routeLogComponent
:: forall unusedInput unusedOutput anyMonad
. H.Component HH.HTML Query unusedInput unusedOutput anyMonad
. H.Component Query unusedInput unusedOutput anyMonad
routeLogComponent = Hooks.component \rec _ -> Hooks.do
history /\ historyIdx <- Hooks.useState []
Hooks.useQuery rec.queryToken case _ of
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ data Message = OutputMessage String
logComponent
:: forall unusedInput anyMonad
. MonadEffect anyMonad
=> H.Component HH.HTML Query unusedInput Message anyMonad
=> H.Component Query unusedInput Message anyMonad
logComponent = Hooks.component \rec _ -> Hooks.do
state /\ stateIdx <- Hooks.useState {inputText: "", messages: []}
Hooks.useQuery rec.queryToken case _ of
Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ main = HA.runHalogenAff do
component
:: forall unusedInput unusedQuery unusedOutput anyMonad
. MonadAff anyMonad
=> H.Component HH.HTML unusedQuery unusedInput unusedOutput anyMonad
=> H.Component unusedQuery unusedInput unusedOutput anyMonad
component = Hooks.component \rec _ -> Hooks.do
chars /\ charsIdx <- Hooks.useState ""
Hooks.useLifecycleEffect do
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ name = "RoutingHashHalogenClassic"
, dependencies =
[ "console", "effect", "generics-rep", "halogen", "psci-support", "routing" ]
[ "console", "effect", "halogen", "psci-support", "routing" ]
, packages = ../../packages.dhall
, sources = [ "recipes/RoutingHashHalogenClassic/src/**/*.purs" ]
}
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ type State
data Query a
= Nav MyRoute a

component :: forall i o m. H.Component HH.HTML Query i o m
component :: forall i o m. H.Component Query i o m
component =
H.mkComponent
{ initialState: const Nothing
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module RoutingHashHalogenClassic.MyRouting where
import Prelude
import Data.Foldable (oneOf)
import Data.Generic.Rep (class Generic)
import Data.Generic.Rep.Show (genericShow)
import Data.Show.Generic (genericShow)
import Routing.Match (Match, int, lit, str)

type PostId
Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ name = "RoutingPushHalogenClassic"
, dependencies =
[ "console", "effect", "generics-rep", "halogen", "psci-support", "routing" ]
[ "console", "effect", "halogen", "psci-support", "routing" ]
, packages = ../../packages.dhall
, sources = [ "recipes/RoutingPushHalogenClassic/src/**/*.purs" ]
}
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ type State
data Query a
= Nav MyRoute a

component :: forall i o m. H.Component HH.HTML Query i o m
component :: forall i o m. H.Component Query i o m
component =
H.mkComponent
{ initialState: const Nothing
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module RoutingPushHalogenClassic.MyRouting where
import Prelude
import Data.Foldable (oneOf)
import Data.Generic.Rep (class Generic)
import Data.Generic.Rep.Show (genericShow)
import Data.Show.Generic (genericShow)
import Routing.Match (Match, int, lit, param, root, str)

type PostId
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ main =
hookComponent
:: forall unusedQuery unusedInput unusedOutput anyMonad
. MonadAff anyMonad
=> H.Component HH.HTML unusedQuery unusedInput unusedOutput anyMonad
=> H.Component unusedQuery unusedInput unusedOutput anyMonad
hookComponent = Hooks.component \_ _ -> Hooks.do
{ hour, minute, second } /\ timeIdx <- Hooks.useState
{ hour: 0, minute: 0, second: 0 }
Expand Down
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
"license": "MIT",
"devDependencies": {
"parcel-bundler": "^1.12.5",
"purescript": "^0.13.8",
"spago": "^0.16.0"
"purescript": "^0.14.3",
"spago": "^0.19.1"
},
"dependencies": {
"ace-builds": "^1.4.11",
Expand Down
2 changes: 1 addition & 1 deletion packages.dhall
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
let upstream =
https://github.com/purescript/package-sets/releases/download/psc-0.13.8-20200831/packages.dhall sha256:cdb3529cac2cd8dd780f07c80fd907d5faceae7decfcaa11a12037df68812c83
https://github.com/purescript/package-sets/releases/download/psc-0.14.3-20210716/packages.dhall sha256:1f9af624ddfd5352455b7ac6df714f950d499e7e3c6504f62ff467eebd11042c

let overrides = {=}

Expand Down
4 changes: 4 additions & 0 deletions recipes/AddRemoveEventListenerJs/spago.dhall
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,11 @@
[ "console"
, "effect"
, "interpolate"
, "maybe"
, "prelude"
, "psci-support"
, "refs"
, "unsafe-coerce"
, "web-dom"
, "web-events"
, "web-html"
Expand Down
12 changes: 11 additions & 1 deletion recipes/AffjaxPostNode/spago.dhall
Original file line number Diff line number Diff line change
@@ -1,6 +1,16 @@
{ name = "AffjaxPostNode"
, dependencies =
[ "affjax", "argonaut", "console", "effect", "node-fs-aff", "psci-support" ]
[ "aff"
, "affjax"
, "argonaut"
, "console"
, "effect"
, "either"
, "maybe"
, "node-fs-aff"
, "prelude"
, "psci-support"
]
, packages = ../../packages.dhall
, sources = [ "recipes/AffjaxPostNode/src/**/*.purs" ]
}
4 changes: 2 additions & 2 deletions recipes/BasicHalogenHooks/src/Main.purs
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ main =

hookComponent
:: forall unusedQuery unusedInput unusedOutput anyMonad
. H.Component HH.HTML unusedQuery unusedInput unusedOutput anyMonad
. H.Component unusedQuery unusedInput unusedOutput anyMonad
hookComponent = Hooks.component \_ _ -> Hooks.do
enabled /\ enabledIdx <- Hooks.useState false
let label = if enabled then "On" else "Off"
Hooks.pure $
HH.button
[ HP.title label
, HE.onClick \_ -> Just $ Hooks.modify_ enabledIdx not
, HE.onClick \_ -> Hooks.modify_ enabledIdx not
]
[ HH.text label ]
2 changes: 1 addition & 1 deletion recipes/BookHalogenHooks/src/Main.purs
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ main =
hookComponent
:: forall unusedQuery unusedInput unusedOutput anyMonad
. MonadAff anyMonad
=> H.Component HH.HTML unusedQuery unusedInput unusedOutput anyMonad
=> H.Component unusedQuery unusedInput unusedOutput anyMonad
hookComponent = Hooks.component \_ _ -> Hooks.do
content /\ contentIdx <- Hooks.useState RD.NotAsked

Expand Down
6 changes: 3 additions & 3 deletions recipes/ButtonsHalogenHooks/src/Main.purs
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,16 @@ main =

hookComponent
:: forall unusedQuery unusedInput unusedOutput anyMonad
. H.Component HH.HTML unusedQuery unusedInput unusedOutput anyMonad
. H.Component unusedQuery unusedInput unusedOutput anyMonad
hookComponent = Hooks.component \_ _ -> Hooks.do
count /\ countIdx <- Hooks.useState 0
Hooks.pure $
HH.div_
[ HH.button
[ HE.onClick \_ -> Just $ Hooks.modify_ countIdx (_ - 1) ]
[ HE.onClick \_ -> Hooks.modify_ countIdx (_ - 1) ]
[ HH.text "-" ]
, HH.div_ [ HH.text $ show count ]
, HH.button
[ HE.onClick \_ -> Just $ Hooks.modify_ countIdx (_ + 1) ]
[ HE.onClick \_ -> Hooks.modify_ countIdx (_ + 1) ]
[ HH.text "+" ]
]
35 changes: 17 additions & 18 deletions recipes/CardsHalogenHooks/src/Main.purs
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
module CardsHalogenHooks.Main where

import Prelude

import CSS (fontSize, em)
import Data.Array.NonEmpty (cons')
import Data.Maybe (Maybe(..))
import Data.NonEmpty ((:|))
import Data.Tuple.Nested ((/\))
import Effect (Effect)
import Effect.Class (class MonadEffect)
Expand All @@ -27,7 +26,7 @@ main =
hookComponent
:: forall unusedQuery unusedInput unusedOutput anyMonad
. MonadEffect anyMonad
=> H.Component HH.HTML unusedQuery unusedInput unusedOutput anyMonad
=> H.Component unusedQuery unusedInput unusedOutput anyMonad
hookComponent = Hooks.component \_ _ -> Hooks.do
let
initialGenState = { newSeed: mkSeed 3, size: 1 }
Expand All @@ -37,7 +36,7 @@ hookComponent = Hooks.component \_ _ -> Hooks.do
Hooks.pure $
HH.div_
[ HH.button
[ HE.onClick \_ -> Just do
[ HE.onClick \_ -> do
-- Modify the card generator state by re-running the generator.
-- We don't need the card value for this update function, so it is ignored with `_`.
Hooks.modify_ cardStateIdx \(_ /\ genState) -> runGen cardGenerator genState
Expand Down Expand Up @@ -68,20 +67,20 @@ data Card
cardGenerator :: Gen Card
cardGenerator =
elements
$ Ace
:| [ Two
, Three
, Four
, Five
, Six
, Seven
, Eight
, Nine
, Ten
, Jack
, Queen
, King
]
$ cons' Ace
[ Two
, Three
, Four
, Five
, Six
, Seven
, Eight
, Nine
, Ten
, Jack
, Queen
, King
]

viewCard :: Card -> String
viewCard = case _ of
Expand Down
30 changes: 15 additions & 15 deletions recipes/CardsReactHooks/src/Main.purs
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
module CardsReactHooks.Main where

import Prelude
import Data.Array.NonEmpty (cons')
import Data.Maybe (Maybe(..))
import Data.NonEmpty ((:|))
import Effect (Effect)
import Effect.Exception (throw)
import React.Basic.DOM (css, render)
Expand Down Expand Up @@ -64,20 +64,20 @@ data Card
cardGenerator :: Gen Card
cardGenerator =
elements
$ Ace
:| [ Two
, Three
, Four
, Five
, Six
, Seven
, Eight
, Nine
, Ten
, Jack
, Queen
, King
]
$ cons' Ace
[ Two
, Three
, Four
, Five
, Six
, Seven
, Eight
, Nine
, Ten
, Jack
, Queen
, King
]

viewCard :: Card -> String
viewCard = case _ of
Expand Down
Loading

0 comments on commit a69f835

Please sign in to comment.