From c494ecaf3d29b95ad0230ed17cd7374dc702c28b Mon Sep 17 00:00:00 2001
From: Adam Matthiesen <amatthiesen@outlook.com>
Date: Sat, 9 Mar 2024 05:09:23 -0800
Subject: [PATCH] Refactor code to remove unnecessary elements in sanitize
 allowElements

---
 .changeset/wicked-months-swim.md                          | 8 ++++++++
 .../astro-ghostcms-brutalbyelian/src/routes/[slug].astro  | 3 +--
 .../astro-ghostcms-catppuccin/src/components/Post.astro   | 3 +--
 .../src/components/Page.astro                             | 1 -
 .../src/components/Post.astro                             | 3 +--
 packages/starlight-ghostcms/src/routes/[slug].astro       | 3 +--
 packages/starlight-ghostcms/src/routes/about.astro        | 5 +++--
 7 files changed, 15 insertions(+), 11 deletions(-)
 create mode 100644 .changeset/wicked-months-swim.md

diff --git a/.changeset/wicked-months-swim.md b/.changeset/wicked-months-swim.md
new file mode 100644
index 00000000..efa17d52
--- /dev/null
+++ b/.changeset/wicked-months-swim.md
@@ -0,0 +1,8 @@
+---
+"@matthiesenxyz/astro-ghostcms-brutalbyelian": patch
+"@matthiesenxyz/astro-ghostcms-theme-default": patch
+"@matthiesenxyz/astro-ghostcms-catppuccin": patch
+"@matthiesenxyz/starlight-ghostcms": patch
+---
+
+Fix html rendering to allow custom components
diff --git a/packages/astro-ghostcms-brutalbyelian/src/routes/[slug].astro b/packages/astro-ghostcms-brutalbyelian/src/routes/[slug].astro
index 1451e85c..e8b21782 100644
--- a/packages/astro-ghostcms-brutalbyelian/src/routes/[slug].astro
+++ b/packages/astro-ghostcms-brutalbyelian/src/routes/[slug].astro
@@ -33,8 +33,7 @@ invariant(settings, "Settings are required");
     <Markup 
       content={post.html} 
       sanitize={{ 
-        allowComponents: true, 
-        allowElements: ['a', 'p', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'img', 'figure', 'figcaption', 'ul', 'ol', 'li', 'blockquote', 'pre', 'code', 'em', 'strong', 'del', 'hr', 'br', 'table', 'thead', 'tbody', 'tr', 'th', 'td', 'caption', 'div', 'span', 'script', 'astrocard'],
+        allowComponents: true,
       }}
       components={{ 
         h1: C.H1,
diff --git a/packages/astro-ghostcms-catppuccin/src/components/Post.astro b/packages/astro-ghostcms-catppuccin/src/components/Post.astro
index c046e38f..673c6f3e 100644
--- a/packages/astro-ghostcms-catppuccin/src/components/Post.astro
+++ b/packages/astro-ghostcms-catppuccin/src/components/Post.astro
@@ -33,8 +33,7 @@ invariant(settings, "Settings not found");
   <Markup 
     content={post.html} 
     sanitize={{ 
-      allowComponents: true, 
-      allowElements: ['a', 'p', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'img', 'figure', 'figcaption', 'ul', 'ol', 'li', 'blockquote', 'pre', 'code', 'em', 'strong', 'del', 'hr', 'br', 'table', 'thead', 'tbody', 'tr', 'th', 'td', 'caption', 'div', 'span', 'script', 'getgist', 'getgistgroup', 'astrocard'],
+      allowComponents: true,
     }}
     components={{
       pre: render.CodeSlot
diff --git a/packages/astro-ghostcms-theme-default/src/components/Page.astro b/packages/astro-ghostcms-theme-default/src/components/Page.astro
index d388ce69..ccfc64cd 100644
--- a/packages/astro-ghostcms-theme-default/src/components/Page.astro
+++ b/packages/astro-ghostcms-theme-default/src/components/Page.astro
@@ -30,7 +30,6 @@ const { page, settings, pageClass } = Astro.props as Props;
     content={page.html} 
     sanitize={{ 
       allowComponents: true, 
-      allowElements: ['a', 'p', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'img', 'figure', 'figcaption', 'ul', 'ol', 'li', 'blockquote', 'pre', 'code', 'em', 'strong', 'del', 'hr', 'br', 'table', 'thead', 'tbody', 'tr', 'th', 'td', 'caption', 'div', 'span', 'script', 'getgist', 'getgistgroup', 'astrocard'],
     }}
     components={{
       pre: render.CodeSlot
diff --git a/packages/astro-ghostcms-theme-default/src/components/Post.astro b/packages/astro-ghostcms-theme-default/src/components/Post.astro
index 64a5f0c9..0103f223 100644
--- a/packages/astro-ghostcms-theme-default/src/components/Post.astro
+++ b/packages/astro-ghostcms-theme-default/src/components/Post.astro
@@ -21,8 +21,7 @@ invariant(settings, "Settings not found");
       <Markup 
     content={post.html} 
     sanitize={{ 
-      allowComponents: true, 
-      allowElements: ['a', 'p', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'img', 'figure', 'figcaption', 'ul', 'ol', 'li', 'blockquote', 'pre', 'code', 'em', 'strong', 'del', 'hr', 'br', 'table', 'thead', 'tbody', 'tr', 'th', 'td', 'caption', 'div', 'span', 'script', 'getgist', 'getgistgroup', 'astrocard'],
+      allowComponents: true,
     }}
     components={{
       pre: render.CodeSlot
diff --git a/packages/starlight-ghostcms/src/routes/[slug].astro b/packages/starlight-ghostcms/src/routes/[slug].astro
index 72b82326..8db132f6 100644
--- a/packages/starlight-ghostcms/src/routes/[slug].astro
+++ b/packages/starlight-ghostcms/src/routes/[slug].astro
@@ -48,8 +48,7 @@ const pageProps = getPageProps(post.title)
     <Markup 
       content={post.html} 
       sanitize={{ 
-        allowComponents: true, 
-        allowElements: ['a', 'p', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'img', 'figure', 'figcaption', 'ul', 'ol', 'li', 'blockquote', 'pre', 'code', 'em', 'strong', 'del', 'hr', 'br', 'table', 'thead', 'tbody', 'tr', 'th', 'td', 'caption', 'div', 'span', 'script', 'getgist', 'getgistgroup', 'astrocard'],
+        allowComponents: true,
       }}
       components={{
         pre: render.CodeSlot,
diff --git a/packages/starlight-ghostcms/src/routes/about.astro b/packages/starlight-ghostcms/src/routes/about.astro
index 3c1ef4be..ae5e2c8c 100644
--- a/packages/starlight-ghostcms/src/routes/about.astro
+++ b/packages/starlight-ghostcms/src/routes/about.astro
@@ -12,23 +12,24 @@ const aboutPage = await getSluggedPage("about");
 
 //const { entries, nextLink, prevLink } = Astro.props
 
-const pageProps = getPageProps(aboutPage?.post?.title)
+const pageProps = getPageProps(aboutPage ? aboutPage.post.title : "")
 ---
 
 <Page {...pageProps}>
   {config.supportGhost && (
     <div id="pghost">Powered by <a href="https://ghost.org">Ghost</a></div>
   )}
+  {aboutPage && 
       <Metadata entry={aboutPage.post} />
       <Markup 
         content={aboutPage.post.html} 
         sanitize={{ 
           allowComponents: true, 
-          allowElements: ['a', 'p', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'img', 'figure', 'figcaption', 'ul', 'ol', 'li', 'blockquote', 'pre', 'code', 'em', 'strong', 'del', 'hr', 'br', 'table', 'thead', 'tbody', 'tr', 'th', 'td', 'caption', 'div', 'span'],
         }}
         components={{
           pre: render.CodeSlot
         }} />
+  }
   <footer class="not-content">
     <!--PrevNextLinks next={nextLink} prev={prevLink} /-->
   </footer>