5 files changed, 15 insertions, 12 deletions

diff --git a/cli/tools/info.rs b/cli/tools/info.rs
index 317befcee..76c5c3880 100644
--- a/cli/tools/info.rs
+++ b/cli/tools/info.rs
@@ -10,6 +10,9 @@ use deno_core::error::AnyError;
 use deno_core::resolve_url_or_path;
 use deno_core::serde_json;
 use deno_core::serde_json::json;
+use deno_graph::npm::NpmPackageId;
+use deno_graph::npm::NpmPackageReference;
+use deno_graph::npm::NpmPackageReq;
 use deno_graph::Dependency;
 use deno_graph::Module;
 use deno_graph::ModuleGraph;
@@ -20,9 +23,6 @@ use deno_runtime::colors;
 use crate::args::Flags;
 use crate::args::InfoFlags;
 use crate::display;
-use crate::npm::NpmPackageId;
-use crate::npm::NpmPackageReference;
-use crate::npm::NpmPackageReq;
 use crate::npm::NpmPackageResolver;
 use crate::npm::NpmResolutionPackage;
 use crate::npm::NpmResolutionSnapshot;
diff --git a/cli/tools/installer.rs b/cli/tools/installer.rs
index ac83fd711..68e52d8f4 100644
--- a/cli/tools/installer.rs
+++ b/cli/tools/installer.rs
@@ -7,14 +7,15 @@ use crate::args::Flags;
 use crate::args::InstallFlags;
 use crate::args::TypeCheckMode;
 use crate::http_util::HttpClient;
-use crate::npm::NpmPackageReference;
 use crate::proc_state::ProcState;
 use crate::util::fs::canonicalize_path_maybe_not_exists;
+
 use deno_core::anyhow::Context;
 use deno_core::error::generic_error;
 use deno_core::error::AnyError;
 use deno_core::resolve_url_or_path;
 use deno_core::url::Url;
+use deno_graph::npm::NpmPackageReference;
 use log::Level;
 use once_cell::sync::Lazy;
 use regex::Regex;
diff --git a/cli/tools/repl/session.rs b/cli/tools/repl/session.rs
index 843e985e6..cf771401d 100644
--- a/cli/tools/repl/session.rs
+++ b/cli/tools/repl/session.rs
@@ -2,8 +2,8 @@
 
 use crate::colors;
 use crate::lsp::ReplLanguageServer;
-use crate::npm::NpmPackageReference;
 use crate::ProcState;
+
 use deno_ast::swc::ast as swc_ast;
 use deno_ast::swc::visit::noop_visit_type;
 use deno_ast::swc::visit::Visit;
@@ -18,6 +18,7 @@ use deno_core::futures::StreamExt;
 use deno_core::serde_json;
 use deno_core::serde_json::Value;
 use deno_core::LocalInspectorSession;
+use deno_graph::npm::NpmPackageReference;
 use deno_graph::source::Resolver;
 use deno_runtime::deno_node;
 use deno_runtime::worker::MainWorker;
diff --git a/cli/tools/run.rs b/cli/tools/run.rs
index 2d001c42b..d48946d41 100644
--- a/cli/tools/run.rs
+++ b/cli/tools/run.rs
@@ -7,6 +7,7 @@ use deno_ast::MediaType;
 use deno_ast::ModuleSpecifier;
 use deno_core::error::AnyError;
 use deno_core::resolve_url_or_path;
+use deno_graph::npm::NpmPackageReference;
 use deno_runtime::permissions::Permissions;
 use deno_runtime::permissions::PermissionsContainer;
 
@@ -14,7 +15,6 @@ use crate::args::EvalFlags;
 use crate::args::Flags;
 use crate::args::RunFlags;
 use crate::file_fetcher::File;
-use crate::npm::NpmPackageReference;
 use crate::proc_state::ProcState;
 use crate::util;
 use crate::worker::create_main_worker;
diff --git a/cli/tools/upgrade.rs b/cli/tools/upgrade.rs
index 16f88f74a..f6533f690 100644
--- a/cli/tools/upgrade.rs
+++ b/cli/tools/upgrade.rs
@@ -16,6 +16,7 @@ use deno_core::anyhow::Context;
 use deno_core::error::AnyError;
 use deno_core::futures::future::BoxFuture;
 use deno_core::futures::FutureExt;
+use deno_graph::semver::Version;
 use once_cell::sync::Lazy;
 use std::borrow::Cow;
 use std::env;
@@ -133,8 +134,8 @@ impl<TEnvironment: UpdateCheckerEnvironment> UpdateChecker<TEnvironment> {
       return None;
     }
 
-    if let Ok(current) = semver::Version::parse(&self.env.current_version()) {
-      if let Ok(latest) = semver::Version::parse(&file.latest_version) {
+    if let Ok(current) = Version::parse_standard(&self.env.current_version()) {
+      if let Ok(latest) = Version::parse_standard(&file.latest_version) {
         if current >= latest {
           return None;
         }
@@ -292,9 +293,9 @@ pub async fn upgrade(
       {
         bail!("Invalid commit hash passed");
       } else if !upgrade_flags.canary
-        && semver::Version::parse(&passed_version).is_err()
+        && Version::parse_standard(&passed_version).is_err()
       {
-        bail!("Invalid semver passed");
+        bail!("Invalid version passed");
       }
 
       let current_is_passed = if upgrade_flags.canary {
@@ -328,8 +329,8 @@ pub async fn upgrade(
         let latest_hash = latest_version.clone();
         crate::version::GIT_COMMIT_HASH == latest_hash
       } else if !crate::version::is_canary() {
-        let current = semver::Version::parse(&crate::version::deno()).unwrap();
-        let latest = semver::Version::parse(&latest_version).unwrap();
+        let current = Version::parse_standard(&crate::version::deno()).unwrap();
+        let latest = Version::parse_standard(&latest_version).unwrap();
         current >= latest
       } else {
         false