summaryrefslogtreecommitdiff
path: root/ext/node/errors.rs
diff options
context:
space:
mode:
authorDavid Sherret <dsherret@users.noreply.github.com>2022-08-30 14:09:22 -0400
committerGitHub <noreply@github.com>2022-08-30 14:09:22 -0400
commit5f251b283b3532849862c7fdf4b91f0f9ed68829 (patch)
tree1552b9525162048ab962d7d33d4be29986bd540f /ext/node/errors.rs
parent54be07d05e4c763dfa1b612decc58fa234aa9c88 (diff)
fix(npm): prefer importing esm from esm (#15676)
Diffstat (limited to 'ext/node/errors.rs')
-rw-r--r--ext/node/errors.rs10
1 files changed, 5 insertions, 5 deletions
diff --git a/ext/node/errors.rs b/ext/node/errors.rs
index 8d1822f7b..9dc6c7e7e 100644
--- a/ext/node/errors.rs
+++ b/ext/node/errors.rs
@@ -56,7 +56,7 @@ pub fn err_invalid_package_target(
key: String,
target: String,
is_import: bool,
- maybe_base: Option<String>,
+ maybe_referrer: Option<String>,
) -> AnyError {
let rel_error = !is_import && !target.is_empty() && !target.starts_with("./");
let mut msg = "[ERR_INVALID_PACKAGE_TARGET]".to_string();
@@ -69,7 +69,7 @@ pub fn err_invalid_package_target(
msg = format!("{} Invalid \"{}\" target {} defined for '{}' in the package config {}package.json", msg, ie, target, key, pkg_path)
};
- if let Some(base) = maybe_base {
+ if let Some(base) = maybe_referrer {
msg = format!("{} imported from {}", msg, base);
};
if rel_error {
@@ -82,7 +82,7 @@ pub fn err_invalid_package_target(
pub fn err_package_path_not_exported(
pkg_path: String,
subpath: String,
- maybe_base: Option<String>,
+ maybe_referrer: Option<String>,
) -> AnyError {
let mut msg = "[ERR_PACKAGE_PATH_NOT_EXPORTED]".to_string();
@@ -95,8 +95,8 @@ pub fn err_package_path_not_exported(
msg = format!("{} Package subpath \'{}\' is not defined by \"exports\" in {}package.json", msg, subpath, pkg_path);
};
- if let Some(base) = maybe_base {
- msg = format!("{} imported from {}", msg, base);
+ if let Some(referrer) = maybe_referrer {
+ msg = format!("{} imported from {}", msg, referrer);
}
generic_error(msg)