@yarnpkg/plugin-essentials 4.0.0-rc.45 → 4.0.0-rc.46
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 +6 -6
- package/package.json +11 -11
package/lib/commands/install.js
CHANGED
|
@@ -376,14 +376,14 @@ async function autofixMergeConflicts(configuration, immutable) {
|
|
|
376
376
|
const merged = Object.assign({}, ...variants);
|
|
377
377
|
// We must keep the lockfile version as small as necessary to force Yarn to
|
|
378
378
|
// refresh the merged-in lockfile metadata that may be missing.
|
|
379
|
-
merged.__metadata.version = Math.min(
|
|
379
|
+
merged.__metadata.version = `${Math.min(...variants.map(variant => {
|
|
380
380
|
var _a;
|
|
381
|
-
return (_a = variant.__metadata.version) !== null && _a !== void 0 ? _a :
|
|
382
|
-
}))
|
|
383
|
-
merged.__metadata.cacheKey = Math.min(
|
|
381
|
+
return parseInt((_a = variant.__metadata.version) !== null && _a !== void 0 ? _a : 0);
|
|
382
|
+
}))}`;
|
|
383
|
+
merged.__metadata.cacheKey = `${Math.min(...variants.map(variant => {
|
|
384
384
|
var _a;
|
|
385
|
-
return (_a = variant.__metadata.cacheKey) !== null && _a !== void 0 ? _a : 0;
|
|
386
|
-
}))
|
|
385
|
+
return parseInt((_a = variant.__metadata.cacheKey) !== null && _a !== void 0 ? _a : 0);
|
|
386
|
+
}))}`;
|
|
387
387
|
// parse as valid YAML except that the objects become strings. We can use
|
|
388
388
|
// that to detect them. Damn, it's really ugly though.
|
|
389
389
|
for (const [key, value] of Object.entries(merged))
|
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.46",
|
|
4
4
|
"stableVersion": "3.3.0",
|
|
5
5
|
"license": "BSD-2-Clause",
|
|
6
6
|
"main": "./lib/index.js",
|
|
@@ -9,29 +9,29 @@
|
|
|
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.46",
|
|
13
|
+
"@yarnpkg/parsers": "^3.0.0-rc.46",
|
|
14
14
|
"ci-info": "^3.2.0",
|
|
15
|
-
"clipanion": "^3.2.
|
|
15
|
+
"clipanion": "^3.2.1",
|
|
16
16
|
"enquirer": "^2.3.6",
|
|
17
17
|
"lodash": "^4.17.15",
|
|
18
18
|
"micromatch": "^4.0.2",
|
|
19
19
|
"semver": "^7.1.2",
|
|
20
20
|
"tslib": "^2.4.0",
|
|
21
|
-
"typanion": "^3.
|
|
21
|
+
"typanion": "^3.12.1"
|
|
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.46",
|
|
25
|
+
"@yarnpkg/core": "^4.0.0-rc.46",
|
|
26
|
+
"@yarnpkg/plugin-git": "^3.0.0-rc.46"
|
|
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.46",
|
|
33
|
+
"@yarnpkg/core": "^4.0.0-rc.46",
|
|
34
|
+
"@yarnpkg/plugin-git": "^3.0.0-rc.46"
|
|
35
35
|
},
|
|
36
36
|
"repository": {
|
|
37
37
|
"type": "git",
|