From 97fe108881a92164f34d871fc74cad107653edc3 Mon Sep 17 00:00:00 2001 From: bubkoo Date: Wed, 4 Nov 2020 18:25:20 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E2=99=BB=EF=B8=8F=20comment=20mess?= =?UTF-8?q?age?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit merge comment fix #1 --- packages/a/CHANGELOG.md | 14 ----------- packages/b/CHANGELOG.md | 14 ----------- packages/c/CHANGELOG.md | 16 ------------- packages/d/CHANGELOG.md | 6 ----- release.config.js | 53 ++++++++++++++++++++++++----------------- 5 files changed, 31 insertions(+), 72 deletions(-) delete mode 100644 packages/a/CHANGELOG.md delete mode 100644 packages/b/CHANGELOG.md delete mode 100644 packages/c/CHANGELOG.md delete mode 100644 packages/d/CHANGELOG.md diff --git a/packages/a/CHANGELOG.md b/packages/a/CHANGELOG.md deleted file mode 100644 index affa2b1..0000000 --- a/packages/a/CHANGELOG.md +++ /dev/null @@ -1,14 +0,0 @@ -## @bubkoo/msr-test-a [1.2.34](https://github.com/bubkoo/monorepo-semantic-release/compare/@bubkoo/msr-test-a@1.2.33...@bubkoo/msr-test-a@1.2.34) (2020-11-04) - - -### Bug Fixes - -* 🐛 release comments ([4365884](https://github.com/bubkoo/monorepo-semantic-release/commit/4365884adfbf4d5cd34ec1c855cc16c9b6dc0145)), closes [#1](https://github.com/bubkoo/monorepo-semantic-release/issues/1) - - - - - -### Dependencies - -* **@bubkoo/msr-test-c:** upgraded to 1.2.34 diff --git a/packages/b/CHANGELOG.md b/packages/b/CHANGELOG.md deleted file mode 100644 index 9d676bb..0000000 --- a/packages/b/CHANGELOG.md +++ /dev/null @@ -1,14 +0,0 @@ -## @bubkoo/msr-test-b [1.2.34](https://github.com/bubkoo/monorepo-semantic-release/compare/@bubkoo/msr-test-b@1.2.33...@bubkoo/msr-test-b@1.2.34) (2020-11-04) - - -### Bug Fixes - -* 🐛 release comments ([4365884](https://github.com/bubkoo/monorepo-semantic-release/commit/4365884adfbf4d5cd34ec1c855cc16c9b6dc0145)), closes [#1](https://github.com/bubkoo/monorepo-semantic-release/issues/1) - - - - - -### Dependencies - -* **@bubkoo/msr-test-a:** upgraded to 1.2.34 diff --git a/packages/c/CHANGELOG.md b/packages/c/CHANGELOG.md deleted file mode 100644 index f592d82..0000000 --- a/packages/c/CHANGELOG.md +++ /dev/null @@ -1,16 +0,0 @@ -## @bubkoo/msr-test-c [1.2.34](https://github.com/bubkoo/monorepo-semantic-release/compare/monorepo-semantic-release-test-c@v1.2.33...monorepo-semantic-release-test-c@v1.2.34) (2020-11-04) - - -### Bug Fixes - -* 🐛 release comments ([4365884](https://github.com/bubkoo/monorepo-semantic-release/commit/4365884adfbf4d5cd34ec1c855cc16c9b6dc0145)), closes [#1](https://github.com/bubkoo/monorepo-semantic-release/issues/1) - - - - - -### Dependencies - -* **@bubkoo/msr-test-a:** upgraded to 1.2.34 -* **@bubkoo/msr-test-b:** upgraded to 1.2.34 -* **@bubkoo/msr-test-d:** upgraded to 1.2.34 diff --git a/packages/d/CHANGELOG.md b/packages/d/CHANGELOG.md deleted file mode 100644 index 8b6175f..0000000 --- a/packages/d/CHANGELOG.md +++ /dev/null @@ -1,6 +0,0 @@ -## @bubkoo/msr-test-d [1.2.34](https://github.com/bubkoo/monorepo-semantic-release/compare/@bubkoo/msr-test-d@1.2.33...@bubkoo/msr-test-d@1.2.34) (2020-11-04) - - -### Bug Fixes - -* 🐛 release comments ([4365884](https://github.com/bubkoo/monorepo-semantic-release/commit/4365884adfbf4d5cd34ec1c855cc16c9b6dc0145)), closes [#1](https://github.com/bubkoo/monorepo-semantic-release/issues/1) diff --git a/release.config.js b/release.config.js index 40570e2..331a211 100644 --- a/release.config.js +++ b/release.config.js @@ -34,28 +34,37 @@ function getSuccessComment() { '' + ":tada: This <%= issue.pull_request ? 'PR is included' : 'issue has been resolved' %> :tada:" + '<% if(typeof releases !== "undefined" && Array.isArray(releases) && releases.length > 0) { %>' - + '<% var releaseInfos = releases.filter(function(release) { return !!release.name }) %>' - + '<% if(releaseInfos.length) { %>' - + '\n\nThe release is available on' - + '<% if (releaseInfos.length === 1) { %>' - + ' ' - + '<% if(releaseInfos[0].url) { %>' - + '[<%= releaseInfos[0].name %>](<%= releaseInfos[0].url %>)' - + '<% } else { %>' - + '<%= releaseInfos[0].name %>' - + '<% } %>' - + '<% } else { %>' - + ':' - + '<% releaseInfos.forEach(function(release) { %>' - + '\n- ' - + '<% if(release.url) { %>' - + '[<%= release.name %>](<%= release.url %>)' - + '<% } else { %>' - + '<%= release.name %>' - + '<% } %>' - + '<% }) %>' - + '<% } %>' - + '<% } %>' + + '<% var releaseInfos = releases.filter(function(release) { return !!release.name }) %>' + + '<% if(releaseInfos.length) { %>' + + '<% var groups = {} %>' + + '<% releaseInfos.forEach(function(release) { %>' + + '<% if (groups[release.gitTag] == null) { groups[release.gitTag] = [] } %>' + + '<% groups[release.gitTag].push(release) %>' + + '<% }) %>' + + + '\n\nThe release is available on' + + + '<% Object.keys(groups).forEach(function(tag) { %>' + + `\n- <%= tag%>: ` + + '<% var items = groups[tag] %>' + + '<% if(items.length === 1) { %>' + + '<% if(items[0].url) { %>' + + '[<%= items[0].name %>](<%= items[0].url %>)' + + '<% } else { %>' + + '<%= items[0].name %>' + + '<% } %>' + + '<% } else { %>' + + '<% items.forEach(function(item) { %>' + + '\n - ' + + '<% if(item.url) { %>' + + '[<%= item.name %>](<%= item.url %>)' + + '<% } else { %>' + + '<%= item.name %>' + + '<% } %>' + + '<% }) %>' + + '<% } %>' + + '<% }) %>' + + '<% } %>' + '<% } %>' ) }