Fix requires and psc-package caching

diff --git a/src/ide.js b/src/ide.js
index a2ccbe32ac90e9022872b0fafd93f29210d9dc62..e6a45c2fc885e4fac7c4bc9003e39567613e0600 100644 (file)
--- a/src/ide.js
+++ b/src/ide.js
@@ -22,7 +22,7 @@ const dargs = require('./dargs');
 
 const compile = require('./compile');
 
-const PsModuleMap = require('./PsModuleMap');
+const PsModuleMap = require('./purs-module-map');
 
 function UnknownModuleError() {
   this.name = 'UnknownModuleError';

diff --git a/src/index.js b/src/index.js
index f77e5f84d478d2a6c75d4b105089bd9f70dd271f..11b06eb8653b168f5bcbfda32cbd673fd01e4967 100644 (file)
--- a/src/index.js
+++ b/src/index.js
@@ -72,7 +72,10 @@ module.exports = function purescriptLoader(source, map) {
 
       const cmd = spawn(pscPackageCommand, pscPackageArgs);
 
-      if (cmd.status !== 0) {
+      if (cmd.error) {
+        throw new Error(cmd.error);
+      }
+      else if (cmd.status !== 0) {
         const error = cmd.stdout.toString();
 
         throw new Error(error);
@@ -140,7 +143,7 @@ module.exports = function purescriptLoader(source, map) {
         compilationStarted: false,
         compilationFinished: false,
         installed: cache.installed,
-        srcOption: cache.srcOption
+        srcOption: []
       };
     });
 

diff --git a/src/to-javascript.js b/src/to-javascript.js
index d0934d5ed46e19fd6da9be41c1109f7cbcf517da..b3e305123ed271927aef8da8bab7203927d07c57 100644 (file)
--- a/src/to-javascript.js
+++ b/src/to-javascript.js
@@ -16,7 +16,7 @@ const debug = debug_('purs-loader');
 
 const debugVerbose = debug_('purs-loader:verbose');
 
-const PsModuleMap = require('./PsModuleMap');
+const PsModuleMap = require('./purs-module-map');
 
 function updatePsModuleMap(psModule) {
   const options = psModule.options;