Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: upgrade to deno_semver 0.7 #148

Merged
merged 8 commits into from
Dec 20, 2024
Merged
Changes from 1 commit
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
Next Next commit
refactor: upgrade to deno_semver 0.7
  • Loading branch information
dsherret committed Dec 18, 2024
commit 2d419ddc54e5caad9fa79cd174779e4c306c2abe
70 changes: 63 additions & 7 deletions Cargo.lock

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

6 changes: 5 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -28,10 +28,14 @@ serde_json = "1.0.85"
url = { version = "2.3.1" }
import_map = { version = "0.20.0", features = ["ext"], optional = true }
thiserror = "1.0.61"
deno_semver = { version = "0.6.0", optional = true }
deno_semver = { version = "0.6.1", optional = true }
deno_package_json = { version = "0.2.1", optional = true }
deno_path_util = "0.2.0"

[dev-dependencies]
tempfile = "3.4.0"
pretty_assertions = "1.4.0"

[patch.crates-io]
deno_semver = { path = "../deno_semver" }
deno_package_json = { path = "../deno_package_json" }
2 changes: 1 addition & 1 deletion rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[toolchain]
channel = "1.78.0"
channel = "1.83.0"
components = ["rustfmt", "clippy"]
2 changes: 1 addition & 1 deletion src/workspace/mod.rs
Original file line number Diff line number Diff line change
@@ -462,7 +462,7 @@ impl Workspace {
Some(NpmPackageConfig {
workspace_dir: self.resolve_member_dir(&pkg_json.specifier()),
nv: PackageNv {
name: pkg_json.name.clone()?,
name: deno_semver::StackString::from(pkg_json.name.as_ref()?.as_str()),
version: {
let version = pkg_json.version.as_ref()?;
deno_semver::Version::parse_from_npm(version).ok()?
11 changes: 7 additions & 4 deletions src/workspace/resolver.rs
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@ use anyhow::Error as AnyError;
use deno_package_json::PackageJsonDepValue;
use deno_package_json::PackageJsonDepValueParseError;
use deno_package_json::PackageJsonDepWorkspaceReq;
use deno_package_json::PackageJsonDeps;
use deno_package_json::PackageJsonDepsRc;
use deno_package_json::PackageJsonRc;
use deno_path_util::url_from_directory_path;
use deno_path_util::url_to_file_path;
@@ -44,7 +44,7 @@ pub struct ResolverWorkspaceJsrPackage {

#[derive(Debug)]
struct PkgJsonResolverFolderConfig {
deps: PackageJsonDeps,
deps: PackageJsonDepsRc,
pkg_json: PackageJsonRc,
}

@@ -336,7 +336,7 @@ impl WorkspaceResolver {
(
dir_url.clone(),
PkgJsonResolverFolderConfig {
deps,
deps: deps.clone(),
pkg_json: pkg_json.clone(),
},
)
@@ -375,7 +375,10 @@ impl WorkspaceResolver {
new_rc(
url_from_directory_path(pkg_json.path.parent().unwrap()).unwrap(),
),
PkgJsonResolverFolderConfig { deps, pkg_json },
PkgJsonResolverFolderConfig {
deps: deps.clone(),
pkg_json,
},
)
})
.collect::<BTreeMap<_, _>>();