@pnpm/plugin-commands-patching 2.0.25 → 2.1.0

package/lib/patch.d.ts

@@ -4,14 +4,16 @@ import { CreateStoreControllerOptions } from '@pnpm/store-connection-manager';
 export declare function rcOptionsTypes(): Pick<any, never>;
 export declare function cliOptionsTypes(): {
     'edit-dir': StringConstructor;
+    'ignore-existing': BooleanConstructor;
 };
 export declare const shorthands: {
     d: string;
 };
 export declare const commandNames: string[];
 export declare function help(): string;
-export type PatchCommandOptions = Pick<Config, 'dir' | 'registries' | 'tag' | 'storeDir'> & CreateStoreControllerOptions & {
+export type PatchCommandOptions = Pick<Config, 'dir' | 'registries' | 'tag' | 'storeDir' | 'rootProjectManifest' | 'lockfileDir'> & CreateStoreControllerOptions & {
     editDir?: string;
     reporter?: (logObj: LogBase) => void;
+    ignoreExisting?: boolean;
 };
 export declare function handler(opts: PatchCommandOptions, params: string[]): Promise<string>;

package/lib/patch.js

@@ -5,6 +5,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.handler = exports.help = exports.commandNames = exports.shorthands = exports.cliOptionsTypes = exports.rcOptionsTypes = void 0;
 const fs_1 = __importDefault(require("fs"));
+const path_1 = __importDefault(require("path"));
+const patching_apply_patch_1 = require("@pnpm/patching.apply-patch");
 const cli_utils_1 = require("@pnpm/cli-utils");
 const config_1 = require("@pnpm/config");
 const pick_1 = __importDefault(require("ramda/src/pick"));
@@ -17,7 +19,7 @@ function rcOptionsTypes() {
 }
 exports.rcOptionsTypes = rcOptionsTypes;
 function cliOptionsTypes() {
-    return { ...rcOptionsTypes(), 'edit-dir': String };
+    return { ...rcOptionsTypes(), 'edit-dir': String, 'ignore-existing': Boolean };
 }
 exports.cliOptionsTypes = cliOptionsTypes;
 exports.shorthands = {
@@ -34,6 +36,10 @@ function help() {
                         description: 'The package that needs to be modified will be extracted to this directory',
                         name: '--edit-dir',
                     },
+                    {
+                        description: 'Ignore existing patch files when patching',
+                        name: '--ignore-existing',
+                    },
                 ],
             }],
         url: (0, cli_utils_1.docsUrl)('patch'),
@@ -46,10 +52,32 @@ async function handler(opts, params) {
         throw new error_1.PnpmError('PATCH_EDIT_DIR_EXISTS', `The target directory already exists: '${opts.editDir}'`);
     }
     const editDir = opts.editDir ?? tempy_1.default.directory();
-    await (0, writePackage_1.writePackage)(params[0], editDir, opts);
+    const patchedDep = await (0, writePackage_1.writePackage)(params[0], editDir, opts);
+    if (!opts.ignoreExisting && opts.rootProjectManifest?.pnpm?.patchedDependencies) {
+        tryPatchWithExistingPatchFile({
+            patchedDep,
+            patchedDir: editDir,
+            patchedDependencies: opts.rootProjectManifest.pnpm.patchedDependencies,
+            lockfileDir: opts.lockfileDir ?? opts.dir ?? process.cwd(),
+        });
+    }
     return `You can now edit the following folder: ${editDir}
 
 Once you're done with your changes, run "pnpm patch-commit ${editDir}"`;
 }
 exports.handler = handler;
+function tryPatchWithExistingPatchFile({ patchedDep, patchedDir, patchedDependencies, lockfileDir, }) {
+    if (!patchedDep.alias || !patchedDep.pref) {
+        return;
+    }
+    const existingPatchFile = patchedDependencies[`${patchedDep.alias}@${patchedDep.pref}`];
+    if (!existingPatchFile) {
+        return;
+    }
+    const existingPatchFilePath = path_1.default.resolve(lockfileDir, existingPatchFile);
+    if (!fs_1.default.existsSync(existingPatchFilePath)) {
+        throw new error_1.PnpmError('PATCH_FILE_NOT_FOUND', `Unable to find patch file ${existingPatchFilePath}`);
+    }
+    (0, patching_apply_patch_1.applyPatchToDir)({ patchedDir, patchFilePath: existingPatchFilePath });
+}
 //# sourceMappingURL=patch.js.map

package/lib/patch.js.map

