Skip to content

Commit 88a3db8

Browse files
Update to v0.14.2 (#230)
* Update dependencies to v0.14.2 release * Update server to use `rebuildModule'` to speed it up slightly * Update changelog
1 parent 7747974 commit 88a3db8

File tree

3 files changed

+11
-8
lines changed

3 files changed

+11
-8
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ Other improvements:
1414
- Stop mangled 'Compiled ModuleName' output (#228 by @JordanMartinez)
1515
- Update dev instructions: create valid symbolic link across OSes (#226 by @JordanMartinez)
1616
- Added a changelog (#229 by @JordanMartinez)
17+
- Update PureScript dependency to v0.14.2 (#230 by @JordanMartinez)
18+
- Speed up server slightly by using `rebuildModule'` (#230 by @JordanMartinez)
1719

1820
## [v2021-05-29.1](https://github.com/purescript/trypurescript/releases/tag/v2021-05-29.1) - 2021-05-29
1921

server/Main.hs

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,8 @@ buildMakeActions codegenRef =
113113
outputPrimDocs :: Make.Make ()
114114
outputPrimDocs = pure ()
115115

116-
server :: [P.ExternsFile] -> P.Environment -> Int -> IO ()
117-
server externs initEnv port = do
116+
server :: [P.ExternsFile] -> P.Env -> P.Environment -> Int -> IO ()
117+
server externs initNamesEnv initEnv port = do
118118
codegenRef <- IORef.newIORef Nothing
119119
let makeActions = buildMakeActions codegenRef
120120
let compile :: Text -> IO (Either Error ([P.JSONError], JS))
@@ -130,7 +130,7 @@ server externs initEnv port = do
130130
return $ Left $ toCompilerErrors parserErrors
131131

132132
(parserWarnings, Right m) | P.getModuleName m == P.ModuleName "Main" -> do
133-
(makeResult, warnings) <- Make.runMake P.defaultOptions $ Make.rebuildModule makeActions externs m
133+
(makeResult, warnings) <- Make.runMake P.defaultOptions $ Make.rebuildModule' makeActions initNamesEnv externs m
134134
codegenResult <- IORef.readIORef codegenRef
135135
return $ case makeResult of
136136
Left errors ->
@@ -235,7 +235,9 @@ main = do
235235
inputFiles <- concat <$> traverse glob inputGlobs
236236
e <- runExceptT $ do
237237
modules <- ExceptT $ I.loadAllModules inputFiles
238-
ExceptT . I.runMake . I.make $ map (second CST.pureResult) modules
238+
(exts, env) <- ExceptT . I.runMake . I.make $ map (second CST.pureResult) modules
239+
namesEnv <- fmap fst . runWriterT $ foldM P.externsEnv P.primEnv exts
240+
pure (exts, namesEnv, env)
239241
case e of
240242
Left err -> print err >> exitFailure
241-
Right (exts, env) -> server exts env port
243+
Right (exts, namesEnv, env) -> server exts namesEnv env port

stack.yaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@ flags:
77
packages:
88
- '.'
99
extra-deps:
10-
- purescript-0.14.1
11-
- purescript-ast-0.1.1.0
12-
- purescript-cst-0.1.1.0
10+
- purescript-0.14.2
11+
- purescript-cst-0.2.0.0
1312
- happy-1.20.0
1413
- language-javascript-0.7.0.0

0 commit comments

Comments
 (0)