astro-accelerator 5.9.15 → 5.9.17

package/package.json

@@ -1,5 +1,5 @@
 {
-    "version": "5.9.15",
+    "version": "5.9.17",
     "author": "Steve Fenton",
     "name": "astro-accelerator",
     "description": "A super-lightweight, accessible, SEO-friendly starter project for Astro",
@@ -33,11 +33,11 @@
         "dts": "tsc ./tests/locate-content.js ./tests/locate-navigation.js ./tests/locate-search.js --allowJs --declaration --emitDeclarationOnly"
     },
     "dependencies": {
-        "@astrojs/mdx": "^4.3.0",
-        "astro": "^5.11.0",
-        "astro-accelerator-utils": "^0.3.48",
+        "@astrojs/mdx": "^4.3.3",
+        "astro": "^5.12.8",
+        "astro-accelerator-utils": "^0.3.49",
         "cspell": "^8.19.4",
-        "csv": "^6.4.0",
+        "csv": "^6.4.1",
         "glob": "^11.0.3",
         "hast-util-from-selector": "^3.0.1",
         "html-to-text": "^9.0.5",
@@ -48,7 +48,7 @@
         "sharp": "^0.33.5"
     },
     "devDependencies": {
-        "@playwright/test": "^1.54.0"
+        "@playwright/test": "^1.54.2"
     },
     "files": [
         ".npmrc",
@@ -61,6 +61,7 @@
         "src/pages/404.md",
         "src/pages/index.md",
         "src/pages/search.md",
+        "src/pages/rss.xml.ts",
         "src/pages/articles/*.astro",
         "src/pages/articles/*.ts",
         "src/pages/authors/**/*.astro",

package/src/pages/authors/[author]/[page].astro

@@ -79,6 +79,12 @@ export async function getData() {
       }
     });
   });
+
+  sourcePosts.filter(PostFiltering.isAuthor).forEach((p) => {
+    if (!data.authors.includes(p.frontmatter.id)) {
+      data.authors.push(p.frontmatter.id);
+    }
+  });
     
   return data;
 }
@@ -93,7 +99,7 @@ export async function getStaticPaths({ paginate }: any) {
     });
     return paginate(filtered, { 
         params: { author: a.toLowerCase() },
-        props: { pubDate: filtered[0].frontmatter.pubDate },
+        props: { pubDate: filtered[0]?.frontmatter.pubDate ?? new Date() },
         pageSize: SITE.pageSize 
     });
   }).flat();
@@ -146,4 +152,4 @@ stats.stop();
   </div>
   <ArticleList lang={ lang } posts={ page.data } />
   <PagingLinks lang={ lang } page={ page } pageLinks={ pageLinks } />
-</Default>
+</Default>

package/src/pages/rss.xml.ts

