From f2bf40d157879cf05a9334d9a4676562bdf1b1c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bartek=20Iwa=C5=84czuk?= Date: Tue, 15 Nov 2022 13:58:04 +0100 Subject: fix(npm): probing for files that have a file stem (#16641) --- cli/node/mod.rs | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'cli/node') diff --git a/cli/node/mod.rs b/cli/node/mod.rs index 56f228d3f..f2a645b5f 100644 --- a/cli/node/mod.rs +++ b/cli/node/mod.rs @@ -1178,8 +1178,8 @@ fn file_extension_probe( ) -> Result { let p = p.clean(); if p.exists() { - let mut p_js = p.clone(); - p_js.set_extension("js"); + let file_name = p.file_name().unwrap(); + let p_js = p.with_file_name(format!("{}.js", file_name.to_str().unwrap())); if p_js.exists() && p_js.is_file() { return Ok(p_js); } else if p.is_dir() { @@ -1187,9 +1187,8 @@ fn file_extension_probe( } else { return Ok(p); } - } else { - let mut p_js = p.clone(); - p_js.set_extension("js"); + } else if let Some(file_name) = p.file_name() { + let p_js = p.with_file_name(format!("{}.js", file_name.to_str().unwrap())); if p_js.exists() && p_js.is_file() { return Ok(p_js); } -- cgit v1.2.3