@pnpm/plugin-commands-patching 1000.2.5 → 1000.3.1
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,7 +10,7 @@ export declare function getPatchedDependency(rawDependency: string, opts: GetPat
|
|
|
10
10
|
export interface LockfileVersion {
|
|
11
11
|
gitTarballUrl?: string;
|
|
12
12
|
name: string;
|
|
13
|
-
|
|
13
|
+
peerDepGraphHash?: string;
|
|
14
14
|
version: string;
|
|
15
15
|
}
|
|
16
16
|
export interface LockfileVersionsList {
|
|
@@ -11,7 +11,6 @@ const enquirer_1 = require("enquirer");
|
|
|
11
11
|
const lockfile_fs_1 = require("@pnpm/lockfile.fs");
|
|
12
12
|
const lockfile_utils_1 = require("@pnpm/lockfile.utils");
|
|
13
13
|
const error_1 = require("@pnpm/error");
|
|
14
|
-
const modules_yaml_1 = require("@pnpm/modules-yaml");
|
|
15
14
|
const pick_fetcher_1 = require("@pnpm/pick-fetcher");
|
|
16
15
|
const realpath_missing_1 = __importDefault(require("realpath-missing"));
|
|
17
16
|
const semver_1 = __importDefault(require("semver"));
|
|
@@ -59,10 +58,9 @@ async function getPatchedDependency(rawDependency, opts) {
|
|
|
59
58
|
}
|
|
60
59
|
async function getVersionsFromLockfile(dep, opts) {
|
|
61
60
|
const modulesDir = await (0, realpath_missing_1.default)(path_1.default.join(opts.lockfileDir, opts.modulesDir ?? 'node_modules'));
|
|
62
|
-
const
|
|
63
|
-
const lockfile = (modules?.virtualStoreDir && await (0, lockfile_fs_1.readCurrentLockfile)(modules.virtualStoreDir, {
|
|
61
|
+
const lockfile = await (0, lockfile_fs_1.readCurrentLockfile)(path_1.default.join(modulesDir, '.pnpm'), {
|
|
64
62
|
ignoreIncompatible: true,
|
|
65
|
-
})
|
|
63
|
+
}) ?? null;
|
|
66
64
|
if (!lockfile) {
|
|
67
65
|
throw new error_1.PnpmError('PATCH_NO_LOCKFILE', 'The modules directory is not ready for patching', {
|
|
68
66
|
hint: 'Run pnpm install first',
|
|
@@ -77,7 +75,8 @@ async function getVersionsFromLockfile(dep, opts) {
|
|
|
77
75
|
gitTarballUrl: (0, pick_fetcher_1.isGitHostedPkgUrl)(tarball) ? tarball : undefined,
|
|
78
76
|
};
|
|
79
77
|
})
|
|
80
|
-
.filter(({ name }) => name === pkgName)
|
|
78
|
+
.filter(({ name }) => name === pkgName)
|
|
79
|
+
.sort((v1, v2) => semver_1.default.compare(v1.version, v2.version));
|
|
81
80
|
return {
|
|
82
81
|
versions,
|
|
83
82
|
preferredVersions: versions.filter(({ version }) => dep.alias && dep.bareSpecifier ? semver_1.default.satisfies(version, dep.bareSpecifier) : true),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getPatchedDependency.js","sourceRoot":"","sources":["../src/getPatchedDependency.ts"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"getPatchedDependency.js","sourceRoot":"","sources":["../src/getPatchedDependency.ts"],"names":[],"mappings":"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"}
|
package/lib/patchRemove.js
CHANGED
|
@@ -54,7 +54,7 @@ async function handler(opts, params) {
|
|
|
54
54
|
}
|
|
55
55
|
const patchesDirs = new Set();
|
|
56
56
|
await Promise.all(patchesToRemove.map(async (patch) => {
|
|
57
|
-
if (Object.
|
|
57
|
+
if (Object.hasOwn(patchedDependencies, patch)) {
|
|
58
58
|
const patchFile = patchedDependencies[patch];
|
|
59
59
|
patchesDirs.add(path_1.default.dirname(patchFile));
|
|
60
60
|
await promises_1.default.rm(patchFile, { force: true });
|
package/lib/patchRemove.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"patchRemove.js","sourceRoot":"","sources":["../src/patchRemove.ts"],"names":[],"mappings":";;;;;;AAWA,wCAEC;AAED,0CAEC;AAID,oBAMC;AAID,0BAiDC;AAhFD,gDAAuB;AACvB,2DAA4B;AAC5B,+CAAyC;AACzC,qFAA4D;AAC5D,yCAA6D;AAC7D,uCAAuC;AACvC,8DAAoC;AACpC,uCAAiC;AACjC,0DAAiC;AACjC,2EAAuE;AAEvE,SAAgB,cAAc;IAC5B,OAAO,IAAA,cAAI,EAAC,EAAE,EAAE,cAAQ,CAAC,CAAA;AAC3B,CAAC;AAED,SAAgB,eAAe;IAC7B,OAAO,EAAE,GAAG,cAAc,EAAE,EAAE,CAAA;AAChC,CAAC;AAEY,QAAA,YAAY,GAAG,CAAC,cAAc,CAAC,CAAA;AAE5C,SAAgB,IAAI;IAClB,OAAO,IAAA,qBAAU,EAAC;QAChB,WAAW,EAAE,6BAA6B;QAC1C,GAAG,EAAE,IAAA,mBAAO,EAAC,cAAc,CAAC;QAC5B,MAAM,EAAE,CAAC,4BAA4B,CAAC;KACvC,CAAC,CAAA;AACJ,CAAC;AAIM,KAAK,UAAU,OAAO,CAAE,IAA+B,EAAE,MAAgB;IAC9E,IAAI,eAAe,GAAG,MAAM,CAAA;IAC5B,MAAM,mBAAmB,GAAG,IAAI,CAAC,mBAAmB,IAAI,EAAE,CAAA;IAE1D,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;QACnB,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAA;QACnD,IAAI,UAAU,CAAC,MAAM,EAAE,CAAC;YACtB,CAAC,EAAE,OAAO,EAAE,eAAe,EAAE,GAAG,MAAM,IAAA,iBAAM,EAEzC;gBACD,IAAI,EAAE,aAAa;gBACnB,IAAI,EAAE,SAAS;gBACf,OAAO,EAAE,gCAAgC;gBACzC,OAAO,EAAE,UAAU;gBACnB,QAAQ,CAAE,KAAK;oBACb,OAAO,KAAK,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,6BAA6B,CAAC,CAAC,CAAC,IAAI,CAAA;gBAClE,CAAC;aACF,CAAC,CAAC,CAAA;QACL,CAAC;IACH,CAAC;IAED,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE,CAAC;QAC5B,MAAM,IAAI,iBAAS,CAAC,sBAAsB,EAAE,8CAA8C,CAAC,CAAA;IAC7F,CAAC;IAED,MAAM,WAAW,GAAG,IAAI,GAAG,EAAU,CAAA;IACrC,MAAM,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,GAAG,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE;QACpD,IAAI,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"patchRemove.js","sourceRoot":"","sources":["../src/patchRemove.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@pnpm/plugin-commands-patching",
|
|
3
|
-
"version": "1000.
|
|
3
|
+
"version": "1000.3.1",
|
|
4
4
|
"description": "Commands for creating patches",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"pnpm",
|
|
@@ -37,26 +37,26 @@
|
|
|
37
37
|
"semver": "^7.7.1",
|
|
38
38
|
"terminal-link": "^2.1.1",
|
|
39
39
|
"tinyglobby": "^0.2.14",
|
|
40
|
-
"@pnpm/cli-utils": "1000.1.
|
|
41
|
-
"@pnpm/config": "
|
|
42
|
-
"@pnpm/config.config-writer": "1000.0.
|
|
40
|
+
"@pnpm/cli-utils": "1000.1.7",
|
|
41
|
+
"@pnpm/config": "1004.0.0",
|
|
42
|
+
"@pnpm/config.config-writer": "1000.0.6",
|
|
43
43
|
"@pnpm/constants": "1001.1.0",
|
|
44
|
-
"@pnpm/crypto.hash": "1000.1.1",
|
|
45
44
|
"@pnpm/fs.packlist": "1000.0.0",
|
|
46
|
-
"@pnpm/lockfile.fs": "1001.1.12",
|
|
47
|
-
"@pnpm/lockfile.utils": "1001.0.11",
|
|
48
|
-
"@pnpm/parse-wanted-dependency": "1001.0.0",
|
|
49
45
|
"@pnpm/error": "1000.0.2",
|
|
46
|
+
"@pnpm/crypto.hash": "1000.1.1",
|
|
47
|
+
"@pnpm/lockfile.fs": "1001.1.14",
|
|
48
|
+
"@pnpm/parse-wanted-dependency": "1001.0.0",
|
|
50
49
|
"@pnpm/modules-yaml": "1000.3.3",
|
|
51
50
|
"@pnpm/patching.apply-patch": "1000.0.4",
|
|
52
|
-
"@pnpm/
|
|
53
|
-
"@pnpm/
|
|
54
|
-
"@pnpm/
|
|
51
|
+
"@pnpm/plugin-commands-installation": "1004.2.0",
|
|
52
|
+
"@pnpm/lockfile.utils": "1002.0.0",
|
|
53
|
+
"@pnpm/pick-fetcher": "1000.0.1",
|
|
54
|
+
"@pnpm/read-package-json": "1000.0.9",
|
|
55
|
+
"@pnpm/store-connection-manager": "1002.0.5",
|
|
56
|
+
"@pnpm/read-project-manifest": "1000.0.11",
|
|
55
57
|
"@pnpm/store-path": "1000.0.2",
|
|
56
58
|
"@pnpm/types": "1000.6.0",
|
|
57
|
-
"@pnpm/read-
|
|
58
|
-
"@pnpm/workspace.read-manifest": "1000.1.5",
|
|
59
|
-
"@pnpm/read-package-json": "1000.0.9"
|
|
59
|
+
"@pnpm/workspace.read-manifest": "1000.2.0"
|
|
60
60
|
},
|
|
61
61
|
"peerDependencies": {
|
|
62
62
|
"@pnpm/logger": ">=1001.0.0 <1002.0.0"
|
|
@@ -69,11 +69,11 @@
|
|
|
69
69
|
"@types/semver": "7.5.3",
|
|
70
70
|
"tempy": "^1.0.1",
|
|
71
71
|
"write-yaml-file": "^5.0.0",
|
|
72
|
+
"@pnpm/plugin-commands-patching": "1000.3.1",
|
|
73
|
+
"@pnpm/prepare": "0.0.121",
|
|
72
74
|
"@pnpm/logger": "1001.0.0",
|
|
73
|
-
"@pnpm/plugin-commands-patching": "1000.2.5",
|
|
74
|
-
"@pnpm/prepare": "0.0.120",
|
|
75
75
|
"@pnpm/test-fixtures": "0.1.37",
|
|
76
|
-
"@pnpm/workspace.filter-packages-from-dir": "1000.0.
|
|
76
|
+
"@pnpm/workspace.filter-packages-from-dir": "1000.0.27"
|
|
77
77
|
},
|
|
78
78
|
"engines": {
|
|
79
79
|
"node": ">=18.12"
|