From df3dd52354d0fd44b367ee98ede2a3e1b51cc343 Mon Sep 17 00:00:00 2001
From: Aaron Yarborough <3855819+AaronJY@users.noreply.github.com>
Date: Fri, 2 May 2025 23:10:34 +0100
Subject: [PATCH] fix: run in docker
---
next-sitemap.config.cjs | 38 ++++++++---------
public/sitemap.xml | 76 ++++++++++++++++-----------------
src/errors.js | 2 +-
src/pages/[[...path]].jsx | 4 ++
src/pages/library/[slug].js | 9 +++-
src/services/content-service.js | 6 +--
6 files changed, 72 insertions(+), 63 deletions(-)
diff --git a/next-sitemap.config.cjs b/next-sitemap.config.cjs
index 1e1ddcf..a0191fb 100644
--- a/next-sitemap.config.cjs
+++ b/next-sitemap.config.cjs
@@ -16,29 +16,29 @@ module.exports = {
}
]
},
- transform: async (config, path) => {
- const metadata = {
- loc: path
- }
+ // transform: async (config, path) => {
+ // const metadata = {
+ // loc: path
+ // }
- if (isHomepage(path)) {
- metadata.priority = 1
- } else if (isBasePage(path)) {
- metadata.priority = 0.8
- } else {
- if (isArticle(path)) {
- metadata.priority = 0.6
- const attributes = getArticleAttibutes(`content${path}.md`)
- if (!attributes) { return null }
+ // if (isHomepage(path)) {
+ // metadata.priority = 1
+ // } else if (isBasePage(path)) {
+ // metadata.priority = 0.8
+ // } else {
+ // if (isArticle(path)) {
+ // metadata.priority = 0.6
+ // const attributes = getArticleAttibutes(`content${path}.md`)
+ // if (!attributes) { return null }
- metadata.lastmod = attributes.moddate ?? attributes.pubdate ?? null
+ // metadata.lastmod = attributes.moddate ?? attributes.pubdate ?? null
- console.log('Calculated sitemap dates for article', path)
- }
- }
+ // console.log('Calculated sitemap dates for article', path)
+ // }
+ // }
- return metadata
- }
+ // return metadata
+ // }
}
function isHomepage (path) {
diff --git a/public/sitemap.xml b/public/sitemap.xml
index 6903a05..7f719bc 100644
--- a/public/sitemap.xml
+++ b/public/sitemap.xml
@@ -1,42 +1,40 @@
-https://www.aaronjy.me/1
-https://www.aaronjy.me/about/0.8
-https://www.aaronjy.me/cv/0.8
-https://www.aaronjy.me/library/0.8
-https://www.aaronjy.me/tags/0.8
-https://www.aaronjy.me/writing/0.8
-https://www.aaronjy.me/library/1001-Nights/
-https://www.aaronjy.me/library/1984/
-https://www.aaronjy.me/library/A-Monster-Calls/
-https://www.aaronjy.me/library/Childhoods-End/
-https://www.aaronjy.me/library/Diary-of-An-Oxygen-Thief/
-https://www.aaronjy.me/library/Eleven-Kinds-of-Loneliness-/
-https://www.aaronjy.me/library/No-God-But-God/
-https://www.aaronjy.me/library/On-Tyranny/
-https://www.aaronjy.me/library/Sex--Punishment/
-https://www.aaronjy.me/library/The-Alchemist/
-https://www.aaronjy.me/library/The-Dangers-of-Smoking-in-Bed-/
-https://www.aaronjy.me/library/The-Invisible-Man/
-https://www.aaronjy.me/library/The-Nature-of-Alexander/
-https://www.aaronjy.me/library/The-Time-Machine/
-https://www.aaronjy.me/library/Wintering-The-Power-of-Rest-and-Retreat-in-Difficult-Times/
-https://www.aaronjy.me/library/a-night-to-remember/
-https://www.aaronjy.me/library/alice-in-wonderland/
-https://www.aaronjy.me/library/animal-farm/
-https://www.aaronjy.me/library/cities-that-shaped-the-ancient-world/
-https://www.aaronjy.me/library/song-of-achilles/
-https://www.aaronjy.me/library/starmaker/
-https://www.aaronjy.me/library/stasiland/
-https://www.aaronjy.me/library/stray-reflections/
-https://www.aaronjy.me/library/the-marmalade-diaries/
-https://www.aaronjy.me/library/the-midnight-library/
-https://www.aaronjy.me/library/to-be-taught-if-fortunate/
-https://www.aaronjy.me/library/when-the-moon-hits-your-eye/
-https://www.aaronjy.me/writing/attitudes-to-reading/Tue, 18 Mar 2025 00:00:00 GMT0.6
-https://www.aaronjy.me/writing/moving-from-github-to-forgejo/Sun, 16 Mar 2025 00:00:00 GMT0.6
-https://www.aaronjy.me/writing/performance-considerations-tcp-game-server/Fri, 21 Mar 2025 21:12:47 GMT0.6
-https://www.aaronjy.me/writing/quick-reflection-katherine-may/Sun, 09 Mar 2025 00:00:00 GMT0.6
-https://www.aaronjy.me/writing/static-site-on-google-cloud/Wed, 01 May 2024 00:00:00 GMT0.6
-https://www.aaronjy.me/writing/support-content-file-structure-changes-on-a-static-site/Mon, 18 Mar 2024 16:47:32 GMT0.6
+https://www.aaronjy.me/cvweekly0.7
+https://www.aaronjy.me/libraryweekly0.7
+https://www.aaronjy.me/tagsweekly0.7
+https://www.aaronjy.me/writingweekly0.7
+https://www.aaronjy.me/library/the-alchemistweekly0.7
+https://www.aaronjy.me/library/the-invisible-manweekly0.7
+https://www.aaronjy.me/library/wintering-the-power-of-rest-and-retreat-in-difficult-timesweekly0.7
+https://www.aaronjy.me/library/the-time-machineweekly0.7
+https://www.aaronjy.me/library/when-the-moon-hits-your-eyeweekly0.7
+https://www.aaronjy.me/library/the-song-of-achillesweekly0.7
+https://www.aaronjy.me/library/to-be-taught-if-fortunateweekly0.7
+https://www.aaronjy.me/library/on-tyrannyweekly0.7
+https://www.aaronjy.me/library/the-dangers-of-smoking-in-bedweekly0.7
+https://www.aaronjy.me/library/the-midnight-libraryweekly0.7
+https://www.aaronjy.me/library/a-night-to-rememberweekly0.7
+https://www.aaronjy.me/library/sex-punishmentweekly0.7
+https://www.aaronjy.me/library/a-monster-callsweekly0.7
+https://www.aaronjy.me/library/diary-of-an-oxygen-thiefweekly0.7
+https://www.aaronjy.me/library/1984weekly0.7
+https://www.aaronjy.me/library/alices-adventures-in-wonderlandweekly0.7
+https://www.aaronjy.me/library/the-nature-of-alexanderweekly0.7
+https://www.aaronjy.me/library/eleven-kinds-of-lonelinessweekly0.7
+https://www.aaronjy.me/library/star-makerweekly0.7
+https://www.aaronjy.me/library/stray-reflectionsweekly0.7
+https://www.aaronjy.me/library/stasiland-stories-from-behind-the-berlin-wallweekly0.7
+https://www.aaronjy.me/library/cities-that-shaped-the-ancient-worldweekly0.7
+https://www.aaronjy.me/library/animal-farmweekly0.7
+https://www.aaronjy.me/library/one-thousand-and-one-nights-a-retellingweekly0.7
+https://www.aaronjy.me/library/childhoods-endweekly0.7
+https://www.aaronjy.me/writing/migrating-from-github-to-forgejoweekly0.7
+https://www.aaronjy.me/writing/performance-considerations-when-writing-a-tcp-game-server-in-dotnetweekly0.7
+https://www.aaronjy.me/writing/quickwrite-a-reflection-on-wintering-by-katherine-mayweekly0.7
+https://www.aaronjy.me/writing/deploying-aaronjy-me-on-a-google-storage-bucketweekly0.7
+https://www.aaronjy.me/writing/supporting-content-file-structure-changes-on-a-static-siteweekly0.7
+https://www.aaronjy.me/writing/attitudes-to-reading-and-how-mine-have-changedweekly0.7
+https://www.aaronjy.me/aboutweekly0.7
+https://www.aaronjy.meweekly0.7
\ No newline at end of file
diff --git a/src/errors.js b/src/errors.js
index 47abc7e..e09c731 100644
--- a/src/errors.js
+++ b/src/errors.js
@@ -53,4 +53,4 @@ export class FailedFetchCVError extends Error {
super(`Failed to fetch basic pages: ${msg}`)
this.name = 'FailedFetchCVError'
}
-}
+}
\ No newline at end of file
diff --git a/src/pages/[[...path]].jsx b/src/pages/[[...path]].jsx
index 209141d..2ecd012 100644
--- a/src/pages/[[...path]].jsx
+++ b/src/pages/[[...path]].jsx
@@ -61,6 +61,10 @@ export async function getStaticProps ({ params }) {
}
export default function BasicPage ({ title, mdxSource }) {
+ if (!mdxSource || "error" in mdxSource) {
+ return Something went wrong: {mdxSource?.error ?? "???"}
+ }
+
return (
{
const { slug } = params
+
+ if (!slug) {
+ return {
+ notFound: true
+ }
+ }
+
const res = await fetchBookReviews([], {
slug,
status: 'published'
diff --git a/src/services/content-service.js b/src/services/content-service.js
index c7f235b..5f86233 100644
--- a/src/services/content-service.js
+++ b/src/services/content-service.js
@@ -10,7 +10,7 @@ export const fetchCV = async (...args) => fetchItems('cv', ...args)
export async function fetchItems (type, fields = undefined, filter = undefined) {
const url = new URL(`${baseUrl}/items/${type}`)
- console.log(`Getting items '${type}' with fields`, fields, 'and filter', filter)
+ // console.trace(`Getting items '${type}' with fields`, fields, 'and filter', filter)
if (fields?.length) {
url.searchParams.append('fields', fields.join(','))
@@ -50,9 +50,9 @@ export function markdownToHtml (content) {
}
async function apiFetch (...args) {
- console.log('API fetch:', args)
+ const url = args[0]
// @ts-ignore
const res = await fetch(...args)
- console.log('API fetch response:', res.status, res.statusText)
+ // console.log('GET (fetch)', url, res.status, res.statusText)
return res
}