beachball 2.24.0 → 2.25.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.
- package/CHANGELOG.json +54 -1
- package/CHANGELOG.md +30 -2
- 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/package.json +2 -7
package/CHANGELOG.json
CHANGED
|
@@ -2,7 +2,60 @@
|
|
|
2
2
|
"name": "beachball",
|
|
3
3
|
"entries": [
|
|
4
4
|
{
|
|
5
|
-
"date": "Thu,
|
|
5
|
+
"date": "Thu, 14 Jul 2022 21:17:06 GMT",
|
|
6
|
+
"tag": "beachball_v2.25.1",
|
|
7
|
+
"version": "2.25.1",
|
|
8
|
+
"comments": {
|
|
9
|
+
"patch": [
|
|
10
|
+
{
|
|
11
|
+
"author": "viditganpi10@gmail.com",
|
|
12
|
+
"package": "beachball",
|
|
13
|
+
"commit": "c1490d51e33daf38ff7d0d14c79a8bcfc1708f61",
|
|
14
|
+
"comment": "Added error handling for git fetch"
|
|
15
|
+
}
|
|
16
|
+
]
|
|
17
|
+
}
|
|
18
|
+
},
|
|
19
|
+
{
|
|
20
|
+
"date": "Wed, 13 Jul 2022 21:17:51 GMT",
|
|
21
|
+
"tag": "beachball_v2.25.0",
|
|
22
|
+
"version": "2.25.0",
|
|
23
|
+
"comments": {
|
|
24
|
+
"minor": [
|
|
25
|
+
{
|
|
26
|
+
"author": "elcraig@microsoft.com",
|
|
27
|
+
"package": "beachball",
|
|
28
|
+
"commit": "bddbce4525f76d209fc91a07ac4128348dcb269d",
|
|
29
|
+
"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))"
|
|
30
|
+
}
|
|
31
|
+
],
|
|
32
|
+
"patch": [
|
|
33
|
+
{
|
|
34
|
+
"author": "elcraig@microsoft.com",
|
|
35
|
+
"package": "beachball",
|
|
36
|
+
"commit": "bddbce4525f76d209fc91a07ac4128348dcb269d",
|
|
37
|
+
"comment": "Remove unused direct dependencies on `git-url-parse` and `glob` (the code moved to `workspace-tools` awhile back)"
|
|
38
|
+
}
|
|
39
|
+
]
|
|
40
|
+
}
|
|
41
|
+
},
|
|
42
|
+
{
|
|
43
|
+
"date": "Wed, 13 Jul 2022 20:33:51 GMT",
|
|
44
|
+
"tag": "beachball_v2.24.1",
|
|
45
|
+
"version": "2.24.1",
|
|
46
|
+
"comments": {
|
|
47
|
+
"patch": [
|
|
48
|
+
{
|
|
49
|
+
"author": "adam.gleitman@gmail.com",
|
|
50
|
+
"package": "beachball",
|
|
51
|
+
"commit": "511dc118032faf4326d7bd071e5ccea80332cea8",
|
|
52
|
+
"comment": "Bump git-url-parse to 12.0.0"
|
|
53
|
+
}
|
|
54
|
+
]
|
|
55
|
+
}
|
|
56
|
+
},
|
|
57
|
+
{
|
|
58
|
+
"date": "Thu, 07 Jul 2022 04:38:07 GMT",
|
|
6
59
|
"tag": "beachball_v2.24.0",
|
|
7
60
|
"version": "2.24.0",
|
|
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 Thu,
|
|
3
|
+
This log was last generated on Thu, 14 Jul 2022 21:17:06 GMT and should not be manually modified.
|
|
4
4
|
|
|
5
5
|
<!-- Start content -->
|
|
6
6
|
|
|
7
|
+
## 2.25.1
|
|
8
|
+
|
|
9
|
+
Thu, 14 Jul 2022 21:17:06 GMT
|
|
10
|
+
|
|
11
|
+
### Patches
|
|
12
|
+
|
|
13
|
+
- Added error handling for git fetch (viditganpi10@gmail.com)
|
|
14
|
+
|
|
15
|
+
## 2.25.0
|
|
16
|
+
|
|
17
|
+
Wed, 13 Jul 2022 21:17:51 GMT
|
|
18
|
+
|
|
19
|
+
### Minor changes
|
|
20
|
+
|
|
21
|
+
- 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)
|
|
22
|
+
|
|
23
|
+
### Patches
|
|
24
|
+
|
|
25
|
+
- Remove unused direct dependencies on `git-url-parse` and `glob` (the code moved to `workspace-tools` awhile back) (elcraig@microsoft.com)
|
|
26
|
+
|
|
27
|
+
## 2.24.1
|
|
28
|
+
|
|
29
|
+
Wed, 13 Jul 2022 20:33:51 GMT
|
|
30
|
+
|
|
31
|
+
### Patches
|
|
32
|
+
|
|
33
|
+
- Bump git-url-parse to 12.0.0 (adam.gleitman@gmail.com)
|
|
34
|
+
|
|
7
35
|
## 2.24.0
|
|
8
36
|
|
|
9
|
-
Thu, 07 Jul 2022 04:38:
|
|
37
|
+
Thu, 07 Jul 2022 04:38:07 GMT
|
|
10
38
|
|
|
11
39
|
### Minor changes
|
|
12
40
|
|
|
@@ -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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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "beachball",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.25.1",
|
|
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": "^11.1.2",
|
|
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.22.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",
|