Make spago run write a JS file and execute it (#297)

purescript · Jun 27, 2019 · 127bac9 · 127bac9
1 parent 0ef0462
commit 127bac9
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/src/Spago/Build.hs b/src/Spago/Build.hs
@@ -141,8 +141,12 @@ runWithNode defaultModuleName maybeSuccessMessage failureMessage maybeModuleName
  where
  moduleName = fromMaybe defaultModuleName maybeModuleName
  args = Text.intercalate " " $ map Purs.unExtraArg nodeArgs
- cmd = "node -e \"require('./output/" <> Purs.unModuleName moduleName <> "').main()\" " <> args
+ contents = "#!/usr/bin/env node\n\n" <> "require('../output/" <> Purs.unModuleName moduleName <> "').main()"
+ cmd = "node .spago/run.js " <> args
  nodeAction = do
+ echoDebug $ "Writing .spago/run.js"
+ writeTextFile ".spago/run.js" contents
+ chmod executable ".spago/run.js"
  shell cmd empty >>= \case
  ExitSuccess -> fromMaybe (pure ()) (echo <$> maybeSuccessMessage)
  ExitFailure n -> die $ failureMessage <> repr n

diff --git a/src/Spago/Prelude.hs b/src/Spago/Prelude.hs
@@ -32,6 +32,8 @@ module Spago.Prelude
  , mktree
  , mv
  , cptree
+ , chmod
+ , executable
  , readTextFile
  , writeTextFile
  , atomically
@@ -97,7 +99,7 @@ import System.FilePath (isAbsolute, pathSeparator, (</>)
 import System.IO (hPutStrLn)
 import Turtle (ExitCode (..), FilePath, appendonly, mktree, repr,
  shell, shellStrict, systemStrictWithErr, testdir,
- testfile)
+ testfile, chmod, executable)
 import UnliftIO (MonadUnliftIO, withRunInIO)
 import UnliftIO.Directory (getModificationTime, makeAbsolute)
 import UnliftIO.Exception (IOException, try)

diff --git a/test/fixtures/run-output.txt b/test/fixtures/run-output.txt
@@ -9,3 +9,4 @@ Running `getGlobalCacheDir`
 Installation complete.
 Running command: `purs compile ".spago/console/v4.2.0/src/**/*.purs" ".spago/effect/v2.0.1/src/**/*.purs" ".spago/prelude/v4.1.1/src/**/*.purs" ".spago/psci-support/v4.0.0/src/**/*.purs" "src/**/*.purs" "test/**/*.purs"`
 Build succeeded.
+Writing .spago/run.js