Skip to content

Commit 5a62bc8

Browse files
authored
Upgrade to latest package set, including new Node eventing model (#148)
1 parent c66a79d commit 5a62bc8

File tree

5 files changed

+14
-25
lines changed

5 files changed

+14
-25
lines changed

.github/workflows/ci.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,4 +40,3 @@ jobs:
4040
- name: Run tests
4141
run: |
4242
spago -x test.dhall test
43-
pulp test

bower.json

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -42,15 +42,5 @@
4242
"purescript-tailrec": "^v6.1.0",
4343
"purescript-transformers": "^v6.0.0",
4444
"purescript-tuples": "^v7.0.0"
45-
},
46-
"devDependencies": {
47-
"purescript-console": "^v6.0.0",
48-
"purescript-node-buffer": "^v8.0.0",
49-
"purescript-node-child-process": "^v9.0.0",
50-
"purescript-node-fs": "^v8.2.0",
51-
"purescript-node-fs-aff": "^v9.2.0",
52-
"purescript-node-os": "^v4.0.0",
53-
"purescript-node-process": "^v10.0.0",
54-
"purescript-node-streams": "^v7.0.0"
5545
}
5646
}

packages.dhall

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
let upstream =
2-
https://github.com/purescript/package-sets/releases/download/psc-0.15.9-20230629/packages.dhall
3-
sha256:f91d36c7e4793fe4d7e042c57fef362ff3f9e9ba88454cd38686701e30bf545a
4-
5-
in upstream
1+
let upstream =
2+
https://github.com/purescript/package-sets/releases/download/psc-0.15.14-20240211/packages.dhall
3+
sha256:e3bb22a7511430536338ff964c9f2961faf9c8e19b409b89490e4c9513eec61b
4+
5+
in upstream

test.dhall

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ in config // {
66
[ "console"
77
, "node-buffer"
88
, "node-child-process"
9+
, "node-event-emitter"
910
, "node-fs"
10-
, "node-fs-aff"
1111
, "node-os"
1212
, "node-process"
1313
, "node-streams"

test/Integration.purs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ import Effect.Class (liftEffect)
1414
import Effect.Class.Console (log)
1515
import Effect.Ref as Ref
1616
import Node.Buffer as Buffer
17-
import Node.ChildProcess (defaultSpawnOptions)
18-
import Node.ChildProcess as IO
1917
import Node.ChildProcess as Proc
18+
import Node.ChildProcess.Types as IO
2019
import Node.Encoding (Encoding(..))
20+
import Node.EventEmitter (on_)
2121
import Node.FS.Aff as FS
2222
import Node.FS.Stats (isDirectory)
2323
import Node.OS (tmpdir)
@@ -110,17 +110,17 @@ prepareEnvironment { debug } =
110110
output <- Ref.new ""
111111
let return = cb <<< Right =<< Ref.read output
112112

113-
proc <- Proc.spawn cmd args defaultSpawnOptions { cwd = Just cwd, stdio = [Just IO.Ignore, Just IO.Pipe, Just IO.Pipe] }
113+
proc <- Proc.spawn' cmd args _ { cwd = Just cwd, appendStdio = Just [IO.ignore, IO.pipe, IO.pipe] }
114114

115115
for_ [Proc.stdout, Proc.stderr] \pipe ->
116-
Stream.onData (pipe proc) \buf -> do
116+
pipe proc # on_ Stream.dataH \buf -> do
117117
str <- Buffer.toString UTF8 buf
118118
void $ output # Ref.modify (_ <> str)
119119

120-
Proc.onExit proc \_ -> return
121-
Proc.onError proc \_ -> return
122-
Proc.onDisconnect proc return
123-
Proc.onClose proc \_ -> return
120+
proc # on_ Proc.exitH \_ -> return
121+
proc # on_ Proc.errorH \_ -> return
122+
proc # on_ Proc.disconnectH return
123+
proc # on_ Proc.closeH \_ -> return
124124

125125
pure nonCanceler
126126

0 commit comments

Comments
 (0)