From e43e6916a4cf8bc38e11a6a28396386c2735505a Mon Sep 17 00:00:00 2001
From: Pete Gonzalez <4673363+octogonz@users.noreply.github.com>
Date: Wed, 24 Jul 2024 21:04:26 -0700
Subject: [PATCH 1/2] Fix an issue where CHANGELOG.md was not included in
 published packages by syncing up with
 https://github.com/microsoft/rushstack/pull/4851

---
 .../rush-plugin-for-command/.npmignore        | 19 +++++++++--------
 .../rush-archive-project-plugin/.npmignore    | 21 +++++++++----------
 .../rush-audit-cache-plugin/.npmignore        | 19 +++++++++--------
 rush-plugins/rush-git-lfs-plugin/.npmignore   | 19 +++++++++--------
 .../rush-init-project-plugin/.npmignore       | 19 +++++++++--------
 .../rush-lint-staged-plugin/.npmignore        | 19 +++++++++--------
 .../rush-upgrade-self-plugin/.npmignore       | 19 +++++++++--------
 7 files changed, 70 insertions(+), 65 deletions(-)

diff --git a/common/_templates/rush-plugin-for-command/.npmignore b/common/_templates/rush-plugin-for-command/.npmignore
index f6463aa..cdad8ba 100644
--- a/common/_templates/rush-plugin-for-command/.npmignore
+++ b/common/_templates/rush-plugin-for-command/.npmignore
@@ -8,8 +8,12 @@
 !/lib/**
 !/lib-*/**
 !/dist/**
+
+!CHANGELOG.md
+!CHANGELOG.json
+!heft-plugin.json
+!rush-plugin-manifest.json
 !ThirdPartyNotice.txt
-!/src/**
 
 # Ignore certain patterns that should not get published.
 /dist/*.stats.*
@@ -20,15 +24,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)
 !/includes/**
-!rush-plugin-manifest.json
 !command-line.json
diff --git a/rush-plugins/rush-archive-project-plugin/.npmignore b/rush-plugins/rush-archive-project-plugin/.npmignore
index 759c0d3..cdad8ba 100644
--- a/rush-plugins/rush-archive-project-plugin/.npmignore
+++ b/rush-plugins/rush-archive-project-plugin/.npmignore
@@ -8,29 +8,28 @@
 !/lib/**
 !/lib-*/**
 !/dist/**
+
+!CHANGELOG.md
+!CHANGELOG.json
+!heft-plugin.json
+!rush-plugin-manifest.json
 !ThirdPartyNotice.txt
-!/src/**
 
 # Ignore certain patterns that should not get published.
 /dist/*.stats.*
 /lib/**/test/
 /lib-*/**/test/
 *.test.js
