@pnpm/merge-lockfile-changes
Advanced tools
Comparing version 6.0.0 to 6.0.1
@@ -40,3 +40,3 @@ "use strict"; | ||
const packages = {}; | ||
for (const depPath of Array.from(new Set([...Object.keys(ours.packages ?? {}), ...Object.keys(theirs.packages ?? {})]))) { | ||
for (const depPath of (Array.from(new Set([...Object.keys(ours.packages ?? {}), ...Object.keys(theirs.packages ?? {})])))) { | ||
const ourPkg = ours.packages?.[depPath]; | ||
@@ -43,0 +43,0 @@ const theirPkg = theirs.packages?.[depPath]; |
{ | ||
"name": "@pnpm/merge-lockfile-changes", | ||
"version": "6.0.0", | ||
"version": "6.0.1", | ||
"description": "Merges lockfiles. Can automatically fix merge conflicts", | ||
@@ -30,9 +30,10 @@ "main": "lib/index.js", | ||
"semver": "^7.6.0", | ||
"@pnpm/lockfile-types": "6.0.0" | ||
"@pnpm/lockfile-types": "7.0.0", | ||
"@pnpm/types": "10.1.0" | ||
}, | ||
"funding": "https://opencollective.com/pnpm", | ||
"devDependencies": { | ||
"@types/ramda": "0.28.20", | ||
"@types/ramda": "0.29.12", | ||
"@types/semver": "7.5.3", | ||
"@pnpm/merge-lockfile-changes": "6.0.0" | ||
"@pnpm/merge-lockfile-changes": "6.0.1" | ||
}, | ||
@@ -39,0 +40,0 @@ "exports": { |
Sorry, the diff of this file is not supported yet
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
10112
5
+ Added@pnpm/types@10.1.0
+ Added@pnpm/lockfile-types@7.0.0(transitive)
+ Added@pnpm/types@10.1.0(transitive)
- Removed@pnpm/lockfile-types@6.0.0(transitive)
- Removed@pnpm/types@10.0.0(transitive)
Updated@pnpm/lockfile-types@7.0.0