@pnpm/patching.apply-patch 2.0.3 → 2.0.4

package/lib/index.js

@@ -2,17 +2,27 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.applyPatchToDir = void 0;
 const error_1 = require("@pnpm/error");
-const applyPatches_1 = require("patch-package/dist/applyPatches");
+const applyPatches_1 = require("@pnpm/patch-package/dist/applyPatches");
 function applyPatchToDir(opts) {
     // Ideally, we would just run "patch" or "git apply".
     // However, "patch" is not available on Windows and "git apply" is hard to execute on a subdirectory of an existing repository
     const cwd = process.cwd();
     process.chdir(opts.patchedDir);
-    const success = (0, applyPatches_1.applyPatch)({
-        patchDir: opts.patchedDir,
-        patchFilePath: opts.patchFilePath,
-    });
-    process.chdir(cwd);
+    let success = false;
+    try {
+        success = (0, applyPatches_1.applyPatch)({
+            patchFilePath: opts.patchFilePath,
+        });
+    }
+    catch (err) { // eslint-disable-line
+        if (err.code === 'ENOENT') {
+            throw new error_1.PnpmError('PATCH_NOT_FOUND', `Patch file not found: ${opts.patchFilePath}`);
+        }
+        throw new error_1.PnpmError('INVALID_PATCH', `Applying patch "${opts.patchFilePath}" failed: ${err.message}`);
+    }
+    finally {
+        process.chdir(cwd);
+    }
     if (!success) {
         throw new error_1.PnpmError('PATCH_FAILED', `Could not apply patch ${opts.patchFilePath} to ${opts.patchedDir}`);
     }

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,uCAAuC;AACvC,kEAA4D;AAO5D,SAAgB,eAAe,CAAE,IAAyB;IACxD,qDAAqD;IACrD,8HAA8H;IAC9H,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,EAAE,CAAA;IACzB,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;IAC9B,MAAM,OAAO,GAAG,IAAA,yBAAU,EAAC;QACzB,QAAQ,EAAE,IAAI,CAAC,UAAU;QACzB,aAAa,EAAE,IAAI,CAAC,aAAa;KAClC,CAAC,CAAA;IACF,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;IAClB,IAAI,CAAC,OAAO,EAAE;QACZ,MAAM,IAAI,iBAAS,CAAC,cAAc,EAAE,yBAAyB,IAAI,CAAC,aAAa,OAAO,IAAI,CAAC,UAAU,EAAE,CAAC,CAAA;KACzG;AACH,CAAC;AAbD,0CAaC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,uCAAuC;AACvC,wEAAkE;AAOlE,SAAgB,eAAe,CAAE,IAAyB;IACxD,qDAAqD;IACrD,8HAA8H;IAC9H,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,EAAE,CAAA;IACzB,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;IAC9B,IAAI,OAAO,GAAG,KAAK,CAAA;IACnB,IAAI;QACF,OAAO,GAAG,IAAA,yBAAU,EAAC;YACnB,aAAa,EAAE,IAAI,CAAC,aAAa;SAClC,CAAC,CAAA;KACH;IAAC,OAAO,GAAQ,EAAE,EAAE,sBAAsB;QACzC,IAAI,GAAG,CAAC,IAAI,KAAK,QAAQ,EAAE;YACzB,MAAM,IAAI,iBAAS,CAAC,iBAAiB,EAAE,yBAAyB,IAAI,CAAC,aAAa,EAAE,CAAC,CAAA;SACtF;QACD,MAAM,IAAI,iBAAS,CAAC,eAAe,EAAE,mBAAmB,IAAI,CAAC,aAAa,aAAa,GAAG,CAAC,OAAiB,EAAE,CAAC,CAAA;KAChH;YAAS;QACR,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;KACnB;IACD,IAAI,CAAC,OAAO,EAAE;QACZ,MAAM,IAAI,iBAAS,CAAC,cAAc,EAAE,yBAAyB,IAAI,CAAC,aAAa,OAAO,IAAI,CAAC,UAAU,EAAE,CAAC,CAAA;KACzG;AACH,CAAC;AArBD,0CAqBC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pnpm/patching.apply-patch",
-  "version": "2.0.3",
+  "version": "2.0.4",
   "description": "Apply a patch to a directory",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -23,19 +23,22 @@
   },
   "homepage": "https://github.com/pnpm/pnpm/blob/main/patching/apply-patch#readme",
   "dependencies": {
-    "patch-package": "^7.0.0",
+    "@pnpm/patch-package": "0.0.0",
     "@pnpm/error": "5.0.2"
   },
   "devDependencies": {
-    "@pnpm/patching.apply-patch": "2.0.3"
+    "@pnpm/patching.apply-patch": "2.0.4",
+    "@pnpm/prepare": "0.0.70",
+    "@pnpm/test-fixtures": "0.0.39"
   },
   "funding": "https://opencollective.com/pnpm",
   "exports": {
     ".": "./lib/index.js"
   },
   "scripts": {
-    "test": "pnpm run compile",
+    "_test": "jest",
+    "test": "pnpm run compile && pnpm run _test",
     "compile": "tsc --build && pnpm run lint --fix",
-    "lint": "eslint \"src/**/*.ts\""
+    "lint": "eslint \"src/**/*.ts\" \"test/**/*.ts\""
   }
 }