From 9c781cacd60692af960d9734983346ecc9481a62 Mon Sep 17 00:00:00 2001 From: Cyril Sobierajewicz Date: Mon, 4 Mar 2019 17:48:28 +0100 Subject: Extract err locations from the format introduced in `purescript@0.12.2` See https://github.com/purescript/purescript/pull/3473. --- package.json | 3 +++ src/index.js | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index f2b95af..ae8d7eb 100644 --- a/package.json +++ b/package.json @@ -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; -- cgit v1.2.3 From 148eb9ab6b5544029e200f7715520dcbd7b7a206 Mon Sep 17 00:00:00 2001 From: Cyril Sobierajewicz Date: Mon, 4 Mar 2019 18:09:12 +0100 Subject: Redirect all urls to our fork --- package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index ae8d7eb..b1974ad 100644 --- a/package.json +++ b/package.json @@ -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", -- cgit v1.2.3 From 66c963c2282afbf948a262978d63421fa518eaec Mon Sep 17 00:00:00 2001 From: Cyril Sobierajewicz Date: Mon, 4 Mar 2019 18:10:49 +0100 Subject: Version 4.0.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b1974ad..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": [ -- cgit v1.2.3