\d+\.\d+\.\d+(-\w+)?)$/;
const match = title.match(pattern);
if (match === null || match === void 0 ? void 0 : match.groups) {
return match.groups['version'];
@@ -52219,24 +56534,11 @@ const changelog_1 = __nccwpck_require__(3325);
const package_json_1 = __nccwpck_require__(1805);
const samples_package_json_1 = __nccwpck_require__(8562);
class Node extends release_pr_1.ReleasePR {
- async _run() {
- // Make an effort to populate packageName from the contents of
- // the package.json, rather than forcing this to be set:
- const contents = await this.gh.getFileContents(this.addPath('package.json'));
- const pkg = JSON.parse(contents.parsedContent);
- if (pkg.name) {
- this.packageName = pkg.name;
- // we've rewritten the package name, recalculate the package prefix
- this.packagePrefix = this.coercePackagePrefix(pkg.name);
- }
- const latestTag = await this.gh.latestTag(this.monorepoTags ? `${this.packagePrefix}-` : undefined);
- const commits = await this.commits({
- sha: latestTag ? latestTag.sha : undefined,
- path: this.path,
- });
+ async _getOpenPROptions(commits, latestTag) {
const cc = new conventional_commits_1.ConventionalCommits({
commits,
- githubRepoUrl: this.repoUrl,
+ owner: this.gh.owner,
+ repository: this.gh.repo,
bumpMinorPreMajor: this.bumpMinorPreMajor,
changelogSections: this.changelogSections,
});
@@ -52254,58 +56556,70 @@ class Node extends release_pr_1.ReleasePR {
return undefined;
}
const updates = [];
+ const packageName = (await this.getPackageName()).name;
updates.push(new package_json_1.PackageJson({
path: this.addPath('package-lock.json'),
changelogEntry,
version: candidate.version,
- packageName: this.packageName,
+ packageName,
}));
updates.push(new samples_package_json_1.SamplesPackageJson({
path: this.addPath('samples/package.json'),
changelogEntry,
version: candidate.version,
- packageName: this.packageName,
+ packageName,
}));
updates.push(new changelog_1.Changelog({
path: this.addPath('CHANGELOG.md'),
changelogEntry,
version: candidate.version,
- packageName: this.packageName,
+ packageName,
}));
updates.push(new package_json_1.PackageJson({
path: this.addPath('package.json'),
changelogEntry,
version: candidate.version,
- packageName: this.packageName,
- contents,
+ packageName,
+ contents: await this.getPkgJsonContents(),
}));
- return await this.openPR({
+ return {
sha: commits[0].sha,
changelogEntry: `${changelogEntry}\n---\n`,
updates,
version: candidate.version,
includePackageName: this.monorepoTags,
+ };
+ }
+ // Always prefer the package.json name
+ async getPackageName() {
+ var _a;
+ if (this._packageName === undefined) {
+ const pkgJsonContents = await this.getPkgJsonContents();
+ const pkg = JSON.parse(pkgJsonContents.parsedContent);
+ this.packageName = this._packageName = (_a = pkg.name) !== null && _a !== void 0 ? _a : this.packageName;
+ }
+ return {
+ name: this.packageName,
+ getComponent: () => this.packageName.match(/^@[\w-]+\//)
+ ? this.packageName.split('/')[1]
+ : this.packageName,
+ };
+ }
+ async _run() {
+ const packageName = await this.getPackageName();
+ const latestTag = await this.latestTag(this.monorepoTags ? `${packageName.getComponent()}-` : undefined);
+ const commits = await this.commits({
+ sha: latestTag ? latestTag.sha : undefined,
+ path: this.path,
});
+ const openPROptions = await this.getOpenPROptions(commits, latestTag);
+ return openPROptions ? await this.openPR(openPROptions) : undefined;
}
- // A releaser can implement this method to automatically detect
- // the release name when creating a GitHub release, for instance by returning
- // name in package.json, or setup.py.
- static async lookupPackageName(gh, path) {
- // Make an effort to populate packageName from the contents of
- // the package.json, rather than forcing this to be set:
- const contents = await gh.getFileContents(this.addPathStatic('package.json', path));
- const pkg = JSON.parse(contents.parsedContent);
- if (pkg.name)
- return pkg.name;
- else
- return undefined;
- }
- // Parse the package prefix for releases from the full package name
- // The package name usually looks like `@[group]/[library]`
- coercePackagePrefix(packageName) {
- return packageName.match(/^@[\w-]+\//)
- ? packageName.split('/')[1]
- : packageName;
+ async getPkgJsonContents() {
+ if (!this.pkgJsonContents) {
+ this.pkgJsonContents = await this.gh.getFileContents(this.addPath('package.json'));
+ }
+ return this.pkgJsonContents;
}
}
exports.Node = Node;
@@ -52356,14 +56670,16 @@ const CHANGELOG_SECTIONS = [
];
class OCaml extends release_pr_1.ReleasePR {
async _run() {
- const latestTag = await this.gh.latestTag(this.monorepoTags ? `${this.packageName}-` : undefined);
+ const packageName = await this.getPackageName();
+ const latestTag = await this.latestTag(this.monorepoTags ? `${packageName.getComponent()}-` : undefined);
const commits = await this.commits({
sha: latestTag ? latestTag.sha : undefined,
path: this.path,
});
const cc = new conventional_commits_1.ConventionalCommits({
commits,
- githubRepoUrl: this.repoUrl,
+ owner: this.gh.owner,
+ repository: this.gh.repo,
bumpMinorPreMajor: this.bumpMinorPreMajor,
// TODO: Is this configurable?
changelogSections: CHANGELOG_SECTIONS,
@@ -52392,7 +56708,7 @@ class OCaml extends release_pr_1.ReleasePR {
path: this.addPath(path),
changelogEntry,
version: candidate.version,
- packageName: this.packageName,
+ packageName: packageName.name,
contents,
}));
}
@@ -52404,14 +56720,14 @@ class OCaml extends release_pr_1.ReleasePR {
path: this.addPath(path),
changelogEntry,
version: candidate.version,
- packageName: this.packageName,
+ packageName: packageName.name,
}));
});
updates.push(new changelog_1.Changelog({
path: this.addPath('CHANGELOG.md'),
changelogEntry,
version: candidate.version,
- packageName: this.packageName,
+ packageName: packageName.name,
}));
return await this.openPR({
sha: commits[0].sha,
@@ -52474,7 +56790,7 @@ const CHANGELOG_SECTIONS = [
];
class PHPYoshi extends release_pr_1.ReleasePR {
async _run() {
- const latestTag = await this.gh.latestTag();
+ const latestTag = await this.latestTag();
const commits = await this.commits({
sha: latestTag ? latestTag.sha : undefined,
});
@@ -52482,7 +56798,8 @@ class PHPYoshi extends release_pr_1.ReleasePR {
// top-level tag version we maintain on the mono-repo itself.
const ccb = new conventional_commits_1.ConventionalCommits({
commits,
- githubRepoUrl: this.repoUrl,
+ owner: this.gh.owner,
+ repository: this.gh.repo,
bumpMinorPreMajor: true,
changelogSections: CHANGELOG_SECTIONS,
});
@@ -52494,6 +56811,7 @@ class PHPYoshi extends release_pr_1.ReleasePR {
let changelogEntry = `## ${candidate.version}`;
const bulkUpdate = await this.releaseAllPHPLibraries(commits, updates, changelogEntry);
changelogEntry = bulkUpdate.changelogEntry;
+ const packageName = await this.getPackageName();
// update the aggregate package information in the root
// composer.json and manifest.json.
updates.push(new root_composer_1.RootComposer({
@@ -52501,27 +56819,27 @@ class PHPYoshi extends release_pr_1.ReleasePR {
changelogEntry,
version: candidate.version,
versions: bulkUpdate.versionUpdates,
- packageName: this.packageName,
+ packageName: packageName.name,
}));
updates.push(new php_manifest_1.PHPManifest({
path: 'docs/manifest.json',
changelogEntry,
version: candidate.version,
versions: bulkUpdate.versionUpdates,
- packageName: this.packageName,
+ packageName: packageName.name,
}));
updates.push(new changelog_1.Changelog({
path: 'CHANGELOG.md',
changelogEntry,
version: candidate.version,
- packageName: this.packageName,
+ packageName: packageName.name,
}));
['src/Version.php', 'src/ServiceBuilder.php'].forEach((path) => {
updates.push(new php_client_version_1.PHPClientVersion({
path,
changelogEntry,
version: candidate.version,
- packageName: this.packageName,
+ packageName: packageName.name,
}));
});
return await this.openPR({
@@ -52545,7 +56863,8 @@ class PHPYoshi extends release_pr_1.ReleasePR {
const pkgKey = pkgKeys[i];
const cc = new conventional_commits_1.ConventionalCommits({
commits: commitLookup[pkgKey],
- githubRepoUrl: this.repoUrl,
+ owner: this.gh.owner,
+ repository: this.gh.repo,
bumpMinorPreMajor: this.bumpMinorPreMajor,
changelogSections: CHANGELOG_SECTIONS,
});
@@ -52564,11 +56883,12 @@ class PHPYoshi extends release_pr_1.ReleasePR {
.parsedContent);
versionUpdates.set(meta.name, candidate);
changelogEntry = updatePHPChangelogEntry(`${meta.name} ${candidate}`, changelogEntry, await cc.generateChangelogEntry({ version: candidate }));
+ const packageName = await this.getPackageName();
updates.push(new version_1.Version({
path: `${pkgKey}/VERSION`,
changelogEntry,
version: candidate,
- packageName: this.packageName,
+ packageName: packageName.name,
contents,
}));
// extra.component indicates an entry-point class file
@@ -52580,7 +56900,7 @@ class PHPYoshi extends release_pr_1.ReleasePR {
path: `${pkgKey}/${meta.extra.component.entry}`,
changelogEntry,
version: candidate,
- packageName: this.packageName,
+ packageName: packageName.name,
}));
}
}
@@ -52665,15 +56985,11 @@ const CHANGELOG_SECTIONS = [
{ type: 'ci', section: 'Continuous Integration', hidden: true },
];
class Python extends release_pr_1.ReleasePR {
- async _run() {
- const latestTag = await this.gh.latestTag(this.monorepoTags ? `${this.packageName}-` : undefined);
- const commits = await this.commits({
- sha: latestTag ? latestTag.sha : undefined,
- path: this.path,
- });
+ async _getOpenPROptions(commits, latestTag) {
const cc = new conventional_commits_1.ConventionalCommits({
commits,
- githubRepoUrl: this.repoUrl,
+ owner: this.gh.owner,
+ repository: this.gh.repo,
bumpMinorPreMajor: this.bumpMinorPreMajor,
changelogSections: this.changelogSections || CHANGELOG_SECTIONS,
});
@@ -52691,42 +57007,55 @@ class Python extends release_pr_1.ReleasePR {
return undefined;
}
const updates = [];
+ const packageName = await this.getPackageName();
updates.push(new changelog_1.Changelog({
path: this.addPath('CHANGELOG.md'),
changelogEntry,
version: candidate.version,
- packageName: this.packageName,
+ packageName: packageName.name,
}));
updates.push(new setup_cfg_1.SetupCfg({
path: this.addPath('setup.cfg'),
changelogEntry,
version: candidate.version,
- packageName: this.packageName,
+ packageName: packageName.name,
}));
updates.push(new setup_py_1.SetupPy({
path: this.addPath('setup.py'),
changelogEntry,
version: candidate.version,
- packageName: this.packageName,
+ packageName: packageName.name,
}));
// There should be only one version.py, but foreach in case that is incorrect
const versionPyFilesSearch = this.gh.findFilesByFilename('version.py', this.path);
const versionPyFiles = await versionPyFilesSearch;
versionPyFiles.forEach(path => {
+ const vpath = this.addPath(path);
+ console.log(vpath);
updates.push(new version_py_1.VersionPy({
path: this.addPath(path),
changelogEntry,
version: candidate.version,
- packageName: this.packageName,
+ packageName: packageName.name,
}));
});
- return await this.openPR({
+ return {
sha: commits[0].sha,
changelogEntry: `${changelogEntry}\n---\n`,
updates,
version: candidate.version,
includePackageName: this.monorepoTags,
+ };
+ }
+ async _run() {
+ const packageName = await this.getPackageName();
+ const latestTag = await this.latestTag(this.monorepoTags ? `${packageName.getComponent()}-` : undefined);
+ const commits = await this.commits({
+ sha: latestTag ? latestTag.sha : undefined,
+ path: this.path,
});
+ const openPROptions = await this.getOpenPROptions(commits, latestTag);
+ return openPROptions ? await this.openPR(openPROptions) : undefined;
}
defaultInitialVersion() {
return '0.1.0';
@@ -52780,12 +57109,13 @@ const CHANGELOG_SECTIONS = [
];
class RubyYoshi extends release_pr_1.ReleasePR {
async _run() {
+ const packageName = await this.getPackageName();
const lastReleaseSha = this.lastPackageVersion
- ? await this.gh.getTagSha(`${this.packageName}/v${this.lastPackageVersion}`)
+ ? await this.gh.getTagSha(`${packageName.getComponent()}/v${this.lastPackageVersion}`)
: undefined;
const commits = await this.commits({
sha: lastReleaseSha,
- path: this.packageName,
+ path: packageName.name,
});
if (commits.length === 0) {
checkpoint_1.checkpoint(`no commits found since ${lastReleaseSha}`, checkpoint_1.CheckpointType.Failure);
@@ -52794,7 +57124,8 @@ class RubyYoshi extends release_pr_1.ReleasePR {
else {
const cc = new conventional_commits_1.ConventionalCommits({
commits: postProcessCommits(commits),
- githubRepoUrl: this.repoUrl,
+ owner: this.gh.owner,
+ repository: this.gh.repo,
bumpMinorPreMajor: this.bumpMinorPreMajor,
commitPartial: fs_1.readFileSync(__nccwpck_require__.ab + "commit.hbs", 'utf8'),
headerPartial: fs_1.readFileSync(__nccwpck_require__.ab + "header.hbs", 'utf8'),
@@ -52819,20 +57150,20 @@ class RubyYoshi extends release_pr_1.ReleasePR {
}
const updates = [];
updates.push(new changelog_1.Changelog({
- path: `${this.packageName}/CHANGELOG.md`,
+ path: `${packageName.name}/CHANGELOG.md`,
changelogEntry,
version: candidate.version,
- packageName: this.packageName,
+ packageName: packageName.name,
}));
updates.push(new version_rb_1.VersionRB({
- path: `${this.packageName}/lib/${this.packageName.replace(/-/g, '/')}/version.rb`,
+ path: `${packageName.name}/lib/${packageName.name.replace(/-/g, '/')}/version.rb`,
changelogEntry,
version: candidate.version,
- packageName: this.packageName,
+ packageName: packageName.name,
}));
return await this.openPR({
sha: commits[0].sha,
- changelogEntry: `${changelogEntry}\n---\n${this.summarizeCommits(lastReleaseSha, commits)}\n`,
+ changelogEntry: `${changelogEntry}\n---\n${this.summarizeCommits(lastReleaseSha, commits, packageName.name)}\n`,
updates,
version: candidate.version,
includePackageName: true,
@@ -52841,22 +57172,23 @@ class RubyYoshi extends release_pr_1.ReleasePR {
}
// create a summary of the commits landed since the last release,
// for the benefit of the release PR.
- summarizeCommits(lastReleaseSha, commits) {
+ summarizeCommits(lastReleaseSha, commits, packageName) {
// summarize the commits that landed:
let summary = '### Commits since last release:\n\n';
const updatedFiles = {};
+ const repoUrl = `${this.gh.owner}/${this.gh.repo}`;
commits.forEach(commit => {
if (commit.sha === null)
return;
const splitMessage = commit.message.split('\n');
- summary += `* [${splitMessage[0]}](https://github.com/${this.repoUrl}/commit/${commit.sha})\n`;
+ summary += `* [${splitMessage[0]}](https://github.com/${repoUrl}/commit/${commit.sha})\n`;
if (splitMessage.length > 2) {
summary = `${summary}${splitMessage
.slice(1)
.join('\n')}
\n`;
}
commit.files.forEach(file => {
- if (file.startsWith(this.packageName)) {
+ if (file.startsWith(packageName)) {
updatedFiles[file] = true;
}
});
@@ -52866,7 +57198,7 @@ class RubyYoshi extends release_pr_1.ReleasePR {
Object.keys(updatedFiles).forEach(file => {
summary += `${file}\n`;
});
- return `${summary}\n[Compare Changes](https://github.com/${this.repoUrl}/compare/${lastReleaseSha}...HEAD)\n`;
+ return `${summary}\n[Compare Changes](https://github.com/${repoUrl}/compare/${lastReleaseSha}...HEAD)\n`;
}
}
exports.RubyYoshi = RubyYoshi;
@@ -52910,18 +57242,21 @@ const changelog_1 = __nccwpck_require__(3325);
const version_rb_1 = __nccwpck_require__(6044);
class Ruby extends release_pr_1.ReleasePR {
constructor(options) {
+ var _a;
super(options);
- this.versionFile = options.versionFile;
+ this.versionFile = (_a = options.versionFile) !== null && _a !== void 0 ? _a : '';
}
async _run() {
- const latestTag = await this.gh.latestTag(this.monorepoTags ? `${this.packageName}-` : undefined, false);
+ const packageName = await this.getPackageName();
+ const latestTag = await this.latestTag(this.monorepoTags ? `${packageName.getComponent()}-` : undefined, false);
const commits = await this.commits({
sha: latestTag ? latestTag.sha : undefined,
path: this.path,
});
const cc = new conventional_commits_1.ConventionalCommits({
commits: postProcessCommits(commits),
- githubRepoUrl: this.repoUrl,
+ owner: this.gh.owner,
+ repository: this.gh.repo,
bumpMinorPreMajor: this.bumpMinorPreMajor,
changelogSections: this.changelogSections,
});
@@ -52943,13 +57278,13 @@ class Ruby extends release_pr_1.ReleasePR {
path: this.addPath('CHANGELOG.md'),
changelogEntry,
version: candidate.version,
- packageName: this.packageName,
+ packageName: packageName.name,
}));
updates.push(new version_rb_1.VersionRB({
path: this.addPath(this.versionFile),
changelogEntry,
version: candidate.version,
- packageName: this.packageName,
+ packageName: packageName.name,
}));
return await this.openPR({
sha: commits[0].sha,
@@ -53012,14 +57347,15 @@ class Rust extends release_pr_1.ReleasePR {
}
return tagOrBranch;
};
- const latestTag = await this.gh.latestTag(prefix);
+ const latestTag = await this.latestTag(prefix);
const commits = await this.commits({
sha: latestTag ? latestTag.sha : undefined,
path: this.path,
});
const cc = new conventional_commits_1.ConventionalCommits({
commits,
- githubRepoUrl: this.repoUrl,
+ owner: this.gh.owner,
+ repository: this.gh.repo,
bumpMinorPreMajor: this.bumpMinorPreMajor,
changelogSections: this.changelogSections,
});
@@ -53179,14 +57515,16 @@ const changelog_1 = __nccwpck_require__(3325);
const version_txt_1 = __nccwpck_require__(914);
class Simple extends release_pr_1.ReleasePR {
async _run() {
- const latestTag = await this.gh.latestTag(this.monorepoTags ? `${this.packageName}-` : undefined);
+ const packageName = await this.getPackageName();
+ const latestTag = await this.latestTag(this.monorepoTags ? `${packageName.getComponent()}-` : undefined);
const commits = await this.commits({
sha: latestTag ? latestTag.sha : undefined,
path: this.path,
});
const cc = new conventional_commits_1.ConventionalCommits({
commits,
- githubRepoUrl: this.repoUrl,
+ owner: this.gh.owner,
+ repository: this.gh.repo,
bumpMinorPreMajor: this.bumpMinorPreMajor,
changelogSections: this.changelogSections,
});
@@ -53208,13 +57546,13 @@ class Simple extends release_pr_1.ReleasePR {
path: 'CHANGELOG.md',
changelogEntry,
version: candidate.version,
- packageName: this.packageName,
+ packageName: packageName.name,
}));
updates.push(new version_txt_1.VersionTxt({
path: 'version.txt',
changelogEntry,
version: candidate.version,
- packageName: this.packageName,
+ packageName: packageName.name,
}));
return await this.openPR({
sha: commits[0].sha,
@@ -53260,14 +57598,16 @@ const readme_1 = __nccwpck_require__(4996);
const module_version_1 = __nccwpck_require__(9696);
class TerraformModule extends release_pr_1.ReleasePR {
async _run() {
- const latestTag = await this.gh.latestTag(this.monorepoTags ? `${this.packageName}-` : undefined);
+ const packageName = await this.getPackageName();
+ const latestTag = await this.latestTag(this.monorepoTags ? `${packageName.getComponent()}-` : undefined);
const commits = await this.commits({
sha: latestTag ? latestTag.sha : undefined,
path: this.path,
});
const cc = new conventional_commits_1.ConventionalCommits({
commits,
- githubRepoUrl: this.repoUrl,
+ owner: this.gh.owner,
+ repository: this.gh.repo,
bumpMinorPreMajor: this.bumpMinorPreMajor,
changelogSections: this.changelogSections,
});
@@ -53289,7 +57629,7 @@ class TerraformModule extends release_pr_1.ReleasePR {
path: this.addPath('CHANGELOG.md'),
changelogEntry,
version: candidate.version,
- packageName: this.packageName,
+ packageName: packageName.name,
}));
// Update version in README to current candidate version.
// A module may have submodules, so find all submodules.
@@ -53299,7 +57639,7 @@ class TerraformModule extends release_pr_1.ReleasePR {
path: this.addPath(path),
changelogEntry,
version: candidate.version,
- packageName: this.packageName,
+ packageName: packageName.name,
}));
});
// Update versions.tf to current candidate version.
@@ -53310,7 +57650,7 @@ class TerraformModule extends release_pr_1.ReleasePR {
path: this.addPath(path),
changelogEntry,
version: candidate.version,
- packageName: this.packageName,
+ packageName: packageName.name,
}));
});
return await this.openPR({
@@ -53386,6 +57726,52 @@ exports.Changelog = Changelog;
/***/ }),
+/***/ 8368:
+/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
+
+"use strict";
+
+// Copyright 2021 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.ChartYaml = void 0;
+const checkpoint_1 = __nccwpck_require__(5279);
+const yaml = __nccwpck_require__(1917);
+class ChartYaml {
+ constructor(options) {
+ this.create = false;
+ this.path = options.path;
+ this.changelogEntry = options.changelogEntry;
+ this.version = options.version;
+ this.packageName = options.packageName;
+ }
+ updateContent(content) {
+ const data = yaml.load(content, { json: true });
+ if (data === null || data === undefined) {
+ return '';
+ }
+ const parsed = JSON.parse(JSON.stringify(data));
+ checkpoint_1.checkpoint(`updating ${this.path} from ${parsed.version} to ${this.version}`, checkpoint_1.CheckpointType.Success);
+ parsed.version = this.version;
+ return yaml.dump(parsed);
+ }
+}
+exports.ChartYaml = ChartYaml;
+//# sourceMappingURL=chart-yaml.js.map
+
+/***/ }),
+
/***/ 6216:
/***/ ((__unused_webpack_module, exports) => {
@@ -62492,7 +66878,7 @@ module.exports = JSON.parse("{\"_args\":[[\"pino@6.11.1\",\"/home/runner/work/re
/***/ ((module) => {
"use strict";
-module.exports = {"i8":"10.1.0"};
+module.exports = JSON.parse("{\"i8\":\"11.0.0-candidate.1\"}");
/***/ }),
@@ -62592,7 +66978,7 @@ module.exports = require("vm");;
/***/ }),
-/***/ 8761:
+/***/ 1903:
/***/ ((module) => {
"use strict";
diff --git a/dist/template1.hbs b/dist/template1.hbs
index 2c1349a..3b194f0 100644
--- a/dist/template1.hbs
+++ b/dist/template1.hbs
@@ -1,11 +1,23 @@
{{> header}}
+{{#if noteGroups}}
+{{#each noteGroups}}
+
+### ⚠ {{title}}
+
+{{#each notes}}
+* {{#if commit.scope}}**{{commit.scope}}:** {{/if}}{{text}}
+{{/each}}
+{{/each}}
+{{/if}}
{{#each commitGroups}}
+
+{{#if title}}
+### {{title}}
+
+{{/if}}
{{#each commits}}
{{> commit root=@root}}
{{/each}}
+
{{/each}}
-
-{{> footer}}
-
-
diff --git a/dist/template2.hbs b/dist/template2.hbs
index 3b194f0..2c1349a 100644
--- a/dist/template2.hbs
+++ b/dist/template2.hbs
@@ -1,23 +1,11 @@
{{> header}}
-{{#if noteGroups}}
-{{#each noteGroups}}
-
-### ⚠ {{title}}
-
-{{#each notes}}
-* {{#if commit.scope}}**{{commit.scope}}:** {{/if}}{{text}}
-{{/each}}
-{{/each}}
-{{/if}}
{{#each commitGroups}}
-
-{{#if title}}
-### {{title}}
-
-{{/if}}
{{#each commits}}
{{> commit root=@root}}
{{/each}}
-
{{/each}}
+
+{{> footer}}
+
+