@@ -1 +1 @@
-{"version":3,"file":"patch.js","sourceRoot":"","sources":["../src/patch.ts"],"names":[],"mappings":";;;;;;AAAA,4CAAmB;AACnB,+CAAyC;AACzC,yCAAwD;AAKxD,0DAAiC;AACjC,8DAAoC;AACpC,kDAAyB;AACzB,uCAAuC;AACvC,iDAA6C;AAE7C,SAAgB,cAAc;IAC5B,OAAO,IAAA,cAAI,EAAC,EAAE,EAAE,cAAQ,CAAC,CAAA;AAC3B,CAAC;AAFD,wCAEC;AAED,SAAgB,eAAe;IAC7B,OAAO,EAAE,GAAG,cAAc,EAAE,EAAE,UAAU,EAAE,MAAM,EAAE,CAAA;AACpD,CAAC;AAFD,0CAEC;AAEY,QAAA,UAAU,GAAG;IACxB,CAAC,EAAE,YAAY;CAChB,CAAA;AAEY,QAAA,YAAY,GAAG,CAAC,OAAO,CAAC,CAAA;AAErC,SAAgB,IAAI;IAClB,OAAO,IAAA,qBAAU,EAAC;QAChB,WAAW,EAAE,gCAAgC;QAC7C,gBAAgB,EAAE,CAAC;gBACjB,KAAK,EAAE,SAAS;gBAChB,IAAI,EAAE;oBACJ;wBACE,WAAW,EAAE,2EAA2E;wBACxF,IAAI,EAAE,YAAY;qBACnB;iBACF;aACF,CAAC;QACF,GAAG,EAAE,IAAA,mBAAO,EAAC,OAAO,CAAC;QACrB,MAAM,EAAE,CAAC,iCAAiC,CAAC;KAC5C,CAAC,CAAA;AACJ,CAAC;AAfD,oBAeC;AAOM,KAAK,UAAU,OAAO,CAAE,IAAyB,EAAE,MAAgB;IACxE,IAAI,IAAI,CAAC,OAAO,IAAI,YAAE,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,YAAE,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE;QAC1F,MAAM,IAAI,iBAAS,CAAC,uBAAuB,EAAE,yCAAyC,IAAI,CAAC,OAAO,GAAG,CAAC,CAAA;KACvG;IACD,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,IAAI,eAAK,CAAC,SAAS,EAAE,CAAA;IACjD,MAAM,IAAA,2BAAY,EAAC,MAAM,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,CAAA;IAC5C,OAAO,0CAA0C,OAAO;;6DAEG,OAAO,GAAG,CAAA;AACvE,CAAC;AATD,0BASC"}
+{"version":3,"file":"patch.js","sourceRoot":"","sources":["../src/patch.ts"],"names":[],"mappings":"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"}

package/lib/writePackage.d.ts

@@ -1,4 +1,6 @@
 import { Config } from '@pnpm/config';
 import { CreateStoreControllerOptions } from '@pnpm/store-connection-manager';
+import { ParseWantedDependencyResult } from '@pnpm/parse-wanted-dependency';
+export { ParseWantedDependencyResult };
 export type WritePackageOptions = CreateStoreControllerOptions & Pick<Config, 'registries'>;
-export declare function writePackage(pkg: string, dest: string, opts: WritePackageOptions): Promise<void>;
+export declare function writePackage(pkg: string, dest: string, opts: WritePackageOptions): Promise<ParseWantedDependencyResult>;

package/lib/writePackage.js

@@ -22,6 +22,7 @@ async function writePackage(pkg, dest, opts) {
         filesResponse,
         force: true,
     });
+    return dep;
 }
 exports.writePackage = writePackage;
 //# sourceMappingURL=writePackage.js.map

package/lib/writePackage.js.map

