Skip to content

Commit a69f835

Browse files
Merge pull request #280 from ptrfrncsmrph/pm/bump-purescript-0-14-3
* Bump repo and most recipes to PureScript v0.14.3 * Move not-yet-migrated recipes to `broken`
2 parents 2b83541 + 1616b74 commit a69f835

File tree

135 files changed

+191
-197
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

135 files changed

+191
-197
lines changed

README.md

Lines changed: 0 additions & 14 deletions

recipes/AceEditorHalogenHooks/src/Main.purs renamed to broken/AceEditorHalogenHooks/src/Main.purs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ _ace = SProxy :: SProxy "ace"
3333
containerComponent
3434
:: forall unusedQuery unusedInput unusedOutput anyMonad
3535
. MonadAff anyMonad
36-
=> H.Component HH.HTML unusedQuery unusedInput unusedOutput anyMonad
36+
=> H.Component unusedQuery unusedInput unusedOutput anyMonad
3737
containerComponent = Hooks.component \rec _ -> Hooks.do
3838
msg /\ msgIdx <- Hooks.useState ""
3939
Hooks.pure $
@@ -71,7 +71,7 @@ aceElemLabel = H.RefLabel "ace"
7171
aceComponent
7272
:: forall unusedInput anyMonad
7373
. MonadAff anyMonad
74-
=> H.Component HH.HTML AceQuery unusedInput AceOutput anyMonad
74+
=> H.Component AceQuery unusedInput AceOutput anyMonad
7575
aceComponent = Hooks.component \rec _ -> Hooks.do
7676
state /\ stateIdx <- Hooks.useState (Nothing :: Maybe Editor)
7777
Hooks.useLifecycleEffect do
File renamed without changes.

recipes/ComponentsHalogenHooks/src/Main.purs renamed to broken/ComponentsHalogenHooks/src/Main.purs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ _button = SProxy
3030
containerComponent
3131
:: forall unusedQuery unusedInput unusedOutput anyMonad
3232
. MonadEffect anyMonad
33-
=> H.Component HH.HTML unusedQuery unusedInput unusedOutput anyMonad
33+
=> H.Component unusedQuery unusedInput unusedOutput anyMonad
3434
containerComponent = Hooks.component \rec _ -> Hooks.do
3535
parentRenders <- useRenderCount
3636
toggleCount /\ toggleCountIdx <- Hooks.useState 0
@@ -62,7 +62,7 @@ data ButtonQuery a = IsOn (Boolean -> a)
6262

6363
buttonComponent
6464
:: forall unusedInput anyMonad
65-
. H.Component HH.HTML ButtonQuery unusedInput ButtonMessage anyMonad
65+
. H.Component ButtonQuery unusedInput ButtonMessage anyMonad
6666
buttonComponent = Hooks.component \rec _ -> Hooks.do
6767
enabled /\ enabledIdx <- Hooks.useState false
6868
Hooks.useQuery rec.queryToken case _ of

recipes/ComponentsInputHalogenHooks/src/Main.purs renamed to broken/ComponentsInputHalogenHooks/src/Main.purs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ _button = SProxy
2828
containerComponent
2929
:: forall unusedQuery unusedInput unusedOutput anyMonad
3030
. MonadEffect anyMonad
31-
=> H.Component HH.HTML unusedQuery unusedInput unusedOutput anyMonad
31+
=> H.Component unusedQuery unusedInput unusedOutput anyMonad
3232
containerComponent = Hooks.component \_ _ -> Hooks.do
3333
parentRenders <- useRenderCount
3434
state /\ stateIdx <- Hooks.useState 0
@@ -56,7 +56,7 @@ _display = SProxy :: SProxy "display"
5656
displayComponent
5757
:: forall unusedQuery unusedOutput anyMonad
5858
. MonadEffect anyMonad
59-
=> H.Component HH.HTML unusedQuery Int unusedOutput anyMonad
59+
=> H.Component unusedQuery Int unusedOutput anyMonad
6060
displayComponent = Hooks.component \_ input -> Hooks.do
6161
Hooks.pure $
6262
HH.div_

recipes/ComponentsMultiTypeHalogenHooks/src/Main.purs renamed to broken/ComponentsMultiTypeHalogenHooks/src/Main.purs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ _button = SProxy
2929
containerComponent
3030
:: forall unusedQuery unusedInput unusedOutput anyMonad
3131
. MonadEffect anyMonad
32-
=> H.Component HH.HTML unusedQuery unusedInput unusedOutput anyMonad
32+
=> H.Component unusedQuery unusedInput unusedOutput anyMonad
3333
containerComponent = Hooks.component \rec _ -> Hooks.do
3434
parentRenders <- useRenderCount
3535
state /\ stateIdx <- Hooks.useState { a: Nothing, b: Nothing, c: Nothing }
@@ -78,7 +78,7 @@ data QueryA a = IsOn (Boolean -> a)
7878

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

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

