From e45261bb3106ba54509167f700dd47765e6876f0 Mon Sep 17 00:00:00 2001
From: Cory Dransfeldt <hi@coryd.dev>
Date: Tue, 16 Jul 2024 09:30:21 -0700
Subject: [PATCH] chore: make cloudflare 404s happy

---
 .eleventy.js           |  3 ++-
 _redirects             | 17 +++--------------
 config/events/index.js | 10 ++++++++++
 package-lock.json      |  4 ++--
 package.json           |  2 +-
 5 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/.eleventy.js b/.eleventy.js
index 7736d28f..17d59042 100644
--- a/.eleventy.js
+++ b/.eleventy.js
@@ -6,7 +6,7 @@ import markdownItAnchor from 'markdown-it-anchor'
 import markdownItFootnote from 'markdown-it-footnote'
 import htmlmin from 'html-minifier-terser'
 import filters from './config/filters/index.js'
-import { minifyJsComponents } from './config/events/index.js'
+import { copy404Page, minifyJsComponents } from './config/events/index.js'
 import { allContent, popularPosts, searchIndex, siteMap } from './config/collections/index.js'
 import { DateTime } from 'luxon'
 
@@ -106,6 +106,7 @@ export default async function (eleventyConfig) {
   })
 
   // events
+  eleventyConfig.on('afterBuild', copy404Page)
   eleventyConfig.on('afterBuild', minifyJsComponents)
 
   return {
diff --git a/_redirects b/_redirects
index 2e2ac79e..cd700170 100644
--- a/_redirects
+++ b/_redirects
@@ -44,18 +44,6 @@
 /posts/2023/semi-automated-hashtags-syndicated-posts/ /posts/2023/semi-automated-hashtags-for-syndicated-posts/ 301
 /posts/2023/automating-rss-syndication-with-nextjs-github/ /posts/2023/automating-rss-syndication-and-sharing-with-nextjs-and-github/ 301
 /posts/2023/locally-stored-music-and-storage-as-a-meaningful-constraint/ /posts/2023/doppler-locally-stored-music-and-storage-as-a-beneficial-constraint/ 301
-
-# 404s
-/* /404.html 404
-/robot.txt /robots.txt 301
-robotx.txt /robots.txt 301
-/sitemap /sitemap.xml 301
-/sitemap.txt /sitemap.xml 301
-/blog / 301
-/posts/2024 / 301
-/stats /search 301
-/books/want-to-read /books 301
-/watching/movies-to-watch /watching 301
 /blog/digital-privacy-tools /posts/2021/digital-privacy-tools/ 301
 
 # feeds
@@ -74,7 +62,7 @@ robotx.txt /robots.txt 301
  /follow.json https://feedpress.me/coryd-all.json
 
 # general
-/articles/ / 301
+/articles/ /posts/ 301
 /recent/movies /watching/recent/movies 301
 /recent/shows /watching/recent/shows 301
 /mastodon https://social.lol/@cory 301
@@ -82,4 +70,5 @@ robotx.txt /robots.txt 301
 /tags /search 301
 /tags/* /search 301
 /music/genre/* /music/genres/:splat 301
-/reading /books
\ No newline at end of file
+/reading /books
+/stats /search 301
\ No newline at end of file
diff --git a/config/events/index.js b/config/events/index.js
index eae68479..52c0c72b 100644
--- a/config/events/index.js
+++ b/config/events/index.js
@@ -1,4 +1,5 @@
 import fs from 'fs'
+import path from 'path'
 import { minify } from 'terser'
 
 export const minifyJsComponents = async () => {
@@ -14,3 +15,12 @@ export const minifyJsComponents = async () => {
     }
   }
 }
+
+export const copy404Page = () => {
+  const sourcePath = path.join('_site', '404', 'index.html')
+  const destinationPath = path.join('_site', '404.html')
+
+  fs.copyFile(sourcePath, destinationPath, (err) => {
+    if (err) console.error('Error copying 404 page:', err)
+  })
+}
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index a4c16be7..5b37e4e6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "coryd.dev",
-  "version": "20.9.2",
+  "version": "20.9.3",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "coryd.dev",
-      "version": "20.9.2",
+      "version": "20.9.3",
       "license": "MIT",
       "dependencies": {
         "@cdransf/api-text": "^1.4.0",
diff --git a/package.json b/package.json
index a913b97b..4cefbad8 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "coryd.dev",
-  "version": "20.9.2",
+  "version": "20.9.3",
   "description": "The source for my personal site. Built using 11ty (and other tools).",
   "type": "module",
   "scripts": {