@pnpm/hooks.read-package-hook 1000.0.3 → 1000.0.5
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.
|
@@ -7,6 +7,7 @@ exports.createVersionsOverrider = createVersionsOverrider;
|
|
|
7
7
|
const path_1 = __importDefault(require("path"));
|
|
8
8
|
const semver_1 = __importDefault(require("semver"));
|
|
9
9
|
const partition_1 = __importDefault(require("ramda/src/partition"));
|
|
10
|
+
const semver_peer_range_1 = require("@pnpm/semver.peer-range");
|
|
10
11
|
const normalize_path_1 = __importDefault(require("normalize-path"));
|
|
11
12
|
const isIntersectingRange_1 = require("./isIntersectingRange");
|
|
12
13
|
function createVersionsOverrider(overrides, rootDir) {
|
|
@@ -41,27 +42,42 @@ function createLocalTarget(override, rootDir) {
|
|
|
41
42
|
}
|
|
42
43
|
function overrideDepsOfPkg({ manifest, dir }, versionOverrides, genericVersionOverrides) {
|
|
43
44
|
const { dependencies, optionalDependencies, devDependencies, peerDependencies } = manifest;
|
|
44
|
-
|
|
45
|
+
const _overrideDeps = overrideDeps.bind(null, { versionOverrides, genericVersionOverrides, dir });
|
|
46
|
+
for (const deps of [dependencies, optionalDependencies, devDependencies]) {
|
|
45
47
|
if (deps) {
|
|
46
|
-
|
|
48
|
+
_overrideDeps(deps, undefined);
|
|
47
49
|
}
|
|
48
50
|
}
|
|
51
|
+
if (peerDependencies) {
|
|
52
|
+
if (!manifest.dependencies)
|
|
53
|
+
manifest.dependencies = {};
|
|
54
|
+
_overrideDeps(manifest.dependencies, peerDependencies);
|
|
55
|
+
}
|
|
49
56
|
}
|
|
50
|
-
function overrideDeps(versionOverrides, genericVersionOverrides, deps,
|
|
51
|
-
for (const [name, pref] of Object.entries(deps)) {
|
|
57
|
+
function overrideDeps({ versionOverrides, genericVersionOverrides, dir }, deps, peerDeps) {
|
|
58
|
+
for (const [name, pref] of Object.entries(peerDeps ?? deps)) {
|
|
52
59
|
const versionOverride = pickMostSpecificVersionOverride(versionOverrides.filter(({ targetPkg }) => targetPkg.name === name && (0, isIntersectingRange_1.isIntersectingRange)(targetPkg.pref, pref))) ??
|
|
53
60
|
pickMostSpecificVersionOverride(genericVersionOverrides.filter(({ targetPkg }) => targetPkg.name === name && (0, isIntersectingRange_1.isIntersectingRange)(targetPkg.pref, pref)));
|
|
54
61
|
if (!versionOverride)
|
|
55
62
|
continue;
|
|
56
63
|
if (versionOverride.newPref === '-') {
|
|
57
|
-
|
|
64
|
+
if (peerDeps) {
|
|
65
|
+
delete peerDeps[versionOverride.targetPkg.name];
|
|
66
|
+
}
|
|
67
|
+
else {
|
|
68
|
+
delete deps[versionOverride.targetPkg.name];
|
|
69
|
+
}
|
|
58
70
|
continue;
|
|
59
71
|
}
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
72
|
+
const newPref = versionOverride.localTarget
|
|
73
|
+
? `${versionOverride.localTarget.protocol}${resolveLocalOverride(versionOverride.localTarget, dir)}`
|
|
74
|
+
: versionOverride.newPref;
|
|
75
|
+
if (peerDeps == null || !(0, semver_peer_range_1.isValidPeerRange)(newPref)) {
|
|
76
|
+
deps[versionOverride.targetPkg.name] = newPref;
|
|
77
|
+
}
|
|
78
|
+
else if ((0, semver_peer_range_1.isValidPeerRange)(newPref)) {
|
|
79
|
+
peerDeps[versionOverride.targetPkg.name] = newPref;
|
|
63
80
|
}
|
|
64
|
-
deps[versionOverride.targetPkg.name] = versionOverride.newPref;
|
|
65
81
|
}
|
|
66
82
|
}
|
|
67
83
|
function resolveLocalOverride({ specifiedViaRelativePath, absolutePath }, pkgDir) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createVersionsOverrider.js","sourceRoot":"","sources":["../src/createVersionsOverrider.ts"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"createVersionsOverrider.js","sourceRoot":"","sources":["../src/createVersionsOverrider.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@pnpm/hooks.read-package-hook",
|
|
3
|
-
"version": "1000.0.
|
|
3
|
+
"version": "1000.0.5",
|
|
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",
|
|
@@ -26,17 +26,18 @@
|
|
|
26
26
|
"ramda": "npm:@pnpm/ramda@0.28.1",
|
|
27
27
|
"semver": "^7.6.2",
|
|
28
28
|
"@pnpm/error": "1000.0.2",
|
|
29
|
+
"@pnpm/matcher": "1000.0.0",
|
|
29
30
|
"@pnpm/parse-overrides": "1000.0.2",
|
|
30
31
|
"@pnpm/parse-wanted-dependency": "1000.0.0",
|
|
31
|
-
"@pnpm/
|
|
32
|
-
"@pnpm/
|
|
32
|
+
"@pnpm/types": "1000.2.0",
|
|
33
|
+
"@pnpm/semver.peer-range": "1000.0.0"
|
|
33
34
|
},
|
|
34
35
|
"devDependencies": {
|
|
35
36
|
"@types/normalize-path": "^3.0.2",
|
|
36
37
|
"@types/ramda": "0.29.12",
|
|
37
38
|
"@types/semver": "7.5.3",
|
|
38
39
|
"@yarnpkg/core": "4.0.5",
|
|
39
|
-
"@pnpm/hooks.read-package-hook": "1000.0.
|
|
40
|
+
"@pnpm/hooks.read-package-hook": "1000.0.5"
|
|
40
41
|
},
|
|
41
42
|
"funding": "https://opencollective.com/pnpm",
|
|
42
43
|
"exports": {
|