@pnpm/lockfile-file - npm Package Compare versions

Comparing version 0.0.0-20201030124 to 0.0.0-20201060511

CHANGELOG.md

 # @pnpm/lockfile-file
 
-## 0.0.0-20201030124
+## 0.0.0-20201060511
 
 ### Minor Changes
 
-- 67f7c15c3: New function added that reads the lockfile and autofixes any merge conflicts.
+- 3776b5a52: New function added that reads the lockfile and autofixes any merge conflicts.
 
 ### Patch Changes
 
-- Updated dependencies [37fffbefa]
-  - @pnpm/merge-lockfiles@0.0.0-20201030124
+- Updated dependencies [3776b5a52]
+  - @pnpm/merge-lockfile-changes@0.0.0-20201060511
 
@@ -14,0 +14,0 @@ ## 3.0.18

lib/gitMergeFile.js

@@ -7,3 +7,3 @@ "use strict";
 exports.isDiff = exports.autofixMergeConflicts = void 0;
-const merge_lockfiles_1 = __importDefault(require("@pnpm/merge-lockfiles"));
+const merge_lockfile_changes_1 = __importDefault(require("@pnpm/merge-lockfile-changes"));
 const yaml = require("js-yaml");
@@ -16,8 +16,3 @@ const MERGE_CONFLICT_PARENT = '|||||||';
     const { ours, theirs } = parseMergeFile(fileContent);
-    const oursParsed = yaml.safeLoad(ours);
-    return merge_lockfiles_1.default({
-        base: oursParsed,
-        ours: oursParsed,
-        theirs: yaml.safeLoad(theirs),
-    });
+    return merge_lockfile_changes_1.default(yaml.safeLoad(ours), yaml.safeLoad(theirs));
 }
@@ -30,3 +25,2 @@ exports.autofixMergeConflicts = autofixMergeConflicts;
     const theirs = [];
-    const base = [];
     while (lines.length > 0) {
@@ -54,6 +48,4 @@ const line = lines.shift();
             theirs.push(line);
-        if (state === 'top' || state === 'parent')
-            base.push(line);
     }
-    return { ours: ours.join('\n'), theirs: theirs.join('\n'), base: base.join('\n') };
+    return { ours: ours.join('\n'), theirs: theirs.join('\n') };
 }
@@ -60,0 +52,0 @@ function isDiff(fileContent) {

package.json

 {
 	"name": "@pnpm/lockfile-file",
-	"version": "0.0.0-20201030124",
+	"version": "0.0.0-20201060511",
 	"description": "Read/write pnpm-lock.yaml files",
@@ -52,3 +52,3 @@ "main": "lib/index.js",
 		"@pnpm/lockfile-types": "2.1.1",
-		"@pnpm/merge-lockfiles": "^0.0.0-20201030124",
+		"@pnpm/merge-lockfile-changes": "^0.0.0-20201060511",
 		"@pnpm/types": "6.3.1",
@@ -55,0 +55,0 @@ "@zkochan/rimraf": "^1.0.0",

No alert changes

Worsened metrics

Total package byte prevSize

26913

decreased by-0.7%

Lines of code

473

decreased by-1.66%

Dependency changes

• + Added@pnpm/merge-lockfile-changes@^0.0.0-20201060511

• + Added@pnpm/merge-lockfile-changes@0.0.0-20201060511(transitive)

• - Removed@pnpm/merge-lockfiles@^0.0.0-20201030124

• - Removed@pnpm/merge-lockfiles@0.0.0-20201030124(transitive)