From b7950a840812052dc63ecf69879d49f61ecc7d74 Mon Sep 17 00:00:00 2001
From: Pete Gonzalez <4673363+octogonz@users.noreply.github.com>
Date: Wed, 24 Jul 2024 20:41:49 -0700
Subject: [PATCH 1/3] Fix an issue where CHANGELOG.md was no longer included in
 published packages

---
 eslint-plugin/.npmignore | 15 ++++++++-------
 tsdoc-config/.npmignore  | 15 ++++++++-------
 tsdoc/.npmignore         | 15 ++++++++-------
 3 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/eslint-plugin/.npmignore b/eslint-plugin/.npmignore
index 0164a20d..ca403e95 100644
--- a/eslint-plugin/.npmignore
+++ b/eslint-plugin/.npmignore
@@ -8,7 +8,10 @@
 !/lib/**
 !/lib-*/**
 !/dist/**
+!CHANGELOG.md
+!CHANGELOG.json
 !ThirdPartyNotice.txt
+!heft-plugin.json
 
 # Ignore certain patterns that should not get published.
 /dist/*.stats.*
@@ -19,12 +22,10 @@
 # NOTE: These don't need to be specified, because NPM includes them automatically.
 #
 # package.json
-# README (and its variants)
-# CHANGELOG (and its variants)
-# LICENSE / LICENCE
+# README.md
+# LICENSE
 
-#--------------------------------------------
-# DO NOT MODIFY THE TEMPLATE ABOVE THIS LINE
-#--------------------------------------------
+# ---------------------------------------------------------------------------
+# DO NOT MODIFY ABOVE THIS LINE!  Add any project-specific overrides below.
+# ---------------------------------------------------------------------------
 
-# (Add your project-specific overrides here)
diff --git a/tsdoc-config/.npmignore b/tsdoc-config/.npmignore
index 0164a20d..ca403e95 100644
--- a/tsdoc-config/.npmignore
+++ b/tsdoc-config/.npmignore
@@ -8,7 +8,10 @@
 !/lib/**
 !/lib-*/**
 !/dist/**
+!CHANGELOG.md
+!CHANGELOG.json
 !ThirdPartyNotice.txt
+!heft-plugin.json
 
 # Ignore certain patterns that should not get published.
 /dist/*.stats.*
@@ -19,12 +22,10 @@
 # NOTE: These don't need to be specified, because NPM includes them automatically.
 #
 # package.json
-# README (and its variants)
-# CHANGELOG (and its variants)
-# LICENSE / LICENCE
+# README.md
+# LICENSE
 
-#--------------------------------------------
-# DO NOT MODIFY THE TEMPLATE ABOVE THIS LINE
-#--------------------------------------------
+# ---------------------------------------------------------------------------
+# DO NOT MODIFY ABOVE THIS LINE!  Add any project-specific overrides below.
+# ---------------------------------------------------------------------------
 
-# (Add your project-specific overrides here)
diff --git a/tsdoc/.npmignore b/tsdoc/.npmignore
index 7fd15895..e8f90304 100644
--- a/tsdoc/.npmignore
+++ b/tsdoc/.npmignore
@@ -8,7 +8,10 @@
 !/lib/**
 !/lib-*/**
 !/dist/**
+!CHANGELOG.md
+!CHANGELOG.json
 !ThirdPartyNotice.txt
+!heft-plugin.json
 
 # Ignore certain patterns that should not get published.
 /dist/*.stats.*
@@ -19,14 +22,12 @@
 # NOTE: These don't need to be specified, because NPM includes them automatically.
 #
 # package.json
-# README (and its variants)
-# CHANGELOG (and its variants)
-# LICENSE / LICENCE
+# README.md
+# LICENSE
 
-#--------------------------------------------
-# DO NOT MODIFY THE TEMPLATE ABOVE THIS LINE
-#--------------------------------------------
+# ---------------------------------------------------------------------------
+# DO NOT MODIFY ABOVE THIS LINE!  Add any project-specific overrides below.
+# ---------------------------------------------------------------------------
 
-# (Add your project-specific overrides here)
 
 !/schemas/**

From 56995de367d93aee628eb47f2872f703a69245b3 Mon Sep 17 00:00:00 2001
From: Pete Gonzalez <4673363+octogonz@users.noreply.github.com>
Date: Wed, 24 Jul 2024 20:42:48 -0700
Subject: [PATCH 2/3] rush change

---
 .../octogonz-missing-changelog_2024-07-25-03-42.json   | 10 ++++++++++
 .../octogonz-missing-changelog_2024-07-25-03-42.json   | 10 ++++++++++
 .../octogonz-missing-changelog_2024-07-25-03-42.json   | 10 ++++++++++
 3 files changed, 30 insertions(+)
 create mode 100644 common/changes/@microsoft/tsdoc-config/octogonz-missing-changelog_2024-07-25-03-42.json
 create mode 100644 common/changes/@microsoft/tsdoc/octogonz-missing-changelog_2024-07-25-03-42.json
 create mode 100644 common/changes/eslint-plugin-tsdoc/octogonz-missing-changelog_2024-07-25-03-42.json

diff --git a/common/changes/@microsoft/tsdoc-config/octogonz-missing-changelog_2024-07-25-03-42.json b/common/changes/@microsoft/tsdoc-config/octogonz-missing-changelog_2024-07-25-03-42.json
new file mode 100644
index 00000000..77e5e6bc
--- /dev/null
+++ b/common/changes/@microsoft/tsdoc-config/octogonz-missing-changelog_2024-07-25-03-42.json
@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "@microsoft/tsdoc-config",
+      "comment": "Include CHANGELOG.md in published releases again",
+      "type": "patch"
+    }
+  ],
+  "packageName": "@microsoft/tsdoc-config"
+}
\ No newline at end of file
diff --git a/common/changes/@microsoft/tsdoc/octogonz-missing-changelog_2024-07-25-03-42.json b/common/changes/@microsoft/tsdoc/octogonz-missing-changelog_2024-07-25-03-42.json
new file mode 100644
index 00000000..4b820875
--- /dev/null
+++ b/common/changes/@microsoft/tsdoc/octogonz-missing-changelog_2024-07-25-03-42.json
@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "@microsoft/tsdoc",
+      "comment": "Include CHANGELOG.md in published releases again",
+      "type": "patch"
+    }
+  ],
+  "packageName": "@microsoft/tsdoc"
+}
\ No newline at end of file
diff --git a/common/changes/eslint-plugin-tsdoc/octogonz-missing-changelog_2024-07-25-03-42.json b/common/changes/eslint-plugin-tsdoc/octogonz-missing-changelog_2024-07-25-03-42.json
new file mode 100644
index 00000000..6f7bfc92
--- /dev/null
+++ b/common/changes/eslint-plugin-tsdoc/octogonz-missing-changelog_2024-07-25-03-42.json
@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "eslint-plugin-tsdoc",
+      "comment": "Include CHANGELOG.md in published releases again",
+      "type": "patch"
+    }
+  ],
+  "packageName": "eslint-plugin-tsdoc"
+}
\ No newline at end of file

From 26a85940822424ca22d670d73b81671414413c21 Mon Sep 17 00:00:00 2001
From: Pete Gonzalez <4673363+octogonz@users.noreply.github.com>
Date: Wed, 24 Jul 2024 20:59:55 -0700
Subject: [PATCH 3/3] Cherry-pick
 https://github.com/microsoft/rushstack/pull/4851/commits/06e9af3c9517bc7ca871e16e6f97baddb906ce4c

---
 eslint-plugin/.npmignore | 5 +++--
 tsdoc-config/.npmignore  | 5 +++--
 tsdoc/.npmignore         | 5 +++--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/eslint-plugin/.npmignore b/eslint-plugin/.npmignore
index ca403e95..bc349f9a 100644
--- a/eslint-plugin/.npmignore
+++ b/eslint-plugin/.npmignore
@@ -8,10 +8,12 @@
 !/lib/**
 !/lib-*/**
 !/dist/**
+
 !CHANGELOG.md
 !CHANGELOG.json
-!ThirdPartyNotice.txt
 !heft-plugin.json
+!rush-plugin-manifest.json
+!ThirdPartyNotice.txt
 
 # Ignore certain patterns that should not get published.
 /dist/*.stats.*
@@ -28,4 +30,3 @@
 # ---------------------------------------------------------------------------
 # DO NOT MODIFY ABOVE THIS LINE!  Add any project-specific overrides below.
 # ---------------------------------------------------------------------------
-
diff --git a/tsdoc-config/.npmignore b/tsdoc-config/.npmignore
index ca403e95..bc349f9a 100644
--- a/tsdoc-config/.npmignore
+++ b/tsdoc-config/.npmignore
@@ -8,10 +8,12 @@
 !/lib/**
 !/lib-*/**
 !/dist/**
+
 !CHANGELOG.md
 !CHANGELOG.json
-!ThirdPartyNotice.txt
 !heft-plugin.json
+!rush-plugin-manifest.json
+!ThirdPartyNotice.txt
 
 # Ignore certain patterns that should not get published.
 /dist/*.stats.*
@@ -28,4 +30,3 @@
 # ---------------------------------------------------------------------------
 # DO NOT MODIFY ABOVE THIS LINE!  Add any project-specific overrides below.
 # ---------------------------------------------------------------------------
-
diff --git a/tsdoc/.npmignore b/tsdoc/.npmignore
index e8f90304..dcb00eb9 100644
--- a/tsdoc/.npmignore
+++ b/tsdoc/.npmignore
@@ -8,10 +8,12 @@
 !/lib/**
 !/lib-*/**
 !/dist/**
+
 !CHANGELOG.md
 !CHANGELOG.json
-!ThirdPartyNotice.txt
 !heft-plugin.json
+!rush-plugin-manifest.json
+!ThirdPartyNotice.txt
 
 # Ignore certain patterns that should not get published.
 /dist/*.stats.*
@@ -29,5 +31,4 @@
 # DO NOT MODIFY ABOVE THIS LINE!  Add any project-specific overrides below.
 # ---------------------------------------------------------------------------
 
-
 !/schemas/**