mirror of
https://github.com/denoland/deno.git
synced 2024-12-23 15:49:44 -05:00
fix(npm): correct exact matching of pre-release versions (#15745)
This commit is contained in:
parent
b23e00771f
commit
fa30d05129
4 changed files with 10 additions and 9 deletions
|
@ -514,7 +514,7 @@ fn get_resolved_package_version_and_info(
|
|||
None => bail!(
|
||||
concat!(
|
||||
"Could not find npm package '{}' matching {}{}. ",
|
||||
"Try retreiving the latest npm package information by running with --reload",
|
||||
"Try retrieving the latest npm package information by running with --reload",
|
||||
),
|
||||
pkg_name,
|
||||
version_matcher.version_text(),
|
||||
|
|
|
@ -313,9 +313,7 @@ fn simple(input: &str) -> ParseResult<VersionRange> {
|
|||
}
|
||||
}
|
||||
}),
|
||||
map(partial, |partial| {
|
||||
partial.as_greater_range(VersionBoundKind::Inclusive)
|
||||
}),
|
||||
map(partial, |partial| partial.as_equal_range()),
|
||||
)(input)
|
||||
}
|
||||
|
||||
|
@ -842,6 +840,8 @@ mod tests {
|
|||
("1.0.0 - x", "1.9.7"),
|
||||
("1.x - x", "1.9.7"),
|
||||
("<=7.x", "7.9.9"),
|
||||
// additional tests
|
||||
("1.0.0-alpha.13", "1.0.0-alpha.13"),
|
||||
];
|
||||
for (req_text, version_text) in fixtures {
|
||||
let req = NpmVersionReq::parse(req_text).unwrap();
|
||||
|
|
|
@ -6,7 +6,6 @@ use monch::*;
|
|||
|
||||
use super::errors::with_failure_handling;
|
||||
use super::range::Partial;
|
||||
use super::range::VersionBoundKind;
|
||||
use super::range::VersionRange;
|
||||
use super::range::XRange;
|
||||
use super::NpmVersion;
|
||||
|
@ -57,9 +56,7 @@ fn version_range(input: &str) -> ParseResult<VersionRange> {
|
|||
map(preceded(ch('^'), partial), |partial| {
|
||||
partial.as_caret_version_range()
|
||||
}),
|
||||
map(partial, |partial| {
|
||||
partial.as_greater_range(VersionBoundKind::Inclusive)
|
||||
}),
|
||||
map(partial, |partial| partial.as_equal_range()),
|
||||
)(input)
|
||||
}
|
||||
|
||||
|
@ -186,6 +183,10 @@ mod tests {
|
|||
assert!(tester.matches("1.0.1"));
|
||||
assert!(!tester.matches("1.0.2"));
|
||||
assert!(!tester.matches("1.1.1"));
|
||||
|
||||
// pre-release
|
||||
let tester = VersionReqTester::new("1.0.0-alpha.13");
|
||||
assert!(tester.matches("1.0.0-alpha.13"));
|
||||
}
|
||||
|
||||
#[test]
|
||||
|
|
|
@ -1,2 +1,2 @@
|
|||
Download http://localhost:4545/npm/registry/mkdirp
|
||||
error: Could not find npm package 'mkdirp' matching 0.5.125. Try retreiving the latest npm package information by running with --reload
|
||||
error: Could not find npm package 'mkdirp' matching 0.5.125. Try retrieving the latest npm package information by running with --reload
|
||||
|
|
Loading…
Reference in a new issue