From 8373d47f80ceae7643e973ce00e22bbaf1d02f31 Mon Sep 17 00:00:00 2001
From: Dave Smith <getdavemail@gmail.com>
Date: Thu, 12 Aug 2021 17:50:28 +0100
Subject: [PATCH 1/3] Remove "Uncategorized" header in output and place items
 at top

---
 bin/plugin/commands/changelog.js | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/bin/plugin/commands/changelog.js b/bin/plugin/commands/changelog.js
index 75aa7a2e0b6b4..3b18d4ed60bbb 100644
--- a/bin/plugin/commands/changelog.js
+++ b/bin/plugin/commands/changelog.js
@@ -673,9 +673,11 @@ async function getChangelog( settings ) {
 				return;
 			}
 
+			const shouldNest = featureName !== UNKNOWN_FEATURE_FALLBACK_NAME;
+
 			// Avoids double nesting such as "Documentation" feature under
 			// the "Documentation" section.
-			if ( group !== featureName ) {
+			if ( group !== featureName && shouldNest ) {
 				// Start new <ul> for the Feature group.
 				changelog += '#### ' + featureName + '\n';
 			}
@@ -686,7 +688,7 @@ async function getChangelog( settings ) {
 				entry = entry && entry.replace( `[${ featureName } - `, '[' );
 
 				// Add a new bullet point to the list.
-				changelog += `${ entry }\n`;
+				changelog += shouldNest ? `  ${ entry }\n` : `${ entry }\n`;
 			} );
 
 			// Close the <ul> for the Feature group.
@@ -711,9 +713,9 @@ function sortFeatureGroups( featureGroups ) {
 		( featureAName, featureBName ) => {
 			// Sort "Unknown" to always be at the end
 			if ( featureAName === UNKNOWN_FEATURE_FALLBACK_NAME ) {
-				return 1;
-			} else if ( featureBName === UNKNOWN_FEATURE_FALLBACK_NAME ) {
 				return -1;
+			} else if ( featureBName === UNKNOWN_FEATURE_FALLBACK_NAME ) {
+				return 1;
 			}
 
 			// Sort by greatest number of PRs in the group first.

From 12689d59c9a22a9e3dcd509be3a6dd4ac85929c3 Mon Sep 17 00:00:00 2001
From: Dave Smith <getdavemail@gmail.com>
Date: Thu, 12 Aug 2021 11:35:39 +0100
Subject: [PATCH 2/3] Tweak comment

---
 bin/plugin/commands/changelog.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/plugin/commands/changelog.js b/bin/plugin/commands/changelog.js
index 3b18d4ed60bbb..a7f9f1df0e093 100644
--- a/bin/plugin/commands/changelog.js
+++ b/bin/plugin/commands/changelog.js
@@ -711,7 +711,7 @@ async function getChangelog( settings ) {
 function sortFeatureGroups( featureGroups ) {
 	return Object.keys( featureGroups ).sort(
 		( featureAName, featureBName ) => {
-			// Sort "Unknown" to always be at the end
+			// Sort "uncategorized" items to *always* be at the top of the section
 			if ( featureAName === UNKNOWN_FEATURE_FALLBACK_NAME ) {
 				return -1;
 			} else if ( featureBName === UNKNOWN_FEATURE_FALLBACK_NAME ) {

From 331749b7acec3aaf1d9228e3d57b471dcec9079d Mon Sep 17 00:00:00 2001
From: Dave Smith <getdavemail@gmail.com>
Date: Thu, 12 Aug 2021 17:52:40 +0100
Subject: [PATCH 3/3] Make compatible with changes to use headings instead of
 bullets

---
 bin/plugin/commands/changelog.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/bin/plugin/commands/changelog.js b/bin/plugin/commands/changelog.js
index a7f9f1df0e093..89de4704362ae 100644
--- a/bin/plugin/commands/changelog.js
+++ b/bin/plugin/commands/changelog.js
@@ -673,11 +673,12 @@ async function getChangelog( settings ) {
 				return;
 			}
 
-			const shouldNest = featureName !== UNKNOWN_FEATURE_FALLBACK_NAME;
-
 			// Avoids double nesting such as "Documentation" feature under
 			// the "Documentation" section.
-			if ( group !== featureName && shouldNest ) {
+			if (
+				group !== featureName &&
+				featureName !== UNKNOWN_FEATURE_FALLBACK_NAME
+			) {
 				// Start new <ul> for the Feature group.
 				changelog += '#### ' + featureName + '\n';
 			}
@@ -688,7 +689,7 @@ async function getChangelog( settings ) {
 				entry = entry && entry.replace( `[${ featureName } - `, '[' );
 
 				// Add a new bullet point to the list.
-				changelog += shouldNest ? `  ${ entry }\n` : `${ entry }\n`;
+				changelog += `${ entry }\n`;
 			} );
 
 			// Close the <ul> for the Feature group.