121121
componentC
122122
:: forall unusedInput unusedOutput anyMonad
123-
. H.Component HH.HTML QueryC unusedInput unusedOutput anyMonad
123+
. H.Component QueryC unusedInput unusedOutput anyMonad
124124
componentC = Hooks.component \rec _ -> Hooks.do
125125
state /\ stateIdx <- Hooks.useState "Hello"
126126
Hooks.useQuery rec.queryToken case _ of

recipes/DriverIoHalogenHooks/src/Main.purs renamed to broken/DriverIoHalogenHooks/src/Main.purs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ data Toggled = Toggled Boolean
4141

4242
buttonComponent
4343
:: forall unusedInput anyMonad
44-
. H.Component HH.HTML ButtonQuery unusedInput Toggled anyMonad
44+
. H.Component ButtonQuery unusedInput Toggled anyMonad
4545
buttonComponent = Hooks.component \rec _ -> Hooks.do
4646
enabled /\ enabledIdx <- Hooks.useState false
4747
Hooks.useQuery rec.queryToken case _ of

recipes/DriverRoutingHalogenHooks/src/Main.purs renamed to broken/DriverRoutingHalogenHooks/src/Main.purs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ data Query a = ChangeRoute String a
6060

6161
routeLogComponent
6262
:: forall unusedInput unusedOutput anyMonad
63-
. H.Component HH.HTML Query unusedInput unusedOutput anyMonad
63+
. H.Component Query unusedInput unusedOutput anyMonad
6464
routeLogComponent = Hooks.component \rec _ -> Hooks.do
6565
history /\ historyIdx <- Hooks.useState []
6666
Hooks.useQuery rec.queryToken case _ of

recipes/DriverWebSocketsHalogenHooks/src/Main.purs renamed to broken/DriverWebSocketsHalogenHooks/src/Main.purs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ data Message = OutputMessage String
8585
logComponent
8686
:: forall unusedInput anyMonad
8787
. MonadEffect anyMonad
88-
=> H.Component HH.HTML Query unusedInput Message anyMonad
88+
=> H.Component Query unusedInput Message anyMonad
8989
logComponent = Hooks.component \rec _ -> Hooks.do
9090
state /\ stateIdx <- Hooks.useState {inputText: "", messages: []}
9191
Hooks.useQuery rec.queryToken case _ of

recipes/KeyboardInputHalogenHooks/src/Main.purs renamed to broken/KeyboardInputHalogenHooks/src/Main.purs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ main = HA.runHalogenAff do
2929
component
3030
:: forall unusedInput unusedQuery unusedOutput anyMonad
3131
. MonadAff anyMonad
32-
=> H.Component HH.HTML unusedQuery unusedInput unusedOutput anyMonad
32+
=> H.Component unusedQuery unusedInput unusedOutput anyMonad
3333
component = Hooks.component \rec _ -> Hooks.do
3434
chars /\ charsIdx <- Hooks.useState ""
3535
Hooks.useLifecycleEffect do
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{ name = "RoutingHashHalogenClassic"
22
, dependencies =
3-
[ "console", "effect", "generics-rep", "halogen", "psci-support", "routing" ]
3+
[ "console", "effect", "halogen", "psci-support", "routing" ]
44
, packages = ../../packages.dhall
55
, sources = [ "recipes/RoutingHashHalogenClassic/src/**/*.purs" ]
66
}

recipes/RoutingHashHalogenClassic/src/Example.purs renamed to broken/RoutingHashHalogenClassic/src/Example.purs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ type State
1414
data Query a
1515
= Nav MyRoute a
1616

