@pnpm/lockfile.merger 1.0.1 → 1.0.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/index.js +1 -2
- package/lib/index.js.map +1 -1
- package/package.json +4 -4
package/lib/index.js
CHANGED
|
@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.mergeLockfileChanges =
|
|
6
|
+
exports.mergeLockfileChanges = mergeLockfileChanges;
|
|
7
7
|
const comver_to_semver_1 = __importDefault(require("comver-to-semver"));
|
|
8
8
|
const semver_1 = __importDefault(require("semver"));
|
|
9
9
|
function mergeLockfileChanges(ours, theirs) {
|
|
@@ -55,7 +55,6 @@ function mergeLockfileChanges(ours, theirs) {
|
|
|
55
55
|
newLockfile.packages = packages;
|
|
56
56
|
return newLockfile;
|
|
57
57
|
}
|
|
58
|
-
exports.mergeLockfileChanges = mergeLockfileChanges;
|
|
59
58
|
function mergeDict(ourDict, theirDict, valueMerger) {
|
|
60
59
|
const newDict = {};
|
|
61
60
|
for (const key of Object.keys(ourDict).concat(Object.keys(theirDict))) {
|
package/lib/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@pnpm/lockfile.merger",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.3",
|
|
4
4
|
"description": "Merges lockfiles. Can automatically fix merge conflicts",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"types": "lib/index.d.ts",
|
|
@@ -27,14 +27,14 @@
|
|
|
27
27
|
"comver-to-semver": "^1.0.0",
|
|
28
28
|
"ramda": "npm:@pnpm/ramda@0.28.1",
|
|
29
29
|
"semver": "^7.6.2",
|
|
30
|
-
"@pnpm/lockfile.types": "1.0.
|
|
31
|
-
"@pnpm/types": "12.
|
|
30
|
+
"@pnpm/lockfile.types": "1.0.3",
|
|
31
|
+
"@pnpm/types": "12.2.0"
|
|
32
32
|
},
|
|
33
33
|
"funding": "https://opencollective.com/pnpm",
|
|
34
34
|
"devDependencies": {
|
|
35
35
|
"@types/ramda": "0.29.12",
|
|
36
36
|
"@types/semver": "7.5.3",
|
|
37
|
-
"@pnpm/lockfile.merger": "1.0.
|
|
37
|
+
"@pnpm/lockfile.merger": "1.0.3"
|
|
38
38
|
},
|
|
39
39
|
"exports": {
|
|
40
40
|
".": "./lib/index.js"
|