purescript · kl0tl · Feb 6, 2020 · Feb 6, 2020 · Feb 6, 2020 · Feb 6, 2020
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -29,7 +29,7 @@ jobs:
 
       - uses: "actions/setup-node@v1"
         with:
-          node-version: "10"
+          node-version: "12"
 
       - id: "haskell"
         uses: "haskell/actions/setup@v1"

diff --git a/app/Command/REPL.hs b/app/Command/REPL.hs
@@ -44,8 +44,7 @@ import           System.IO.UTF8 (readUTF8File)
 import           System.Exit
 import           System.Directory (doesFileExist, getCurrentDirectory)
 import           System.FilePath ((</>))
-import           System.FilePath.Glob (glob)
-import           System.Process (readProcessWithExitCode)
+import qualified System.FilePath.Glob as Glob
 import qualified Data.ByteString.Lazy.UTF8 as U
 
 -- | Command line options
@@ -108,7 +107,7 @@ pasteMode =
 -- | Make a JavaScript bundle for the browser.
 bundle :: IO (Either Bundle.ErrorMessage String)
 bundle = runExceptT $ do
-  inputFiles <- liftIO (glob (".psci_modules" </> "node_modules" </> "*" </> "*.js"))
+  inputFiles <- liftIO $ concat <$> Glob.globDir [Glob.compile "*/*.js", Glob.compile "*/foreign.cjs"] modulesDir
   input <- for inputFiles $ \filename -> do
     js <- liftIO (readUTF8File filename)
     mid <- Bundle.guessModuleIdentifier filename
@@ -280,13 +279,12 @@ nodeBackend nodePath nodeArgs = Backend setup eval reload shutdown
 
     eval :: () -> String -> IO ()
     eval _ _ = do
-      writeFile indexFile "require('$PSCI')['$main']();"
-      process <- maybe findNodeProcess (pure . pure) nodePath
-      result <- traverse (\node -> readProcessWithExitCode node (nodeArgs ++ [indexFile]) "") process
+      writeFile indexFile "import('./$PSCI/index.js').then(({ $main }) => $main());"
+      result <- readNodeProcessWithExitCode nodePath (nodeArgs ++ [indexFile]) ""
       case result of
-        Just (ExitSuccess, out, _)   -> putStrLn out
-        Just (ExitFailure _, _, err) -> putStrLn err
-        Nothing                      -> putStrLn "Could not find node.js. Do you have node.js installed and available in your PATH?"
+        Right (ExitSuccess, out, _)   -> putStrLn out
+        Right (ExitFailure _, _, err) -> putStrLn err
+        Left err                      -> putStrLn err
 
     reload :: () -> IO ()
     reload _ = return ()
@@ -303,7 +301,7 @@ command = loop <$> options
   where
     loop :: PSCiOptions -> IO ()
     loop PSCiOptions{..} = do
-        inputFiles <- concat <$> traverse glob psciInputGlob
+        inputFiles <- concat <$> traverse Glob.glob psciInputGlob
         e <- runExceptT $ do
           modules <- ExceptT (loadAllModules inputFiles)
           when (null modules) . liftIO $ do

diff --git a/app/static/index.js b/app/static/index.js
@@ -16,13 +16,24 @@ var evaluate = function evaluate(js) {
         // which will be returned to PSCi.
         buffer.push(s);
     };
-    // Replace any require(...) statements with lookups on the PSCI object.
+    // Replace any require and import statements with lookups on the PSCI object
+    // and export statements with assignments to module.exports.
     var replaced = js.replace(/require\("[^"]*"\)/g, function(s) {
         return "PSCI['" + s.split('/')[1] + "']";
+    }).replace(/import \* as ([^\s]+) from "([^"]*)"/g, function (_, as, from) {
+        return "var " + as + " = PSCI['" + from.split('/')[1] + "']";
+    }).replace(/export \{([^}]+)\} from "\.\/foreign\.js";?/g, function (_, exports) {
+        return exports.replace(/^\s*([^,\s]+),?\s*$/gm, function (_, exported) {
+            return "module.exports." + exported + " = $foreign." + exported + ";";
+        });
+    }).replace(/export \{([^}]+)\};?/g, function (_, exports) {
+        return exports.replace(/^\s*([^,\s]+)(?: as ([^\s]+))?,?\s*$/gm, function (_, exported, as) {
+            return "module.exports." + (as || exported) + " = " + exported + ";";
+        });
     });
     // Wrap the module and evaluate it.
     var wrapped =
-      [ 'var module = {};'
+      [ 'var module = { exports: {} };'
       , '(function(module) {'
       , replaced
       , '})(module);'