@yarnpkg/plugin-essentials 4.0.0-rc.30 → 4.0.0-rc.32
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/commands/install.js +12 -2
- package/package.json +9 -9
package/lib/commands/install.js
CHANGED
|
@@ -315,11 +315,21 @@ async function autofixMergeConflicts(configuration, immutable) {
|
|
|
315
315
|
return false;
|
|
316
316
|
if (immutable)
|
|
317
317
|
throw new core_1.ReportError(core_1.MessageName.AUTOMERGE_IMMUTABLE, `Cannot autofix a lockfile when running an immutable install`);
|
|
318
|
-
|
|
318
|
+
let commits = await core_1.execUtils.execvp(`git`, [`rev-parse`, `MERGE_HEAD`, `HEAD`], {
|
|
319
319
|
cwd: configuration.projectCwd,
|
|
320
320
|
});
|
|
321
|
+
if (commits.code !== 0) {
|
|
322
|
+
commits = await core_1.execUtils.execvp(`git`, [`rev-parse`, `REBASE_HEAD`, `HEAD`], {
|
|
323
|
+
cwd: configuration.projectCwd,
|
|
324
|
+
});
|
|
325
|
+
}
|
|
326
|
+
if (commits.code !== 0) {
|
|
327
|
+
commits = await core_1.execUtils.execvp(`git`, [`rev-parse`, `CHERRY_PICK_HEAD`, `HEAD`], {
|
|
328
|
+
cwd: configuration.projectCwd,
|
|
329
|
+
});
|
|
330
|
+
}
|
|
321
331
|
if (commits.code !== 0)
|
|
322
|
-
throw new core_1.ReportError(core_1.MessageName.AUTOMERGE_GIT_ERROR, `Git returned an error when trying to find the commits pertaining to the
|
|
332
|
+
throw new core_1.ReportError(core_1.MessageName.AUTOMERGE_GIT_ERROR, `Git returned an error when trying to find the commits pertaining to the conflict`);
|
|
323
333
|
let variants = await Promise.all(commits.stdout.trim().split(/\n/).map(async (hash) => {
|
|
324
334
|
const content = await core_1.execUtils.execvp(`git`, [`show`, `${hash}:./${fslib_1.Filename.lockfile}`], {
|
|
325
335
|
cwd: configuration.projectCwd,
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@yarnpkg/plugin-essentials",
|
|
3
|
-
"version": "4.0.0-rc.
|
|
3
|
+
"version": "4.0.0-rc.32",
|
|
4
4
|
"stableVersion": "3.2.3",
|
|
5
5
|
"license": "BSD-2-Clause",
|
|
6
6
|
"main": "./lib/index.js",
|
|
@@ -9,8 +9,8 @@
|
|
|
9
9
|
"./package.json": "./package.json"
|
|
10
10
|
},
|
|
11
11
|
"dependencies": {
|
|
12
|
-
"@yarnpkg/fslib": "^3.0.0-rc.
|
|
13
|
-
"@yarnpkg/parsers": "^3.0.0-rc.
|
|
12
|
+
"@yarnpkg/fslib": "^3.0.0-rc.32",
|
|
13
|
+
"@yarnpkg/parsers": "^3.0.0-rc.32",
|
|
14
14
|
"ci-info": "^3.2.0",
|
|
15
15
|
"clipanion": "^3.2.0-rc.10",
|
|
16
16
|
"enquirer": "^2.3.6",
|
|
@@ -21,17 +21,17 @@
|
|
|
21
21
|
"typanion": "^3.3.0"
|
|
22
22
|
},
|
|
23
23
|
"peerDependencies": {
|
|
24
|
-
"@yarnpkg/cli": "^4.0.0-rc.
|
|
25
|
-
"@yarnpkg/core": "^4.0.0-rc.
|
|
26
|
-
"@yarnpkg/plugin-git": "^3.0.0-rc.
|
|
24
|
+
"@yarnpkg/cli": "^4.0.0-rc.32",
|
|
25
|
+
"@yarnpkg/core": "^4.0.0-rc.32",
|
|
26
|
+
"@yarnpkg/plugin-git": "^3.0.0-rc.32"
|
|
27
27
|
},
|
|
28
28
|
"devDependencies": {
|
|
29
29
|
"@types/lodash": "^4.14.136",
|
|
30
30
|
"@types/micromatch": "^4.0.1",
|
|
31
31
|
"@types/semver": "^7.1.0",
|
|
32
|
-
"@yarnpkg/cli": "^4.0.0-rc.
|
|
33
|
-
"@yarnpkg/core": "^4.0.0-rc.
|
|
34
|
-
"@yarnpkg/plugin-git": "^3.0.0-rc.
|
|
32
|
+
"@yarnpkg/cli": "^4.0.0-rc.32",
|
|
33
|
+
"@yarnpkg/core": "^4.0.0-rc.32",
|
|
34
|
+
"@yarnpkg/plugin-git": "^3.0.0-rc.32"
|
|
35
35
|
},
|
|
36
36
|
"repository": {
|
|
37
37
|
"type": "git",
|