Fix issues with missing sourcemaps

enso-org · May 5, 2023 · 639cb7f · 639cb7f
1 parent 402c95b
commit 639cb7f
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 10 deletions.
diff --git a/app/ide-desktop/lib/client/esbuild-config.ts b/app/ide-desktop/lib/client/esbuild-config.ts
@@ -50,7 +50,7 @@ export function bundlerOptions(
             PROJECT_MANAGER_IN_BUNDLE_PATH: JSON.stringify(projectManagerInBundlePath),
             /* eslint-enable @typescript-eslint/naming-convention */
         },
-        sourcemap: true,
+        sourcemap: 'inline',
         external: ['electron'],
     }
 }
diff --git a/app/ide-desktop/lib/client/src/bin/server.ts b/app/ide-desktop/lib/client/src/bin/server.ts
@@ -22,14 +22,11 @@ const HTTP_STATUS_OK = 200
 // === URL Parameters ===
 // ======================
 
-/** Construct URL query with the given parameters. For each `key` - `value` pair,
+/** Construct a URL query string with the given parameters. For each `key` - `value` pair,
  * `key=value` will be added to the query. */
 export function urlParamsFromObject(obj: Record<string, string>) {
-    const params = []
-    for (const [key, value] of Object.entries(obj)) {
-        params.push(`${key}=${encodeURIComponent(value)}`)
-    }
-    return params.length === 0 ? '' : '?' + params.join('&')
+    const params = new URLSearchParams(obj).toString()
+    return params ? '?' + params : ''
 }
 
 // ==============

diff --git a/app/ide-desktop/lib/content/esbuild-config.ts b/app/ide-desktop/lib/content/esbuild-config.ts
@@ -88,6 +88,7 @@ export function bundlerOptions(args: Arguments) {
         loader: {
             '.html': 'copy',
             '.css': 'copy',
+            '.map': 'copy',
             '.wasm': 'copy',
             '.svg': 'copy',
             '.png': 'copy',

diff --git a/build/build/paths.yaml b/build/build/paths.yaml
@@ -47,7 +47,7 @@
     gui/:
       assets/:
         dynamic-assets/: # Assets used by the WASM application.
-        pkg.js: # The `pks.js` artifact of wasm-pack WITH bundled snippets.
+        pkg.js: # The `pkg.js` artifact of wasm-pack WITH bundled snippets.
         pkg.js.map: # The sourcemap mapping to `pkg.js` generated by wasm-pack.
         pkg-opt.wasm: # The optimized WASM artifact.
         index.js:
@@ -60,7 +60,8 @@
       index.js: # The main JS bundle to load WASM and JS wasm-pack bundles.
       index.d.ts: # TypeScript types interface file.
       index.js.map: # The sourcemap mapping to `index.js`.
-      pkg.js: # The `pks.js` artifact of wasm-pack WITH bundled snippets.
+      pkg.js: # The `pkg.js` artifact of wasm-pack WITH bundled snippets.
+      pkg.js.map: # The sourcemap mapping to `pkg.js` generated by wasm-pack.
       pkg.wasm: # The `pks_bg.wasm` artifact of wasm-pack.
       pkg-opt.wasm: # The optimized `pks_bg.wasm`.
   distribution/:

diff --git a/build/build/src/project/wasm.rs b/build/build/src/project/wasm.rs
@@ -451,10 +451,16 @@ impl Artifact {
             index_d_ts: _,
             index_js_map: _,
             pkg_js,
+            pkg_js_map,
             pkg_wasm: _,
             pkg_opt_wasm,
         } = &self.0;
-        vec![dynamic_assets.as_path(), pkg_js.as_path(), pkg_opt_wasm.as_path()]
+        vec![
+            dynamic_assets.as_path(),
+            pkg_js.as_path(),
+            pkg_js_map.as_path(),
+            pkg_opt_wasm.as_path(),
+        ]
     }
 
     pub fn symlink_ensogl_dist(&self, linked_dist: &RepoRootTargetEnsoglPackLinkedDist) -> Result {