From 4c8d173eabc6ea58c5da36b18933db6b55e129e4 Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Thu, 13 Jul 2023 07:58:16 +0700
Subject: [PATCH] chore(developer): enable source maps for bundle

---
 developer/src/kmc/.eslintrc.cjs |  1 +
 developer/src/kmc/build.sh      | 80 +++++++++++++++++----------------
 2 files changed, 43 insertions(+), 38 deletions(-)

diff --git a/developer/src/kmc/.eslintrc.cjs b/developer/src/kmc/.eslintrc.cjs
index 01ff867bb8..057fce1430 100644
--- a/developer/src/kmc/.eslintrc.cjs
+++ b/developer/src/kmc/.eslintrc.cjs
@@ -2,6 +2,7 @@ module.exports = {
   parserOptions: {
     project: ["./tsconfig.json", "./test/tsconfig.json"],
   },
+  sourcemap: true,
   ignorePatterns: ["build-bundler.js"],
   rules: {
     "prefer-const": "off", // TODO: enable this once infrastructure is in place and cleanup the problem cases
diff --git a/developer/src/kmc/build.sh b/developer/src/kmc/build.sh
index 02339ae635..6b00093a4c 100755
--- a/developer/src/kmc/build.sh
+++ b/developer/src/kmc/build.sh
@@ -82,25 +82,9 @@ fi
 
 #-------------------------------------------------------------------------------------------------------------------
 
-sourcemap_paths=(
-  ../kmc/build
-  ../kmc-analyze/build
-  ../kmc-kmn/build
-  ../kmc-ldml/build
-  ../kmc-model/build
-  ../kmc-model-info/build
-  ../kmc-package/build
-)
-
 if builder_start_action build; then
   copy_schemas
   npm run build
-  ./node_modules/.bin/sentry-cli sourcemaps inject \
-   --org keyman \
-   --project keyman-developer \
-   --release "$VERSION_GIT_TAG"  \
-   --ext js --ext mjs --ext ts --ext map \
-    "${sourcemap_paths[@]}"
   builder_finish_action success build
 fi
 
@@ -118,28 +102,6 @@ fi
 
 #-------------------------------------------------------------------------------------------------------------------
 
-if builder_start_action bundle; then
-
-  if ! builder_has_option --build-path; then
-    builder_finish_action "Parameter --build-path is required" bundle
-    exit 64
-  fi
-
-  rm -rf build/dist
-  mkdir -p build/dist
-  node build-bundler.js
-
-  # Manually copy over kmcmplib module and schemas
-  copy_schemas
-  cp ../kmc-kmn/build/src/import/kmcmplib/wasm-host.wasm build/dist/
-
-  cp build/dist/* "$BUILD_PATH"
-
-  builder_finish_action success bundle
-fi
-
-#-------------------------------------------------------------------------------------------------------------------
-
 readonly PACKAGES=(
   common/web/keyman-version
   common/web/types
@@ -153,6 +115,48 @@ readonly PACKAGES=(
   developer/src/kmc-package
 )
 
+if builder_start_action bundle; then
+  SOURCEMAP_PATHS=( "${PACKAGES[@]}" )
+  SOURCEMAP_PATHS=( "${SOURCEMAP_PATHS[@]/%//build}" )
+  SOURCEMAP_PATHS=( "${SOURCEMAP_PATHS[@]/#/../../../}" )
+  readonly SOURCEMAP_PATHS
+
+  if ! builder_has_option --build-path; then
+    builder_finish_action "Parameter --build-path is required" bundle
+    exit 64
+  fi
+
+  rm -rf build/dist
+
+  ./node_modules/.bin/sentry-cli sourcemaps inject \
+    --org keyman \
+    --project keyman-developer \
+    --release "$VERSION_GIT_TAG"  \
+    --ext js --ext mjs --ext ts --ext map \
+    build/ "${SOURCEMAP_PATHS[@]}"
+
+  mkdir -p build/dist
+  node build-bundler.js
+
+  ./node_modules/.bin/sentry-cli sourcemaps inject \
+    --org keyman \
+    --project keyman-developer \
+    --release "$VERSION_GIT_TAG"  \
+    --ext js --ext mjs --ext ts --ext map \
+    build/dist
+
+  # Manually copy over kmcmplib module and schemas
+  copy_schemas
+  cp ../kmc-kmn/build/src/import/kmcmplib/wasm-host.wasm build/dist/
+
+  cp build/dist/* "$BUILD_PATH"
+
+  builder_finish_action success bundle
+fi
+
+#-------------------------------------------------------------------------------------------------------------------
+
+
 if builder_start_action publish; then
   . "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"