beachball 2.31.5 → 2.31.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.
package/lib/bump/performBump.js
CHANGED
|
@@ -41,7 +41,7 @@ function updatePackageLock(cwd) {
|
|
|
41
41
|
const root = workspace_tools_1.findProjectRoot(cwd);
|
|
42
42
|
if (root && fs_extra_1.default.existsSync(path_1.default.join(root, 'package-lock.json'))) {
|
|
43
43
|
console.log('Updating package-lock.json after bumping packages');
|
|
44
|
-
const res = npm_1.npm(['install', '--package-lock-only'], { stdio: 'inherit' });
|
|
44
|
+
const res = npm_1.npm(['install', '--package-lock-only', '--ignore-scripts'], { stdio: 'inherit' });
|
|
45
45
|
if (!res.success) {
|
|
46
46
|
console.warn('Updating package-lock.json failed. Continuing...');
|
|
47
47
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"performBump.js","sourceRoot":"","sources":["../../src/bump/performBump.ts"],"names":[],"mappings":";;;;;;AAAA,wDAA0B;AAC1B,gDAAwB;AACxB,uEAAoE;AACpE,gEAA6D;AAI7D,qDAAkD;AAClD,+CAA4C;AAE5C,SAAgB,gBAAgB,CAAC,gBAA6B,EAAE,YAA0B;IACxF,KAAK,MAAM,OAAO,IAAI,gBAAgB,EAAE;QACtC,MAAM,IAAI,GAAG,YAAY,CAAC,OAAO,CAAC,CAAC;QACnC,MAAM,WAAW,GAAG,kBAAE,CAAC,YAAY,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;QAE1D,WAAW,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;QAEnC,CAAC,cAAc,EAAE,iBAAiB,EAAE,kBAAkB,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;YACxE,mGAAmG;YACnG,MAAM,mBAAmB,GAA6B,IAAY,CAAC,OAAO,CAAC,CAAC;YAC5E,IAAI,mBAAmB,EAAE;gBACvB,wFAAwF;gBACxF,2FAA2F;gBAC3F,qCAAqC;gBACrC,MAAM,YAAY,GAAG,MAAM,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,gBAAgB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;gBAE/F,KAAK,MAAM,GAAG,IAAI,YAAY,EAAE;oBAC9B,IAAI,WAAW,CAAC,OAAO,CAAC,IAAI,WAAW,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,EAAE;wBACrD,WAAW,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,GAAG,mBAAmB,CAAC,GAAG,CAAC,CAAC;qBACtD;iBACF;aACF;QACH,CAAC,CAAC,CAAC;QAEH,kBAAE,CAAC,aAAa,CAAC,IAAI,CAAC,eAAe,EAAE,WAAW,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC;KACpE;AACH,CAAC;AA1BD,4CA0BC;AAED;;GAEG;AACH,SAAgB,iBAAiB,CAAC,GAAW;IAC3C,MAAM,IAAI,GAAG,iCAAe,CAAC,GAAG,CAAC,CAAC;IAClC,IAAI,IAAI,IAAI,kBAAE,CAAC,UAAU,CAAC,cAAI,CAAC,IAAI,CAAC,IAAI,EAAE,mBAAmB,CAAC,CAAC,EAAE;QAC/D,OAAO,CAAC,GAAG,CAAC,mDAAmD,CAAC,CAAC;QACjE,MAAM,GAAG,GAAG,SAAG,CAAC,CAAC,SAAS,EAAE,qBAAqB,CAAC,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"performBump.js","sourceRoot":"","sources":["../../src/bump/performBump.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bumpAndPush.d.ts","sourceRoot":"","sources":["../../src/publish/bumpAndPush.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAC7C,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAQ7D,wBAAsB,WAAW,CAAC,QAAQ,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,EAAE,OAAO,EAAE,gBAAgB,
|
|
1
|
+
{"version":3,"file":"bumpAndPush.d.ts","sourceRoot":"","sources":["../../src/publish/bumpAndPush.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAC7C,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAQ7D,wBAAsB,WAAW,CAAC,QAAQ,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,EAAE,OAAO,EAAE,gBAAgB,iBA8ErG"}
|
|
@@ -8,7 +8,7 @@ const mergePublishBranch_1 = require("./mergePublishBranch");
|
|
|
8
8
|
const displayManualRecovery_1 = require("./displayManualRecovery");
|
|
9
9
|
const BUMP_PUSH_RETRIES = 5;
|
|
10
10
|
async function bumpAndPush(bumpInfo, publishBranch, options) {
|
|
11
|
-
const { path: cwd, branch, tag, message } = options;
|
|
11
|
+
const { path: cwd, branch, tag, message, timeout } = options;
|
|
12
12
|
const { remote, remoteBranch } = workspace_tools_1.parseRemoteBranch(branch);
|
|
13
13
|
let completed = false;
|
|
14
14
|
let tryNumber = 0;
|
|
@@ -54,15 +54,21 @@ async function bumpAndPush(bumpInfo, publishBranch, options) {
|
|
|
54
54
|
console.log(`pushing to ${branch}, running the following command for git push:`);
|
|
55
55
|
const pushArgs = ['push', '--no-verify', '--follow-tags', '--verbose', remote, `HEAD:${remoteBranch}`];
|
|
56
56
|
console.log('git ' + pushArgs.join(' '));
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
57
|
+
try {
|
|
58
|
+
const pushResult = workspace_tools_1.git(pushArgs, { cwd, timeout });
|
|
59
|
+
if (!pushResult.success) {
|
|
60
|
+
console.warn(`[WARN ${tryNumber}/${BUMP_PUSH_RETRIES}]: push to ${branch} has failed!\n${pushResult.stderr}`);
|
|
61
|
+
continue;
|
|
62
|
+
}
|
|
63
|
+
else {
|
|
64
|
+
console.log(pushResult.stdout.toString());
|
|
65
|
+
console.log(pushResult.stderr.toString());
|
|
66
|
+
completed = true;
|
|
67
|
+
}
|
|
61
68
|
}
|
|
62
|
-
|
|
63
|
-
console.
|
|
64
|
-
|
|
65
|
-
completed = true;
|
|
69
|
+
catch (e) {
|
|
70
|
+
console.warn(`[WARN ${tryNumber}/${BUMP_PUSH_RETRIES}]: push to ${branch} has failed!\n${e}`);
|
|
71
|
+
continue;
|
|
66
72
|
}
|
|
67
73
|
}
|
|
68
74
|
if (!completed) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bumpAndPush.js","sourceRoot":"","sources":["../../src/publish/bumpAndPush.ts"],"names":[],"mappings":";;;AAAA,qDAAkD;AAGlD,qDAA6E;AAC7E,+CAAwD;AACxD,6DAA0D;AAC1D,mEAAgE;AAEhE,MAAM,iBAAiB,GAAG,CAAC,CAAC;AAErB,KAAK,UAAU,WAAW,CAAC,QAAkB,EAAE,aAAqB,EAAE,OAAyB;IACpG,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"bumpAndPush.js","sourceRoot":"","sources":["../../src/publish/bumpAndPush.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "beachball",
|
|
3
|
-
"version": "2.31.
|
|
3
|
+
"version": "2.31.7",
|
|
4
4
|
"description": "The Sunniest Semantic Version Bumper",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -55,15 +55,12 @@
|
|
|
55
55
|
},
|
|
56
56
|
"devDependencies": {
|
|
57
57
|
"@jest/globals": "28.1.3",
|
|
58
|
-
"@types/cosmiconfig": "6.0.0",
|
|
59
|
-
"@types/execa": "2.0.0",
|
|
60
58
|
"@types/fs-extra": "9.0.13",
|
|
61
|
-
"@types/lodash": "4.14.
|
|
59
|
+
"@types/lodash": "4.14.191",
|
|
62
60
|
"@types/minimatch": "3.0.5",
|
|
63
61
|
"@types/node": "12.20.55",
|
|
64
|
-
"@types/
|
|
65
|
-
"@types/
|
|
66
|
-
"@types/semver": "7.3.12",
|
|
62
|
+
"@types/prompts": "2.4.2",
|
|
63
|
+
"@types/semver": "7.3.13",
|
|
67
64
|
"@types/tmp": "0.2.3",
|
|
68
65
|
"@types/toposort": "2.0.3",
|
|
69
66
|
"@types/uuid": "8.3.4",
|
|
@@ -72,7 +69,7 @@
|
|
|
72
69
|
"gh-pages": "4.0.0",
|
|
73
70
|
"jest": "28.1.3",
|
|
74
71
|
"jest-mock": "28.1.3",
|
|
75
|
-
"prettier": "2.
|
|
72
|
+
"prettier": "2.8.2",
|
|
76
73
|
"strip-ansi": "6.0.1",
|
|
77
74
|
"tmp": "0.2.1",
|
|
78
75
|
"ts-jest": "28.0.8",
|
|
@@ -80,7 +77,7 @@
|
|
|
80
77
|
"verdaccio": "4.13.2",
|
|
81
78
|
"verdaccio-auth-memory": "10.2.0",
|
|
82
79
|
"verdaccio-memory": "10.3.0",
|
|
83
|
-
"vuepress": "1.9.
|
|
80
|
+
"vuepress": "1.9.8",
|
|
84
81
|
"vuepress-plugin-mermaidjs": "1.9.1"
|
|
85
82
|
}
|
|
86
83
|
}
|