@pnpm/hooks.read-package-hook 4.0.1 → 4.0.3
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.
|
@@ -15,19 +15,9 @@ function createVersionsOverrider(overrides, rootDir) {
|
|
|
15
15
|
const parsedOverrides = tryParseOverrides(overrides);
|
|
16
16
|
const [versionOverrides, genericVersionOverrides] = (0, partition_1.default)(({ parentPkg }) => parentPkg != null, parsedOverrides
|
|
17
17
|
.map((override) => {
|
|
18
|
-
let linkTarget;
|
|
19
|
-
if (override.newPref.startsWith('link:')) {
|
|
20
|
-
const pkgPath = override.newPref.substring(5);
|
|
21
|
-
linkTarget = path_1.default.isAbsolute(pkgPath) ? pkgPath : path_1.default.join(rootDir, pkgPath);
|
|
22
|
-
}
|
|
23
|
-
let linkFileTarget;
|
|
24
|
-
if (override.newPref.startsWith('file:')) {
|
|
25
|
-
linkFileTarget = override.newPref.substring(5);
|
|
26
|
-
}
|
|
27
18
|
return {
|
|
28
19
|
...override,
|
|
29
|
-
|
|
30
|
-
linkFileTarget,
|
|
20
|
+
localTarget: createLocalTarget(override, rootDir),
|
|
31
21
|
};
|
|
32
22
|
}));
|
|
33
23
|
return ((manifest, dir) => {
|
|
@@ -48,6 +38,22 @@ function tryParseOverrides(overrides) {
|
|
|
48
38
|
throw new error_1.PnpmError('INVALID_OVERRIDES_SELECTOR', `${e.message} in pnpm.overrides`);
|
|
49
39
|
}
|
|
50
40
|
}
|
|
41
|
+
function createLocalTarget(override, rootDir) {
|
|
42
|
+
let protocol;
|
|
43
|
+
if (override.newPref.startsWith('file:')) {
|
|
44
|
+
protocol = 'file:';
|
|
45
|
+
}
|
|
46
|
+
else if (override.newPref.startsWith('link:')) {
|
|
47
|
+
protocol = 'link:';
|
|
48
|
+
}
|
|
49
|
+
else {
|
|
50
|
+
return undefined;
|
|
51
|
+
}
|
|
52
|
+
const pkgPath = override.newPref.substring(protocol.length);
|
|
53
|
+
const specifiedViaRelativePath = !path_1.default.isAbsolute(pkgPath);
|
|
54
|
+
const absolutePath = specifiedViaRelativePath ? path_1.default.join(rootDir, pkgPath) : pkgPath;
|
|
55
|
+
return { absolutePath, specifiedViaRelativePath, protocol };
|
|
56
|
+
}
|
|
51
57
|
function overrideDepsOfPkg({ manifest, dir }, versionOverrides, genericVersionOverrides) {
|
|
52
58
|
if (manifest.dependencies != null)
|
|
53
59
|
overrideDeps(versionOverrides, genericVersionOverrides, manifest.dependencies, dir);
|
|
@@ -64,17 +70,18 @@ function overrideDeps(versionOverrides, genericVersionOverrides, deps, dir) {
|
|
|
64
70
|
pickMostSpecificVersionOverride(genericVersionOverrides.filter(({ targetPkg }) => targetPkg.name === name && (0, isIntersectingRange_1.isIntersectingRange)(targetPkg.pref, pref)));
|
|
65
71
|
if (!versionOverride)
|
|
66
72
|
continue;
|
|
67
|
-
if (versionOverride.
|
|
68
|
-
deps[versionOverride.targetPkg.name] =
|
|
69
|
-
continue;
|
|
70
|
-
}
|
|
71
|
-
if (versionOverride.linkFileTarget) {
|
|
72
|
-
deps[versionOverride.targetPkg.name] = `file:${versionOverride.linkFileTarget}`;
|
|
73
|
+
if (versionOverride.localTarget) {
|
|
74
|
+
deps[versionOverride.targetPkg.name] = `${versionOverride.localTarget.protocol}${resolveLocalOverride(versionOverride.localTarget, dir)}`;
|
|
73
75
|
continue;
|
|
74
76
|
}
|
|
75
77
|
deps[versionOverride.targetPkg.name] = versionOverride.newPref;
|
|
76
78
|
}
|
|
77
79
|
}
|
|
80
|
+
function resolveLocalOverride({ specifiedViaRelativePath, absolutePath }, pkgDir) {
|
|
81
|
+
return specifiedViaRelativePath && pkgDir
|
|
82
|
+
? (0, normalize_path_1.default)(path_1.default.relative(pkgDir, absolutePath))
|
|
83
|
+
: absolutePath;
|
|
84
|
+
}
|
|
78
85
|
function pickMostSpecificVersionOverride(versionOverrides) {
|
|
79
86
|
return versionOverrides.sort((a, b) => (0, isIntersectingRange_1.isIntersectingRange)(b.targetPkg.pref ?? '', a.targetPkg.pref ?? '') ? -1 : 1)[0];
|
|
80
87
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createVersionsOverrider.js","sourceRoot":"","sources":["../src/createVersionsOverrider.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAuB;AACvB,oDAA2B;AAC3B,oEAA2C;AAE3C,uCAAuC;AACvC,2DAAmG;AACnG,oEAA0C;AAC1C,+DAA2D;AAE3D,SAAgB,uBAAuB,CACrC,SAAiC,EACjC,OAAe;IAEf,MAAM,eAAe,GAAG,iBAAiB,CAAC,SAAS,CAAC,CAAA;IACpD,MAAM,CAAC,gBAAgB,EAAE,uBAAuB,CAAC,GAAG,IAAA,mBAAS,EAAC,CAAC,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC,SAAS,IAAI,IAAI,EAChG,eAAe;SACZ,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE;QAChB,
|
|
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": "4.0.
|
|
3
|
+
"version": "4.0.3",
|
|
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",
|
|
@@ -25,18 +25,18 @@
|
|
|
25
25
|
"normalize-path": "^3.0.0",
|
|
26
26
|
"ramda": "npm:@pnpm/ramda@0.28.1",
|
|
27
27
|
"semver": "^7.6.0",
|
|
28
|
+
"@pnpm/error": "6.0.1",
|
|
28
29
|
"@pnpm/matcher": "6.0.0",
|
|
29
|
-
"@pnpm/error": "6.0.0",
|
|
30
|
-
"@pnpm/parse-overrides": "5.0.0",
|
|
31
30
|
"@pnpm/parse-wanted-dependency": "6.0.0",
|
|
32
|
-
"@pnpm/
|
|
31
|
+
"@pnpm/parse-overrides": "5.0.1",
|
|
32
|
+
"@pnpm/types": "10.1.0"
|
|
33
33
|
},
|
|
34
34
|
"devDependencies": {
|
|
35
35
|
"@types/normalize-path": "^3.0.2",
|
|
36
36
|
"@types/ramda": "0.29.12",
|
|
37
37
|
"@types/semver": "7.5.3",
|
|
38
38
|
"@yarnpkg/core": "4.0.3",
|
|
39
|
-
"@pnpm/hooks.read-package-hook": "4.0.
|
|
39
|
+
"@pnpm/hooks.read-package-hook": "4.0.3"
|
|
40
40
|
},
|
|
41
41
|
"funding": "https://opencollective.com/pnpm",
|
|
42
42
|
"exports": {
|