Skip to content

Commit 8d930ce

Browse files
committed
Update onerror for previewEntry
1 parent 21b787e commit 8d930ce

File tree

1 file changed

+16
-9
lines changed

1 file changed

+16
-9
lines changed

client/utils/previewEntry.js

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -62,17 +62,24 @@ function handleMessageEvent(e) {
6262
window.addEventListener('message', handleMessageEvent);
6363

6464
// catch reference errors, via http://stackoverflow.com/a/12747364/2994108
65-
window.onerror = function onError(msg, source, lineNumber, columnNo, error) {
66-
const urls = Object.keys(window.objectUrls);
65+
window.onerror = async function onError(
66+
msg,
67+
source,
68+
lineNumber,
69+
columnNo,
70+
error
71+
) {
72+
// maybe i can use error.stack sometime but i'm having a hard time triggering
73+
// this function
74+
6775
let data = error.stack;
68-
urls.forEach((url) => {
69-
if (error.stack.match(url)) {
70-
data = error.stack.replaceAll(url, window.objectUrls[url]);
71-
}
72-
});
73-
if (data.match('index.html')) {
74-
data = data.replace(`:${lineNumber}:`, `:${lineNumber - htmlOffset}:`);
76+
const resolvedFileName = window.objectUrls[source];
77+
let resolvedLineNo = lineNumber;
78+
if (window.objectUrls[source] === 'index.html') {
79+
resolvedLineNo = lineNumber - htmlOffset;
7580
}
81+
const line = `\n at ${resolvedFileName}:${resolvedLineNo}:${columnNo}`;
82+
data = data.concat(line);
7683
editor.postMessage(
7784
{
7885
source: 'sketch',

0 commit comments

Comments
 (0)