@pnpm/lockfile-file - npm Package Compare versions

Comparing version 7.0.4 to 7.0.5

lib/gitMergeFile.js

@@ -9,2 +9,3 @@ "use strict";
 const js_yaml_1 = __importDefault(require("js-yaml"));
+const inlineSpecifiersLockfileConverters_1 = require("./experiments/inlineSpecifiersLockfileConverters");
 const MERGE_CONFLICT_PARENT = '|||||||';
@@ -16,3 +17,3 @@ const MERGE_CONFLICT_END = '>>>>>>>';
     const { ours, theirs } = parseMergeFile(fileContent);
-    return (0, merge_lockfile_changes_1.mergeLockfileChanges)(js_yaml_1.default.load(ours), js_yaml_1.default.load(theirs));
+    return (0, merge_lockfile_changes_1.mergeLockfileChanges)((0, inlineSpecifiersLockfileConverters_1.revertFromInlineSpecifiersFormatIfNecessary)(js_yaml_1.default.load(ours)), (0, inlineSpecifiersLockfileConverters_1.revertFromInlineSpecifiersFormatIfNecessary)(js_yaml_1.default.load(theirs)));
 }
@@ -19,0 +20,0 @@ exports.autofixMergeConflicts = autofixMergeConflicts;

lib/read.js

@@ -54,6 +54,6 @@ "use strict";
     }
-    let lockfileFile;
+    let lockfile;
     let hadConflicts;
     try {
-        lockfileFile = js_yaml_1.default.load(lockfileRawContent);
+        lockfile = (0, inlineSpecifiersLockfileConverters_1.revertFromInlineSpecifiersFormatIfNecessary)(convertFromLockfileFileMutable(js_yaml_1.default.load(lockfileRawContent)));
         hadConflicts = false;
@@ -66,3 +66,3 @@ }
         hadConflicts = true;
-        lockfileFile = (0, gitMergeFile_1.autofixMergeConflicts)(lockfileRawContent);
+        lockfile = convertFromLockfileFileMutable((0, gitMergeFile_1.autofixMergeConflicts)(lockfileRawContent));
         logger_1.lockfileLogger.info({
@@ -73,4 +73,3 @@ message: `Merge conflict detected in ${constants_1.WANTED_LOCKFILE} and successfully merged`,
     }
-    if (lockfileFile) {
-        const lockfile = (0, inlineSpecifiersLockfileConverters_1.revertFromInlineSpecifiersFormatIfNecessary)(convertFromLockfileFileMutable(lockfileFile));
+    if (lockfile) {
         const lockfileSemver = (0, comver_to_semver_1.default)((lockfile.lockfileVersion ?? 0).toString());
@@ -77,0 +76,0 @@ /* eslint-enable @typescript-eslint/dot-notation */

package.json

 {
   "name": "@pnpm/lockfile-file",
-  "version": "7.0.4",
+  "version": "7.0.5",
   "description": "Read/write pnpm-lock.yaml files",
@@ -38,3 +38,3 @@ "main": "lib/index.js",
     "yaml-tag": "1.1.0",
-    "@pnpm/lockfile-file": "7.0.4"
+    "@pnpm/lockfile-file": "7.0.5"
   },
@@ -65,3 +65,3 @@ "dependencies": {
   "scripts": {
-    "lint": "eslint src/**/*.ts test/**/*.ts",
+    "lint": "eslint \"src/**/*.ts\" \"test/**/*.ts\"",
     "_test": "jest",
@@ -68,0 +68,0 @@ "test": "pnpm run compile && pnpm run _test",

No alert changes

Improved metrics

Total package byte prevSize

84021

increased by0.37%

Lines of code

1076

increased by0.09%

No dependency changes