Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 29 additions & 1 deletion cli/tools/pm/deps.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ use deno_core::futures::future::try_join;
use deno_core::futures::stream::FuturesOrdered;
use deno_core::futures::stream::FuturesUnordered;
use deno_core::serde_json;
use deno_npm::registry::NpmPackageInfo;
use deno_package_json::PackageJsonDepsMap;
use deno_package_json::PackageJsonRc;
use deno_runtime::deno_permissions::PermissionsContainer;
Expand Down Expand Up @@ -714,13 +715,29 @@ impl DepManager {
async {
let semver_req = &dep.req;
let _permit = npm_sema.acquire().await;
let semver_compatible =
let mut semver_compatible =
self.npm_fetch_resolver.req_to_nv(semver_req).await;
let info =
self.npm_fetch_resolver.package_info(&semver_req.name).await;
let latest = info
.and_then(|info| {
let latest_tag = info.dist_tags.get("latest")?;

// see https://github.com/denoland/deno_npm/blob/722fbecb5bdbd93241e5fc774cc1deaebd40365b/src/resolution/common.rs#L117-L125
let can_use_latest = npm_version_satisfies(
latest_tag,
&semver_req.version_req,
&info,
);

if can_use_latest {
semver_compatible = Some(PackageNv {
name: semver_req.name.clone(),
version: latest_tag.clone(),
});
return Some(latest_tag.clone());
}

let lower_bound = &semver_compatible.as_ref()?.version;
if latest_tag >= lower_bound {
Some(latest_tag.clone())
Expand Down Expand Up @@ -930,6 +947,17 @@ impl DepManager {
}
}

fn npm_version_satisfies(
version: &Version,
version_req: &VersionReq,
npm_info: &NpmPackageInfo,
) -> bool {
if let Some(tag) = version_req.tag() {
return npm_info.dist_tags.get(tag) == Some(version);
}
version_req.matches(version)
}

fn get_or_create_updater<'a>(
config_updaters: &'a mut HashMap<std::path::PathBuf, ConfigUpdater>,
location: &DepLocation,
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"name": "@denotest/pre-release-with-nightlies",
"version": "1.0.0-beta.13"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"name": "@denotest/pre-release-with-nightlies",
"version": "1.0.0-beta.32",
"dependencies": {
},
"publishConfig": {
"tag": "latest"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"name": "@denotest/pre-release-with-nightlies",
"version": "1.0.0-beta.9-commit.d91dfb5",
"dependencies": {
},
"publishConfig": {
"tag": "nightly"
}
}
17 changes: 17 additions & 0 deletions tests/specs/outdated/pre_release_latest_tag/__test__.jsonc
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"tempDir": true,
"steps": [
{
"args": "install",
"output": "[WILDCARD]"
},
{
"args": "outdated",
"output": "outdated.out"
},
{
"args": "update",
"output": "update.out"
}
]
}
5 changes: 5 additions & 0 deletions tests/specs/outdated/pre_release_latest_tag/deno.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"imports": {
"@denotest/pre-release-with-nightlies": "npm:@denotest/pre-release-with-nightlies@^1.0.0-beta.13"
}
}
17 changes: 17 additions & 0 deletions tests/specs/outdated/pre_release_latest_tag/deno.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions tests/specs/outdated/pre_release_latest_tag/outdated.out
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
┌──────────────────────────────────────────┬───────────────┬───────────────┬───────────────┐
│ Package │ Current │ Update │ Latest │
├──────────────────────────────────────────┼───────────────┼───────────────┼───────────────┤
│ npm:@denotest/pre-release-with-nightlies │ 1.0.0-beta.13 │ 1.0.0-beta.32 │ 1.0.0-beta.32 │
└──────────────────────────────────────────┴───────────────┴───────────────┴───────────────┘

Run deno update --latest to update to the latest available versions,
or deno outdated --help for more information.
3 changes: 3 additions & 0 deletions tests/specs/outdated/pre_release_latest_tag/update.out
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Download http://localhost:4260/@denotest/pre-release-with-nightlies/1.0.0-beta.32.tgz
Updated 1 dependency:
- npm:@denotest/pre-release-with-nightlies ^1.0.0-beta.13 -> ^1.0.0-beta.32
Loading