Skip to content

Commit 00cc506

Browse files
committed
upgrade to ps 0.12
1 parent 32514de commit 00cc506

File tree

6 files changed

+110
-87
lines changed

6 files changed

+110
-87
lines changed

bower.json

+18-5
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,23 @@
2727
"package.json"
2828
],
2929
"dependencies": {
30-
"purescript-ace": "^4.0.0",
31-
"purescript-halogen": "^3.1.1",
32-
"purescript-now": "^3.0.0",
33-
"purescript-random": "^3.0.0",
34-
"purescript-refs": "^3.0.0"
30+
"purescript-ace": "^7.0.0",
31+
"purescript-halogen": "4.0.0",
32+
"purescript-now": "^4.0.0",
33+
"purescript-random": "^4.0.0",
34+
"purescript-refs": "^4.1.0",
35+
"purescript-aff": "^5.1.1",
36+
"purescript-foreign-object": "^2.0.1",
37+
"purescript-prelude": "^4.1.1"
38+
},
39+
"resolutions": {
40+
"purescript-foreign-object": "^2.0.1",
41+
"purescript-typelevel-prelude": "^4.0.0",
42+
"purescript-web-html": "^2.0.0",
43+
"purescript-web-uievents": "^2.0.0",
44+
"purescript-web-file": "^2.0.0",
45+
"purescript-web-dom": "^2.0.0",
46+
"purescript-web-storage": "^3.0.0",
47+
"purescript-web-events": "^2.0.0"
3548
}
3649
}

example/bower.json

+26-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,33 @@
11
{
22
"name": "purescript-ace-halogen-example",
33
"private": true,
4+
"ignore": [
5+
"**/.*",
6+
"bower_components",
7+
"node_modules",
8+
"example",
9+
"output",
10+
"test",
11+
"bower.json",
12+
"package.json"
13+
],
414
"dependencies": {
515
"purescript-ace-halogen": "*",
6-
"ace-builds": "^1.2.2"
16+
"purescript-prelude": "^4.1.1",
17+
"purescript-halogen": "4.0.0",
18+
"purescript-ace": "^7.0.0",
19+
"purescript-aff": "^5.1.1",
20+
"purescript-random": "^4.0.0",
21+
"ace-builds": "^1.4.4"
22+
},
23+
"resolutions": {
24+
"purescript-foreign-object": "^2.0.1",
25+
"purescript-typelevel-prelude": "^4.0.0",
26+
"purescript-web-html": "^2.0.0",
27+
"purescript-web-uievents": "^2.0.0",
28+
"purescript-web-file": "^2.0.0",
29+
"purescript-web-dom": "^2.0.0",
30+
"purescript-web-storage": "^3.0.0",
31+
"purescript-web-events": "^2.0.0"
732
}
833
}

example/package.json

+4-3
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@
55
"build": "pulp browserify --optimise --to example.js"
66
},
77
"devDependencies": {
8-
"pulp": "^9.0.1",
9-
"purescript": "^0.10.1",
10-
"rimraf": "^2.5.4"
8+
"bower": "^1.8.4",
9+
"pulp": "^12.4.2",
10+
"purescript": "^0.12.5",
11+
"rimraf": "^2.6.2"
1112
}
1213
}

example/src/Main.purs

+12-17
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,9 @@ module Main where
22

33
import Prelude
44

5-
import Control.Monad.Aff (Aff)
6-
import Control.Monad.Eff (Eff)
7-
import Control.Monad.Eff.Class (liftEff)
8-
import Control.Monad.Eff.Random (RANDOM)
9-
import Control.Monad.Eff.Now (NOW)
5+
import Effect (Effect)
6+
import Effect.Aff (Aff)
7+
import Effect.Class (liftEffect)
108

119
import Data.Maybe (Maybe(..))
1210

@@ -19,7 +17,7 @@ import Halogen.VDom.Driver (runUI)
1917
import Ace.Editor as Editor
2018
import Ace.EditSession as Session
2119
import Ace.Halogen.Component (AceQuery, AceMessage(..), aceComponent)
22-
import Ace.Types (ACE, Editor)
20+
import Ace.Types (Editor)
2321

2422
data Query a
2523
= HandleMessage AceMessage a
@@ -35,13 +33,10 @@ initialState =
3533

3634
type AceSlot = Unit
3735

38-
type MainEffects = HA.HalogenEffects (random RANDOM, now NOW, ace ACE)
39-
type MainAff = Aff MainEffects
36+
type MainHtml = H.ParentHTML Query AceQuery AceSlot Aff
37+
type MainDSL = H.ParentDSL State Query AceQuery AceSlot Void Aff
4038

41-
type MainHtml = H.ParentHTML Query AceQuery AceSlot MainAff
42-
type MainDSL = H.ParentDSL State Query AceQuery AceSlot Void MainAff
43-
44-
ui H.Component HH.HTML Query Unit Void MainAff
39+
ui H.Component HH.HTML Query Unit Void Aff
4540
ui =
4641
H.parentComponent
4742
{ initialState: const initialState
@@ -58,11 +53,11 @@ ui =
5853
, HH.div_ [ HH.text state.text ]
5954
]
6055

61-
component :: State H.Component HH.HTML AceQuery Unit AceMessage MainAff
56+
component :: State H.Component HH.HTML AceQuery Unit AceMessage Aff
6257
component state = aceComponent (initEditor state) Nothing
6358

64-
initEditor State Editor MainAff Unit
65-
initEditor state editor = liftEff $ do
59+
initEditor State Editor Aff Unit
60+
initEditor state editor = liftEffect $ do
6661
session ← Editor.getSession editor
6762
Session.setMode "ace/mode/yaml" session
6863
_ ← Editor.setValue state.text Nothing editor
@@ -71,8 +66,8 @@ ui =
7166
eval Query ~> MainDSL
7267
eval = case _ of
7368
HandleMessage (TextChanged text) next → do
74-
H.modify (_ { text = text })
69+
_ <- H.modify (_ { text = text })
7570
pure next
7671

77-
main Eff MainEffects Unit
72+
main Effect Unit
7873
main = HA.runHalogenAff (runUI ui unit =<< HA.awaitBody)

package.json

+5-3
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,15 @@
33
"scripts": {
44
"clean": "rimraf output && rimraf .pulp-cache",
55
"build": "eslint src && pulp build -- --censor-lib --strict",
6+
"purs:ide": "purs ide server --log-level=debug 'bower_components/purescript-*/src/**/*.purs' 'src/**/*.purs'",
67
"example": "bower link && cd example && bower link purescript-ace-halogen && npm run -s build"
78
},
89
"devDependencies": {
10+
"bower": "^1.8.4",
911
"eslint": "^4.16.0",
10-
"pulp": "^12.0.1",
11-
"purescript": "^0.11.7",
12-
"purescript-psa": "^0.6.0",
12+
"pulp": "^12.4.2",
13+
"purescript": "^0.12.5",
14+
"purescript-psa": "^0.7.2",
1315
"rimraf": "^2.6.2"
1416
}
1517
}

0 commit comments

Comments
 (0)