@pnpm/plugin-commands-patching 2.1.15 → 2.2.0
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/patchCommit.d.ts +1 -1
- package/lib/patchCommit.js +14 -4
- package/lib/patchCommit.js.map +1 -1
- package/package.json +11 -9
package/lib/patchCommit.d.ts
CHANGED
|
@@ -4,4 +4,4 @@ export declare const rcOptionsTypes: typeof cliOptionsTypes;
|
|
|
4
4
|
export declare function cliOptionsTypes(): Pick<any, never>;
|
|
5
5
|
export declare const commandNames: string[];
|
|
6
6
|
export declare function help(): string;
|
|
7
|
-
export declare function handler(opts: install.InstallCommandOptions & Pick<Config, 'rootProjectManifest'>, params: string[]): Promise<void>;
|
|
7
|
+
export declare function handler(opts: install.InstallCommandOptions & Pick<Config, 'patchesDir' | 'rootProjectManifest'>, params: string[]): Promise<void>;
|
package/lib/patchCommit.js
CHANGED
|
@@ -11,6 +11,7 @@ const config_1 = require("@pnpm/config");
|
|
|
11
11
|
const plugin_commands_installation_1 = require("@pnpm/plugin-commands-installation");
|
|
12
12
|
const read_package_json_1 = require("@pnpm/read-package-json");
|
|
13
13
|
const read_project_manifest_1 = require("@pnpm/read-project-manifest");
|
|
14
|
+
const normalize_path_1 = __importDefault(require("normalize-path"));
|
|
14
15
|
const pick_1 = __importDefault(require("ramda/src/pick"));
|
|
15
16
|
const safe_execa_1 = __importDefault(require("safe-execa"));
|
|
16
17
|
const escape_string_regexp_1 = __importDefault(require("escape-string-regexp"));
|
|
@@ -20,14 +21,22 @@ const writePackage_1 = require("./writePackage");
|
|
|
20
21
|
const parse_wanted_dependency_1 = require("@pnpm/parse-wanted-dependency");
|
|
21
22
|
exports.rcOptionsTypes = cliOptionsTypes;
|
|
22
23
|
function cliOptionsTypes() {
|
|
23
|
-
return (0, pick_1.default)([], config_1.types);
|
|
24
|
+
return (0, pick_1.default)(['patches-dir'], config_1.types);
|
|
24
25
|
}
|
|
25
26
|
exports.cliOptionsTypes = cliOptionsTypes;
|
|
26
27
|
exports.commandNames = ['patch-commit'];
|
|
27
28
|
function help() {
|
|
28
29
|
return (0, render_help_1.default)({
|
|
29
30
|
description: 'Generate a patch out of a directory',
|
|
30
|
-
descriptionLists: [
|
|
31
|
+
descriptionLists: [{
|
|
32
|
+
title: 'Options',
|
|
33
|
+
list: [
|
|
34
|
+
{
|
|
35
|
+
description: 'The generated patch file will be saved to this directory',
|
|
36
|
+
name: '--patches-dir',
|
|
37
|
+
},
|
|
38
|
+
],
|
|
39
|
+
}],
|
|
31
40
|
url: (0, cli_utils_1.docsUrl)('patch-commit'),
|
|
32
41
|
usages: ['pnpm patch-commit <patchDir>'],
|
|
33
42
|
});
|
|
@@ -36,7 +45,8 @@ exports.help = help;
|
|
|
36
45
|
async function handler(opts, params) {
|
|
37
46
|
const userDir = params[0];
|
|
38
47
|
const lockfileDir = opts.lockfileDir ?? opts.dir ?? process.cwd();
|
|
39
|
-
const
|
|
48
|
+
const patchesDirName = (0, normalize_path_1.default)(path_1.default.normalize(opts.patchesDir ?? 'patches'));
|
|
49
|
+
const patchesDir = path_1.default.join(lockfileDir, patchesDirName);
|
|
40
50
|
await fs_1.default.promises.mkdir(patchesDir, { recursive: true });
|
|
41
51
|
const patchedPkgManifest = await (0, read_package_json_1.readPackageJsonFromDir)(userDir);
|
|
42
52
|
const pkgNameAndVersion = `${patchedPkgManifest.name}@${patchedPkgManifest.version}`;
|
|
@@ -55,7 +65,7 @@ async function handler(opts, params) {
|
|
|
55
65
|
else if (!rootProjectManifest.pnpm.patchedDependencies) {
|
|
56
66
|
rootProjectManifest.pnpm.patchedDependencies = {};
|
|
57
67
|
}
|
|
58
|
-
rootProjectManifest.pnpm.patchedDependencies[pkgNameAndVersion] =
|
|
68
|
+
rootProjectManifest.pnpm.patchedDependencies[pkgNameAndVersion] = `${patchesDirName}/${patchFileName}.patch`;
|
|
59
69
|
await writeProjectManifest(rootProjectManifest);
|
|
60
70
|
if (opts?.selectedProjectsGraph?.[lockfileDir]) {
|
|
61
71
|
opts.selectedProjectsGraph[lockfileDir].package.manifest = rootProjectManifest;
|
package/lib/patchCommit.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"patchCommit.js","sourceRoot":"","sources":["../src/patchCommit.ts"],"names":[],"mappings":";;;;;;AAAA,4CAAmB;AACnB,gDAAuB;AACvB,+CAAyC;AACzC,yCAAwD;AACxD,qFAA4D;AAC5D,+DAAgE;AAChE,uEAAoE;AACpE,0DAAiC;AACjC,4DAA8B;AAC9B,gFAAqD;AACrD,8DAAoC;AACpC,kDAAyB;AACzB,iDAA6C;AAC7C,2EAAqE;AAExD,QAAA,cAAc,GAAG,eAAe,CAAA;AAE7C,SAAgB,eAAe;IAC7B,OAAO,IAAA,cAAI,EAAC,
|
|
1
|
+
{"version":3,"file":"patchCommit.js","sourceRoot":"","sources":["../src/patchCommit.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": "2.
|
|
3
|
+
"version": "2.2.0",
|
|
4
4
|
"description": "Commands for creating patches",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"types": "lib/index.d.ts",
|
|
@@ -24,37 +24,39 @@
|
|
|
24
24
|
"homepage": "https://github.com/pnpm/pnpm/blob/main/patching/plugin-commands-patching#readme",
|
|
25
25
|
"devDependencies": {
|
|
26
26
|
"@pnpm/registry-mock": "3.5.0",
|
|
27
|
+
"@types/normalize-path": "^3.0.0",
|
|
27
28
|
"@types/ramda": "0.28.20",
|
|
28
29
|
"@types/semver": "7.3.13",
|
|
29
30
|
"write-yaml-file": "^4.2.0",
|
|
30
|
-
"@pnpm/filter-workspace-packages": "6.0.
|
|
31
|
-
"@pnpm/plugin-commands-patching": "2.
|
|
31
|
+
"@pnpm/filter-workspace-packages": "6.0.42",
|
|
32
|
+
"@pnpm/plugin-commands-patching": "2.2.0",
|
|
32
33
|
"@pnpm/prepare": "0.0.64",
|
|
33
34
|
"@pnpm/test-fixtures": "0.0.33"
|
|
34
35
|
},
|
|
35
36
|
"dependencies": {
|
|
36
37
|
"enquirer": "^2.3.6",
|
|
37
38
|
"escape-string-regexp": "^4.0.0",
|
|
39
|
+
"normalize-path": "^3.0.0",
|
|
38
40
|
"ramda": "npm:@pnpm/ramda@0.28.1",
|
|
39
41
|
"realpath-missing": "^1.1.0",
|
|
40
42
|
"render-help": "^1.0.3",
|
|
41
43
|
"safe-execa": "^0.1.3",
|
|
42
44
|
"semver": "^7.3.8",
|
|
43
45
|
"tempy": "^1.0.1",
|
|
44
|
-
"@pnpm/cli-utils": "1.1.
|
|
45
|
-
"@pnpm/config": "17.0.
|
|
46
|
+
"@pnpm/cli-utils": "1.1.7",
|
|
47
|
+
"@pnpm/config": "17.0.2",
|
|
46
48
|
"@pnpm/constants": "6.2.0",
|
|
47
49
|
"@pnpm/error": "4.0.1",
|
|
50
|
+
"@pnpm/lockfile-file": "7.0.6",
|
|
51
|
+
"@pnpm/lockfile-utils": "5.0.7",
|
|
48
52
|
"@pnpm/modules-yaml": "11.1.0",
|
|
49
53
|
"@pnpm/parse-wanted-dependency": "4.1.0",
|
|
50
54
|
"@pnpm/patching.apply-patch": "1.0.0",
|
|
51
55
|
"@pnpm/pick-registry-for-package": "4.0.3",
|
|
52
|
-
"@pnpm/plugin-commands-installation": "11.5.
|
|
56
|
+
"@pnpm/plugin-commands-installation": "11.5.7",
|
|
53
57
|
"@pnpm/read-package-json": "7.0.5",
|
|
54
58
|
"@pnpm/read-project-manifest": "4.1.4",
|
|
55
|
-
"@pnpm/store-connection-manager": "5.2.
|
|
56
|
-
"@pnpm/lockfile-file": "7.0.6",
|
|
57
|
-
"@pnpm/lockfile-utils": "5.0.7"
|
|
59
|
+
"@pnpm/store-connection-manager": "5.2.20"
|
|
58
60
|
},
|
|
59
61
|
"peerDependencies": {
|
|
60
62
|
"@pnpm/logger": "^5.0.0"
|