From 3cef2fe9aa45a8dcf02303c59c5e920f6543ea13 Mon Sep 17 00:00:00 2001 From: Filip Tibell Date: Mon, 23 May 2022 21:19:30 +0200 Subject: [PATCH] Fix sourcemap command not stripping paths correctly (#544) * Fix sourcemap command not stripping paths correctly * Use ServeSession to get the proper root dir to strip for sourcemap --- src/cli/sourcemap.rs | 5 +---- src/serve_session.rs | 4 ++++ 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/cli/sourcemap.rs b/src/cli/sourcemap.rs index 66341dc8..8cda48ff 100644 --- a/src/cli/sourcemap.rs +++ b/src/cli/sourcemap.rs @@ -56,9 +56,6 @@ impl SourcemapCommand { pub fn run(self) -> anyhow::Result<()> { let project_path = resolve_path(&self.project); - let mut project_dir = project_path.to_path_buf(); - project_dir.pop(); - log::trace!("Constructing in-memory filesystem"); let vfs = Vfs::new_default(); @@ -71,7 +68,7 @@ impl SourcemapCommand { filter_non_scripts }; - let root_node = recurse_create_node(&tree, tree.get_root_id(), &project_dir, filter); + let root_node = recurse_create_node(&tree, tree.get_root_id(), session.root_dir(), filter); if let Some(output_path) = self.output { let mut file = BufWriter::new(File::create(&output_path)?); diff --git a/src/serve_session.rs b/src/serve_session.rs index 2cf1dc1c..a4eced44 100644 --- a/src/serve_session.rs +++ b/src/serve_session.rs @@ -216,6 +216,10 @@ impl ServeSession { pub fn serve_address(&self) -> Option { self.root_project.serve_address } + + pub fn root_dir(&self) -> &Path { + self.root_project.folder_location() + } } #[derive(Debug, Error)]