@pnpm/plugin-commands-patching 5.0.18 → 5.1.1

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.
Files changed (3) hide show
  1. package/lib/patchRemove.js +11 -0
  2. package/lib/patchRemove.js.map +1 -1
  3. package/package.json +15 -15
package/lib/patchRemove.js CHANGED
@@ -54,9 +54,11 @@ async function handler(opts, params) {
54
54
  if (!patchesToRemove.length) {
55
55
  throw new error_1.PnpmError('NO_PATCHES_TO_REMOVE', 'There are no patches that need to be removed');
56
56
  }
57
+ const patchesDirs = new Set();
57
58
  await Promise.all(patchesToRemove.map(async (patch) => {
58
59
  if (Object.prototype.hasOwnProperty.call(patchedDependencies, patch)) {
59
60
  const patchFile = path_1.default.join(lockfileDir, patchedDependencies[patch]);
61
+ patchesDirs.add(path_1.default.dirname(patchFile));
60
62
  await promises_1.default.rm(patchFile, { force: true });
61
63
  delete rootProjectManifest.pnpm.patchedDependencies[patch];
62
64
  if (!Object.keys(rootProjectManifest.pnpm.patchedDependencies).length) {
@@ -67,6 +69,15 @@ async function handler(opts, params) {
67
69
  }
68
70
  }
69
71
  }));
72
+ await Promise.all(Array.from(patchesDirs).map(async (dir) => {
73
+ try {
74
+ const files = await promises_1.default.readdir(dir);
75
+ if (!files.length) {
76
+ await promises_1.default.rmdir(dir);
77
+ }
78
+ }
79
+ catch { }
80
+ }));
70
81
  await writeProjectManifest(rootProjectManifest);
71
82
  if (opts?.selectedProjectsGraph?.[lockfileDir]) {
72
83
  opts.selectedProjectsGraph[lockfileDir].package.manifest = rootProjectManifest;
package/lib/patchRemove.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"patchRemove.js","sourceRoot":"","sources":["../src/patchRemove.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAuB;AACvB,2DAA4B;AAC5B,+CAAyC;AACzC,qFAA4D;AAC5D,yCAA6D;AAC7D,uEAAoE;AACpE,uCAAuC;AACvC,8DAAoC;AACpC,uCAAiC;AACjC,0DAAiC;AAEjC,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,CAAA;AAChC,CAAC;AAFD,0CAEC;AAEY,QAAA,YAAY,GAAG,CAAC,cAAc,CAAC,CAAA;AAE5C,SAAgB,IAAI;IAClB,OAAO,IAAA,qBAAU,EAAC;QAChB,WAAW,EAAE,6BAA6B;QAC1C,GAAG,EAAE,IAAA,mBAAO,EAAC,cAAc,CAAC;QAC5B,MAAM,EAAE,CAAC,4BAA4B,CAAC;KACvC,CAAC,CAAA;AACJ,CAAC;AAND,oBAMC;AAIM,KAAK,UAAU,OAAO,CAAE,IAA+B,EAAE,MAAgB;IAC9E,IAAI,eAAe,GAAG,MAAM,CAAA;IAC5B,MAAM,WAAW,GAAG,IAAI,CAAC,WAAW,IAAI,IAAI,CAAC,GAAG,IAAI,OAAO,CAAC,GAAG,EAAE,CAAA;IACjE,MAAM,EAAE,oBAAoB,EAAE,QAAQ,EAAE,GAAG,MAAM,IAAA,8CAAsB,EAAC,WAAW,CAAC,CAAA;IACpF,MAAM,mBAAmB,GAAG,IAAI,CAAC,mBAAmB,IAAI,QAAQ,IAAI,EAAE,CAAA;IACtE,MAAM,mBAAmB,GAAG,mBAAmB,CAAC,IAAI,EAAE,mBAAmB,IAAI,EAAE,CAAA;IAE/E,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;QACnB,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAA;QACnD,IAAI,UAAU,CAAC,MAAM,EAAE,CAAC;YACtB,CAAC,EAAE,OAAO,EAAE,eAAe,EAAE,GAAG,MAAM,IAAA,iBAAM,EAEzC;gBACD,IAAI,EAAE,aAAa;gBACnB,IAAI,EAAE,SAAS;gBACf,OAAO,EAAE,gCAAgC;gBACzC,OAAO,EAAE,UAAU;gBACnB,QAAQ,CAAE,KAAK;oBACb,OAAO,KAAK,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,6BAA6B,CAAC,CAAC,CAAC,IAAI,CAAA;gBAClE,CAAC;aACF,CAAC,CAAC,CAAA;QACL,CAAC;IACH,CAAC;IAED,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE,CAAC;QAC5B,MAAM,IAAI,iBAAS,CAAC,sBAAsB,EAAE,8CAA8C,CAAC,CAAA;IAC7F,CAAC;IAED,MAAM,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,GAAG,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE;QACpD,IAAI,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,mBAAmB,EAAE,KAAK,CAAC,EAAE,CAAC;YACrE,MAAM,SAAS,GAAG,cAAI,CAAC,IAAI,CAAC,WAAW,EAAE,mBAAmB,CAAC,KAAK,CAAC,CAAC,CAAA;YACpE,MAAM,kBAAE,CAAC,EAAE,CAAC,SAAS,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAA;YACvC,OAAO,mBAAmB,CAAC,IAAK,CAAC,mBAAoB,CAAC,KAAK,CAAC,CAAA;YAC5D,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,mBAAmB,CAAC,IAAK,CAAC,mBAAoB,CAAC,CAAC,MAAM,EAAE,CAAC;gBACxE,OAAO,mBAAmB,CAAC,IAAK,CAAC,mBAAmB,CAAA;gBACpD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,mBAAmB,CAAC,IAAK,CAAC,CAAC,MAAM,EAAE,CAAC;oBACnD,OAAO,mBAAmB,CAAC,IAAI,CAAA;gBACjC,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC,CAAC,CAAC,CAAA;IAEH,MAAM,oBAAoB,CAAC,mBAAmB,CAAC,CAAA;IAE/C,IAAI,IAAI,EAAE,qBAAqB,EAAE,CAAC,WAAW,CAAC,EAAE,CAAC;QAC/C,IAAI,CAAC,qBAAqB,CAAC,WAAW,CAAC,CAAC,OAAO,CAAC,QAAQ,GAAG,mBAAmB,CAAA;IAChF,CAAC;IAED,IAAI,IAAI,EAAE,gBAAgB,EAAE,CAAC,WAAW,CAAC,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC;QAC3D,IAAI,CAAC,gBAAgB,CAAC,WAAW,CAAC,CAAC,OAAO,CAAC,QAAQ,GAAG,mBAAmB,CAAA;IAC3E,CAAC;IAED,OAAO,sCAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;AAC9B,CAAC;AArDD,0BAqDC"}
1
+ {"version":3,"file":"patchRemove.js","sourceRoot":"","sources":["../src/patchRemove.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": "5.0.18",
3
+ "version": "5.1.1",
4
4
  "description": "Commands for creating patches",
5
5
  "main": "lib/index.js",
6
6
  "types": "lib/index.d.ts",
@@ -23,15 +23,15 @@
23
23
  },
24
24
  "homepage": "https://github.com/pnpm/pnpm/blob/main/patching/plugin-commands-patching#readme",
25
25
  "devDependencies": {
26
- "@pnpm/registry-mock": "3.17.1",
26
+ "@pnpm/registry-mock": "3.18.0",
27
27
  "@types/normalize-path": "^3.0.2",
28
28
  "@types/ramda": "0.28.20",
29
29
  "@types/semver": "7.5.3",
30
30
  "write-yaml-file": "^5.0.0",
31
- "@pnpm/filter-workspace-packages": "7.2.10",
32
- "@pnpm/plugin-commands-patching": "5.0.18",
33
- "@pnpm/prepare": "0.0.88",
34
- "@pnpm/test-fixtures": "0.1.18"
31
+ "@pnpm/plugin-commands-patching": "5.1.1",
32
+ "@pnpm/prepare": "0.0.89",
33
+ "@pnpm/test-fixtures": "0.1.19",
34
+ "@pnpm/filter-workspace-packages": "7.2.11"
35
35
  },
36
36
  "dependencies": {
37
37
  "enquirer": "^2.4.1",
@@ -44,22 +44,22 @@
44
44
  "safe-execa": "^0.1.3",
45
45
  "semver": "^7.5.4",
46
46
  "tempy": "^1.0.1",
47
- "@pnpm/config": "20.4.1",
48
- "@pnpm/cli-utils": "2.1.8",
49
- "@pnpm/constants": "7.1.1",
47
+ "@pnpm/config": "20.4.2",
48
+ "@pnpm/cli-utils": "2.1.9",
50
49
  "@pnpm/error": "5.0.2",
51
- "@pnpm/fs.packlist": "1.0.2",
50
+ "@pnpm/fs.packlist": "1.0.3",
51
+ "@pnpm/constants": "7.1.1",
52
52
  "@pnpm/lockfile-file": "8.1.6",
53
+ "@pnpm/lockfile-utils": "9.0.5",
53
54
  "@pnpm/modules-yaml": "12.1.7",
54
- "@pnpm/lockfile-utils": "9.0.4",
55
- "@pnpm/parse-wanted-dependency": "5.0.0",
56
55
  "@pnpm/patching.apply-patch": "2.0.5",
57
- "@pnpm/pick-registry-for-package": "5.0.6",
56
+ "@pnpm/parse-wanted-dependency": "5.0.0",
58
57
  "@pnpm/pick-fetcher": "2.0.1",
59
- "@pnpm/plugin-commands-installation": "14.1.2",
58
+ "@pnpm/pick-registry-for-package": "5.0.6",
60
59
  "@pnpm/read-package-json": "8.0.7",
60
+ "@pnpm/plugin-commands-installation": "14.2.0",
61
61
  "@pnpm/read-project-manifest": "5.0.10",
62
- "@pnpm/store-connection-manager": "7.0.24"
62
+ "@pnpm/store-connection-manager": "7.0.26"
63
63
  },
64
64
  "peerDependencies": {
65
65
  "@pnpm/logger": "^5.0.0"