@yarnpkg/plugin-essentials 4.0.0-rc.27 → 4.0.0-rc.29

package/lib/commands/install.js

@@ -303,9 +303,6 @@ YarnCommand.usage = clipanion_1.Command.Usage({
             `$0 install --immutable --immutable-cache --check-cache`,
         ]],
 });
-const MERGE_CONFLICT_ANCESTOR = `|||||||`;
-const MERGE_CONFLICT_END = `>>>>>>>`;
-const MERGE_CONFLICT_SEP = `=======`;
 const MERGE_CONFLICT_START = `<<<<<<<`;
 async function autofixMergeConflicts(configuration, immutable) {
     if (!configuration.projectCwd)
@@ -318,22 +315,57 @@ async function autofixMergeConflicts(configuration, immutable) {
         return false;
     if (immutable)
         throw new core_1.ReportError(core_1.MessageName.AUTOMERGE_IMMUTABLE, `Cannot autofix a lockfile when running an immutable install`);
-    const [left, right] = getVariants(file);
-    let parsedLeft;
-    let parsedRight;
-    try {
-        parsedLeft = (0, parsers_1.parseSyml)(left);
-        parsedRight = (0, parsers_1.parseSyml)(right);
-    }
-    catch (error) {
-        throw new core_1.ReportError(core_1.MessageName.AUTOMERGE_FAILED_TO_PARSE, `The individual variants of the lockfile failed to parse`);
-    }
-    const merged = {
-        ...parsedLeft,
-        ...parsedRight,
-    };
+    const commits = await core_1.execUtils.execvp(`git`, [`rev-parse`, `MERGE_HEAD`, `HEAD`], {
+        cwd: configuration.projectCwd,
+    });
+    if (commits.code !== 0)
+        throw new core_1.ReportError(core_1.MessageName.AUTOMERGE_GIT_ERROR, `Git returned an error when trying to find the commits pertaining to the merge conflict`);
+    let variants = await Promise.all(commits.stdout.trim().split(/\n/).map(async (hash) => {
+        const content = await core_1.execUtils.execvp(`git`, [`show`, `${hash}:./${fslib_1.Filename.lockfile}`], {
+            cwd: configuration.projectCwd,
+        });
+        if (content.code !== 0)
+            throw new core_1.ReportError(core_1.MessageName.AUTOMERGE_GIT_ERROR, `Git returned an error when trying to access the lockfile content in ${hash}`);
+        try {
+            return (0, parsers_1.parseSyml)(content.stdout);
+        }
+        catch {
+            throw new core_1.ReportError(core_1.MessageName.AUTOMERGE_FAILED_TO_PARSE, `A variant of the conflicting lockfile failed to parse`);
+        }
+    }));
     // Old-style lockfiles should be filtered out (for example when switching
-    // from a Yarn 2 branch to a Yarn 1 branch). Fortunately (?), they actually
+    // from a Yarn 2 branch to a Yarn 1 branch).
+    variants = variants.filter(variant => {
+        return !!variant.__metadata;
+    });
+    for (const variant of variants) {
+        // Pre-lockfile v7, the entries weren't normalized (ie we had "foo@x.y.z"
+        // in the lockfile rather than "foo@npm:x.y.z")
+        if (variant.__metadata.version < 7) {
+            for (const key of Object.keys(variant)) {
+                if (key === `__metadata`)
+                    continue;
+                const descriptor = core_1.structUtils.parseDescriptor(key, true);
+                const normalizedDescriptor = configuration.normalizeDependency(descriptor);
+                const newKey = core_1.structUtils.stringifyDescriptor(normalizedDescriptor);
+                if (newKey !== key) {
+                    variant[newKey] = variant[key];
+                    delete variant[key];
+                }
+            }
+        }
+    }
+    const merged = Object.assign({}, ...variants);
+    // We must keep the lockfile version as small as necessary to force Yarn to
+    // refresh the merged-in lockfile metadata that may be missing.
+    merged.__metadata.version = Math.min(0, ...variants.map(variant => {
+        var _a;
+        return (_a = variant.__metadata.version) !== null && _a !== void 0 ? _a : Infinity;
+    }));
+    merged.__metadata.cacheKey = Math.min(0, ...variants.map(variant => {
+        var _a;
+        return (_a = variant.__metadata.cacheKey) !== null && _a !== void 0 ? _a : 0;
+    }));
     // parse as valid YAML except that the objects become strings. We can use
     // that to detect them. Damn, it's really ugly though.
     for (const [key, value] of Object.entries(merged))
@@ -344,52 +376,3 @@ async function autofixMergeConflicts(configuration, immutable) {
     });
     return true;
 }
