Use pathdiff for vp path remapping

Author: branchseer

Cargo.lock

@@ -90,6 +90,7 @@ os_str_bytes = "7.1.1"
 ouroboros = "0.18.5"
 owo-colors = "4.1.0"
 passfd = { git = "https://github.com/polachok/passfd", rev = "d55881752c16aced1a49a75f9c428d38d3767213", default-features = false }
+pathdiff = "0.2.3"
 petgraph = "0.8.2"
 phf = { version = "0.11.3", features = ["macros"] }
 portable-pty = "0.9.0"

Cargo.toml

@@ -29,6 +29,7 @@ which = { workspace = true }
 cow-utils = { workspace = true }
 cp_r = { workspace = true }
 insta = { workspace = true, features = ["glob", "json", "redactions", "filters", "ron"] }
+pathdiff = { workspace = true }
 pty_terminal = { workspace = true }
 pty_terminal_test = { workspace = true }
 regex = { workspace = true }

crates/vite_task_bin/Cargo.toml

@@ -9,6 +9,7 @@ use std::{
 };
 
 use cp_r::CopyOptions;
+use pathdiff::diff_paths;
 use pty_terminal::{geo::ScreenSize, terminal::CommandBuilder};
 use pty_terminal_test::TestTerminal;
 use redact::redact_e2e_output;
@@ -68,14 +69,14 @@ fn resolve_runtime_vp_path() -> AbsolutePathBuf {
     let compile_time_repo_root = compile_time_manifest.parent().unwrap().parent().unwrap();
     let runtime_repo_root = runtime_manifest.parent().unwrap().parent().unwrap();
 
-    let relative_vp = compile_time_vp.strip_prefix(compile_time_repo_root).unwrap_or_else(|_| {
+    let relative_vp = diff_paths(&compile_time_vp, compile_time_repo_root).unwrap_or_else(|| {
         panic!(
-            "Failed to resolve vp relative path. vp={} repo_root={}",
+            "Failed to diff vp path. vp={} repo_root={}",
             compile_time_vp.display(),
             compile_time_repo_root.display(),
         )
     });
-    let runtime_vp = runtime_repo_root.join(relative_vp);
+    let runtime_vp = runtime_repo_root.join(&relative_vp);
 
     assert!(
         runtime_vp.exists(),