From 681c886e33167c023d8727b5bed47f4a9ed71378 Mon Sep 17 00:00:00 2001
From: Bret Comnes <bcomnes@gmail.com>
Date: Thu, 23 Nov 2023 19:13:47 -0800
Subject: [PATCH] deps

Add sitemap
---
 package.json                                 |  9 ++---
 src/blog/2023/introducing-hifiwifi/README.md |  4 ---
 src/blog/2023/page.js                        |  3 +-
 src/blog/page.js                             |  3 +-
 src/{ => globals}/global.client.js           |  0
 src/{ => globals}/global.css                 |  0
 src/{ => globals}/global.vars.js             |  0
 src/layouts/article.layout.js                |  6 ++--
 src/layouts/root.layout.js                   |  2 +-
 src/robots.txt.template.js                   | 25 ++++++++++++++
 src/sitemap.xml.template.js                  | 36 ++++++++++++++++++++
 11 files changed, 74 insertions(+), 14 deletions(-)
 rename src/{ => globals}/global.client.js (100%)
 rename src/{ => globals}/global.css (100%)
 rename src/{ => globals}/global.vars.js (100%)
 create mode 100644 src/robots.txt.template.js
 create mode 100644 src/sitemap.xml.template.js

diff --git a/package.json b/package.json
index 6403fd0..18bfc9d 100644
--- a/package.json
+++ b/package.json
@@ -9,8 +9,7 @@
     "url": "https://github.com/hifiwi-fi/hifiwi.fi/issues"
   },
   "devDependencies": {
-    "top-bun": "^7.0.0",
-    "@voxpelli/tsconfig": "^9.0.0",
+    "@voxpelli/tsconfig": "^10.0.0",
     "auto-changelog": "^2.0.0",
     "classnames": "^2.3.2",
     "gh-release": "^7.0.0",
@@ -19,13 +18,15 @@
     "p-map": "^6.0.0",
     "snazzy": "^9.0.0",
     "standard": "^17.0.0",
-    "typescript": "~5.2.2",
+    "top-bun": "^7.0.0",
+    "typescript": "~5.3.2",
     "uland-isomorphic": "^2.0.0"
   },
   "dependencies": {
     "fragmentions": "^1.1.3",
     "highlight.js": "^11.5.0",
-    "mine.css": "^9.0.1"
+    "mine.css": "^9.0.1",
+    "xmlbuilder": "^15.1.1"
   },
   "homepage": "https://github.com/hifiwi-fi/hifiwi.fi",
   "keywords": [],
