@pnpm/plugin-commands-patching 3.0.9 → 3.1.0

package/lib/index.d.ts

@@ -1,3 +1,4 @@
 import * as patch from './patch';
 import * as patchCommit from './patchCommit';
-export { patch, patchCommit };
+import * as patchRemove from './patchRemove';
+export { patch, patchCommit, patchRemove };

package/lib/index.js

@@ -23,9 +23,11 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.patchCommit = exports.patch = void 0;
+exports.patchRemove = exports.patchCommit = exports.patch = void 0;
 const patch = __importStar(require("./patch"));
 exports.patch = patch;
 const patchCommit = __importStar(require("./patchCommit"));
 exports.patchCommit = patchCommit;
+const patchRemove = __importStar(require("./patchRemove"));
+exports.patchRemove = patchRemove;
 //# sourceMappingURL=index.js.map

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+CAAgC;AAGvB,sBAAK;AAFd,2DAA4C;AAE5B,kCAAW"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+CAAgC;AAIvB,sBAAK;AAHd,2DAA4C;AAG5B,kCAAW;AAF3B,2DAA4C;AAEf,kCAAW"}

package/lib/patchRemove.d.ts

@@ -0,0 +1,8 @@
+import { install } from '@pnpm/plugin-commands-installation';
+import { type Config } from '@pnpm/config';
+export declare function rcOptionsTypes(): Pick<any, never>;
+export declare function cliOptionsTypes(): {};
+export declare const commandNames: string[];
+export declare function help(): string;
+export type PatchRemoveCommandOptions = install.InstallCommandOptions & Pick<Config, 'dir' | 'lockfileDir' | 'patchesDir' | 'rootProjectManifest'>;
+export declare function handler(opts: PatchRemoveCommandOptions, params: string[]): Promise<void>;

package/lib/patchRemove.js

@@ -0,0 +1,74 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.handler = exports.help = exports.commandNames = exports.cliOptionsTypes = exports.rcOptionsTypes = void 0;
+const path_1 = __importDefault(require("path"));
+const promises_1 = __importDefault(require("fs/promises"));
+const cli_utils_1 = require("@pnpm/cli-utils");
+const plugin_commands_installation_1 = require("@pnpm/plugin-commands-installation");
+const config_1 = require("@pnpm/config");
+const read_project_manifest_1 = require("@pnpm/read-project-manifest");
+const error_1 = require("@pnpm/error");
+const render_help_1 = __importDefault(require("render-help"));
+const enquirer_1 = require("enquirer");
+const pick_1 = __importDefault(require("ramda/src/pick"));
+function rcOptionsTypes() {
+    return (0, pick_1.default)([], config_1.types);
+}
+exports.rcOptionsTypes = rcOptionsTypes;
+function cliOptionsTypes() {
+    return { ...rcOptionsTypes() };
+}
+exports.cliOptionsTypes = cliOptionsTypes;
+exports.commandNames = ['patch-remove'];
+function help() {
+    return (0, render_help_1.default)({
+        description: 'Remove existing patch files',
+        url: (0, cli_utils_1.docsUrl)('patch-remove'),
+        usages: ['pnpm patch-remove [pkg...]'],
+    });
+}
+exports.help = help;
+async function handler(opts, params) {
+    let patchesToRemove = params;
+    const lockfileDir = opts.lockfileDir ?? opts.dir ?? process.cwd();
+    const { writeProjectManifest, manifest } = await (0, read_project_manifest_1.tryReadProjectManifest)(lockfileDir);
+    const rootProjectManifest = opts.rootProjectManifest ?? manifest ?? {};
+    const patchedDependencies = rootProjectManifest.pnpm?.patchedDependencies ?? {};
+    if (!params.length) {
+        const allPatches = Object.keys(patchedDependencies);
+        if (allPatches.length) {
+            ({ patches: patchesToRemove } = await (0, enquirer_1.prompt)({
+                type: 'multiselect',
+                name: 'patches',
+                message: 'Select the patch to be removed',
+                choices: allPatches,
+                validate(value) {
+                    return value.length === 0 ? 'Select at least one option.' : true;
+                },
+            }));
+        }
+    }
+    if (!patchesToRemove.length) {
+        throw new error_1.PnpmError('NO_PATCHES_TO_REMOVE', 'There are no patches that need to be removed');
+    }
+    for (const patch of patchesToRemove) {
+        if (Object.prototype.hasOwnProperty.call(patchedDependencies, patch)) {
+            const patchFile = path_1.default.join(lockfileDir, patchedDependencies[patch]);
+            await promises_1.default.rm(patchFile, { force: true });
+            delete rootProjectManifest.pnpm.patchedDependencies[patch];
+        }
+    }
+    await writeProjectManifest(rootProjectManifest);
+    if (opts?.selectedProjectsGraph?.[lockfileDir]) {
+        opts.selectedProjectsGraph[lockfileDir].package.manifest = rootProjectManifest;
+    }
+    if (opts?.allProjectsGraph?.[lockfileDir].package.manifest) {
+        opts.allProjectsGraph[lockfileDir].package.manifest = rootProjectManifest;
+    }
+    return plugin_commands_installation_1.install.handler(opts);
+}
+exports.handler = handler;
+//# sourceMappingURL=patchRemove.js.map

package/lib/patchRemove.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"patchRemove.js","sourceRoot":"","sources":["../src/patchRemove.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pnpm/plugin-commands-patching",
-  "version": "3.0.9",
+  "version": "3.1.0",
   "description": "Commands for creating patches",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -29,7 +29,7 @@
     "@types/semver": "7.3.13",
     "write-yaml-file": "^5.0.0",
     "@pnpm/filter-workspace-packages": "7.0.7",
-    "@pnpm/plugin-commands-patching": "3.0.9",
+    "@pnpm/plugin-commands-patching": "3.1.0",
     "@pnpm/prepare": "0.0.66",
     "@pnpm/test-fixtures": "0.0.35"
   },
@@ -53,7 +53,7 @@
     "@pnpm/parse-wanted-dependency": "5.0.0",
     "@pnpm/patching.apply-patch": "2.0.0",
     "@pnpm/pick-registry-for-package": "5.0.0",
-    "@pnpm/plugin-commands-installation": "13.0.3",
+    "@pnpm/plugin-commands-installation": "13.0.5",
     "@pnpm/read-package-json": "8.0.0",
     "@pnpm/read-project-manifest": "5.0.0",
     "@pnpm/store-connection-manager": "6.0.8"