aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorCyril Sobierajewicz <38043722+cyrilfretlink@users.noreply.github.com>2019-03-04 18:20:42 +0100
committerGitHub <noreply@github.com>2019-03-04 18:20:42 +0100
commit8a5fcc4d12c8526871d82cb5ea5760a32d1ae813 (patch)
treea63da343c66064f5cee134123e80f41bb02016b3
parentcb94750aafc73f93a2b7056517cd94a30a5149d7 (diff)
parent66c963c2282afbf948a262978d63421fa518eaec (diff)
downloadpurs-loader-8a5fcc4d12c8526871d82cb5ea5760a32d1ae813.tar.gz
purs-loader-8a5fcc4d12c8526871d82cb5ea5760a32d1ae813.tar.zst
purs-loader-8a5fcc4d12c8526871d82cb5ea5760a32d1ae813.zip
Merge pull request #2 from cyrilfretlink/purescript@0.12.2
Version 4.0.0
-rw-r--r--package.json11
-rw-r--r--src/index.js2
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 @@
1{ 1{
2 "name": "purs-loader", 2 "name": "purs-loader",
3 "version": "3.3.3", 3 "version": "4.0.0",
4 "description": "A webpack loader for PureScript.", 4 "description": "A webpack loader for PureScript.",
5 "main": "lib/index.js", 5 "main": "lib/index.js",
6 "files": [ 6 "files": [
@@ -17,7 +17,7 @@
17 }, 17 },
18 "repository": { 18 "repository": {
19 "type": "git", 19 "type": "git",
20 "url": "git://github.com/ethul/purs-loader.git" 20 "url": "git://github.com/fretlink/purs-loader.git"
21 }, 21 },
22 "keywords": [ 22 "keywords": [
23 "loader", 23 "loader",
@@ -32,9 +32,9 @@
32 ], 32 ],
33 "license": "MIT", 33 "license": "MIT",
34 "bugs": { 34 "bugs": {
35 "url": "https://github.com/ethul/purs-loader/issues" 35 "url": "https://github.com/fretlink/purs-loader/issues"
36 }, 36 },
37 "homepage": "https://github.com/ethul/purs-loader#readme", 37 "homepage": "https://github.com/fretlink/purs-loader#readme",
38 "dependencies": { 38 "dependencies": {
39 "bluebird": "^3.3.5", 39 "bluebird": "^3.3.5",
40 "chalk": "^1.1.3", 40 "chalk": "^1.1.3",
@@ -50,5 +50,8 @@
50 "devDependencies": { 50 "devDependencies": {
51 "babel-cli": "^6.8.0", 51 "babel-cli": "^6.8.0",
52 "babel-preset-es2015": "^6.6.0" 52 "babel-preset-es2015": "^6.6.0"
53 },
54 "peerDependencies": {
55 "purescript": ">=0.12.2"
53 } 56 }
54} 57}
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) {
195 const matchErrorsSeparator = /\n(?=Error)/; 195 const matchErrorsSeparator = /\n(?=Error)/;
196 const errors = pscMessage.split(matchErrorsSeparator); 196 const errors = pscMessage.split(matchErrorsSeparator);
197 for (const error of errors) { 197 for (const error of errors) {
198 const matchErrLocation = /at (.+\.purs) line (\d+), column (\d+) - line (\d+), column (\d+)/; 198 const matchErrLocation = /at (.+\.purs):(\d+):(\d+) - (\d+):(\d+) \(line \2, column \3 - line \4, column \5\)/;
199 const [, filename] = matchErrLocation.exec(error) || []; 199 const [, filename] = matchErrLocation.exec(error) || [];
200 if (!filename) continue; 200 if (!filename) continue;
201 201