diff --git a/src/blog/2023/introducing-hifiwifi/README.md b/src/blog/2023/introducing-hifiwifi/README.md
index 9f9c996..4186d23 100644
--- a/src/blog/2023/introducing-hifiwifi/README.md
+++ b/src/blog/2023/introducing-hifiwifi/README.md
@@ -14,10 +14,6 @@ HifiWifi was launched March 5th, 2022 with the following two products:
 - 📡 [gumcast](https://gumcast.com) — gumroad subscription courier
 - 🥖 [breadcrum.net](https://breadcrum.net) — internet newspaper clippings
 
-A directory of HifiWifi's network infrastructure projects can be found in the installations directory:
-
-- 🚧 [Installation Directory](/installations/)
-
 You can follow HifiWifi on the following channels:
 
 - 🌎 WWW: [hifiwi.fi](http://hifiwi.fi)
diff --git a/src/blog/2023/page.js b/src/blog/2023/page.js
index 27f6544..7d732e1 100644
--- a/src/blog/2023/page.js
+++ b/src/blog/2023/page.js
@@ -5,7 +5,8 @@
 
 export const vars = {
   title: '2023 Blog Posts',
-  layout: 'blog-auto-index'
+  layout: 'blog-auto-index',
+  noindex: true
 }
 
 /**
diff --git a/src/blog/page.js b/src/blog/page.js
index a789b6e..662012f 100644
--- a/src/blog/page.js
+++ b/src/blog/page.js
@@ -8,7 +8,8 @@ import { dirname, basename } from 'node:path'
 
 export const vars = {
   title: 'Recent Blog Posts',
-  layout: 'blog-index'
+  layout: 'blog-index',
+  noindex: true
 }
 
 /**
diff --git a/src/global.client.js b/src/globals/global.client.js
similarity index 100%
rename from src/global.client.js
rename to src/globals/global.client.js
diff --git a/src/global.css b/src/globals/global.css
similarity index 100%
rename from src/global.css
rename to src/globals/global.css
diff --git a/src/global.vars.js b/src/globals/global.vars.js
similarity index 100%
rename from src/global.vars.js
rename to src/globals/global.vars.js
diff --git a/src/layouts/article.layout.js b/src/layouts/article.layout.js
index f1595ad..e6ede8b 100644
--- a/src/layouts/article.layout.js
+++ b/src/layouts/article.layout.js
@@ -14,15 +14,15 @@ export default function articleLayout (args) {
       <header class="article-header">
         <h1 class="p-name article-title" itemprop="headline">${vars.title}</h1>
         <div class="metadata">
-          <address class="author-info" itemprop="author" itemscope itemtype="http://schema.org/Person">
+          <address class="author-info p-author h-card" itemprop="author" itemscope itemtype="http://schema.org/Person">
             ${vars.authorImgUrl
               ? html`<img height="40" width="40"  src="${vars.authorImgUrl}" alt="${vars.authorImgAlt}" class="u-photo" itemprop="image">`
               : null
             }
             ${vars.authorName && vars.authorUrl
               ? html`
-                  <a href="${vars.authorUrl}" class="p-author h-card" itemprop="url">
-                    <span itemprop="name">${vars.authorName}</span>
+                  <a href="${vars.authorUrl}" class="u-url" itemprop="url">
+                    <span itemprop="p-name name">${vars.authorName}</span>
                   </a>`
               : null
             }
diff --git a/src/layouts/root.layout.js b/src/layouts/root.layout.js
index 390d83f..9e08726 100644
--- a/src/layouts/root.layout.js
+++ b/src/layouts/root.layout.js
@@ -2,7 +2,7 @@ import { html, render } from 'uland-isomorphic'
 
 /**
  * @template T
- * @typedef {import('@siteup/cli').LayoutFunction<T>} LayoutFunction
+ * @typedef {import('top-bun').LayoutFunction<T>} LayoutFunction
  */
 
 /**
diff --git a/src/robots.txt.template.js b/src/robots.txt.template.js
new file mode 100644
index 0000000..692bca2
--- /dev/null
+++ b/src/robots.txt.template.js
@@ -0,0 +1,25 @@
+/**
+ * @template T
+ * @typedef {import('top-bun').TemplateFunction<T>} TemplateFunction
+ */
+
+/** @type {TemplateFunction<{
+ *  siteName: string,
+ *  siteDescription: string,
+ *  siteUrl: string,
+ *  authorName: string,
+ *  authorUrl: string,
+ *  authorImgUrl: string
+ *  layout: string,
+ *  publishDate: string
+ *  title: string
+ * }>} */
+export default async ({
+  vars: {
+    siteUrl
+  }
+}) => `User-agent: *
+Allow: /
+
+Sitemap: ${siteUrl}/sitemap.xml
+`
diff --git a/src/sitemap.xml.template.js b/src/sitemap.xml.template.js
new file mode 100644
index 0000000..fbf592a
--- /dev/null
+++ b/src/sitemap.xml.template.js
@@ -0,0 +1,36 @@
+import builder from 'xmlbuilder'
+
+/**
+ * @template T
+ * @typedef {import('top-bun').TemplateFunction<T>} TemplateFunction
+ */
+
+/** @type {TemplateFunction<{
+ *  siteName: string,
+ *  siteDescription: string,
+ *  siteUrl: string,
+ *  authorName: string,
+ *  authorUrl: string,
+ *  authorImgUrl: string
+ *  layout: string,
+ *  publishDate: string
+ *  title: string,
+ *  noindex?: boolean
+ * }>} */
+export default async ({
+  vars: {
+    siteUrl
+  },
+  pages
+}) => {
+  const sitemapObj = {
+    urlset: {
+      '@xmlns': 'http://www.sitemaps.org/schemas/sitemap/0.9',
+      url: pages.filter(page => !page.vars.noindex).map(page => ({
+        loc: `${siteUrl}/${page.pageInfo.path}${page.pageInfo.path && !page.pageInfo.path.endsWith('.html') ? '/' : ''}`
+      }))
+    }
+  }
+  const feed = builder.create(sitemapObj, { encoding: 'utf-8' })
+  return feed.end({ pretty: true, allowEmpty: false })
+}