From 9aa461bb0773cb11de157d605202e659f0136bde Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Gr=C3=B6ger?= Date: Thu, 26 Jan 2023 22:00:18 +0100 Subject: [PATCH 1/2] Make sourcemaps include column info --- lib/colocated-broccoli-plugin.js | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/colocated-broccoli-plugin.js b/lib/colocated-broccoli-plugin.js index e9a07a03..08799aa2 100644 --- a/lib/colocated-broccoli-plugin.js +++ b/lib/colocated-broccoli-plugin.js @@ -177,6 +177,7 @@ module.exports = class ColocatedTemplateProcessor extends Plugin { source: jsOutputPath, file: jsOutputPath, includeContent: true, + hires: true }); jsContents += `\n//# sourceMappingURL=${jsContentsMap.toUrl()}`; From b0fa71984d9bd353065c4d23ede8d4c7b1a1677c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Gr=C3=B6ger?= Date: Thu, 26 Jan 2023 22:01:20 +0100 Subject: [PATCH 2/2] Fix relative component paths for sourcemaps --- lib/colocated-broccoli-plugin.js | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/lib/colocated-broccoli-plugin.js b/lib/colocated-broccoli-plugin.js index 08799aa2..8becb3a2 100644 --- a/lib/colocated-broccoli-plugin.js +++ b/lib/colocated-broccoli-plugin.js @@ -102,18 +102,22 @@ module.exports = class ColocatedTemplateProcessor extends Plugin { let hasBackingClass = false; let hasTemplate = this.inputHasFile(basePath + '.hbs'); let backingClassPath = basePath; - + let ext; if (this.inputHasFile(basePath + '.js')) { backingClassPath += '.js'; + ext = '.js'; hasBackingClass = true; } else if (this.inputHasFile(basePath + '.ts')) { backingClassPath += '.ts'; + ext = '.ts'; hasBackingClass = true; } else if (this.inputHasFile(basePath + '.coffee')) { backingClassPath += '.coffee'; + ext = '.coffee'; hasBackingClass = true; } else { backingClassPath += '.js'; + ext = '.js'; hasBackingClass = false; } @@ -173,9 +177,10 @@ module.exports = class ColocatedTemplateProcessor extends Plugin { // It's not clear to me how to format this correctly for coffeescript. if (!backingClassPath.endsWith('.coffee')) { + let file = filePathParts.name + ext; let jsContentsMap = jsContentsMagic.generateMap({ - source: jsOutputPath, - file: jsOutputPath, + source: backingClassPath, + file, includeContent: true, hires: true });