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

---
 apps/sparo-lib/.npmignore | 16 ++++++++--------
 apps/sparo/.npmignore     | 16 ++++++++--------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/apps/sparo-lib/.npmignore b/apps/sparo-lib/.npmignore
index e42f0c3..7812dde 100644
--- a/apps/sparo-lib/.npmignore
+++ b/apps/sparo-lib/.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,11 @@
 # 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)
 !/assets/**
-/lib-*/**
diff --git a/apps/sparo/.npmignore b/apps/sparo/.npmignore
index e42f0c3..7812dde 100644
--- a/apps/sparo/.npmignore
+++ b/apps/sparo/.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,11 @@
 # 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)
 !/assets/**
-/lib-*/**

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

---
 .../sparo/octogonz-npmignore_2024-07-25-03-47.json     | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 common/changes/sparo/octogonz-npmignore_2024-07-25-03-47.json

diff --git a/common/changes/sparo/octogonz-npmignore_2024-07-25-03-47.json b/common/changes/sparo/octogonz-npmignore_2024-07-25-03-47.json
new file mode 100644
index 0000000..44f27ba
--- /dev/null
+++ b/common/changes/sparo/octogonz-npmignore_2024-07-25-03-47.json
@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "sparo",
+      "comment": "Include CHANGELOG.md in published releases",
+      "type": "none"
+    }
+  ],
+  "packageName": "sparo"
+}
\ No newline at end of file

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

---
 apps/sparo-lib/.npmignore | 4 +++-
 apps/sparo/.npmignore     | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/apps/sparo-lib/.npmignore b/apps/sparo-lib/.npmignore
index 7812dde..26a59bc 100644
--- a/apps/sparo-lib/.npmignore
+++ b/apps/sparo-lib/.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.*
diff --git a/apps/sparo/.npmignore b/apps/sparo/.npmignore
index 7812dde..26a59bc 100644
--- a/apps/sparo/.npmignore
+++ b/apps/sparo/.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.*