summaryrefslogtreecommitdiff
path: root/cli/npm/resolvers/local.rs
diff options
context:
space:
mode:
authorBartek IwaƄczuk <biwanczuk@gmail.com>2023-05-02 02:35:33 +0200
committerGitHub <noreply@github.com>2023-05-02 02:35:33 +0200
commit2f651b2d64523bdd377d22b8b7213a04ad82f459 (patch)
treef5776da1ee7e25b70bd736bf2428c3fbb06b35a0 /cli/npm/resolvers/local.rs
parent000315e75a20e82616a227702c98346f2b5e8b59 (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 'cli/npm/resolvers/local.rs')
-rw-r--r--cli/npm/resolvers/local.rs6
1 files changed, 5 insertions, 1 deletions
diff --git a/cli/npm/resolvers/local.rs b/cli/npm/resolvers/local.rs
index f5385c2f1..b4cf5af27 100644
--- a/cli/npm/resolvers/local.rs
+++ b/cli/npm/resolvers/local.rs
@@ -91,7 +91,11 @@ impl LocalNpmPackageResolver {
specifier: &ModuleSpecifier,
) -> Result<PathBuf, AnyError> {
match self.maybe_resolve_folder_for_specifier(specifier) {
- Some(path) => Ok(path),
+ // Canonicalize the path so it's not pointing to the symlinked directory
+ // in `node_modules` directory of the referrer.
+ Some(path) => {
+ Ok(deno_core::strip_unc_prefix(self.fs.canonicalize(&path)?))
+ }
None => bail!("could not find npm package for '{}'", specifier),
}
}