Merge branch 'master' into leecalcote/fix-mdx-styles

Author: leecalcote

.github/workflows/build-and-deploy-site.yml

@@ -17,6 +17,17 @@ jobs:
         with:
           fetch-depth: 1
 
+      - name: Cache Gatsby .cache and public folders
+        uses: actions/cache@v4
+        id: gatsby-cache
+        with:
+          path: |
+            public
+            .cache
+          key: ${{ runner.os }}-gatsby-${{ hashFiles('**/package-lock.json') }}
+          restore-keys: |
+            ${{ runner.os }}-gatsby-
+
       - name: Install and Build 🔧
         run: |
           npm install --legacy-peer-deps

gatsby-config.js

@@ -115,7 +115,8 @@ module.exports = {
               filter: { frontmatter: { published: { eq: true }${process.env.NODE_ENV === "development" ? ", date: { gte: \"2024-01-01\" }" : ""} } }
             ) {
               nodes {
-                html 
+                # Using excerpt instead of html because gatsby-plugin-mdx v5+ removed the html field
+                excerpt
                 frontmatter {
                   title
                   author
@@ -167,7 +168,7 @@ module.exports = {
                     enclosure: node.frontmatter.thumbnail && {
                       url: site.siteMetadata.siteUrl + node.frontmatter.thumbnail.publicURL,
                     },
-                    custom_elements: [{ "content:encoded": node.html }],
+                    custom_elements: [{ "content:encoded": node.excerpt }],
                   });
                 });
             },
@@ -192,7 +193,7 @@ module.exports = {
                     enclosure: node.frontmatter.thumbnail && {
                       url: site.siteMetadata.siteUrl + node.frontmatter.thumbnail.publicURL,
                     },
-                    custom_elements: [{ "content:encoded": node.html }],
+                    custom_elements: [{ "content:encoded": node.excerpt }],
                   });
                 });
             },
@@ -217,7 +218,7 @@ module.exports = {
                     enclosure: node.frontmatter.thumbnail && {
                       url: site.siteMetadata.siteUrl + node.frontmatter.thumbnail.publicURL,
                     },
-                    custom_elements: [{ "content:encoded": node.html }],
+                    custom_elements: [{ "content:encoded": node.excerpt }],
                   });
                 });
             },
@@ -242,7 +243,7 @@ module.exports = {
                     enclosure: node.frontmatter.thumbnail && {
                       url: site.siteMetadata.siteUrl + node.frontmatter.thumbnail.publicURL,
                     },
-                    custom_elements: [{ "content:encoded": node.html }],
+                    custom_elements: [{ "content:encoded": node.excerpt }],
                   });
                 });
             },
@@ -276,7 +277,7 @@ module.exports = {
                       url: site.siteMetadata.siteUrl + node.frontmatter.thumbnail.publicURL,
                     },
                     custom_elements: [
-                      { "content:encoded": node.html },
+                      { "content:encoded": node.excerpt },
                       { "content:type": node.frontmatter.type },
                       { "content:category": node.frontmatter.category },
                       { "content:tags": node.frontmatter.tags?.join(", ") || "" },
@@ -305,7 +306,7 @@ module.exports = {
                     enclosure: node.frontmatter.thumbnail && {
                       url: site.siteMetadata.siteUrl + node.frontmatter.thumbnail.publicURL,
                     },
-                    custom_elements: [{ "content:encoded": node.html }],
+                    custom_elements: [{ "content:encoded": node.excerpt }],
                   });
                 });
             },
@@ -330,7 +331,7 @@ module.exports = {
                     enclosure: node.frontmatter.thumbnail && {
                       url: site.siteMetadata.siteUrl + node.frontmatter.thumbnail.publicURL,
                     },
-                    custom_elements: [{ "content:encoded": node.html }],
+                    custom_elements: [{ "content:encoded": node.excerpt }],
                   });
                 });
             },

gatsby-node.js

@@ -19,7 +19,7 @@ if (process.env.CI === "true") {
   // All process.env.CI conditionals in this file are in place for GitHub Pages, if webhost changes in the future, code may need to be modified or removed.
   //Replacing '/' would result in empty string which is invalid
   const replacePath = (url) =>
-    url === "/" || url.includes("/404") ? url : `${url}.html`;
+    url === "/" || url.includes("/404") || url.endsWith(".html") ? url : `${url}.html`;
 
   exports.onCreatePage = ({ page, actions }) => {
     const { createPage, deletePage, createRedirect } = actions;