beachball 2.24.1 → 2.26.0
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/CHANGELOG.json +54 -1
- package/CHANGELOG.md +30 -2
- package/lib/options/getCliOptions.js +4 -1
- package/lib/options/getCliOptions.js.map +1 -1
- package/lib/options/getRepoOptions.d.ts.map +1 -1
- package/lib/options/getRepoOptions.js +4 -3
- package/lib/options/getRepoOptions.js.map +1 -1
- package/lib/publish/bumpAndPush.d.ts.map +1 -1
- package/lib/publish/bumpAndPush.js +10 -4
- package/lib/publish/bumpAndPush.js.map +1 -1
- package/lib/publish/mergePublishBranch.d.ts +1 -5
- package/lib/publish/mergePublishBranch.d.ts.map +1 -1
- package/package.json +2 -7
package/CHANGELOG.json
CHANGED
|
@@ -2,7 +2,60 @@
|
|
|
2
2
|
"name": "beachball",
|
|
3
3
|
"entries": [
|
|
4
4
|
{
|
|
5
|
-
"date": "
|
|
5
|
+
"date": "Thu, 21 Jul 2022 00:41:11 GMT",
|
|
6
|
+
"tag": "beachball_v2.26.0",
|
|
7
|
+
"version": "2.26.0",
|
|
8
|
+
"comments": {
|
|
9
|
+
"minor": [
|
|
10
|
+
{
|
|
11
|
+
"author": "elcraig@microsoft.com",
|
|
12
|
+
"package": "beachball",
|
|
13
|
+
"commit": "1e95735b4897363a2100c797129b30db495d0bb6",
|
|
14
|
+
"comment": "Update workspace-tools to fix remote detection"
|
|
15
|
+
}
|
|
16
|
+
]
|
|
17
|
+
}
|
|
18
|
+
},
|
|
19
|
+
{
|
|
20
|
+
"date": "Thu, 14 Jul 2022 21:17:09 GMT",
|
|
21
|
+
"tag": "beachball_v2.25.1",
|
|
22
|
+
"version": "2.25.1",
|
|
23
|
+
"comments": {
|
|
24
|
+
"patch": [
|
|
25
|
+
{
|
|
26
|
+
"author": "viditganpi10@gmail.com",
|
|
27
|
+
"package": "beachball",
|
|
28
|
+
"commit": "c1490d51e33daf38ff7d0d14c79a8bcfc1708f61",
|
|
29
|
+
"comment": "Added error handling for git fetch"
|
|
30
|
+
}
|
|
31
|
+
]
|
|
32
|
+
}
|
|
33
|
+
},
|
|
34
|
+
{
|
|
35
|
+
"date": "Wed, 13 Jul 2022 21:17:51 GMT",
|
|
36
|
+
"tag": "beachball_v2.25.0",
|
|
37
|
+
"version": "2.25.0",
|
|
38
|
+
"comments": {
|
|
39
|
+
"minor": [
|
|
40
|
+
{
|
|
41
|
+
"author": "elcraig@microsoft.com",
|
|
42
|
+
"package": "beachball",
|
|
43
|
+
"commit": "bddbce4525f76d209fc91a07ac4128348dcb269d",
|
|
44
|
+
"comment": "Update `workspace-tools` to pick up new `git-url-parse` (may include [breaking changes](https://github.com/IonicaBizau/git-url-parse/releases/tag/12.0.0))"
|
|
45
|
+
}
|
|
46
|
+
],
|
|
47
|
+
"patch": [
|
|
48
|
+
{
|
|
49
|
+
"author": "elcraig@microsoft.com",
|
|
50
|
+
"package": "beachball",
|
|
51
|
+
"commit": "bddbce4525f76d209fc91a07ac4128348dcb269d",
|
|
52
|
+
"comment": "Remove unused direct dependencies on `git-url-parse` and `glob` (the code moved to `workspace-tools` awhile back)"
|
|
53
|
+
}
|
|
54
|
+
]
|
|
55
|
+
}
|
|
56
|
+
},
|
|
57
|
+
{
|
|
58
|
+
"date": "Wed, 13 Jul 2022 20:33:51 GMT",
|
|
6
59
|
"tag": "beachball_v2.24.1",
|
|
7
60
|
"version": "2.24.1",
|
|
8
61
|
"comments": {
|
package/CHANGELOG.md
CHANGED
|
@@ -1,12 +1,40 @@
|
|
|
1
1
|
# Change Log - beachball
|
|
2
2
|
|
|
3
|
-
This log was last generated on
|
|
3
|
+
This log was last generated on Thu, 21 Jul 2022 00:41:11 GMT and should not be manually modified.
|
|
4
4
|
|
|
5
5
|
<!-- Start content -->
|
|
6
6
|
|
|
7
|
+
## 2.26.0
|
|
8
|
+
|
|
9
|
+
Thu, 21 Jul 2022 00:41:11 GMT
|
|
10
|
+
|
|
11
|
+
### Minor changes
|
|
12
|
+
|
|
13
|
+
- Update workspace-tools to fix remote detection (elcraig@microsoft.com)
|
|
14
|
+
|
|
15
|
+
## 2.25.1
|
|
16
|
+
|
|
17
|
+
Thu, 14 Jul 2022 21:17:09 GMT
|
|
18
|
+
|
|
19
|
+
### Patches
|
|
20
|
+
|
|
21
|
+
- Added error handling for git fetch (viditganpi10@gmail.com)
|
|
22
|
+
|
|
23
|
+
## 2.25.0
|
|
24
|
+
|
|
25
|
+
Wed, 13 Jul 2022 21:17:51 GMT
|
|
26
|
+
|
|
27
|
+
### Minor changes
|
|
28
|
+
|
|
29
|
+
- Update `workspace-tools` to pick up new `git-url-parse` (may include [breaking changes](https://github.com/IonicaBizau/git-url-parse/releases/tag/12.0.0)) (elcraig@microsoft.com)
|
|
30
|
+
|
|
31
|
+
### Patches
|
|
32
|
+
|
|
33
|
+
- Remove unused direct dependencies on `git-url-parse` and `glob` (the code moved to `workspace-tools` awhile back) (elcraig@microsoft.com)
|
|
34
|
+
|
|
7
35
|
## 2.24.1
|
|
8
36
|
|
|
9
|
-
Wed, 13 Jul 2022 20:33:
|
|
37
|
+
Wed, 13 Jul 2022 20:33:51 GMT
|
|
10
38
|
|
|
11
39
|
### Patches
|
|
12
40
|
|
|
@@ -61,7 +61,10 @@ function getCliOptionsUncached(argv) {
|
|
|
61
61
|
cliOptions.disallowedChangeTypes = disallowedChangeTypesArgs;
|
|
62
62
|
}
|
|
63
63
|
if (args.branch) {
|
|
64
|
-
cliOptions.branch =
|
|
64
|
+
cliOptions.branch =
|
|
65
|
+
args.branch.indexOf('/') > -1
|
|
66
|
+
? args.branch
|
|
67
|
+
: workspace_tools_1.getDefaultRemoteBranch({ branch: args.branch, verbose: args.verbose, cwd });
|
|
65
68
|
}
|
|
66
69
|
if (cliOptions.command === 'canary') {
|
|
67
70
|
cliOptions.tag = cliOptions.canaryName || 'canary';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getCliOptions.js","sourceRoot":"","sources":["../../src/options/getCliOptions.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,gEAAkC;AAElC,qDAA0E;AAE1E,IAAI,gBAA4B,CAAC;AAEjC,SAAgB,aAAa,CAAC,IAAc;IAC1C,iEAAiE;IACjE,IAAI,IAAI,KAAK,OAAO,CAAC,IAAI,EAAE;QACzB,IAAI,CAAC,gBAAgB,EAAE;YACrB,gBAAgB,GAAG,qBAAqB,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;SACxD;QACD,OAAO,gBAAgB,CAAC;KACzB;SAAM;QACL,OAAO,qBAAqB,CAAC,IAAI,CAAC,CAAC;KACpC;AACH,CAAC;AAVD,sCAUC;AAED,SAAS,qBAAqB,CAAC,IAAc;IAC3C,0CAA0C;IAC1C,MAAM,WAAW,GAAG,CAAC,GAAG,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;IAExC,MAAM,IAAI,GAAG,sBAAM,CAAC,WAAW,EAAE;QAC/B,MAAM,EAAE,CAAC,QAAQ,EAAE,KAAK,EAAE,SAAS,EAAE,SAAS,EAAE,OAAO,EAAE,uBAAuB,EAAE,QAAQ,CAAC;QAC3F,KAAK,EAAE,CAAC,OAAO,EAAE,yBAAyB,CAAC;QAC3C,OAAO,EAAE,CAAC,UAAU,EAAE,mBAAmB,EAAE,OAAO,EAAE,+BAA+B,EAAE,WAAW,EAAE,OAAO,CAAC;QAC1G,MAAM,EAAE,CAAC,OAAO,CAAC;QACjB,KAAK,EAAE;YACL,QAAQ,EAAE,CAAC,GAAG,CAAC;YACf,MAAM,EAAE,CAAC,GAAG,CAAC;YACb,MAAM,EAAE,CAAC,GAAG,CAAC;YACb,GAAG,EAAE,CAAC,GAAG,CAAC;YACV,QAAQ,EAAE,CAAC,GAAG,CAAC;YACf,OAAO,EAAE,CAAC,GAAG,CAAC;YACd,KAAK,EAAE,CAAC,GAAG,CAAC;YACZ,IAAI,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC;YAChB,GAAG,EAAE,CAAC,GAAG,CAAC;YACV,OAAO,EAAE,CAAC,GAAG,CAAC;YACd,OAAO,EAAE,CAAC,GAAG,CAAC;SACf;KACF,CAAC,CAAC;IAEH,MAAM,EAAE,CAAC,KAAkB,IAAI,EAAjB,QAAQ,UAAK,IAAI,EAAzB,KAAkB,CAAO,CAAC;IAChC,MAAM,GAAG,GAAG,iCAAe,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC;IAC5D,MAAM,UAAU,GAAG,8CACd,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,GAClC,QAAgB,KACpB,IAAI,EAAE,GAAG,EACT,OAAO,EAAE,IAAI,CAAC,KAAK,EACnB,eAAe,EAAE,IAAI,CAAC,mBAAmB,CAAC,EAC1C,0BAA0B,EAAE,IAAI,CAAC,+BAA+B,CAAC,EACjE,aAAa,EAAE,IAAI,CAAC,KAAK,EACzB,UAAU,EAAE,IAAI,CAAC,MAAM,GACV,CAAC;IAEhB,MAAM,yBAAyB,GAAG,IAAI,CAAC,yBAAyB,CAAC,CAAC;IAClE,IAAI,yBAAyB,EAAE;QAC7B,UAAU,CAAC,qBAAqB,GAAG,yBAAyB,CAAC;KAC9D;IAED,IAAI,IAAI,CAAC,MAAM,EAAE;QACf,UAAU,CAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"getCliOptions.js","sourceRoot":"","sources":["../../src/options/getCliOptions.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,gEAAkC;AAElC,qDAA0E;AAE1E,IAAI,gBAA4B,CAAC;AAEjC,SAAgB,aAAa,CAAC,IAAc;IAC1C,iEAAiE;IACjE,IAAI,IAAI,KAAK,OAAO,CAAC,IAAI,EAAE;QACzB,IAAI,CAAC,gBAAgB,EAAE;YACrB,gBAAgB,GAAG,qBAAqB,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;SACxD;QACD,OAAO,gBAAgB,CAAC;KACzB;SAAM;QACL,OAAO,qBAAqB,CAAC,IAAI,CAAC,CAAC;KACpC;AACH,CAAC;AAVD,sCAUC;AAED,SAAS,qBAAqB,CAAC,IAAc;IAC3C,0CAA0C;IAC1C,MAAM,WAAW,GAAG,CAAC,GAAG,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;IAExC,MAAM,IAAI,GAAG,sBAAM,CAAC,WAAW,EAAE;QAC/B,MAAM,EAAE,CAAC,QAAQ,EAAE,KAAK,EAAE,SAAS,EAAE,SAAS,EAAE,OAAO,EAAE,uBAAuB,EAAE,QAAQ,CAAC;QAC3F,KAAK,EAAE,CAAC,OAAO,EAAE,yBAAyB,CAAC;QAC3C,OAAO,EAAE,CAAC,UAAU,EAAE,mBAAmB,EAAE,OAAO,EAAE,+BAA+B,EAAE,WAAW,EAAE,OAAO,CAAC;QAC1G,MAAM,EAAE,CAAC,OAAO,CAAC;QACjB,KAAK,EAAE;YACL,QAAQ,EAAE,CAAC,GAAG,CAAC;YACf,MAAM,EAAE,CAAC,GAAG,CAAC;YACb,MAAM,EAAE,CAAC,GAAG,CAAC;YACb,GAAG,EAAE,CAAC,GAAG,CAAC;YACV,QAAQ,EAAE,CAAC,GAAG,CAAC;YACf,OAAO,EAAE,CAAC,GAAG,CAAC;YACd,KAAK,EAAE,CAAC,GAAG,CAAC;YACZ,IAAI,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC;YAChB,GAAG,EAAE,CAAC,GAAG,CAAC;YACV,OAAO,EAAE,CAAC,GAAG,CAAC;YACd,OAAO,EAAE,CAAC,GAAG,CAAC;SACf;KACF,CAAC,CAAC;IAEH,MAAM,EAAE,CAAC,KAAkB,IAAI,EAAjB,QAAQ,UAAK,IAAI,EAAzB,KAAkB,CAAO,CAAC;IAChC,MAAM,GAAG,GAAG,iCAAe,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC;IAC5D,MAAM,UAAU,GAAG,8CACd,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,GAClC,QAAgB,KACpB,IAAI,EAAE,GAAG,EACT,OAAO,EAAE,IAAI,CAAC,KAAK,EACnB,eAAe,EAAE,IAAI,CAAC,mBAAmB,CAAC,EAC1C,0BAA0B,EAAE,IAAI,CAAC,+BAA+B,CAAC,EACjE,aAAa,EAAE,IAAI,CAAC,KAAK,EACzB,UAAU,EAAE,IAAI,CAAC,MAAM,GACV,CAAC;IAEhB,MAAM,yBAAyB,GAAG,IAAI,CAAC,yBAAyB,CAAC,CAAC;IAClE,IAAI,yBAAyB,EAAE;QAC7B,UAAU,CAAC,qBAAqB,GAAG,yBAAyB,CAAC;KAC9D;IAED,IAAI,IAAI,CAAC,MAAM,EAAE;QACf,UAAU,CAAC,MAAM;YACf,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;gBAC3B,CAAC,CAAC,IAAI,CAAC,MAAM;gBACb,CAAC,CAAC,wCAAsB,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC;KACnF;IAED,IAAI,UAAU,CAAC,OAAO,KAAK,QAAQ,EAAE;QACnC,UAAU,CAAC,GAAG,GAAG,UAAU,CAAC,UAAU,IAAI,QAAQ,CAAC;KACpD;IAED,OAAO,UAAU,CAAC;AACpB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getRepoOptions.d.ts","sourceRoot":"","sources":["../../src/options/getRepoOptions.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,UAAU,
|
|
1
|
+
{"version":3,"file":"getRepoOptions.d.ts","sourceRoot":"","sources":["../../src/options/getRepoOptions.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,UAAU,EAAoB,MAAM,2BAA2B,CAAC;AAItF,wBAAgB,cAAc,CAAC,UAAU,EAAE,UAAU,GAAG,WAAW,CAmClE"}
|
|
@@ -5,7 +5,7 @@ const cosmiconfig_1 = require("cosmiconfig");
|
|
|
5
5
|
const workspace_tools_1 = require("workspace-tools");
|
|
6
6
|
let cachedRepoOptions = new Map();
|
|
7
7
|
function getRepoOptions(cliOptions) {
|
|
8
|
-
const { configPath, path:
|
|
8
|
+
const { configPath, path: cwd, branch } = cliOptions;
|
|
9
9
|
if (cachedRepoOptions.has(cliOptions)) {
|
|
10
10
|
return cachedRepoOptions.get(cliOptions);
|
|
11
11
|
}
|
|
@@ -25,13 +25,14 @@ function getRepoOptions(cliOptions) {
|
|
|
25
25
|
// avoid potential for log messages/errors which aren't relevant if the branch was specified on
|
|
26
26
|
// the command line.)
|
|
27
27
|
if (!branch) {
|
|
28
|
+
const verbose = repoOptions.verbose;
|
|
28
29
|
if (repoOptions.branch && !repoOptions.branch.includes('/')) {
|
|
29
30
|
// Add a remote to the branch if it's not already included
|
|
30
|
-
repoOptions.branch = workspace_tools_1.getDefaultRemoteBranch(repoOptions.branch,
|
|
31
|
+
repoOptions.branch = workspace_tools_1.getDefaultRemoteBranch({ branch: repoOptions.branch, cwd, verbose });
|
|
31
32
|
}
|
|
32
33
|
else if (!repoOptions.branch) {
|
|
33
34
|
// Branch is not specified at all. Add in the default remote and branch.
|
|
34
|
-
repoOptions.branch = workspace_tools_1.getDefaultRemoteBranch(
|
|
35
|
+
repoOptions.branch = workspace_tools_1.getDefaultRemoteBranch({ cwd, verbose });
|
|
35
36
|
}
|
|
36
37
|
}
|
|
37
38
|
cachedRepoOptions.set(cliOptions, repoOptions);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getRepoOptions.js","sourceRoot":"","sources":["../../src/options/getRepoOptions.ts"],"names":[],"mappings":";;;AAAA,6CAA8C;AAC9C,qDAAyD;AAGzD,IAAI,iBAAiB,GAAG,IAAI,GAAG,EAA2B,CAAC;AAE3D,SAAgB,cAAc,CAAC,UAAsB;IACnD,MAAM,EAAE,UAAU,EAAE,IAAI,EAAE,
|
|
1
|
+
{"version":3,"file":"getRepoOptions.js","sourceRoot":"","sources":["../../src/options/getRepoOptions.ts"],"names":[],"mappings":";;;AAAA,6CAA8C;AAC9C,qDAAyD;AAGzD,IAAI,iBAAiB,GAAG,IAAI,GAAG,EAA2B,CAAC;AAE3D,SAAgB,cAAc,CAAC,UAAsB;IACnD,MAAM,EAAE,UAAU,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,UAAU,CAAC;IACrD,IAAI,iBAAiB,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE;QACrC,OAAO,iBAAiB,CAAC,GAAG,CAAC,UAAU,CAAE,CAAC;KAC3C;IAED,IAAI,WAA+B,CAAC;IACpC,IAAI,UAAU,EAAE;QACd,WAAW,GAAG,aAAa,CAAC,UAAU,CAAC,CAAC;QACxC,IAAI,CAAC,WAAW,EAAE;YAChB,OAAO,CAAC,KAAK,CAAC,gBAAgB,UAAU,uBAAuB,CAAC,CAAC;YACjE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;SACjB;KACF;SAAM;QACL,WAAW,GAAG,eAAe,EAAE,IAAK,EAAkB,CAAC;KACxD;IAED,iGAAiG;IACjG,8FAA8F;IAC9F,+FAA+F;IAC/F,qBAAqB;IACrB,IAAI,CAAC,MAAM,EAAE;QACX,MAAM,OAAO,GAAI,WAAgC,CAAC,OAAO,CAAC;QAC1D,IAAI,WAAW,CAAC,MAAM,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;YAC3D,0DAA0D;YAC1D,WAAW,CAAC,MAAM,GAAG,wCAAsB,CAAC,EAAE,MAAM,EAAE,WAAW,CAAC,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,CAAC,CAAC;SAC3F;aAAM,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE;YAC9B,wEAAwE;YACxE,WAAW,CAAC,MAAM,GAAG,wCAAsB,CAAC,EAAE,GAAG,EAAE,OAAO,EAAE,CAAC,CAAC;SAC/D;KACF;IAED,iBAAiB,CAAC,GAAG,CAAC,UAAU,EAAE,WAAW,CAAC,CAAC;IAE/C,OAAO,WAAW,CAAC;AACrB,CAAC;AAnCD,wCAmCC;AAED,SAAS,aAAa,CAAC,UAAkB;IACvC,MAAM,cAAc,GAAG,6BAAe,CAAC,WAAW,CAAC,CAAC;IACpD,MAAM,WAAW,GAAG,cAAc,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IACpD,OAAO,CAAC,WAAW,IAAI,WAAW,CAAC,MAAM,CAAC,IAAI,IAAI,CAAC;AACrD,CAAC;AAED,SAAS,eAAe;IACtB,MAAM,cAAc,GAAG,6BAAe,CAAC,WAAW,CAAC,CAAC;IACpD,MAAM,aAAa,GAAG,cAAc,CAAC,MAAM,EAAE,CAAC;IAC9C,OAAO,CAAC,aAAa,IAAI,aAAa,CAAC,MAAM,CAAC,IAAI,IAAI,CAAC;AACzD,CAAC"}
|
|
@@ -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,iBAsErG"}
|
|
@@ -30,11 +30,17 @@ function bumpAndPush(bumpInfo, publishBranch, options) {
|
|
|
30
30
|
// pull in latest from origin branch
|
|
31
31
|
console.log('Fetching from remote');
|
|
32
32
|
if (options.fetch !== false) {
|
|
33
|
-
|
|
34
|
-
|
|
33
|
+
try {
|
|
34
|
+
if (options.depth) {
|
|
35
|
+
workspace_tools_1.gitFailFast(['fetch', remote, remoteBranch, `--depth=${options.depth}`], { cwd });
|
|
36
|
+
}
|
|
37
|
+
else {
|
|
38
|
+
workspace_tools_1.gitFailFast(['fetch', remote, remoteBranch], { cwd });
|
|
39
|
+
}
|
|
35
40
|
}
|
|
36
|
-
|
|
37
|
-
|
|
41
|
+
catch (err) {
|
|
42
|
+
console.warn(`[WARN ${tryNumber}/${BUMP_PUSH_RETRIES}]: fetch from ${branch} has failed!\n${err}`);
|
|
43
|
+
continue;
|
|
38
44
|
}
|
|
39
45
|
}
|
|
40
46
|
const mergeResult = workspace_tools_1.git(['merge', '-X', 'theirs', `${branch}`], { cwd });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bumpAndPush.js","sourceRoot":"","sources":["../../src/publish/bumpAndPush.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qDAAkD;AAGlD,qDAA0F;AAC1F,+CAAwD;AACxD,6DAA0D;AAC1D,mEAAgE;AAEhE,MAAM,iBAAiB,GAAG,CAAC,CAAC;AAE5B,SAAsB,WAAW,CAAC,QAAkB,EAAE,aAAqB,EAAE,OAAyB;;QACpG,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;QACpD,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,GAAG,mCAAiB,CAAC,MAAM,CAAC,CAAC;QAE3D,IAAI,SAAS,GAAG,KAAK,CAAC;QACtB,IAAI,SAAS,GAAG,CAAC,CAAC;QAElB,OAAO,SAAS,GAAG,iBAAiB,IAAI,CAAC,SAAS,EAAE;YAClD,SAAS,EAAE,CAAC;YACZ,OAAO,CAAC,GAAG,CAAC,kCAAkC,SAAS,IAAI,iBAAiB,EAAE,CAAC,CAAC;YAChF,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;YACzB,oCAAkB,CAAC,GAAG,CAAC,CAAC;YAExB,oCAAoC;YACpC,OAAO,CAAC,GAAG,CAAC,sBAAsB,CAAC,CAAC;YACpC,IAAI,OAAO,CAAC,KAAK,KAAK,KAAK,EAAE;gBAC3B,IAAI,OAAO,CAAC,KAAK,EAAE;
|
|
1
|
+
{"version":3,"file":"bumpAndPush.js","sourceRoot":"","sources":["../../src/publish/bumpAndPush.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,2 @@
|
|
|
1
|
-
export declare function mergePublishBranch(publishBranch: string, branch: string, message: string, cwd: string):
|
|
2
|
-
stderr: string;
|
|
3
|
-
stdout: string;
|
|
4
|
-
success: boolean;
|
|
5
|
-
};
|
|
1
|
+
export declare function mergePublishBranch(publishBranch: string, branch: string, message: string, cwd: string): import("workspace-tools").GitProcessOutput;
|
|
6
2
|
//# sourceMappingURL=mergePublishBranch.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mergePublishBranch.d.ts","sourceRoot":"","sources":["../../src/publish/mergePublishBranch.ts"],"names":[],"mappings":"AAEA,wBAAgB,kBAAkB,CAAC,aAAa,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM
|
|
1
|
+
{"version":3,"file":"mergePublishBranch.d.ts","sourceRoot":"","sources":["../../src/publish/mergePublishBranch.ts"],"names":[],"mappings":"AAEA,wBAAgB,kBAAkB,CAAC,aAAa,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,8CAoBrG"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "beachball",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.26.0",
|
|
4
4
|
"description": "The Sunniest Semantic Version Bumper",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -37,8 +37,6 @@
|
|
|
37
37
|
"cosmiconfig": "^6.0.0",
|
|
38
38
|
"execa": "^4.0.3",
|
|
39
39
|
"fs-extra": "^8.0.1",
|
|
40
|
-
"git-url-parse": "^12.0.0",
|
|
41
|
-
"glob": "^7.1.4",
|
|
42
40
|
"human-id": "^2.0.1",
|
|
43
41
|
"lodash": "^4.17.15",
|
|
44
42
|
"minimatch": "^3.0.4",
|
|
@@ -47,15 +45,13 @@
|
|
|
47
45
|
"semver": "^6.1.1",
|
|
48
46
|
"toposort": "^2.0.2",
|
|
49
47
|
"uuid": "^8.3.1",
|
|
50
|
-
"workspace-tools": "^0.
|
|
48
|
+
"workspace-tools": "^0.24.0",
|
|
51
49
|
"yargs-parser": "^20.2.4"
|
|
52
50
|
},
|
|
53
51
|
"devDependencies": {
|
|
54
52
|
"@types/cosmiconfig": "6.0.0",
|
|
55
53
|
"@types/execa": "^2.0.0",
|
|
56
54
|
"@types/fs-extra": "^8.0.0",
|
|
57
|
-
"@types/git-url-parse": "^9.0.0",
|
|
58
|
-
"@types/glob": "^7.1.1",
|
|
59
55
|
"@types/jest": "^26.0.24",
|
|
60
56
|
"@types/lodash": "^4.14.149",
|
|
61
57
|
"@types/minimatch": "^3.0.3",
|
|
@@ -70,7 +66,6 @@
|
|
|
70
66
|
"find-free-port": "~2.0.0",
|
|
71
67
|
"gh-pages": "^3.1.0",
|
|
72
68
|
"jest": "^27.0.6",
|
|
73
|
-
"ncp": "^2.0.0",
|
|
74
69
|
"prettier": "~2.3.2",
|
|
75
70
|
"tmp": "^0.1.0",
|
|
76
71
|
"ts-jest": "^27.0.3",
|