Skip to content

Commit a34bd42

Browse files
committed
Revert "Update to latest versions of gren-lang/core and gren-lang/node."
This reverts commit e8d747a.
1 parent f209787 commit a34bd42

File tree

3 files changed

+8
-7
lines changed

3 files changed

+8
-7
lines changed

gren.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
],
2424
"gren-version": "0.5.0 <= v < 0.6.0",
2525
"dependencies": {
26-
"gren-lang/core": "local:../core",
27-
"gren-lang/node": "local:../node"
26+
"gren-lang/core": "6.0.1 <= v < 7.0.0",
27+
"gren-lang/node": "5.0.0 <= v < 6.0.0"
2828
}
2929
}

src/Compiler/Backend.gren

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ downloadUrl platform cpuArch =
104104

105105
{-| Downlod the compiler blob.
106106
-}
107-
download : HttpClient.Permission -> String -> Task HttpClient.Error (HttpClient.Response Bytes)
107+
download : HttpClient.Permission -> String -> Task (HttpClient.Error Bytes) (HttpClient.Response Bytes)
108108
download permission url =
109109
HttpClient.get url
110110
|> HttpClient.expectBytes
@@ -298,7 +298,7 @@ type alias RunOptions msg =
298298
{ useColor : Bool
299299
, compilerPath : Path
300300
, pathToString : (Path -> String)
301-
, connection : ChildProcess.Connection msg
301+
, onInit : { processId : Process.Id, streams : Maybe ChildProcess.StreamIO } -> msg
302302
, onComplete : (Int -> msg)
303303
}
304304

@@ -319,10 +319,11 @@ run permission options =
319319
permission
320320
(options.pathToString options.compilerPath)
321321
[]
322-
{ ( ChildProcess.defaultSpawnOptions options.connection options.onComplete )
322+
{ ( ChildProcess.defaultSpawnOptions options.onInit options.onComplete )
323323
| shell = NoShell
324324
, environmentVariables =
325325
ChildProcess.MergeWithEnvironmentVariables colorEnvVar
326+
, connection = ChildProcess.External
326327
}
327328

328329

src/FileSystem/Lock.gren

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ update fsPerm msg model =
144144
{ path = path
145145
, model = { model | locks = Set.remove (Path.toPosixString lockPath) model.locks }
146146
, command =
147-
FileSystem.remove fsPerm { recursive = True } lockPath
147+
FileSystem.remove fsPerm { recursive = True, ignoreErrors = False } lockPath
148148
|> Task.onError (\err -> Task.succeed lockPath)
149149
|> Task.execute
150150
}
@@ -163,7 +163,7 @@ update fsPerm msg model =
163163
LockMetaCheck { path, attempt, result = Ok { time, meta } } ->
164164
if Time.posixToMillis time - Time.posixToMillis meta.lastAccessed > 5000 then
165165
-- Lock is stale, let's try again
166-
FileSystem.remove fsPerm { recursive = True } path
166+
FileSystem.remove fsPerm { recursive = True, ignoreErrors = False } path
167167
|> Task.onError (\_ -> Task.succeed path)
168168
|> Task.perform (\_ -> Lock { path = fromLockPath path, attempt = attempt + 1 })
169169
|> Working

0 commit comments

Comments
 (0)