-function getVariants(file) {
-    const variants = [[], []];
-    const lines = file.split(/\r?\n/g);
-    let skip = false;
-    while (lines.length > 0) {
-        const line = lines.shift();
-        if (typeof line === `undefined`)
-            throw new Error(`Assertion failed: Some lines should remain`);
-        if (line.startsWith(MERGE_CONFLICT_START)) {
-            // get the first variant
-            while (lines.length > 0) {
-                const conflictLine = lines.shift();
-                if (typeof conflictLine === `undefined`)
-                    throw new Error(`Assertion failed: Some lines should remain`);
-                if (conflictLine === MERGE_CONFLICT_SEP) {
-                    skip = false;
-                    break;
-                }
-                else if (skip || conflictLine.startsWith(MERGE_CONFLICT_ANCESTOR)) {
-                    skip = true;
-                    continue;
-                }
-                else {
-                    variants[0].push(conflictLine);
-                }
-            }
-            // get the second variant
-            while (lines.length > 0) {
-                const conflictLine = lines.shift();
-                if (typeof conflictLine === `undefined`)
-                    throw new Error(`Assertion failed: Some lines should remain`);
-                if (conflictLine.startsWith(MERGE_CONFLICT_END)) {
-                    break;
-                }
-                else {
-                    variants[1].push(conflictLine);
-                }
-            }
-        }
-        else {
-            variants[0].push(line);
-            variants[1].push(line);
-        }
-    }
-    return [
-        variants[0].join(`\n`),
-        variants[1].join(`\n`),
-    ];
-}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yarnpkg/plugin-essentials",
-  "version": "4.0.0-rc.27",
+  "version": "4.0.0-rc.29",
   "stableVersion": "3.2.3",
   "license": "BSD-2-Clause",
   "main": "./lib/index.js",
@@ -9,8 +9,8 @@
     "./package.json": "./package.json"
   },
   "dependencies": {
-    "@yarnpkg/fslib": "^3.0.0-rc.27",
-    "@yarnpkg/parsers": "^3.0.0-rc.27",
+    "@yarnpkg/fslib": "^3.0.0-rc.29",
+    "@yarnpkg/parsers": "^3.0.0-rc.29",
     "ci-info": "^3.2.0",
     "clipanion": "^3.2.0-rc.10",
     "enquirer": "^2.3.6",
@@ -21,17 +21,17 @@
     "typanion": "^3.3.0"
   },
   "peerDependencies": {
-    "@yarnpkg/cli": "^4.0.0-rc.27",
-    "@yarnpkg/core": "^4.0.0-rc.27",
-    "@yarnpkg/plugin-git": "^3.0.0-rc.27"
+    "@yarnpkg/cli": "^4.0.0-rc.29",
+    "@yarnpkg/core": "^4.0.0-rc.29",
+    "@yarnpkg/plugin-git": "^3.0.0-rc.29"
   },
   "devDependencies": {
     "@types/lodash": "^4.14.136",
     "@types/micromatch": "^4.0.1",
     "@types/semver": "^7.1.0",
-    "@yarnpkg/cli": "^4.0.0-rc.27",
-    "@yarnpkg/core": "^4.0.0-rc.27",
-    "@yarnpkg/plugin-git": "^3.0.0-rc.27"
+    "@yarnpkg/cli": "^4.0.0-rc.29",
+    "@yarnpkg/core": "^4.0.0-rc.29",
+    "@yarnpkg/plugin-git": "^3.0.0-rc.29"
   },
   "repository": {
     "type": "git",