@@ -1 +1 @@
-{"version":3,"file":"writePackage.js","sourceRoot":"","sources":["../src/writePackage.ts"],"names":[],"mappings":";;;AACA,6EAGuC;AACvC,+EAAwE;AACxE,2EAAqE;AAI9D,KAAK,UAAU,YAAY,CAAE,GAAW,EAAE,IAAY,EAAE,IAAyB;IACtF,MAAM,GAAG,GAAG,IAAA,+CAAqB,EAAC,GAAG,CAAC,CAAA;IACtC,MAAM,KAAK,GAAG,MAAM,IAAA,yDAA8B,EAAC;QACjD,GAAG,IAAI;QACP,mBAAmB,EAAE,eAAe;KACrC,CAAC,CAAA;IACF,MAAM,WAAW,GAAG,MAAM,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC,GAAG,EAAE;QACvD,gBAAgB,EAAE,CAAC;QACnB,WAAW,EAAE,IAAI,CAAC,GAAG;QACrB,iBAAiB,EAAE,EAAE;QACrB,UAAU,EAAE,IAAI,CAAC,GAAG;QACpB,QAAQ,EAAE,CAAC,GAAG,CAAC,KAAK,IAAI,IAAA,kDAAsB,EAAC,IAAI,CAAC,UAAU,EAAE,GAAG,CAAC,KAAK,CAAC,CAAC,IAAI,IAAI,CAAC,UAAU,CAAC,OAAO;KACvG,CAAC,CAAA;IACF,MAAM,aAAa,GAAG,MAAM,WAAW,CAAC,KAAM,EAAE,CAAA;IAChD,MAAM,KAAK,CAAC,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE;QACnC,aAAa;QACb,KAAK,EAAE,IAAI;KACZ,CAAC,CAAA;AACJ,CAAC;AAlBD,oCAkBC"}
+{"version":3,"file":"writePackage.js","sourceRoot":"","sources":["../src/writePackage.ts"],"names":[],"mappings":";;;AACA,6EAGuC;AACvC,+EAAwE;AACxE,2EAAkG;AAM3F,KAAK,UAAU,YAAY,CAAE,GAAW,EAAE,IAAY,EAAE,IAAyB;IACtF,MAAM,GAAG,GAAG,IAAA,+CAAqB,EAAC,GAAG,CAAC,CAAA;IACtC,MAAM,KAAK,GAAG,MAAM,IAAA,yDAA8B,EAAC;QACjD,GAAG,IAAI;QACP,mBAAmB,EAAE,eAAe;KACrC,CAAC,CAAA;IACF,MAAM,WAAW,GAAG,MAAM,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC,GAAG,EAAE;QACvD,gBAAgB,EAAE,CAAC;QACnB,WAAW,EAAE,IAAI,CAAC,GAAG;QACrB,iBAAiB,EAAE,EAAE;QACrB,UAAU,EAAE,IAAI,CAAC,GAAG;QACpB,QAAQ,EAAE,CAAC,GAAG,CAAC,KAAK,IAAI,IAAA,kDAAsB,EAAC,IAAI,CAAC,UAAU,EAAE,GAAG,CAAC,KAAK,CAAC,CAAC,IAAI,IAAI,CAAC,UAAU,CAAC,OAAO;KACvG,CAAC,CAAA;IACF,MAAM,aAAa,GAAG,MAAM,WAAW,CAAC,KAAM,EAAE,CAAA;IAChD,MAAM,KAAK,CAAC,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE;QACnC,aAAa;QACb,KAAK,EAAE,IAAI;KACZ,CAAC,CAAA;IACF,OAAO,GAAG,CAAA;AACZ,CAAC;AAnBD,oCAmBC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pnpm/plugin-commands-patching",
-  "version": "2.0.25",
+  "version": "2.1.0",
   "description": "Commands for creating patches",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -11,7 +11,7 @@
   "engines": {
     "node": ">=14.6"
   },
-  "repository": "https://github.com/pnpm/pnpm/blob/main/packages/plugin-commands-patching",
+  "repository": "https://github.com/pnpm/pnpm/blob/main/patching/plugin-commands-patching",
   "keywords": [
     "pnpm7",
     "pnpm",
@@ -21,11 +21,11 @@
   "bugs": {
     "url": "https://github.com/pnpm/pnpm/issues"
   },
-  "homepage": "https://github.com/pnpm/pnpm/blob/main/packages/plugin-commands-patching#readme",
+  "homepage": "https://github.com/pnpm/pnpm/blob/main/patching/plugin-commands-patching#readme",
   "devDependencies": {
     "@pnpm/registry-mock": "3.2.0",
     "@types/ramda": "0.28.20",
-    "@pnpm/plugin-commands-patching": "2.0.25",
+    "@pnpm/plugin-commands-patching": "2.1.0",
     "@pnpm/prepare": "0.0.61"
   },
   "dependencies": {
@@ -34,15 +34,16 @@
     "render-help": "^1.0.2",
     "safe-execa": "^0.1.3",
     "tempy": "^1.0.1",
-    "@pnpm/cli-utils": "1.0.25",
-    "@pnpm/config": "16.4.3",
+    "@pnpm/cli-utils": "1.0.26",
+    "@pnpm/config": "16.5.0",
     "@pnpm/error": "4.0.1",
-    "@pnpm/parse-wanted-dependency": "4.0.1",
+    "@pnpm/parse-wanted-dependency": "4.1.0",
+    "@pnpm/patching.apply-patch": "1.0.0",
     "@pnpm/pick-registry-for-package": "4.0.3",
-    "@pnpm/plugin-commands-installation": "11.3.3",
+    "@pnpm/plugin-commands-installation": "11.3.4",
     "@pnpm/read-package-json": "7.0.5",
     "@pnpm/read-project-manifest": "4.1.3",
-    "@pnpm/store-connection-manager": "5.2.3"
+    "@pnpm/store-connection-manager": "5.2.4"
   },
   "peerDependencies": {
     "@pnpm/logger": "^5.0.0"