@pnpm/plugin-commands-patching 1.3.6 → 1.3.7

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/patchCommit.js +8 -5
  2. package/lib/patchCommit.js.map +1 -1
  3. package/package.json +10 -10
package/lib/patchCommit.js CHANGED
@@ -92,14 +92,17 @@ async function diffFolders(folderA, folderB) {
92
92
  // i.e. git diff will exit with 1 if there were differences
93
93
  if (stderr.length > 0)
94
94
  throw new Error(`Unable to diff directories. Make sure you have a recent version of 'git' available in PATH.\nThe following error was reported by 'git':\n${stderr}`);
95
- const normalizePath = folderAN.startsWith('/')
96
- ? (p) => p.slice(1)
97
- : (p) => p;
98
95
  return stdout
99
- .replace(new RegExp(`(a|b)(${(0, escape_string_regexp_1.default)(`/${normalizePath(folderAN)}/`)})`, 'g'), '$1/')
100
- .replace(new RegExp(`(a|b)${(0, escape_string_regexp_1.default)(`/${normalizePath(folderBN)}/`)}`, 'g'), '$1/')
96
+ .replace(new RegExp(`(a|b)(${(0, escape_string_regexp_1.default)(`/${removeTrailingAndLeadingSlash(folderAN)}/`)})`, 'g'), '$1/')
97
+ .replace(new RegExp(`(a|b)${(0, escape_string_regexp_1.default)(`/${removeTrailingAndLeadingSlash(folderBN)}/`)}`, 'g'), '$1/')
101
98
  .replace(new RegExp((0, escape_string_regexp_1.default)(`${folderAN}/`), 'g'), '')
102
99
  .replace(new RegExp((0, escape_string_regexp_1.default)(`${folderBN}/`), 'g'), '')
103
100
  .replace(/\n\$/, '');
104
101
  }
102
+ function removeTrailingAndLeadingSlash(p) {
103
+ if (p.startsWith('/') || p.endsWith('/')) {
104
+ return p.replace(/^\/|\/$/g, '');
105
+ }
106
+ return p;
107
+ }
105
108
  //# sourceMappingURL=patchCommit.js.map
package/lib/patchCommit.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"patchCommit.js","sourceRoot":"","sources":["../src/patchCommit.ts"],"names":[],"mappings":"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"}
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": "1.3.6",
3
+ "version": "1.3.7",
4
4
  "description": "Commands for creating patches",
5
5
  "main": "lib/index.js",
6
6
  "types": "lib/index.d.ts",
@@ -23,21 +23,21 @@
23
23
  },
24
24
  "homepage": "https://github.com/pnpm/pnpm/blob/main/packages/plugin-commands-patching#readme",
25
25
  "devDependencies": {
26
- "@pnpm/plugin-commands-patching": "1.3.6",
26
+ "@pnpm/plugin-commands-patching": "1.3.7",
27
27
  "@pnpm/prepare": "0.0.54",
28
- "@pnpm/registry-mock": "3.0.0-3",
28
+ "@pnpm/registry-mock": "3.0.0",
29
29
  "@types/ramda": "0.28.15"
30
30
  },
31
31
  "dependencies": {
32
- "@pnpm/cli-utils": "0.7.40",
33
- "@pnpm/config": "15.10.9",
34
- "@pnpm/error": "3.0.1",
32
+ "@pnpm/cli-utils": "0.7.41",
33
+ "@pnpm/config": "15.10.10",
34
+ "@pnpm/error": "3.1.0",
35
35
  "@pnpm/parse-wanted-dependency": "3.0.2",
36
36
  "@pnpm/pick-registry-for-package": "3.0.8",
37
- "@pnpm/plugin-commands-installation": "10.8.1",
38
- "@pnpm/read-package-json": "6.0.10",
39
- "@pnpm/read-project-manifest": "3.0.11",
40
- "@pnpm/store-connection-manager": "4.3.13",
37
+ "@pnpm/plugin-commands-installation": "10.8.2",
38
+ "@pnpm/read-package-json": "6.0.11",
39
+ "@pnpm/read-project-manifest": "3.0.12",
40
+ "@pnpm/store-connection-manager": "4.3.14",
41
41
  "escape-string-regexp": "^4.0.0",
42
42
  "ramda": "npm:@pnpm/ramda@0.28.1",
43
43
  "render-help": "^1.0.2",