diff options
author | Bartek IwaĆczuk <biwanczuk@gmail.com> | 2023-05-02 02:35:33 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-05-02 02:35:33 +0200 |
commit | 2f651b2d64523bdd377d22b8b7213a04ad82f459 (patch) | |
tree | f5776da1ee7e25b70bd736bf2428c3fbb06b35a0 /ext/node/ops/require.rs | |
parent | 000315e75a20e82616a227702c98346f2b5e8b59 (diff) |
fix(npm): canonicalize filename before returning (#18948)
This commit changes how paths for npm packages are handled,
by canonicalizing them when resolving. This is done so that instead
of returning
"node_modules/<package_name>@<version>/node_modules/<dep>/index.js"
(which is a symlink) we "node_modules/<dep>@<dep_version>/index.js.
Fixes https://github.com/denoland/deno/issues/18924
Fixes https://github.com/bluwy/create-vite-extra/issues/31
---------
Co-authored-by: David Sherret <dsherret@gmail.com>
Diffstat (limited to 'ext/node/ops/require.rs')
-rw-r--r-- | ext/node/ops/require.rs | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/ext/node/ops/require.rs b/ext/node/ops/require.rs index 34eac8475..1c8647bab 100644 --- a/ext/node/ops/require.rs +++ b/ext/node/ops/require.rs @@ -287,15 +287,7 @@ where let path = PathBuf::from(request); ensure_read_permission::<Env::P>(state, &path)?; let fs = state.borrow::<Arc<dyn NodeFs>>(); - let mut canonicalized_path = fs.canonicalize(&path)?; - if cfg!(windows) { - canonicalized_path = PathBuf::from( - canonicalized_path - .display() - .to_string() - .trim_start_matches("\\\\?\\"), - ); - } + let canonicalized_path = deno_core::strip_unc_prefix(fs.canonicalize(&path)?); Ok(canonicalized_path.to_string_lossy().to_string()) } |