@pnpm/hooks.read-package-hook 3.0.4 → 3.0.6
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.
|
@@ -10,7 +10,7 @@ const partition_1 = __importDefault(require("ramda/src/partition"));
|
|
|
10
10
|
const error_1 = require("@pnpm/error");
|
|
11
11
|
const parse_overrides_1 = require("@pnpm/parse-overrides");
|
|
12
12
|
const normalize_path_1 = __importDefault(require("normalize-path"));
|
|
13
|
-
const
|
|
13
|
+
const isIntersectingRange_1 = require("./isIntersectingRange");
|
|
14
14
|
function createVersionsOverrider(overrides, rootDir) {
|
|
15
15
|
const parsedOverrides = tryParseOverrides(overrides);
|
|
16
16
|
const [versionOverrides, genericVersionOverrides] = (0, partition_1.default)(({ parentPkg }) => parentPkg != null, parsedOverrides
|
|
@@ -55,11 +55,13 @@ function overrideDepsOfPkg({ manifest, dir }, versionOverrides, genericVersionOv
|
|
|
55
55
|
overrideDeps(versionOverrides, genericVersionOverrides, manifest.optionalDependencies, dir);
|
|
56
56
|
if (manifest.devDependencies != null)
|
|
57
57
|
overrideDeps(versionOverrides, genericVersionOverrides, manifest.devDependencies, dir);
|
|
58
|
+
if (manifest.peerDependencies != null)
|
|
59
|
+
overrideDeps(versionOverrides, genericVersionOverrides, manifest.peerDependencies, dir);
|
|
58
60
|
}
|
|
59
61
|
function overrideDeps(versionOverrides, genericVersionOverrides, deps, dir) {
|
|
60
62
|
for (const [name, pref] of Object.entries(deps)) {
|
|
61
|
-
const versionOverride = pickMostSpecificVersionOverride(versionOverrides.filter(({ targetPkg }) => targetPkg.name === name && (0,
|
|
62
|
-
pickMostSpecificVersionOverride(genericVersionOverrides.filter(({ targetPkg }) => targetPkg.name === name && (0,
|
|
63
|
+
const versionOverride = pickMostSpecificVersionOverride(versionOverrides.filter(({ targetPkg }) => targetPkg.name === name && (0, isIntersectingRange_1.isIntersectingRange)(targetPkg.pref, pref))) ??
|
|
64
|
+
pickMostSpecificVersionOverride(genericVersionOverrides.filter(({ targetPkg }) => targetPkg.name === name && (0, isIntersectingRange_1.isIntersectingRange)(targetPkg.pref, pref)));
|
|
63
65
|
if (!versionOverride)
|
|
64
66
|
continue;
|
|
65
67
|
if (versionOverride.linkTarget && dir) {
|
|
@@ -74,6 +76,6 @@ function overrideDeps(versionOverrides, genericVersionOverrides, deps, dir) {
|
|
|
74
76
|
}
|
|
75
77
|
}
|
|
76
78
|
function pickMostSpecificVersionOverride(versionOverrides) {
|
|
77
|
-
return versionOverrides.sort((a, b) => (0,
|
|
79
|
+
return versionOverrides.sort((a, b) => (0, isIntersectingRange_1.isIntersectingRange)(b.targetPkg.pref ?? '', a.targetPkg.pref ?? '') ? -1 : 1)[0];
|
|
78
80
|
}
|
|
79
81
|
//# sourceMappingURL=createVersionsOverrider.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createVersionsOverrider.js","sourceRoot":"","sources":["../src/createVersionsOverrider.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAuB;AACvB,oDAA2B;AAC3B,oEAA2C;AAE3C,uCAAuC;AACvC,2DAAsD;AACtD,oEAA0C;AAC1C
|
|
1
|
+
{"version":3,"file":"createVersionsOverrider.js","sourceRoot":"","sources":["../src/createVersionsOverrider.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export declare function isIntersectingRange(range1: string | undefined, range2: string): boolean;
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.isIntersectingRange = void 0;
|
|
7
|
+
const semver_1 = __importDefault(require("semver"));
|
|
8
|
+
function isIntersectingRange(range1, range2) {
|
|
9
|
+
return !range1 ||
|
|
10
|
+
range2 === range1 ||
|
|
11
|
+
semver_1.default.validRange(range2) != null &&
|
|
12
|
+
semver_1.default.validRange(range1) != null &&
|
|
13
|
+
semver_1.default.intersects(range2, range1);
|
|
14
|
+
}
|
|
15
|
+
exports.isIntersectingRange = isIntersectingRange;
|
|
16
|
+
//# sourceMappingURL=isIntersectingRange.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"isIntersectingRange.js","sourceRoot":"","sources":["../src/isIntersectingRange.ts"],"names":[],"mappings":";;;;;;AAAA,oDAA2B;AAE3B,SAAgB,mBAAmB,CAAE,MAA0B,EAAE,MAAc;IAC7E,OAAO,CAAC,MAAM;QACZ,MAAM,KAAK,MAAM;QACjB,gBAAM,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,IAAI;YACjC,gBAAM,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,IAAI;YACjC,gBAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;AACrC,CAAC;AAND,kDAMC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@pnpm/hooks.read-package-hook",
|
|
3
|
-
"version": "3.0.
|
|
3
|
+
"version": "3.0.6",
|
|
4
4
|
"description": "Creates the default package reader hook used by pnpm",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"types": "lib/index.d.ts",
|
|
@@ -36,7 +36,7 @@
|
|
|
36
36
|
"@types/ramda": "0.28.20",
|
|
37
37
|
"@types/semver": "7.3.13",
|
|
38
38
|
"@yarnpkg/core": "4.0.0-rc.45",
|
|
39
|
-
"@pnpm/hooks.read-package-hook": "3.0.
|
|
39
|
+
"@pnpm/hooks.read-package-hook": "3.0.6"
|
|
40
40
|
},
|
|
41
41
|
"funding": "https://opencollective.com/pnpm",
|
|
42
42
|
"exports": {
|