@pnpm/merge-lockfile-changes
Advanced tools
Comparing version 4.0.3 to 5.0.0
@@ -1,2 +0,2 @@ | ||
import { Lockfile } from '@pnpm/lockfile-types'; | ||
import { type Lockfile } from '@pnpm/lockfile-types'; | ||
export declare function mergeLockfileChanges(ours: Lockfile, theirs: Lockfile): Lockfile; |
@@ -22,3 +22,3 @@ "use strict"; | ||
newLockfile.importers[importerId][key] = mergeDict(ours.importers[importerId]?.[key] ?? {}, theirs.importers[importerId]?.[key] ?? {}, mergeVersions); | ||
if (Object.keys(newLockfile.importers[importerId][key]).length === 0) { | ||
if (Object.keys(newLockfile.importers[importerId][key] ?? {}).length === 0) { | ||
delete newLockfile.importers[importerId][key]; | ||
@@ -39,3 +39,3 @@ } | ||
pkg[key] = mergeDict(ourPkg?.[key] ?? {}, theirPkg?.[key] ?? {}, mergeVersions); | ||
if (Object.keys(pkg[key]).length === 0) { | ||
if (Object.keys(pkg[key] ?? {}).length === 0) { | ||
delete pkg[key]; | ||
@@ -42,0 +42,0 @@ } |
{ | ||
"name": "@pnpm/merge-lockfile-changes", | ||
"version": "4.0.3", | ||
"version": "5.0.0", | ||
"description": "Merges lockfiles. Can automatically fix merge conflicts", | ||
@@ -8,3 +8,3 @@ "main": "lib/index.js", | ||
"engines": { | ||
"node": ">=14.6" | ||
"node": ">=16.14" | ||
}, | ||
@@ -17,3 +17,3 @@ "files": [ | ||
"keywords": [ | ||
"pnpm7", | ||
"pnpm8", | ||
"pnpm", | ||
@@ -32,3 +32,3 @@ "shrinkwrap", | ||
"semver": "^7.3.8", | ||
"@pnpm/lockfile-types": "4.3.6" | ||
"@pnpm/lockfile-types": "5.0.0" | ||
}, | ||
@@ -39,3 +39,3 @@ "funding": "https://opencollective.com/pnpm", | ||
"@types/semver": "7.3.13", | ||
"@pnpm/merge-lockfile-changes": "4.0.3" | ||
"@pnpm/merge-lockfile-changes": "5.0.0" | ||
}, | ||
@@ -46,3 +46,3 @@ "exports": { | ||
"scripts": { | ||
"lint": "eslint src/**/*.ts test/**/*.ts", | ||
"lint": "eslint \"src/**/*.ts\" \"test/**/*.ts\"", | ||
"_test": "jest", | ||
@@ -49,0 +49,0 @@ "test": "pnpm run compile && pnpm run _test", |
Sorry, the diff of this file is not supported yet
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
9061
+ Added@pnpm/lockfile-types@5.0.0(transitive)
+ Added@pnpm/types@9.0.0(transitive)
- Removed@pnpm/lockfile-types@4.3.6(transitive)
- Removed@pnpm/types@8.10.0(transitive)
Updated@pnpm/lockfile-types@5.0.0