@pnpm/plugin-commands-patching 2.1.9 → 2.1.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.
- package/lib/patchCommit.d.ts +2 -1
- package/lib/patchCommit.js +14 -10
- package/lib/patchCommit.js.map +1 -1
- package/package.json +9 -7
package/lib/patchCommit.d.ts
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
|
+
import { Config } from '@pnpm/config';
|
|
1
2
|
import { install } from '@pnpm/plugin-commands-installation';
|
|
2
3
|
export declare const rcOptionsTypes: typeof cliOptionsTypes;
|
|
3
4
|
export declare function cliOptionsTypes(): Pick<any, never>;
|
|
4
5
|
export declare const commandNames: string[];
|
|
5
6
|
export declare function help(): string;
|
|
6
|
-
export declare function handler(opts: install.InstallCommandOptions, params: string[]): Promise<void>;
|
|
7
|
+
export declare function handler(opts: install.InstallCommandOptions & Pick<Config, 'rootProjectManifest'>, params: string[]): Promise<void>;
|
package/lib/patchCommit.js
CHANGED
|
@@ -44,20 +44,24 @@ async function handler(opts, params) {
|
|
|
44
44
|
const patchContent = await diffFolders(srcDir, userDir);
|
|
45
45
|
const patchFileName = pkgNameAndVersion.replace('/', '__');
|
|
46
46
|
await fs_1.default.promises.writeFile(path_1.default.join(patchesDir, `${patchFileName}.patch`), patchContent, 'utf8');
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
if (!manifest.pnpm) {
|
|
52
|
-
manifest.pnpm = {
|
|
47
|
+
const { writeProjectManifest, manifest } = await (0, read_project_manifest_1.tryReadProjectManifest)(lockfileDir);
|
|
48
|
+
const rootProjectManifest = opts.rootProjectManifest ?? manifest ?? {};
|
|
49
|
+
if (!rootProjectManifest.pnpm) {
|
|
50
|
+
rootProjectManifest.pnpm = {
|
|
53
51
|
patchedDependencies: {},
|
|
54
52
|
};
|
|
55
53
|
}
|
|
56
|
-
else if (!
|
|
57
|
-
|
|
54
|
+
else if (!rootProjectManifest.pnpm.patchedDependencies) {
|
|
55
|
+
rootProjectManifest.pnpm.patchedDependencies = {};
|
|
56
|
+
}
|
|
57
|
+
rootProjectManifest.pnpm.patchedDependencies[pkgNameAndVersion] = `patches/${patchFileName}.patch`;
|
|
58
|
+
await writeProjectManifest(rootProjectManifest);
|
|
59
|
+
if (opts?.selectedProjectsGraph?.[lockfileDir]) {
|
|
60
|
+
opts.selectedProjectsGraph[lockfileDir].package.manifest = rootProjectManifest;
|
|
61
|
+
}
|
|
62
|
+
if (opts?.allProjectsGraph?.[lockfileDir].package.manifest) {
|
|
63
|
+
opts.allProjectsGraph[lockfileDir].package.manifest = rootProjectManifest;
|
|
58
64
|
}
|
|
59
|
-
manifest.pnpm.patchedDependencies[pkgNameAndVersion] = `patches/${patchFileName}.patch`;
|
|
60
|
-
await writeProjectManifest(manifest);
|
|
61
65
|
return plugin_commands_installation_1.install.handler(opts);
|
|
62
66
|
}
|
|
63
67
|
exports.handler = handler;
|
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,
|
|
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.1.
|
|
3
|
+
"version": "2.1.10",
|
|
4
4
|
"description": "Commands for creating patches",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"types": "lib/index.d.ts",
|
|
@@ -25,7 +25,9 @@
|
|
|
25
25
|
"devDependencies": {
|
|
26
26
|
"@pnpm/registry-mock": "3.4.0",
|
|
27
27
|
"@types/ramda": "0.28.20",
|
|
28
|
-
"
|
|
28
|
+
"write-yaml-file": "^4.2.0",
|
|
29
|
+
"@pnpm/plugin-commands-patching": "2.1.10",
|
|
30
|
+
"@pnpm/filter-workspace-packages": "6.0.36",
|
|
29
31
|
"@pnpm/prepare": "0.0.63"
|
|
30
32
|
},
|
|
31
33
|
"dependencies": {
|
|
@@ -34,16 +36,16 @@
|
|
|
34
36
|
"render-help": "^1.0.3",
|
|
35
37
|
"safe-execa": "^0.1.3",
|
|
36
38
|
"tempy": "^1.0.1",
|
|
37
|
-
"@pnpm/cli-utils": "1.1.
|
|
38
|
-
"@pnpm/config": "16.6.
|
|
39
|
+
"@pnpm/cli-utils": "1.1.1",
|
|
40
|
+
"@pnpm/config": "16.6.4",
|
|
39
41
|
"@pnpm/error": "4.0.1",
|
|
40
42
|
"@pnpm/parse-wanted-dependency": "4.1.0",
|
|
41
43
|
"@pnpm/patching.apply-patch": "1.0.0",
|
|
42
44
|
"@pnpm/pick-registry-for-package": "4.0.3",
|
|
43
|
-
"@pnpm/plugin-commands-installation": "11.5.
|
|
45
|
+
"@pnpm/plugin-commands-installation": "11.5.1",
|
|
44
46
|
"@pnpm/read-package-json": "7.0.5",
|
|
45
47
|
"@pnpm/read-project-manifest": "4.1.3",
|
|
46
|
-
"@pnpm/store-connection-manager": "5.2.
|
|
48
|
+
"@pnpm/store-connection-manager": "5.2.14"
|
|
47
49
|
},
|
|
48
50
|
"peerDependencies": {
|
|
49
51
|
"@pnpm/logger": "^5.0.0"
|
|
@@ -53,7 +55,7 @@
|
|
|
53
55
|
".": "./lib/index.js"
|
|
54
56
|
},
|
|
55
57
|
"scripts": {
|
|
56
|
-
"lint": "eslint src/**/*.ts test/**/*.ts",
|
|
58
|
+
"lint": "eslint \"src/**/*.ts\" \"test/**/*.ts\"",
|
|
57
59
|
"registry-mock": "registry-mock",
|
|
58
60
|
"test:jest": "jest",
|
|
59
61
|
"test:e2e": "registry-mock prepare && run-p -r registry-mock test:jest",
|