From 980bf303233fffb047bda344468fb24e625498a2 Mon Sep 17 00:00:00 2001
From: ochafik <ochafik@google.com>
Date: Mon, 1 Jul 2024 02:00:02 +0100
Subject: [PATCH 1/2] fix error line shift for bundled files

---
 src/runner/output-parser.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/runner/output-parser.ts b/src/runner/output-parser.ts
index 6fc273c..cf285cc 100644
--- a/src/runner/output-parser.ts
+++ b/src/runner/output-parser.ts
@@ -47,7 +47,7 @@ export function parseMergedOutputs(mergedOutputs: MergedOutputs, opts: MergedOut
   const shiftSourceName = opts.shiftSourceLines && opts.shiftSourceLines.sourcePath;
   const getLine = (path: string, lineStr: string) => {
     const line = Number(lineStr);
-    if (shiftSourceName && (path == shiftSourceName)) {
+    if (shiftSourceName && path.endsWith(shiftSourceName)) {
       return line - opts.shiftSourceLines!.skipLines;
     } else {
       return line;

From 9929ffe3248a218b8d0ea539d016b88d8c46dd0d Mon Sep 17 00:00:00 2001
From: ochafik <ochafik@google.com>
Date: Mon, 1 Jul 2024 01:48:35 +0100
Subject: [PATCH 2/2] symlinks for openscad.{js,wasm} under src

---
 Makefile | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index ce5d071..390c2e1 100644
--- a/Makefile
+++ b/Makefile
@@ -11,7 +11,7 @@ all: public
 
 .PHONY: public
 public: \
-		libs/openscad-wasm \
+		src/wasm \
 		public/openscad.js \
 		public/openscad.wasm \
 		public/libraries/fonts.zip \
@@ -49,19 +49,20 @@ dist/index.js: public
 dist/openscad-worker.js: src/openscad-worker.ts
 	npx rollup -c
 
+src/wasm: libs/openscad-wasm
+	rm -f src/wasm
+	ln -sf "$(shell pwd)/libs/openscad-wasm" src/wasm
+
 libs/openscad-wasm:
 	mkdir -p libs/openscad-wasm
 	wget ${WASM_BUILD_URL} -O libs/openscad-wasm.zip
 	( cd libs/openscad-wasm && unzip ../openscad-wasm.zip )
-	rm libs/openscad-wasm.zip
-	rm -f src/wasm
-	ln -sf "$(shell pwd)/libs/openscad-wasm" src/wasm
 	
-public/openscad.js: libs/openscad-wasm
-	cp libs/openscad-wasm/openscad.{js,wasm} public
+public/openscad.js: libs/openscad-wasm libs/openscad-wasm/openscad.js
+	ln -sf libs/openscad-wasm/openscad.js public/openscad.js
 		
-public/openscad.wasm: libs/openscad-wasm
-	cp libs/openscad-wasm/openscad.wasm public
+public/openscad.wasm: libs/openscad-wasm libs/openscad-wasm/openscad.wasm
+	ln -sf libs/openscad-wasm/openscad.wasm public/openscad.wasm
 
 public/libraries/fonts.zip: libs/liberation
 	mkdir -p public/libraries