@pnpm/hooks.read-package-hook 1000.0.8 → 1000.0.10
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,11 +10,11 @@ function createPackageExtender(packageExtensions) {
|
|
|
10
10
|
const extensionsByPkgName = new Map();
|
|
11
11
|
for (const selector in packageExtensions) {
|
|
12
12
|
const packageExtension = packageExtensions[selector];
|
|
13
|
-
const { alias,
|
|
13
|
+
const { alias, bareSpecifier } = (0, parse_wanted_dependency_1.parseWantedDependency)(selector);
|
|
14
14
|
if (!extensionsByPkgName.has(alias)) {
|
|
15
15
|
extensionsByPkgName.set(alias, []);
|
|
16
16
|
}
|
|
17
|
-
extensionsByPkgName.get(alias).push({ packageExtension, range:
|
|
17
|
+
extensionsByPkgName.get(alias).push({ packageExtension, range: bareSpecifier });
|
|
18
18
|
}
|
|
19
19
|
return extendPkgHook.bind(null, extensionsByPkgName);
|
|
20
20
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createPackageExtender.js","sourceRoot":"","sources":["../src/createPackageExtender.ts"],"names":[],"mappings":";;;;;AAWA,sDAaC;AAvBD,2EAAqE;AACrE,oDAA2B;AAS3B,SAAgB,qBAAqB,CACnC,iBAAmD;IAEnD,MAAM,mBAAmB,GAAwB,IAAI,GAAG,EAAE,CAAA;IAC1D,KAAK,MAAM,QAAQ,IAAI,iBAAiB,EAAE,CAAC;QACzC,MAAM,gBAAgB,GAAG,iBAAiB,CAAC,QAAQ,CAAC,CAAA;QACpD,MAAM,EAAE,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"createPackageExtender.js","sourceRoot":"","sources":["../src/createPackageExtender.ts"],"names":[],"mappings":";;;;;AAWA,sDAaC;AAvBD,2EAAqE;AACrE,oDAA2B;AAS3B,SAAgB,qBAAqB,CACnC,iBAAmD;IAEnD,MAAM,mBAAmB,GAAwB,IAAI,GAAG,EAAE,CAAA;IAC1D,KAAK,MAAM,QAAQ,IAAI,iBAAiB,EAAE,CAAC;QACzC,MAAM,gBAAgB,GAAG,iBAAiB,CAAC,QAAQ,CAAC,CAAA;QACpD,MAAM,EAAE,KAAK,EAAE,aAAa,EAAE,GAAG,IAAA,+CAAqB,EAAC,QAAQ,CAAC,CAAA;QAChE,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,KAAM,CAAC,EAAE,CAAC;YACrC,mBAAmB,CAAC,GAAG,CAAC,KAAM,EAAE,EAAE,CAAC,CAAA;QACrC,CAAC;QACD,mBAAmB,CAAC,GAAG,CAAC,KAAM,CAAE,CAAC,IAAI,CAAC,EAAE,gBAAgB,EAAE,KAAK,EAAE,aAAa,EAAE,CAAC,CAAA;IACnF,CAAC;IACD,OAAO,aAAa,CAAC,IAAI,CAAC,IAAI,EAAE,mBAAmB,CAAoB,CAAA;AACzE,CAAC;AAED,SAAS,aAAa,CAAE,mBAAwC,EAAE,QAAyB;IACzF,MAAM,UAAU,GAAG,mBAAmB,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;IACzD,IAAI,UAAU,IAAI,IAAI;QAAE,OAAO,QAAQ,CAAA;IACvC,SAAS,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAA;IAC/B,OAAO,QAAQ,CAAA;AACjB,CAAC;AAED,SAAS,SAAS,CAAE,QAAyB,EAAE,UAAmC;IAChF,KAAK,MAAM,EAAE,KAAK,EAAE,gBAAgB,EAAE,IAAI,UAAU,EAAE,CAAC;QACrD,IAAI,KAAK,IAAI,IAAI,IAAI,CAAC,gBAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,KAAK,CAAC;YAAE,SAAQ;QACzE,KAAK,MAAM,KAAK,IAAI,CAAC,cAAc,EAAE,sBAAsB,EAAE,kBAAkB,EAAE,sBAAsB,CAAU,EAAE,CAAC;YAClH,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC;gBAAE,SAAQ;YACtC,QAAQ,CAAC,KAAK,CAAC,GAAG;gBAChB,GAAG,gBAAgB,CAAC,KAAK,CAAC;gBAC1B,GAAG,QAAQ,CAAC,KAAK,CAAC;aACZ,CAAA,CAAC,yDAAyD;QACpE,CAAC;IACH,CAAC;AACH,CAAC"}
|
|
@@ -18,7 +18,7 @@ function createVersionsOverrider(overrides, rootDir) {
|
|
|
18
18
|
return ((manifest, dir) => {
|
|
19
19
|
const versionOverridesWithParent = versionOverrides.filter(({ parentPkg }) => {
|
|
20
20
|
return (parentPkg.name === manifest.name &&
|
|
21
|
-
(!parentPkg.
|
|
21
|
+
(!parentPkg.bareSpecifier || semver_1.default.satisfies(manifest.version, parentPkg.bareSpecifier)));
|
|
22
22
|
});
|
|
23
23
|
overrideDepsOfPkg({ manifest, dir }, versionOverridesWithParent, genericVersionOverrides);
|
|
24
24
|
return manifest;
|
|
@@ -26,16 +26,16 @@ function createVersionsOverrider(overrides, rootDir) {
|
|
|
26
26
|
}
|
|
27
27
|
function createLocalTarget(override, rootDir) {
|
|
28
28
|
let protocol;
|
|
29
|
-
if (override.
|
|
29
|
+
if (override.newBareSpecifier.startsWith('file:')) {
|
|
30
30
|
protocol = 'file:';
|
|
31
31
|
}
|
|
32
|
-
else if (override.
|
|
32
|
+
else if (override.newBareSpecifier.startsWith('link:')) {
|
|
33
33
|
protocol = 'link:';
|
|
34
34
|
}
|
|
35
35
|
else {
|
|
36
36
|
return undefined;
|
|
37
37
|
}
|
|
38
|
-
const pkgPath = override.
|
|
38
|
+
const pkgPath = override.newBareSpecifier.substring(protocol.length);
|
|
39
39
|
const specifiedViaRelativePath = !path_1.default.isAbsolute(pkgPath);
|
|
40
40
|
const absolutePath = specifiedViaRelativePath ? path_1.default.join(rootDir, pkgPath) : pkgPath;
|
|
41
41
|
return { absolutePath, specifiedViaRelativePath, protocol };
|
|
@@ -55,12 +55,12 @@ function overrideDepsOfPkg({ manifest, dir }, versionOverrides, genericVersionOv
|
|
|
55
55
|
}
|
|
56
56
|
}
|
|
57
57
|
function overrideDeps({ versionOverrides, genericVersionOverrides, dir }, deps, peerDeps) {
|
|
58
|
-
for (const [name,
|
|
59
|
-
const versionOverride = pickMostSpecificVersionOverride(versionOverrides.filter(({ targetPkg }) => targetPkg.name === name && (0, isIntersectingRange_1.isIntersectingRange)(targetPkg.
|
|
60
|
-
pickMostSpecificVersionOverride(genericVersionOverrides.filter(({ targetPkg }) => targetPkg.name === name && (0, isIntersectingRange_1.isIntersectingRange)(targetPkg.
|
|
58
|
+
for (const [name, bareSpecifier] of Object.entries(peerDeps ?? deps)) {
|
|
59
|
+
const versionOverride = pickMostSpecificVersionOverride(versionOverrides.filter(({ targetPkg }) => targetPkg.name === name && (0, isIntersectingRange_1.isIntersectingRange)(targetPkg.bareSpecifier, bareSpecifier))) ??
|
|
60
|
+
pickMostSpecificVersionOverride(genericVersionOverrides.filter(({ targetPkg }) => targetPkg.name === name && (0, isIntersectingRange_1.isIntersectingRange)(targetPkg.bareSpecifier, bareSpecifier)));
|
|
61
61
|
if (!versionOverride)
|
|
62
62
|
continue;
|
|
63
|
-
if (versionOverride.
|
|
63
|
+
if (versionOverride.newBareSpecifier === '-') {
|
|
64
64
|
if (peerDeps) {
|
|
65
65
|
delete peerDeps[versionOverride.targetPkg.name];
|
|
66
66
|
}
|
|
@@ -69,14 +69,14 @@ function overrideDeps({ versionOverrides, genericVersionOverrides, dir }, deps,
|
|
|
69
69
|
}
|
|
70
70
|
continue;
|
|
71
71
|
}
|
|
72
|
-
const
|
|
72
|
+
const newBareSpecifier = versionOverride.localTarget
|
|
73
73
|
? `${versionOverride.localTarget.protocol}${resolveLocalOverride(versionOverride.localTarget, dir)}`
|
|
74
|
-
: versionOverride.
|
|
75
|
-
if (peerDeps == null || !(0, semver_peer_range_1.isValidPeerRange)(
|
|
76
|
-
deps[versionOverride.targetPkg.name] =
|
|
74
|
+
: versionOverride.newBareSpecifier;
|
|
75
|
+
if (peerDeps == null || !(0, semver_peer_range_1.isValidPeerRange)(newBareSpecifier)) {
|
|
76
|
+
deps[versionOverride.targetPkg.name] = newBareSpecifier;
|
|
77
77
|
}
|
|
78
|
-
else if ((0, semver_peer_range_1.isValidPeerRange)(
|
|
79
|
-
peerDeps[versionOverride.targetPkg.name] =
|
|
78
|
+
else if ((0, semver_peer_range_1.isValidPeerRange)(newBareSpecifier)) {
|
|
79
|
+
peerDeps[versionOverride.targetPkg.name] = newBareSpecifier;
|
|
80
80
|
}
|
|
81
81
|
}
|
|
82
82
|
}
|
|
@@ -86,6 +86,6 @@ function resolveLocalOverride({ specifiedViaRelativePath, absolutePath }, pkgDir
|
|
|
86
86
|
: absolutePath;
|
|
87
87
|
}
|
|
88
88
|
function pickMostSpecificVersionOverride(versionOverrides) {
|
|
89
|
-
return versionOverrides.sort((a, b) => (0, isIntersectingRange_1.isIntersectingRange)(b.targetPkg.
|
|
89
|
+
return versionOverrides.sort((a, b) => (0, isIntersectingRange_1.isIntersectingRange)(b.targetPkg.bareSpecifier ?? '', a.targetPkg.bareSpecifier ?? '') ? -1 : 1)[0];
|
|
90
90
|
}
|
|
91
91
|
//# sourceMappingURL=createVersionsOverrider.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createVersionsOverrider.js","sourceRoot":"","sources":["../src/createVersionsOverrider.ts"],"names":[],"mappings":";;;;;AAWA,0DAqBC;AAhCD,gDAAuB;AACvB,oDAA2B;AAC3B,oEAA2C;AAG3C,+DAA0D;AAC1D,oEAA0C;AAC1C,+DAA2D;AAI3D,SAAgB,uBAAuB,CACrC,SAA8C,EAC9C,OAAe;IAEf,MAAM,CAAC,gBAAgB,EAAE,uBAAuB,CAAC,GAAG,IAAA,mBAAS,EAAC,CAAC,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC,SAAS,IAAI,IAAI,EAChG,SAAS,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;QAC3B,GAAG,QAAQ;QACX,WAAW,EAAE,iBAAiB,CAAC,QAAQ,EAAE,OAAO,CAAC;KAClD,CAAC,CAAC,CACgD,CAAA;IACrD,OAAO,CAAC,CAAC,QAAyB,EAAE,GAAY,EAAE,EAAE;QAClD,MAAM,0BAA0B,GAAG,gBAAgB,CAAC,MAAM,CAAC,CAAC,EAAE,SAAS,EAAE,EAAE,EAAE;YAC3E,OAAO,CACL,SAAS,CAAC,IAAI,KAAK,QAAQ,CAAC,IAAI;gBAChC,CAAC,CAAC,SAAS,CAAC,
|
|
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.10",
|
|
4
4
|
"description": "Creates the default package reader hook used by pnpm",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"pnpm",
|
|
@@ -28,18 +28,18 @@
|
|
|
28
28
|
"ramda": "npm:@pnpm/ramda@0.28.1",
|
|
29
29
|
"semver": "^7.7.1",
|
|
30
30
|
"@pnpm/error": "1000.0.2",
|
|
31
|
+
"@pnpm/parse-overrides": "1001.0.0",
|
|
31
32
|
"@pnpm/matcher": "1000.0.0",
|
|
32
|
-
"@pnpm/parse-
|
|
33
|
-
"@pnpm/
|
|
34
|
-
"@pnpm/
|
|
35
|
-
"@pnpm/types": "1000.4.0"
|
|
33
|
+
"@pnpm/parse-wanted-dependency": "1001.0.0",
|
|
34
|
+
"@pnpm/types": "1000.6.0",
|
|
35
|
+
"@pnpm/semver.peer-range": "1000.0.0"
|
|
36
36
|
},
|
|
37
37
|
"devDependencies": {
|
|
38
38
|
"@types/normalize-path": "^3.0.2",
|
|
39
39
|
"@types/ramda": "0.29.12",
|
|
40
40
|
"@types/semver": "7.5.3",
|
|
41
41
|
"@yarnpkg/core": "4.0.5",
|
|
42
|
-
"@pnpm/hooks.read-package-hook": "1000.0.
|
|
42
|
+
"@pnpm/hooks.read-package-hook": "1000.0.10"
|
|
43
43
|
},
|
|
44
44
|
"engines": {
|
|
45
45
|
"node": ">=18.12"
|