@pnpm/lockfile.merger
Advanced tools
Comparing version 1000.0.0 to 1001.0.0
@@ -1,2 +0,2 @@ | ||
import { type Lockfile } from '@pnpm/lockfile.types'; | ||
export declare function mergeLockfileChanges(ours: Lockfile, theirs: Lockfile): Lockfile; | ||
import { type LockfileObject } from '@pnpm/lockfile.types'; | ||
export declare function mergeLockfileChanges(ours: LockfileObject, theirs: LockfileObject): LockfileObject; |
{ | ||
"name": "@pnpm/lockfile.merger", | ||
"version": "1000.0.0", | ||
"version": "1001.0.0", | ||
"description": "Merges lockfiles. Can automatically fix merge conflicts", | ||
@@ -30,4 +30,4 @@ "main": "lib/index.js", | ||
"semver": "^7.6.2", | ||
"@pnpm/types": "1000.0.0", | ||
"@pnpm/lockfile.types": "1000.0.0" | ||
"@pnpm/lockfile.types": "1001.0.0", | ||
"@pnpm/types": "1000.0.0" | ||
}, | ||
@@ -38,3 +38,3 @@ "funding": "https://opencollective.com/pnpm", | ||
"@types/semver": "7.5.3", | ||
"@pnpm/lockfile.merger": "1000.0.0" | ||
"@pnpm/lockfile.merger": "1001.0.0" | ||
}, | ||
@@ -41,0 +41,0 @@ "exports": { |
Sorry, the diff of this file is not supported yet
10102
+ Added@pnpm/lockfile.types@1001.0.0(transitive)
- Removed@pnpm/lockfile.types@1000.0.0(transitive)