17-
component :: forall i o m. H.Component HH.HTML Query i o m
17+
component :: forall i o m. H.Component Query i o m
1818
component =
1919
H.mkComponent
2020
{ initialState: const Nothing

recipes/RoutingHashHalogenClassic/src/Routing.purs renamed to broken/RoutingHashHalogenClassic/src/Routing.purs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module RoutingHashHalogenClassic.MyRouting where
33
import Prelude
44
import Data.Foldable (oneOf)
55
import Data.Generic.Rep (class Generic)
6-
import Data.Generic.Rep.Show (genericShow)
6+
import Data.Show.Generic (genericShow)
77
import Routing.Match (Match, int, lit, str)
88

99
type PostId
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{ name = "RoutingPushHalogenClassic"
22
, dependencies =
3-
[ "console", "effect", "generics-rep", "halogen", "psci-support", "routing" ]
3+
[ "console", "effect", "halogen", "psci-support", "routing" ]
44
, packages = ../../packages.dhall
55
, sources = [ "recipes/RoutingPushHalogenClassic/src/**/*.purs" ]
66
}

recipes/RoutingPushHalogenClassic/src/Example.purs renamed to broken/RoutingPushHalogenClassic/src/Example.purs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ type State
1414
data Query a
1515
= Nav MyRoute a
1616

17-
component :: forall i o m. H.Component HH.HTML Query i o m
17+
component :: forall i o m. H.Component Query i o m
1818
component =
1919
H.mkComponent
2020
{ initialState: const Nothing

recipes/RoutingPushHalogenClassic/src/Routing.purs renamed to broken/RoutingPushHalogenClassic/src/Routing.purs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module RoutingPushHalogenClassic.MyRouting where
33
import Prelude
44
import Data.Foldable (oneOf)
55
import Data.Generic.Rep (class Generic)
6-
import Data.Generic.Rep.Show (genericShow)
6+
import Data.Show.Generic (genericShow)
77
import Routing.Match (Match, int, lit, param, root, str)
88

99
type PostId

recipes/TimeHalogenHooks/src/Main.purs renamed to broken/TimeHalogenHooks/src/Main.purs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ main =
3030
hookComponent
3131
:: forall unusedQuery unusedInput unusedOutput anyMonad
3232
. MonadAff anyMonad
33-
=> H.Component HH.HTML unusedQuery unusedInput unusedOutput anyMonad
33+
=> H.Component unusedQuery unusedInput unusedOutput anyMonad
3434
hookComponent = Hooks.component \_ _ -> Hooks.do
3535
{ hour, minute, second } /\ timeIdx <- Hooks.useState
3636
{ hour: 0, minute: 0, second: 0 }

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
"license": "MIT",
33
"devDependencies": {
44
"parcel-bundler": "^1.12.5",
5-
"purescript": "^0.13.8",
6-
"spago": "^0.16.0"
5+
"purescript": "^0.14.3",
6+
"spago": "^0.19.1"
77
},
88
"dependencies": {
99
"ace-builds": "^1.4.11",

packages.dhall

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
let upstream =
2-
https://github.com/purescript/package-sets/releases/download/psc-0.13.8-20200831/packages.dhall sha256:cdb3529cac2cd8dd780f07c80fd907d5faceae7decfcaa11a12037df68812c83
2+
https://github.com/purescript/package-sets/releases/download/psc-0.14.3-20210716/packages.dhall sha256:1f9af624ddfd5352455b7ac6df714f950d499e7e3c6504f62ff467eebd11042c
33

44
let overrides = {=}
55

recipes/AddRemoveEventListenerJs/spago.dhall

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,11 @@
33
[ "console"
44
, "effect"
55
, "interpolate"
6+
, "maybe"
7+
, "prelude"
68
, "psci-support"
9+
, "refs"
10+
, "unsafe-coerce"
711
, "web-dom"
812
, "web-events"
913
, "web-html"

recipes/AffjaxPostNode/spago.dhall

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,16 @@
11
{ name = "AffjaxPostNode"
22
, dependencies =
3-
[ "affjax", "argonaut", "console", "effect", "node-fs-aff", "psci-support" ]
3+
[ "aff"
4+
, "affjax"
5+
, "argonaut"
6+
, "console"
7+
, "effect"
8+
, "either"
9+
, "maybe"
10+
, "node-fs-aff"
11+
, "prelude"
12+
, "psci-support"
13+
]
414
, packages = ../../packages.dhall
515
, sources = [ "recipes/AffjaxPostNode/src/**/*.purs" ]
616
}

recipes/BasicHalogenHooks/src/Main.purs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@ main =
2121

2222
hookComponent
2323
:: forall unusedQuery unusedInput unusedOutput anyMonad
24-
. H.Component HH.HTML unusedQuery unusedInput unusedOutput anyMonad
24+
. H.Component unusedQuery unusedInput unusedOutput anyMonad
2525
hookComponent = Hooks.component \_ _ -> Hooks.do
2626
enabled /\ enabledIdx <- Hooks.useState false
2727
let label = if enabled then "On" else "Off"
2828
Hooks.pure $
2929
HH.button
3030
[ HP.title label
31-
, HE.onClick \_ -> Just $ Hooks.modify_ enabledIdx not
31+
, HE.onClick \_ -> Hooks.modify_ enabledIdx not
3232
]
3333
[ HH.text label ]

recipes/BookHalogenHooks/src/Main.purs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ main =
2727
hookComponent
2828
:: forall unusedQuery unusedInput unusedOutput anyMonad
2929
. MonadAff anyMonad
30-
=> H.Component HH.HTML unusedQuery unusedInput unusedOutput anyMonad
30+
=> H.Component unusedQuery unusedInput unusedOutput anyMonad
3131
hookComponent = Hooks.component \_ _ -> Hooks.do
3232
content /\ contentIdx <- Hooks.useState RD.NotAsked
3333

recipes/ButtonsHalogenHooks/src/Main.purs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,16 @@ main =
2020

2121
hookComponent
2222
:: forall unusedQuery unusedInput unusedOutput anyMonad
23-
. H.Component HH.HTML unusedQuery unusedInput unusedOutput anyMonad
23+
. H.Component unusedQuery unusedInput unusedOutput anyMonad
2424
hookComponent = Hooks.component \_ _ -> Hooks.do
2525
count /\ countIdx <- Hooks.useState 0
2626
Hooks.pure $
2727
HH.div_
2828
[ HH.button
29-
[ HE.onClick \_ -> Just $ Hooks.modify_ countIdx (_ - 1) ]
29+
[ HE.onClick \_ -> Hooks.modify_ countIdx (_ - 1) ]
3030
[ HH.text "-" ]
3131
, HH.div_ [ HH.text $ show count ]
3232
, HH.button
33-
[ HE.onClick \_ -> Just $ Hooks.modify_ countIdx (_ + 1) ]
33+
[ HE.onClick \_ -> Hooks.modify_ countIdx (_ + 1) ]
3434
[ HH.text "+" ]
3535
]

recipes/CardsHalogenHooks/src/Main.purs

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
module CardsHalogenHooks.Main where
22

33
import Prelude
4-
54
import CSS (fontSize, em)
5+
import Data.Array.NonEmpty (cons')
66
import Data.Maybe (Maybe(..))
7-
import Data.NonEmpty ((:|))
87
import Data.Tuple.Nested ((/\))
98
import Effect (Effect)
109
import Effect.Class (class MonadEffect)
@@ -27,7 +26,7 @@ main =
2726
hookComponent
2827
:: forall unusedQuery unusedInput unusedOutput anyMonad
2928
. MonadEffect anyMonad
30-
=> H.Component HH.HTML unusedQuery unusedInput unusedOutput anyMonad
29+
=> H.Component unusedQuery unusedInput unusedOutput anyMonad
3130
hookComponent = Hooks.component \_ _ -> Hooks.do
3231
let
3332
initialGenState = { newSeed: mkSeed 3, size: 1 }
@@ -37,7 +36,7 @@ hookComponent = Hooks.component \_ _ -> Hooks.do
3736
Hooks.pure $
3837
HH.div_
3938
[ HH.button
40-
[ HE.onClick \_ -> Just do
39+
[ HE.onClick \_ -> do
4140
-- Modify the card generator state by re-running the generator.
4241
-- We don't need the card value for this update function, so it is ignored with `_`.
4342
Hooks.modify_ cardStateIdx \(_ /\ genState) -> runGen cardGenerator genState
@@ -68,20 +67,20 @@ data Card
6867
cardGenerator :: Gen Card
6968
cardGenerator =
7069
elements
71-
$ Ace
72-
:| [ Two
73-
, Three
74-
, Four
75-
, Five
76-
, Six
77-
, Seven
78-
, Eight
79-
, Nine
80-
, Ten
81-
, Jack
82-
, Queen
83-
, King
84-
]
70+
$ cons' Ace
71+
[ Two
72+
, Three
73+
, Four
74+
, Five
75+
, Six
76+
, Seven
77+
, Eight
78+
, Nine
79+
, Ten
80+
, Jack
81+
, Queen
82+
, King
83+
]
8584

8685
viewCard :: Card -> String
8786
viewCard = case _ of

recipes/CardsReactHooks/src/Main.purs

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
module CardsReactHooks.Main where
22

33
import Prelude
4+
import Data.Array.NonEmpty (cons')
45
import Data.Maybe (Maybe(..))
5-
import Data.NonEmpty ((:|))
66
import Effect (Effect)
77
import Effect.Exception (throw)
88
import React.Basic.DOM (css, render)
@@ -64,20 +64,20 @@ data Card
6464
cardGenerator :: Gen Card
6565
cardGenerator =
6666
elements
67-
$ Ace
68-
:| [ Two
69-
, Three
70-
, Four
71-
, Five
72-
, Six
73-
, Seven
74-
, Eight
75-
, Nine
76-
, Ten
77-
, Jack
78-
, Queen
79-
, King
80-
]
67+
$ cons' Ace
68+
[ Two
69+
, Three
70+
, Four
71+
, Five
72+
, Six
73+
, Seven
74+
, Eight
75+
, Nine
76+
, Ten
77+
, Jack
78+
, Queen
79+
, King
80+
]
8181

8282
viewCard :: Card -> String
8383
viewCard = case _ of

0 commit comments

Comments
 (0)