@pnpm/hooks.read-package-hook 1000.0.12 → 1000.0.14
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/createReadPackageHook.d.ts +1 -1
- package/lib/createReadPackageHook.js +7 -7
- package/lib/createReadPackageHook.js.map +1 -1
- package/lib/createVersionsOverrider.js +4 -4
- package/lib/createVersionsOverrider.js.map +1 -1
- package/lib/index.d.ts +1 -1
- package/lib/index.js +2 -2
- package/lib/index.js.map +1 -1
- package/package.json +6 -6
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { type PackageExtension, type ReadPackageHook } from '@pnpm/types';
|
|
2
|
-
import { type VersionOverrideWithoutRawSelector } from './createVersionsOverrider';
|
|
2
|
+
import { type VersionOverrideWithoutRawSelector } from './createVersionsOverrider.js';
|
|
3
3
|
export declare function createReadPackageHook({ ignoreCompatibilityDb, lockfileDir, overrides, ignoredOptionalDependencies, packageExtensions, readPackageHook, }: {
|
|
4
4
|
ignoreCompatibilityDb?: boolean;
|
|
5
5
|
lockfileDir: string;
|
|
@@ -7,16 +7,16 @@ exports.createReadPackageHook = createReadPackageHook;
|
|
|
7
7
|
const extensions_1 = require("@yarnpkg/extensions");
|
|
8
8
|
const isEmpty_1 = __importDefault(require("ramda/src/isEmpty"));
|
|
9
9
|
const pipeWith_1 = __importDefault(require("ramda/src/pipeWith"));
|
|
10
|
-
const
|
|
11
|
-
const
|
|
12
|
-
const
|
|
10
|
+
const createOptionalDependenciesRemover_js_1 = require("./createOptionalDependenciesRemover.js");
|
|
11
|
+
const createPackageExtender_js_1 = require("./createPackageExtender.js");
|
|
12
|
+
const createVersionsOverrider_js_1 = require("./createVersionsOverrider.js");
|
|
13
13
|
function createReadPackageHook({ ignoreCompatibilityDb, lockfileDir, overrides, ignoredOptionalDependencies, packageExtensions, readPackageHook, }) {
|
|
14
14
|
const hooks = [];
|
|
15
15
|
if (!ignoreCompatibilityDb) {
|
|
16
|
-
hooks.push((0,
|
|
16
|
+
hooks.push((0, createPackageExtender_js_1.createPackageExtender)(Object.fromEntries(extensions_1.packageExtensions)));
|
|
17
17
|
}
|
|
18
18
|
if (!(0, isEmpty_1.default)(packageExtensions ?? {})) {
|
|
19
|
-
hooks.push((0,
|
|
19
|
+
hooks.push((0, createPackageExtender_js_1.createPackageExtender)(packageExtensions));
|
|
20
20
|
}
|
|
21
21
|
if (Array.isArray(readPackageHook)) {
|
|
22
22
|
hooks.push(...readPackageHook);
|
|
@@ -25,10 +25,10 @@ function createReadPackageHook({ ignoreCompatibilityDb, lockfileDir, overrides,
|
|
|
25
25
|
hooks.push(readPackageHook);
|
|
26
26
|
}
|
|
27
27
|
if (!(0, isEmpty_1.default)(overrides ?? {})) {
|
|
28
|
-
hooks.push((0,
|
|
28
|
+
hooks.push((0, createVersionsOverrider_js_1.createVersionsOverrider)(overrides, lockfileDir));
|
|
29
29
|
}
|
|
30
30
|
if (ignoredOptionalDependencies && !(0, isEmpty_1.default)(ignoredOptionalDependencies)) {
|
|
31
|
-
hooks.push((0,
|
|
31
|
+
hooks.push((0, createOptionalDependenciesRemover_js_1.createOptionalDependenciesRemover)(ignoredOptionalDependencies));
|
|
32
32
|
}
|
|
33
33
|
if (hooks.length === 0) {
|
|
34
34
|
return undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createReadPackageHook.js","sourceRoot":"","sources":["../src/createReadPackageHook.ts"],"names":[],"mappings":";;;;;AAaA,sDA2CC;AAxDD,oDAAkF;AAOlF,gEAAuC;AACvC,kEAAyC;AACzC,
|
|
1
|
+
{"version":3,"file":"createReadPackageHook.js","sourceRoot":"","sources":["../src/createReadPackageHook.ts"],"names":[],"mappings":";;;;;AAaA,sDA2CC;AAxDD,oDAAkF;AAOlF,gEAAuC;AACvC,kEAAyC;AACzC,iGAA0F;AAC1F,yEAAkE;AAClE,6EAA8G;AAE9G,SAAgB,qBAAqB,CACnC,EACE,qBAAqB,EACrB,WAAW,EACX,SAAS,EACT,2BAA2B,EAC3B,iBAAiB,EACjB,eAAe,GAQhB;IAED,MAAM,KAAK,GAAsB,EAAE,CAAA;IACnC,IAAI,CAAC,qBAAqB,EAAE,CAAC;QAC3B,KAAK,CAAC,IAAI,CAAC,IAAA,gDAAqB,EAAC,MAAM,CAAC,WAAW,CAAC,8BAAuB,CAAC,CAAC,CAAC,CAAA;IAChF,CAAC;IACD,IAAI,CAAC,IAAA,iBAAO,EAAC,iBAAiB,IAAI,EAAE,CAAC,EAAE,CAAC;QACtC,KAAK,CAAC,IAAI,CAAC,IAAA,gDAAqB,EAAC,iBAAkB,CAAC,CAAC,CAAA;IACvD,CAAC;IACD,IAAI,KAAK,CAAC,OAAO,CAAC,eAAe,CAAC,EAAE,CAAC;QACnC,KAAK,CAAC,IAAI,CAAC,GAAG,eAAe,CAAC,CAAA;IAChC,CAAC;SAAM,IAAI,eAAe,EAAE,CAAC;QAC3B,KAAK,CAAC,IAAI,CAAC,eAAe,CAAC,CAAA;IAC7B,CAAC;IACD,IAAI,CAAC,IAAA,iBAAO,EAAC,SAAS,IAAI,EAAE,CAAC,EAAE,CAAC;QAC9B,KAAK,CAAC,IAAI,CAAC,IAAA,oDAAuB,EAAC,SAAU,EAAE,WAAW,CAAC,CAAC,CAAA;IAC9D,CAAC;IACD,IAAI,2BAA2B,IAAI,CAAC,IAAA,iBAAO,EAAC,2BAA2B,CAAC,EAAE,CAAC;QACzE,KAAK,CAAC,IAAI,CAAC,IAAA,wEAAiC,EAAC,2BAA2B,CAAC,CAAC,CAAA;IAC5E,CAAC;IAED,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACvB,OAAO,SAAS,CAAA;IAClB,CAAC;IACD,MAAM,oBAAoB,GAAG,KAAK,CAAC,MAAM,KAAK,CAAC;QAC7C,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;QACV,CAAC,CAAC,CAAC,CAAC,GAAsC,EAAE,GAAW,EAAE,EAAE,CAAC,IAAA,kBAAQ,EAAC,KAAK,EAAE,CAAC,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,GAAG,EAAE,GAAG,CAAC,EAAE,KAAY,CAAC,CAAC,GAAG,EAAE,GAAG,CAAC,CAAoB,CAAA,CAAC,yDAAyD;IACjN,OAAO,oBAAoB,CAAA;AAC7B,CAAC"}
|
|
@@ -9,7 +9,7 @@ const semver_1 = __importDefault(require("semver"));
|
|
|
9
9
|
const partition_1 = __importDefault(require("ramda/src/partition"));
|
|
10
10
|
const semver_peer_range_1 = require("@pnpm/semver.peer-range");
|
|
11
11
|
const normalize_path_1 = __importDefault(require("normalize-path"));
|
|
12
|
-
const
|
|
12
|
+
const isIntersectingRange_js_1 = require("./isIntersectingRange.js");
|
|
13
13
|
function createVersionsOverrider(overrides, rootDir) {
|
|
14
14
|
const [versionOverrides, genericVersionOverrides] = (0, partition_1.default)(({ parentPkg }) => parentPkg != null, overrides.map((override) => ({
|
|
15
15
|
...override,
|
|
@@ -56,8 +56,8 @@ function overrideDepsOfPkg({ manifest, dir }, versionOverrides, genericVersionOv
|
|
|
56
56
|
}
|
|
57
57
|
function overrideDeps({ versionOverrides, genericVersionOverrides, dir }, deps, peerDeps) {
|
|
58
58
|
for (const [name, bareSpecifier] of Object.entries(peerDeps ?? deps)) {
|
|
59
|
-
const versionOverride = pickMostSpecificVersionOverride(versionOverrides.filter(({ targetPkg }) => targetPkg.name === name && (0,
|
|
60
|
-
pickMostSpecificVersionOverride(genericVersionOverrides.filter(({ targetPkg }) => targetPkg.name === name && (0,
|
|
59
|
+
const versionOverride = pickMostSpecificVersionOverride(versionOverrides.filter(({ targetPkg }) => targetPkg.name === name && (0, isIntersectingRange_js_1.isIntersectingRange)(targetPkg.bareSpecifier, bareSpecifier))) ??
|
|
60
|
+
pickMostSpecificVersionOverride(genericVersionOverrides.filter(({ targetPkg }) => targetPkg.name === name && (0, isIntersectingRange_js_1.isIntersectingRange)(targetPkg.bareSpecifier, bareSpecifier)));
|
|
61
61
|
if (!versionOverride)
|
|
62
62
|
continue;
|
|
63
63
|
if (versionOverride.newBareSpecifier === '-') {
|
|
@@ -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,
|
|
89
|
+
return versionOverrides.sort((a, b) => (0, isIntersectingRange_js_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
|
|
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,qEAA8D;AAI9D,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,aAAa,IAAI,gBAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,SAAS,CAAC,aAAa,CAAC,CAAC,CAC1F,CAAA;QACH,CAAC,CAAC,CAAA;QACF,iBAAiB,CAAC,EAAE,QAAQ,EAAE,GAAG,EAAE,EAAE,0BAA0B,EAAE,uBAAuB,CAAC,CAAA;QAEzF,OAAO,QAAQ,CAAA;IACjB,CAAC,CAAoB,CAAA;AACvB,CAAC;AAUD,SAAS,iBAAiB,CAAE,QAA2C,EAAE,OAAe;IACtF,IAAI,QAAmC,CAAA;IACvC,IAAI,QAAQ,CAAC,gBAAgB,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC;QAClD,QAAQ,GAAG,OAAO,CAAA;IACpB,CAAC;SAAM,IAAI,QAAQ,CAAC,gBAAgB,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC;QACzD,QAAQ,GAAG,OAAO,CAAA;IACpB,CAAC;SAAM,CAAC;QACN,OAAO,SAAS,CAAA;IAClB,CAAC;IACD,MAAM,OAAO,GAAG,QAAQ,CAAC,gBAAgB,CAAC,SAAS,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAA;IACpE,MAAM,wBAAwB,GAAG,CAAC,cAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAA;IAC1D,MAAM,YAAY,GAAG,wBAAwB,CAAC,CAAC,CAAC,cAAI,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAA;IACrF,OAAO,EAAE,YAAY,EAAE,wBAAwB,EAAE,QAAQ,EAAE,CAAA;AAC7D,CAAC;AAUD,SAAS,iBAAiB,CACxB,EAAE,QAAQ,EAAE,GAAG,EAA0D,EACzE,gBAA6C,EAC7C,uBAA0C;IAE1C,MAAM,EAAE,YAAY,EAAE,oBAAoB,EAAE,eAAe,EAAE,gBAAgB,EAAE,GAAG,QAAQ,CAAA;IAC1F,MAAM,aAAa,GAAG,YAAY,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,gBAAgB,EAAE,uBAAuB,EAAE,GAAG,EAAE,CAAC,CAAA;IACjG,KAAK,MAAM,IAAI,IAAI,CAAC,YAAY,EAAE,oBAAoB,EAAE,eAAe,CAAC,EAAE,CAAC;QACzE,IAAI,IAAI,EAAE,CAAC;YACT,aAAa,CAAC,IAAI,EAAE,SAAS,CAAC,CAAA;QAChC,CAAC;IACH,CAAC;IACD,IAAI,gBAAgB,EAAE,CAAC;QACrB,IAAI,CAAC,QAAQ,CAAC,YAAY;YAAE,QAAQ,CAAC,YAAY,GAAG,EAAE,CAAA;QACtD,aAAa,CAAC,QAAQ,CAAC,YAAY,EAAE,gBAAgB,CAAC,CAAA;IACxD,CAAC;AACH,CAAC;AAED,SAAS,YAAY,CACnB,EAAE,gBAAgB,EAAE,uBAAuB,EAAE,GAAG,EAI/C,EACD,IAAkB,EAClB,QAAkC;IAElC,KAAK,MAAM,CAAC,IAAI,EAAE,aAAa,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,QAAQ,IAAI,IAAI,CAAC,EAAE,CAAC;QACrE,MAAM,eAAe,GACrB,+BAA+B,CAC7B,gBAAgB,CAAC,MAAM,CACrB,CAAC,EAAE,SAAS,EAAE,EAAE,EAAE,CAChB,SAAS,CAAC,IAAI,KAAK,IAAI,IAAI,IAAA,4CAAmB,EAAC,SAAS,CAAC,aAAa,EAAE,aAAa,CAAC,CACzF,CACF;YACD,+BAA+B,CAC7B,uBAAuB,CAAC,MAAM,CAC5B,CAAC,EAAE,SAAS,EAAE,EAAE,EAAE,CAChB,SAAS,CAAC,IAAI,KAAK,IAAI,IAAI,IAAA,4CAAmB,EAAC,SAAS,CAAC,aAAa,EAAE,aAAa,CAAC,CACzF,CACF,CAAA;QACD,IAAI,CAAC,eAAe;YAAE,SAAQ;QAE9B,IAAI,eAAe,CAAC,gBAAgB,KAAK,GAAG,EAAE,CAAC;YAC7C,IAAI,QAAQ,EAAE,CAAC;gBACb,OAAO,QAAQ,CAAC,eAAe,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;YACjD,CAAC;iBAAM,CAAC;gBACN,OAAO,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;YAC7C,CAAC;YACD,SAAQ;QACV,CAAC;QAED,MAAM,gBAAgB,GAAG,eAAe,CAAC,WAAW;YAClD,CAAC,CAAC,GAAG,eAAe,CAAC,WAAW,CAAC,QAAQ,GAAG,oBAAoB,CAAC,eAAe,CAAC,WAAW,EAAE,GAAG,CAAC,EAAE;YACpG,CAAC,CAAC,eAAe,CAAC,gBAAgB,CAAA;QACpC,IAAI,QAAQ,IAAI,IAAI,IAAI,CAAC,IAAA,oCAAgB,EAAC,gBAAgB,CAAC,EAAE,CAAC;YAC5D,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,gBAAgB,CAAA;QACzD,CAAC;aAAM,IAAI,IAAA,oCAAgB,EAAC,gBAAgB,CAAC,EAAE,CAAC;YAC9C,QAAQ,CAAC,eAAe,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,gBAAgB,CAAA;QAC7D,CAAC;IACH,CAAC;AACH,CAAC;AAED,SAAS,oBAAoB,CAAE,EAAE,wBAAwB,EAAE,YAAY,EAAe,EAAE,MAAe;IACrG,OAAO,wBAAwB,IAAI,MAAM;QACvC,CAAC,CAAC,IAAA,wBAAa,EAAC,cAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;QACpD,CAAC,CAAC,YAAY,CAAA;AAClB,CAAC;AAED,SAAS,+BAA+B,CAAE,gBAAmC;IAC3E,OAAO,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,IAAA,4CAAmB,EAAC,CAAC,CAAC,SAAS,CAAC,aAAa,IAAI,EAAE,EAAE,CAAC,CAAC,SAAS,CAAC,aAAa,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;AAC3I,CAAC"}
|
package/lib/index.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
export { createReadPackageHook } from './createReadPackageHook';
|
|
1
|
+
export { createReadPackageHook } from './createReadPackageHook.js';
|
package/lib/index.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.createReadPackageHook = void 0;
|
|
4
|
-
var
|
|
5
|
-
Object.defineProperty(exports, "createReadPackageHook", { enumerable: true, get: function () { return
|
|
4
|
+
var createReadPackageHook_js_1 = require("./createReadPackageHook.js");
|
|
5
|
+
Object.defineProperty(exports, "createReadPackageHook", { enumerable: true, get: function () { return createReadPackageHook_js_1.createReadPackageHook; } });
|
|
6
6
|
//# sourceMappingURL=index.js.map
|
package/lib/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,uEAAkE;AAAzD,iIAAA,qBAAqB,OAAA"}
|
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.14",
|
|
4
4
|
"description": "Creates the default package reader hook used by pnpm",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"pnpm",
|
|
@@ -28,19 +28,19 @@
|
|
|
28
28
|
"normalize-path": "^3.0.0",
|
|
29
29
|
"ramda": "npm:@pnpm/ramda@0.28.1",
|
|
30
30
|
"semver": "^7.7.1",
|
|
31
|
-
"@pnpm/error": "1000.0.
|
|
31
|
+
"@pnpm/error": "1000.0.5",
|
|
32
32
|
"@pnpm/matcher": "1000.0.0",
|
|
33
|
-
"@pnpm/parse-
|
|
33
|
+
"@pnpm/parse-wanted-dependency": "1001.0.0",
|
|
34
34
|
"@pnpm/semver.peer-range": "1000.0.0",
|
|
35
|
-
"@pnpm/
|
|
36
|
-
"@pnpm/
|
|
35
|
+
"@pnpm/parse-overrides": "1001.0.3",
|
|
36
|
+
"@pnpm/types": "1000.8.0"
|
|
37
37
|
},
|
|
38
38
|
"devDependencies": {
|
|
39
39
|
"@types/normalize-path": "^3.0.2",
|
|
40
40
|
"@types/ramda": "0.29.12",
|
|
41
41
|
"@types/semver": "7.5.3",
|
|
42
42
|
"@yarnpkg/core": "4.2.0",
|
|
43
|
-
"@pnpm/hooks.read-package-hook": "1000.0.
|
|
43
|
+
"@pnpm/hooks.read-package-hook": "1000.0.14"
|
|
44
44
|
},
|
|
45
45
|
"engines": {
|
|
46
46
|
"node": ">=18.12"
|