这是indexloc提供的服务，不要输入任何密码
Skip to content

fix(lockfile): Fix directory resolution variant #5551

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.

Sign up for GitHub

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

Merged
merged 5 commits into from
Jul 18, 2023
Merged

fix(lockfile): Fix directory resolution variant #5551

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4917ba4
make pnpm package resolution parsing unstructured
Jul 17, 2023
ac9446b
keep structure, but fixup misname
Jul 17, 2023
3d89b8d
Merge branch 'main' into olszewski/fix_pnpm_resolution_definition
chris-olszewski Jul 18, 2023
d85eee3
remove old comment
Jul 18, 2023
2b81399
Merge branch 'main' into olszewski/fix_pnpm_resolution_definition
chris-olszewski Jul 18, 2023
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
40 changes: 38 additions & 2 deletions crates/turborepo-lockfiles/src/pnpm/data.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@ pub struct Dependency {
#[derive(Debug, Serialize, Deserialize, PartialEq, Eq, Clone)]
#[serde(rename_all = "camelCase")]
pub struct PackageSnapshot {
// can we make this flow?/is it necessary?
resolution: PackageResolution,
#[serde(skip_serializing_if = "Option::is_none")]
id: Option<String>,
Expand Down Expand Up @@ -113,14 +112,21 @@ pub struct DependenciesMeta {

#[derive(Debug, Serialize, Deserialize, PartialEq, Eq, Clone)]
pub struct PackageResolution {
// Type field, cannot use serde(tag) due to tarball having an empty type field
// tarball -> none
// directory -> 'directory'
// git repository -> 'git'
#[serde(rename = "type", skip_serializing_if = "Option::is_none")]
type_field: Option<String>,
// Tarball fields
#[serde(skip_serializing_if = "Option::is_none")]
integrity: Option<String>,
#[serde(skip_serializing_if = "Option::is_none")]
tarball: Option<String>,
// Directory fields
#[serde(skip_serializing_if = "Option::is_none")]
dir: Option<String>,
directory: Option<String>,
// Git repository fields
#[serde(skip_serializing_if = "Option::is_none")]
repo: Option<String>,
#[serde(skip_serializing_if = "Option::is_none")]
Expand Down Expand Up @@ -792,4 +798,34 @@ mod tests {
],
);
}

#[test]
fn test_injected_package_round_trip() {
let original_contents = "a:
resolution:
type: directory,
directory: packages/ui,
name: ui
version: 0.0.0
dev: false
b:
resolution:
integrity: deadbeef,
tarball: path/to/tarball.tar.gz,
name: tar
version: 0.0.0
dev: false
c:
resolution:
repo: great-repo.git,
commit: greatcommit,
name: git
version: 0.0.0
dev: false
";
let original_parsed: Map<String, PackageSnapshot> =
serde_yaml::from_str(original_contents).unwrap();
let contents = serde_yaml::to_string(&original_parsed).unwrap();
assert_eq!(original_contents, &contents);
}
}