@@ -0,0 +1,113 @@
+/** @format */
+
+// warning: This file is overwritten by Astro Accelerator
+
+// Generates an ATOM feed across the whole site with full content
+import { SITE } from '@config';
+import {
+  Accelerator,
+  PostFiltering,
+  PostOrdering,
+} from 'astro-accelerator-utils';
+import type { MarkdownInstance } from 'astro-accelerator-utils/types/Astro';
+
+type Frontmatter = MarkdownInstance['frontmatter'];
+
+async function getData() {
+  //@ts-ignore
+  const allArticles = import.meta.glob(['./**/*.md', './**/*.mdx']);
+
+  const accelerator = new Accelerator(SITE);
+  const stats = new accelerator.statistics('pages/articles/feed.xml');
+  stats.start();
+
+  let articles: MarkdownInstance[] = [];
+  const authors = accelerator.posts.all().filter(PostFiltering.isAuthor);
+  const contentItems: { [index: string]: string } = {};
+
+  for (const path in allArticles) {
+    const article: any = await allArticles[path]();
+
+    const filtered = [article]
+      .filter(PostFiltering.isListable)
+      .filter(PostFiltering.notAuthor)
+      .filter(PostFiltering.notSearch);
+
+    if (filtered.length === 0) {
+      continue;
+    }
+
+    if (typeof article.compiledContent !== 'function') {
+      continue;
+    }
+
+    const content = await article.compiledContent();
+    contentItems[article.url] = content;
+
+    article.frontmatter.title = await accelerator.markdown.getTextFrom(
+      article.frontmatter?.title
+    );
+
+    articles.push({
+      url: article.url,
+      frontmatter: article.frontmatter,
+    } as MarkdownInstance);
+  }
+
+  function getAuthorName(frontmatter: Frontmatter): string {
+    if (frontmatter.authors && frontmatter.authors.length > 0) {
+      const author = authors.filter(
+        (a) => a.frontmatter.id == frontmatter.authors?.[0]
+      )[0];
+
+      if (author?.frontmatter?.title) {
+        return author.frontmatter.title + ', Octopus Deploy';
+      }
+    }
+
+    return 'Octopus Deploy';
+  }
+
+  const limit = SITE.rssLimit ?? 20;
+  const items = articles
+    .sort(PostOrdering.sortByModDateDesc)
+    .slice(0, limit)
+    .map(
+      (a) => `
+    <entry>
+      <title>${a.frontmatter.title ?? ''}</title>
+      <link href="${SITE.url + a.url}" />
+      <id>${SITE.url + accelerator.urlFormatter.formatAddress(a.url)}</id>
+      <published>${a.frontmatter.pubDate}</published>
+      <updated>${a.frontmatter.modDate ?? a.frontmatter.pubDate}</updated>
+      <summary>${a.frontmatter.description ?? ''}</summary>
+      <author>
+        <name>${getAuthorName(a.frontmatter)}</name>
+      </author>
+      <content type="html"><![CDATA[${contentItems[a.url] ?? ''}]]></content>
+    </entry>`
+    );
+
+  stats.stop();
+
+  return new Response(
+    `<?xml version="1.0" encoding="utf-8"?>
+<feed xmlns="http://www.w3.org/2005/Atom">
+  <title>${SITE.title}</title>
+  <subtitle>${SITE.description}</subtitle>
+  <link href="${SITE.url}${SITE.feedUrl}" rel="self" />
+  <link href="${SITE.url}" />
+  <id>${SITE.url}${SITE.feedUrl}</id>
+  <updated>${articles[0].frontmatter.pubDate}</updated>
+${items.join('')}
+</feed>`,
+    {
+      status: 200,
+      headers: {
+        'Content-Type': 'application/xml',
+      },
+    }
+  );
+}
+
+export const GET = getData;

package/src/themes/accelerator/utilities/img.mjs

@@ -88,19 +88,22 @@ async function recurseFiles(directory) {
                     if (!fs.existsSync(metaPath)) {
                         console.log('Processing:', metaPath);
                         filesToProcess.push(info);
+                    } else {
+                        const data = fs.readFileSync(metaPath, 'utf8');
+                        const jsonData = JSON.parse(data);
+                        const date90DaysAgo = new Date(
+                            Date.now() - 90 * 24 * 60 * 60 * 1000
+                        );
+
+                        if (
+                            !jsonData.updated ||
+                            new Date(jsonData.updated) < date90DaysAgo
+                        ) {
+                            console.log('Processing:', metaPath);
+                            filesToProcess.push(info);
+                        }
                     }
 
-                    // The code below uses modified dates (and will update more images than the above)
-                    // const fullPath = path.join(imageDirectory, info.path);
-                    // const modified = fs.statSync(fullPath).mtime;
-
-                    // const destinationModified = fs.existsSync(fullDestination)
-                    //     ? fs.statSync(fullDestination).mtime
-                    //     : new Date(0);
-
-                    // if (destinationModified < modified) {
-                    //     filesToProcess.push(info);
-                    // }
                     break;
             }
         }
@@ -141,6 +144,7 @@ for (const file of filesToProcess) {
         width: info.width,
         height: info.height,
         sizeInBytes: info.size,
+        updated: new Date().toISOString(),
     };
 
     const metaFile = source + '.json';