Skip to content

Commit 5e51bf4

Browse files
authored
chore(misc): patch lerna 6.6.2 to catch additional publish conflicts (nrwl#17809)
1 parent 7055c72 commit 5e51bf4

File tree

3 files changed

+61
-3
lines changed

3 files changed

+61
-3
lines changed

package.json

+5-1
Original file line numberDiff line numberDiff line change
@@ -347,6 +347,10 @@
347347
"depcheck",
348348
"documentation"
349349
]
350+
},
351+
"pnpm": {
352+
"patchedDependencies": {
353+
354+
}
350355
}
351356
}
352-

patches/[email protected]

+48
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
diff --git a/dist/cli.js b/dist/cli.js
2+
index 8cd49ff1e99dca8241a75bc412c669a85475fce2..8f081b7ee0769a493b11f22c5d5d0752e8285629 100755
3+
--- a/dist/cli.js
4+
+++ b/dist/cli.js
5+
@@ -7933,7 +7933,10 @@ var require_src10 = __commonJS({
6+
logPacked(pkg.packed);
7+
return pkg;
8+
}).catch((err) => {
9+
- if (err.code === "EPUBLISHCONFLICT") {
10+
+ if (
11+
+ err.code === "EPUBLISHCONFLICT" ||
12+
+ (err.code === "E403" &&
13+
+ err.body?.error?.includes("You cannot publish over the previously published versions"))) {
14+
tracker.warn("publish", `Package is already published: ${pkg.name}@${pkg.version}`);
15+
tracker.completeWork(1);
16+
return pkg;
17+
diff --git a/dist/commands/publish/index.js b/dist/commands/publish/index.js
18+
index 34fe8f496af5e7adaf58a7f9c4c3a11d812608c3..bbab4d70c044729b174208b2f1250f54ab69e56d 100644
19+
--- a/dist/commands/publish/index.js
20+
+++ b/dist/commands/publish/index.js
21+
@@ -6094,7 +6094,10 @@ var require_src2 = __commonJS({
22+
logPacked(pkg.packed);
23+
return pkg;
24+
}).catch((err) => {
25+
- if (err.code === "EPUBLISHCONFLICT") {
26+
+ if (
27+
+ err.code === "EPUBLISHCONFLICT" ||
28+
+ (err.code === "E403" &&
29+
+ err.body?.error?.includes("You cannot publish over the previously published versions"))) {
30+
tracker.warn("publish", `Package is already published: ${pkg.name}@${pkg.version}`);
31+
tracker.completeWork(1);
32+
return pkg;
33+
diff --git a/dist/index.js b/dist/index.js
34+
index a1f83a569598efc7f129d8de7d004f45177514f4..86364db7a267c0fa3eaafc9b1bc51838a41f4f4f 100644
35+
--- a/dist/index.js
36+
+++ b/dist/index.js
37+
@@ -7932,7 +7932,10 @@ var require_src10 = __commonJS({
38+
logPacked(pkg2.packed);
39+
return pkg2;
40+
}).catch((err) => {
41+
- if (err.code === "EPUBLISHCONFLICT") {
42+
+ if (
43+
+ err.code === "EPUBLISHCONFLICT" ||
44+
+ (err.code === "E403" &&
45+
+ err.body?.error?.includes("You cannot publish over the previously published versions"))) {
46+
tracker.warn("publish", `Package is already published: ${pkg2.name}@${pkg2.version}`);
47+
tracker.completeWork(1);
48+
return pkg2;

pnpm-lock.yaml

+8-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)