Merge remote-tracking branch 'fretlink/master' into latest

3 files changed, 18 insertions, 1 deletions

diff --git a/package.json b/package.json
index e9b5035..1faef7b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "purs-loader",
-  "version": "4.0.0",
+  "version": "4.1.0",
   "description": "A webpack loader for PureScript.",
   "main": "lib/index.js",
   "files": [
diff --git a/src/index.js b/src/index.js
index 28246e3..be809c6 100644
--- a/src/index.js
+++ b/src/index.js
@@ -202,6 +202,19 @@ module.exports = function purescriptLoader(source, map) {
           const baseModulePath = path.join(this.rootContext, filename);
           this.addDependency(baseModulePath);
 
+          const foreignModulesErrorCodes = [
+            'ErrorParsingFFIModule',
+            'MissingFFIImplementations',
+            'UnusedFFIImplementations',
+            'MissingFFIModule'
+          ];
+          for (const code of foreignModulesErrorCodes) {
+            if (error.includes(code)) {
+              const resolved = utils.resolveForeignModule(baseModulePath);
+              this.addDependency(resolved);
+            }
+          }
+
           const matchErrModuleName = /in module ((?:\w+\.)*\w+)/;
           const [, baseModuleName] = matchErrModuleName.exec(error) || [];
           if (!baseModuleName) continue;
diff --git a/src/utils.js b/src/utils.js
index b6ccf81..829ba72 100644
--- a/src/utils.js
+++ b/src/utils.js
@@ -33,3 +33,7 @@ exports.resolvePursModule = ({ baseModulePath, baseModuleName, targetModuleName
       `${path.join(...parts)}.purs`)
     : baseModulePath;
 };
+
+exports.resolveForeignModule = pursModulePath =>
+  path.join(path.dirname(pursModulePath),
+    path.basename(pursModulePath, path.extname(pursModulePath)) + '.js');