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

2 files changed, 8 insertions, 5 deletions

diff --git a/package.json b/package.json
index f2b95af..e9b5035 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "purs-loader",
-  "version": "3.3.3",
+  "version": "4.0.0",
   "description": "A webpack loader for PureScript.",
   "main": "lib/index.js",
   "files": [
@@ -17,7 +17,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "git://github.com/ethul/purs-loader.git"
+    "url": "git://github.com/fretlink/purs-loader.git"
   },
   "keywords": [
     "loader",
@@ -32,9 +32,9 @@
   ],
   "license": "MIT",
   "bugs": {
-    "url": "https://github.com/ethul/purs-loader/issues"
+    "url": "https://github.com/fretlink/purs-loader/issues"
   },
-  "homepage": "https://github.com/ethul/purs-loader#readme",
+  "homepage": "https://github.com/fretlink/purs-loader#readme",
   "dependencies": {
     "bluebird": "^3.3.5",
     "chalk": "^1.1.3",
@@ -50,5 +50,8 @@
   "devDependencies": {
     "babel-cli": "^6.8.0",
     "babel-preset-es2015": "^6.6.0"
+  },
+  "peerDependencies": {
+    "purescript": ">=0.12.2"
   }
 }
diff --git a/src/index.js b/src/index.js
index 8a2e468..28246e3 100644
--- a/src/index.js
+++ b/src/index.js
@@ -195,7 +195,7 @@ module.exports = function purescriptLoader(source, map) {
         const matchErrorsSeparator = /\n(?=Error)/;
         const errors = pscMessage.split(matchErrorsSeparator);
         for (const error of errors) {
-          const matchErrLocation = /at (.+\.purs) line (\d+), column (\d+) - line (\d+), column (\d+)/;
+          const matchErrLocation = /at (.+\.purs):(\d+):(\d+) - (\d+):(\d+) \(line \2, column \3 - line \4, column \5\)/;
           const [, filename] = matchErrLocation.exec(error) || [];
           if (!filename) continue;