Skip to content

Update to v0.14.2 #230

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 7, 2021
Merged

Update to v0.14.2 #230

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
55d49be
Update dependencies to v0.14.2 release
JordanMartinez Jun 6, 2021
fce8308
Update server to use `rebuildModule'` to speed it up slightly
JordanMartinez Jun 6, 2021
553a705
Update changelog
JordanMartinez Jun 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ Other improvements:
- Stop mangled 'Compiled ModuleName' output (#228 by @JordanMartinez)
- Update dev instructions: create valid symbolic link across OSes (#226 by @JordanMartinez)
- Added a changelog (#229 by @JordanMartinez)
- Update PureScript dependency to v0.14.2 (#230 by @JordanMartinez)
- Speed up server slightly by using `rebuildModule'` (#230 by @JordanMartinez)

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

Expand Down
12 changes: 7 additions & 5 deletions server/Main.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,8 +113,8 @@ buildMakeActions codegenRef =
outputPrimDocs :: Make.Make ()
outputPrimDocs = pure ()

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

(parserWarnings, Right m) | P.getModuleName m == P.ModuleName "Main" -> do
(makeResult, warnings) <- Make.runMake P.defaultOptions $ Make.rebuildModule makeActions externs m
(makeResult, warnings) <- Make.runMake P.defaultOptions $ Make.rebuildModule' makeActions initNamesEnv externs m
codegenResult <- IORef.readIORef codegenRef
return $ case makeResult of
Left errors ->
Expand Down Expand Up @@ -235,7 +235,9 @@ main = do
inputFiles <- concat <$> traverse glob inputGlobs
e <- runExceptT $ do
modules <- ExceptT $ I.loadAllModules inputFiles
ExceptT . I.runMake . I.make $ map (second CST.pureResult) modules
(exts, env) <- ExceptT . I.runMake . I.make $ map (second CST.pureResult) modules
namesEnv <- fmap fst . runWriterT $ foldM P.externsEnv P.primEnv exts
pure (exts, namesEnv, env)
case e of
Left err -> print err >> exitFailure
Right (exts, env) -> server exts env port
Right (exts, namesEnv, env) -> server exts namesEnv env port
5 changes: 2 additions & 3 deletions stack.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@ flags:
packages:
- '.'
extra-deps:
- purescript-0.14.1
- purescript-ast-0.1.1.0
- purescript-cst-0.1.1.0
- purescript-0.14.2
- purescript-cst-0.2.0.0
- happy-1.20.0
- language-javascript-0.7.0.0