@pnpm/merge-lockfile-changes
Advanced tools
Comparing version 3.0.11 to 4.0.0
import { Lockfile } from '@pnpm/lockfile-types'; | ||
export default function mergeLockfileChanges(ours: Lockfile, theirs: Lockfile): Lockfile; | ||
export declare function mergeLockfileChanges(ours: Lockfile, theirs: Lockfile): Lockfile; |
@@ -6,2 +6,3 @@ "use strict"; | ||
Object.defineProperty(exports, "__esModule", { value: true }); | ||
exports.mergeLockfileChanges = void 0; | ||
const comver_to_semver_1 = __importDefault(require("comver-to-semver")); | ||
@@ -47,3 +48,3 @@ const semver_1 = __importDefault(require("semver")); | ||
} | ||
exports.default = mergeLockfileChanges; | ||
exports.mergeLockfileChanges = mergeLockfileChanges; | ||
function mergeDict(ourDict, theirDict, valueMerger) { | ||
@@ -50,0 +51,0 @@ const newDict = {}; |
{ | ||
"name": "@pnpm/merge-lockfile-changes", | ||
"version": "3.0.11", | ||
"version": "4.0.0", | ||
"description": "Merges lockfiles. Can automatically fix merge conflicts", | ||
@@ -30,9 +30,9 @@ "main": "lib/index.js", | ||
"ramda": "npm:@pnpm/ramda@0.28.1", | ||
"semver": "^7.3.7" | ||
"semver": "^7.3.8" | ||
}, | ||
"funding": "https://opencollective.com/pnpm", | ||
"devDependencies": { | ||
"@pnpm/merge-lockfile-changes": "3.0.11", | ||
"@pnpm/merge-lockfile-changes": "4.0.0", | ||
"@types/ramda": "0.28.15", | ||
"@types/semver": "7.3.10" | ||
"@types/semver": "7.3.12" | ||
}, | ||
@@ -39,0 +39,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
9012
76
Updatedsemver@^7.3.8