@pnpm/resolve-dependencies 1008.7.4 → 1008.7.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.
- package/lib/hoistPeers.js +20 -1
- package/lib/hoistPeers.js.map +1 -1
- package/package.json +14 -14
package/lib/hoistPeers.js
CHANGED
|
@@ -33,7 +33,26 @@ function hoistPeers(opts, missingRequiredPeers) {
|
|
|
33
33
|
nonVersions.push(spec);
|
|
34
34
|
}
|
|
35
35
|
}
|
|
36
|
-
|
|
36
|
+
// When the range is an exact version (e.g. pinned by an override like "4.3.0"),
|
|
37
|
+
// try to find a preferred version that satisfies it. This prevents a stale
|
|
38
|
+
// higher version from the lockfile being picked over the overridden version.
|
|
39
|
+
// For regular semver ranges (e.g. "^1.0.0"), use the highest preferred
|
|
40
|
+
// version for deduplication.
|
|
41
|
+
const isExactVersion = semver_1.default.valid(range) != null;
|
|
42
|
+
const satisfyingVersion = isExactVersion
|
|
43
|
+
? semver_1.default.maxSatisfying(versions, range, { includePrerelease: true })
|
|
44
|
+
: null;
|
|
45
|
+
if (satisfyingVersion) {
|
|
46
|
+
dependencies[peerName] = [satisfyingVersion, ...nonVersions].join(' || ');
|
|
47
|
+
}
|
|
48
|
+
else if (isExactVersion && opts.autoInstallPeers) {
|
|
49
|
+
// No preferred version satisfies the exact override version.
|
|
50
|
+
// Use the range directly so pnpm resolves it from the registry.
|
|
51
|
+
dependencies[peerName] = range;
|
|
52
|
+
}
|
|
53
|
+
else {
|
|
54
|
+
dependencies[peerName] = [semver_1.default.maxSatisfying(versions, '*', { includePrerelease: true }), ...nonVersions].join(' || ');
|
|
55
|
+
}
|
|
37
56
|
}
|
|
38
57
|
else if (opts.autoInstallPeers) {
|
|
39
58
|
dependencies[peerName] = range;
|
package/lib/hoistPeers.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hoistPeers.js","sourceRoot":"","sources":["../src/hoistPeers.ts"],"names":[],"mappings":";;;;;AAKA,
|
|
1
|
+
{"version":3,"file":"hoistPeers.js","sourceRoot":"","sources":["../src/hoistPeers.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@pnpm/resolve-dependencies",
|
|
3
|
-
"version": "1008.7.
|
|
3
|
+
"version": "1008.7.5",
|
|
4
4
|
"description": "Resolves dependency graph of a package",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"pnpm",
|
|
@@ -42,28 +42,28 @@
|
|
|
42
42
|
"semver-range-intersect": "^0.3.1",
|
|
43
43
|
"version-selector-type": "^3.0.0",
|
|
44
44
|
"@pnpm/calc-dep-state": "1003.0.2",
|
|
45
|
-
"@pnpm/constants": "1001.3.1",
|
|
46
|
-
"@pnpm/config.version-policy": "1000.0.5",
|
|
47
45
|
"@pnpm/catalogs.resolver": "1000.0.5",
|
|
48
|
-
"@pnpm/
|
|
46
|
+
"@pnpm/config.version-policy": "1000.0.5",
|
|
47
|
+
"@pnpm/catalogs.types": "1000.0.0",
|
|
48
|
+
"@pnpm/constants": "1001.3.1",
|
|
49
|
+
"@pnpm/core-loggers": "1001.0.9",
|
|
49
50
|
"@pnpm/dependency-path": "1001.1.10",
|
|
50
|
-
"@pnpm/
|
|
51
|
+
"@pnpm/error": "1000.0.5",
|
|
51
52
|
"@pnpm/lockfile.pruner": "1001.0.26",
|
|
52
|
-
"@pnpm/
|
|
53
|
+
"@pnpm/lockfile.preferred-versions": "1000.0.31",
|
|
53
54
|
"@pnpm/lockfile.types": "1002.0.9",
|
|
54
|
-
"@pnpm/core-loggers": "1001.0.9",
|
|
55
|
-
"@pnpm/lockfile.utils": "1004.0.2",
|
|
56
55
|
"@pnpm/manifest-utils": "1002.0.4",
|
|
57
56
|
"@pnpm/patching.config": "1001.0.18",
|
|
57
|
+
"@pnpm/lockfile.utils": "1004.0.2",
|
|
58
58
|
"@pnpm/patching.types": "1000.1.0",
|
|
59
|
+
"@pnpm/npm-resolver": "1005.2.1",
|
|
59
60
|
"@pnpm/read-package-json": "1000.1.7",
|
|
60
61
|
"@pnpm/semver.peer-range": "1000.0.0",
|
|
61
|
-
"@pnpm/npm-resolver": "1005.2.1",
|
|
62
62
|
"@pnpm/resolver-base": "1005.4.1",
|
|
63
|
-
"@pnpm/store-controller-types": "1004.5.1",
|
|
64
63
|
"@pnpm/types": "1001.3.0",
|
|
65
|
-
"@pnpm/
|
|
66
|
-
"@pnpm/
|
|
64
|
+
"@pnpm/pick-fetcher": "1001.0.0",
|
|
65
|
+
"@pnpm/store-controller-types": "1004.5.1",
|
|
66
|
+
"@pnpm/workspace.spec-parser": "1000.0.0"
|
|
67
67
|
},
|
|
68
68
|
"peerDependencies": {
|
|
69
69
|
"@pnpm/logger": ">=1001.0.0 <1002.0.0"
|
|
@@ -72,8 +72,8 @@
|
|
|
72
72
|
"@types/normalize-path": "^3.0.2",
|
|
73
73
|
"@types/ramda": "0.29.12",
|
|
74
74
|
"@types/semver": "7.5.3",
|
|
75
|
-
"@pnpm/
|
|
76
|
-
"@pnpm/
|
|
75
|
+
"@pnpm/logger": "1001.0.1",
|
|
76
|
+
"@pnpm/resolve-dependencies": "1008.7.5"
|
|
77
77
|
},
|
|
78
78
|
"engines": {
|
|
79
79
|
"node": ">=18.12"
|