-/lib/__mocks__/
-/src/__mocks__/
 
 # 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)
 !/includes/**
-!rush-plugin-manifest.json
 !command-line.json
diff --git a/rush-plugins/rush-audit-cache-plugin/.npmignore b/rush-plugins/rush-audit-cache-plugin/.npmignore
index f6463aa..cdad8ba 100644
--- a/rush-plugins/rush-audit-cache-plugin/.npmignore
+++ b/rush-plugins/rush-audit-cache-plugin/.npmignore
@@ -8,8 +8,12 @@
 !/lib/**
 !/lib-*/**
 !/dist/**
+
+!CHANGELOG.md
+!CHANGELOG.json
+!heft-plugin.json
+!rush-plugin-manifest.json
 !ThirdPartyNotice.txt
-!/src/**
 
 # Ignore certain patterns that should not get published.
 /dist/*.stats.*
@@ -20,15 +24,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)
 !/includes/**
-!rush-plugin-manifest.json
 !command-line.json
diff --git a/rush-plugins/rush-git-lfs-plugin/.npmignore b/rush-plugins/rush-git-lfs-plugin/.npmignore
index f6463aa..cdad8ba 100644
--- a/rush-plugins/rush-git-lfs-plugin/.npmignore
+++ b/rush-plugins/rush-git-lfs-plugin/.npmignore
@@ -8,8 +8,12 @@
 !/lib/**
 !/lib-*/**
 !/dist/**
+
+!CHANGELOG.md
+!CHANGELOG.json
+!heft-plugin.json
+!rush-plugin-manifest.json
 !ThirdPartyNotice.txt
-!/src/**
 
 # Ignore certain patterns that should not get published.
 /dist/*.stats.*
@@ -20,15 +24,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)
 !/includes/**
-!rush-plugin-manifest.json
 !command-line.json
diff --git a/rush-plugins/rush-init-project-plugin/.npmignore b/rush-plugins/rush-init-project-plugin/.npmignore
index f6463aa..cdad8ba 100644
--- a/rush-plugins/rush-init-project-plugin/.npmignore
+++ b/rush-plugins/rush-init-project-plugin/.npmignore
@@ -8,8 +8,12 @@
 !/lib/**
 !/lib-*/**
 !/dist/**
+
+!CHANGELOG.md
+!CHANGELOG.json
+!heft-plugin.json
+!rush-plugin-manifest.json
 !ThirdPartyNotice.txt
-!/src/**
 
 # Ignore certain patterns that should not get published.
 /dist/*.stats.*
@@ -20,15 +24,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)
 !/includes/**
-!rush-plugin-manifest.json
 !command-line.json
diff --git a/rush-plugins/rush-lint-staged-plugin/.npmignore b/rush-plugins/rush-lint-staged-plugin/.npmignore
index f6463aa..cdad8ba 100644
--- a/rush-plugins/rush-lint-staged-plugin/.npmignore
+++ b/rush-plugins/rush-lint-staged-plugin/.npmignore
@@ -8,8 +8,12 @@
 !/lib/**
 !/lib-*/**
 !/dist/**
+
+!CHANGELOG.md
+!CHANGELOG.json
+!heft-plugin.json
+!rush-plugin-manifest.json
 !ThirdPartyNotice.txt
-!/src/**
 
 # Ignore certain patterns that should not get published.
 /dist/*.stats.*
@@ -20,15 +24,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)
 !/includes/**
-!rush-plugin-manifest.json
 !command-line.json
diff --git a/rush-plugins/rush-upgrade-self-plugin/.npmignore b/rush-plugins/rush-upgrade-self-plugin/.npmignore
index f6463aa..cdad8ba 100644
--- a/rush-plugins/rush-upgrade-self-plugin/.npmignore
+++ b/rush-plugins/rush-upgrade-self-plugin/.npmignore
@@ -8,8 +8,12 @@
 !/lib/**
 !/lib-*/**
 !/dist/**
+
+!CHANGELOG.md
+!CHANGELOG.json
+!heft-plugin.json
+!rush-plugin-manifest.json
 !ThirdPartyNotice.txt
-!/src/**
 
 # Ignore certain patterns that should not get published.
 /dist/*.stats.*
@@ -20,15 +24,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)
 !/includes/**
-!rush-plugin-manifest.json
 !command-line.json

From 4846e4340c4824bd023a948e30f9599984e29480 Mon Sep 17 00:00:00 2001
From: Pete Gonzalez <4673363+octogonz@users.noreply.github.com>
Date: Wed, 24 Jul 2024 21:05:52 -0700
Subject: [PATCH 2/2] rush change

---
 .../octogonz-npmignore_2024-07-25-04-05.json          | 11 +++++++++++
 .../octogonz-npmignore_2024-07-25-04-05.json          | 11 +++++++++++
 .../octogonz-npmignore_2024-07-25-04-05.json          | 11 +++++++++++
 .../octogonz-npmignore_2024-07-25-04-05.json          | 11 +++++++++++
 .../octogonz-npmignore_2024-07-25-04-05.json          | 11 +++++++++++
 .../octogonz-npmignore_2024-07-25-04-05.json          | 11 +++++++++++
 6 files changed, 66 insertions(+)
 create mode 100644 common/changes/rush-archive-project-plugin/octogonz-npmignore_2024-07-25-04-05.json
 create mode 100644 common/changes/rush-audit-cache-plugin/octogonz-npmignore_2024-07-25-04-05.json
 create mode 100644 common/changes/rush-git-lfs-plugin/octogonz-npmignore_2024-07-25-04-05.json
 create mode 100644 common/changes/rush-init-project-plugin/octogonz-npmignore_2024-07-25-04-05.json
 create mode 100644 common/changes/rush-lint-staged-plugin/octogonz-npmignore_2024-07-25-04-05.json
 create mode 100644 common/changes/rush-upgrade-self-plugin/octogonz-npmignore_2024-07-25-04-05.json

diff --git a/common/changes/rush-archive-project-plugin/octogonz-npmignore_2024-07-25-04-05.json b/common/changes/rush-archive-project-plugin/octogonz-npmignore_2024-07-25-04-05.json
new file mode 100644
index 0000000..e3a82b0
--- /dev/null
+++ b/common/changes/rush-archive-project-plugin/octogonz-npmignore_2024-07-25-04-05.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "comment": "Include CHANGELOG.md in published releases",
+      "type": "patch",
+      "packageName": "rush-archive-project-plugin"
+    }
+  ],
+  "packageName": "rush-archive-project-plugin",
+  "email": "4673363+octogonz@users.noreply.github.com"
+}
\ No newline at end of file
diff --git a/common/changes/rush-audit-cache-plugin/octogonz-npmignore_2024-07-25-04-05.json b/common/changes/rush-audit-cache-plugin/octogonz-npmignore_2024-07-25-04-05.json
new file mode 100644
index 0000000..08b78bf
--- /dev/null
+++ b/common/changes/rush-audit-cache-plugin/octogonz-npmignore_2024-07-25-04-05.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "comment": "Include CHANGELOG.md in published releases",
+      "type": "patch",
+      "packageName": "rush-audit-cache-plugin"
+    }
+  ],
+  "packageName": "rush-audit-cache-plugin",
+  "email": "4673363+octogonz@users.noreply.github.com"
+}
\ No newline at end of file
diff --git a/common/changes/rush-git-lfs-plugin/octogonz-npmignore_2024-07-25-04-05.json b/common/changes/rush-git-lfs-plugin/octogonz-npmignore_2024-07-25-04-05.json
new file mode 100644
index 0000000..15b880b
--- /dev/null
+++ b/common/changes/rush-git-lfs-plugin/octogonz-npmignore_2024-07-25-04-05.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "comment": "Include CHANGELOG.md in published releases",
+      "type": "patch",
+      "packageName": "rush-git-lfs-plugin"
+    }
+  ],
+  "packageName": "rush-git-lfs-plugin",
+  "email": "4673363+octogonz@users.noreply.github.com"
+}
\ No newline at end of file
diff --git a/common/changes/rush-init-project-plugin/octogonz-npmignore_2024-07-25-04-05.json b/common/changes/rush-init-project-plugin/octogonz-npmignore_2024-07-25-04-05.json
new file mode 100644
index 0000000..1e09c54
--- /dev/null
+++ b/common/changes/rush-init-project-plugin/octogonz-npmignore_2024-07-25-04-05.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "comment": "Include CHANGELOG.md in published releases",
+      "type": "patch",
+      "packageName": "rush-init-project-plugin"
+    }
+  ],
+  "packageName": "rush-init-project-plugin",
+  "email": "4673363+octogonz@users.noreply.github.com"
+}
\ No newline at end of file
diff --git a/common/changes/rush-lint-staged-plugin/octogonz-npmignore_2024-07-25-04-05.json b/common/changes/rush-lint-staged-plugin/octogonz-npmignore_2024-07-25-04-05.json
new file mode 100644
index 0000000..79cf190
--- /dev/null
+++ b/common/changes/rush-lint-staged-plugin/octogonz-npmignore_2024-07-25-04-05.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "comment": "Include CHANGELOG.md in published releases",
+      "type": "patch",
+      "packageName": "rush-lint-staged-plugin"
+    }
+  ],
+  "packageName": "rush-lint-staged-plugin",
+  "email": "4673363+octogonz@users.noreply.github.com"
+}
\ No newline at end of file
diff --git a/common/changes/rush-upgrade-self-plugin/octogonz-npmignore_2024-07-25-04-05.json b/common/changes/rush-upgrade-self-plugin/octogonz-npmignore_2024-07-25-04-05.json
new file mode 100644
index 0000000..a4fab3e
--- /dev/null
+++ b/common/changes/rush-upgrade-self-plugin/octogonz-npmignore_2024-07-25-04-05.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "comment": "Include CHANGELOG.md in published releases",
+      "type": "patch",
+      "packageName": "rush-upgrade-self-plugin"
+    }
+  ],
+  "packageName": "rush-upgrade-self-plugin",
+  "email": "4673363+octogonz@users.noreply.github.com"
+}
\ No newline at end of file