foster/denoland-deno
1
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2024-11-24 15:19:26 -05:00
Code Issues Packages 1 Wiki Activity

fix(npm): improve error message importing non-existent file in a node_modules npm package (#19835)

Browse source
This commit is contained in:
David Sherret 2023-07-14 13:47:15 -04:00 committed by GitHub
parent 0223ad72a9
commit b83dac3b14
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 21 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
cli/npm/resolvers/local.rs
View file

@ -14,6 +14,7 @@ use std::sync::Arc;
use crate::cache::CACHE_PERM;
use crate::npm::cache::mixed_case_package_name_decode;
use crate::util::fs::atomic_write_file;
use crate::util::fs::canonicalize_path_maybe_not_exists_with_fs;
use crate::util::fs::symlink_dir;
use crate::util::fs::LaxSingleProcessFsFlag;
use crate::util::progress_bar::ProgressBar;
@ -112,9 +113,13 @@ impl LocalNpmPackageResolver {
match self.maybe_resolve_folder_for_specifier(specifier) {
// 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.realpath_sync(&path)?))
}
Some(path) => canonicalize_path_maybe_not_exists_with_fs(&path, |path| {
self
.fs
.realpath_sync(path)
.map_err(|err| err.into_io_error())
})
.map_err(|err| err.into()),
None => bail!("could not find npm package for '{}'", specifier),
}
}

10
cli/tests/integration/npm_tests.rs
View file

@ -286,6 +286,16 @@ itest!(nonexistent_file {
exit_code: 1,
});
itest!(nonexistent_file_node_modules_dir {
// there was a bug where the message was different when using a node_modules dir
args: "run -A --quiet --node-modules-dir npm/nonexistent_file/main.js",
output: "npm/nonexistent_file/main.out",
copy_temp_dir: Some("npm/nonexistent_file/"),
envs: env_vars_for_npm_tests(),
http_server: true,
exit_code: 1,
});
itest!(invalid_package_name {
args: "run -A --quiet npm/invalid_package_name/main.js",
output: "npm/invalid_package_name/main.out",

3
cli/tests/testdata/npm/nonexistent_file/main.js vendored
View file

@ -1 +1,2 @@
import hmacSHA512 from "npm:crypto-js/hmac-sha512";
import hmacSHA512 from "npm:crypto-js/non-existent";
console.log(hmacSHA512);

2
cli/tests/testdata/npm/nonexistent_file/main.out vendored
View file

@ -1,4 +1,4 @@
error: Unable to load [WILDCARD]hmac-sha512 imported from [WILDCARD]/testdata/npm/nonexistent_file/main.js
error: Unable to load [WILDCARD]non-existent imported from [WILDCARD]main.js
Caused by:
[WILDCARD]