From 4c57a825da0de68dfdb9dad2ec7b7f448f825e27 Mon Sep 17 00:00:00 2001
From: Zach Leatherman <zachleat@users.noreply.github.com>
Date: Sun, 14 Jan 2024 12:32:15 +1300
Subject: [PATCH] Status

---
 README.md                  |  2 +-
 _data/metadata.js          |  2 +-
 _includes/layouts/base.njk |  4 ++--
 content/404.md             |  2 +-
 content/blog/fifthpost.md  |  8 ++++----
 content/blog/secondpost.md |  4 ++--
 content/tag-pages.njk      | 22 ++++++++++++++++++++++
 content/tags-list.njk      | 12 ------------
 content/tags.njk           | 25 +++++++------------------
 eleventy.config.js         | 14 ++++++++------
 package.json               |  8 ++++----
 11 files changed, 52 insertions(+), 51 deletions(-)
 create mode 100644 content/tag-pages.njk
 delete mode 100644 content/tags-list.njk

diff --git a/README.md b/README.md
index 7177590..5e21e4f 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# eleventy-base-blog v8
+# eleventy-base-blog v9
 
 A starter repository showing how to build a blog with the [Eleventy](https://www.11ty.dev/) site generator (using the [v2.0 release](https://www.11ty.dev/blog/eleventy-v2/)).
 
diff --git a/_data/metadata.js b/_data/metadata.js
index 97faa8c..7e8b636 100644
--- a/_data/metadata.js
+++ b/_data/metadata.js
@@ -1,5 +1,5 @@
 export default {
-	title: "Eleventy Base Blog v8",
+	title: "Eleventy Base Blog v9",
 	url: "https://example.com/",
 	language: "en",
 	description: "I am writing about my experiences as a naval navel-gazer.",
diff --git a/_includes/layouts/base.njk b/_includes/layouts/base.njk
index 3b3226f..1308e54 100644
--- a/_includes/layouts/base.njk
+++ b/_includes/layouts/base.njk
@@ -7,8 +7,8 @@
 		<meta name="description" content="{{ description or metadata.description }}">
 
 		{#- Atom and JSON feeds included by default #}
-		<link rel="alternate" href="/feed/feed.xml" type="application/atom+xml" title="{{ metadata.title }}">
-		<link rel="alternate" href="/feed/feed.json" type="application/json" title="{{ metadata.title }}">
+		<link rel="alternate" href="feed/feed.njk" type="application/atom+xml" title="{{ metadata.title }}">
+		<link rel="alternate" href="feed/json.njk" type="application/json" title="{{ metadata.title }}">
 
 		{#- Uncomment this if you’d like folks to know that you used Eleventy to build your site!  #}
 		{#- <meta name="generator" content="{{ eleventy.generator }}"> #}
diff --git a/content/404.md b/content/404.md
index bd51f61..c8be2df 100644
--- a/content/404.md
+++ b/content/404.md
@@ -5,7 +5,7 @@ eleventyExcludeFromCollections: true
 ---
 # Content not found.
 
-Go <a href="/">home</a>.
+Go <a href="index.njk">home</a>.
 
 <!--
 
diff --git a/content/blog/fifthpost.md b/content/blog/fifthpost.md
index b173821..da2e95e 100644
--- a/content/blog/fifthpost.md
+++ b/content/blog/fifthpost.md
@@ -1,6 +1,6 @@
----
-title: This is a fifth post (draft)
-date: 2023-01-23
-draft: true
+---node
+const title = "This is a fifth post (draft)";
+const date = "2023-01-23";
+const draft = true;
 ---
 This is a draft post
diff --git a/content/blog/secondpost.md b/content/blog/secondpost.md
index 3c521a6..008fdc8 100644
--- a/content/blog/secondpost.md
+++ b/content/blog/secondpost.md
@@ -9,8 +9,8 @@ Leverage agile frameworks to provide a robust synopsis for high level overviews.
 
 ## Section Header
 
-<a href="/blog/firstpost/">First post</a>
-<a href="/blog/thirdpost/">Third post</a>
+<a href="/blog/firstpost.md">First post</a>
+<a href="blog/thirdpost.md">Third post</a>
 
 Bring to the table win-win survival strategies to ensure proactive domination. At the end of the day, going forward, a new normal that has evolved from generation X is on the runway heading towards a streamlined cloud solution. User generated content in real-time will have multiple touchpoints for offshoring.
 
diff --git a/content/tag-pages.njk b/content/tag-pages.njk
new file mode 100644
index 0000000..e5a5f70
--- /dev/null
+++ b/content/tag-pages.njk
@@ -0,0 +1,22 @@
+---
+pagination:
+  data: collections
+  size: 1
+  alias: tag
+  filter:
+    - all
+    - post
+    - posts
+    - tagList
+  addAllPagesToCollections: true
+layout: layouts/home.njk
+eleventyComputed:
+  title: Tagged “{{ tag }}”
+permalink: /tags/{{ tag | slugify }}/
+---
+<h1>Tagged “{{ tag }}”</h1>
+
+{% set postslist = collections[ tag ] %}
+{% include "postslist.njk" %}
+
+<p>See <a href="tags.njk">all tags</a>.</p>
diff --git a/content/tags-list.njk b/content/tags-list.njk
deleted file mode 100644
index 3050c9c..0000000
--- a/content/tags-list.njk
+++ /dev/null
@@ -1,12 +0,0 @@
----
-permalink: /tags/
-layout: layouts/home.njk
----
-<h1>Tags</h1>
-
-<ul>
-{% for tag in collections.all | getAllTags | filterTagList %}
-	{% set tagUrl %}/tags/{{ tag | slugify }}/{% endset %}
-	<li><a href="{{ tagUrl }}" class="post-tag">{{ tag }}</a></li>
-{% endfor %}
-</ul>
diff --git a/content/tags.njk b/content/tags.njk
index 437598a..a5a08cb 100644
--- a/content/tags.njk
+++ b/content/tags.njk
@@ -1,22 +1,11 @@
 ---
-pagination:
-  data: collections
-  size: 1
-  alias: tag
-  filter:
-    - all
-    - post
-    - posts
-    - tagList
-  addAllPagesToCollections: true
 layout: layouts/home.njk
-eleventyComputed:
-  title: Tagged “{{ tag }}”
-permalink: /tags/{{ tag | slugify }}/
 ---
-<h1>Tagged “{{ tag }}”</h1>
+<h1>Tags</h1>
 
-{% set postslist = collections[ tag ] %}
-{% include "postslist.njk" %}
-
-<p>See <a href="/tags/">all tags</a>.</p>
+<ul>
+{% for tag in collections.all | getAllTags | filterTagList %}
+	{% set tagUrl %}/tags/{{ tag | slugify }}/{% endset %}
+	<li><a href="{{ tagUrl }}" class="post-tag">{{ tag }}</a></li>
+{% endfor %}
+</ul>
diff --git a/eleventy.config.js b/eleventy.config.js
index 807d26e..7a30433 100644
--- a/eleventy.config.js
+++ b/eleventy.config.js
@@ -1,6 +1,7 @@
 import { DateTime } from "luxon";
 import markdownItAnchor from "markdown-it-anchor";
 
+import { PathToUrlTransformPlugin, HtmlBasePlugin } from "@11ty/eleventy";
 import pluginRss from "@11ty/eleventy-plugin-rss";
 import pluginSyntaxHighlight from "@11ty/eleventy-plugin-syntaxhighlight";
 import pluginBundle from "@11ty/eleventy-plugin-bundle";
@@ -11,8 +12,6 @@ import pluginImages from "./eleventy.config.images.js";
 
 /** @param {import("@11ty/eleventy").UserConfig} eleventyConfig */
 export default async function(eleventyConfig) {
-	const { EleventyHtmlBasePlugin } = await import("@11ty/eleventy");
-
 	// Copy the contents of the `public` folder to the output folder
 	// For example, `./public/css/` ends up in `_site/css/`
 	eleventyConfig.addPassthroughCopy({
@@ -36,8 +35,10 @@ export default async function(eleventyConfig) {
 		preAttributes: { tabindex: 0 }
 	});
 	eleventyConfig.addPlugin(pluginNavigation);
-	eleventyConfig.addPlugin(EleventyHtmlBasePlugin);
+
 	eleventyConfig.addPlugin(pluginBundle);
+	eleventyConfig.addPlugin(HtmlBasePlugin);
+	eleventyConfig.addPlugin(PathToUrlTransformPlugin);
 
 	// Filters
 	eleventyConfig.addFilter("readableDate", (dateObj, format, zone) => {
@@ -45,7 +46,7 @@ export default async function(eleventyConfig) {
 		return DateTime.fromJSDate(dateObj, { zone: zone || "utc" }).toFormat(format || "dd LLLL yyyy");
 	});
 
-	eleventyConfig.addFilter('htmlDateString', (dateObj) => {
+	eleventyConfig.addFilter("htmlDateString", (dateObj) => {
 		// dateObj input: https://html.spec.whatwg.org/multipage/common-microsyntaxes.html#valid-date-string
 		return DateTime.fromJSDate(dateObj, {zone: 'utc'}).toFormat('yyyy-LL-dd');
 	});
@@ -67,7 +68,7 @@ export default async function(eleventyConfig) {
 		return Math.min.apply(null, numbers);
 	});
 
-	// Return all the tags used in a collection
+	// Return all the tags used in any collection
 	eleventyConfig.addFilter("getAllTags", collection => {
 		let tagSet = new Set();
 		for(let item of collection) {
@@ -136,6 +137,7 @@ export default async function(eleventyConfig) {
 		// When paired with the HTML <base> plugin https://www.11ty.dev/docs/plugins/html-base/
 		// it will transform any absolute URLs in your HTML to include this
 		// folder name and does **not** affect where things go in the output folder.
-		pathPrefix: "/",
+
+		// pathPrefix: "/",
 	};
 };
diff --git a/package.json b/package.json
index 118f343..2475c67 100644
--- a/package.json
+++ b/package.json
@@ -33,13 +33,13 @@
 	},
 	"homepage": "https://github.com/11ty/eleventy-base-blog#readme",
 	"devDependencies": {
-		"@11ty/eleventy": "^2.0.1",
-		"@11ty/eleventy-img": "^3.1.1",
+		"@11ty/eleventy": "file:../eleventy",
+		"@11ty/eleventy-img": "^3.1.8",
 		"@11ty/eleventy-navigation": "^0.3.5",
-		"@11ty/eleventy-plugin-bundle": "^1.0.4",
+		"@11ty/eleventy-plugin-bundle": "^1.0.5",
 		"@11ty/eleventy-plugin-rss": "^1.2.0",
 		"@11ty/eleventy-plugin-syntaxhighlight": "^5.0.0",
-		"luxon": "^3.3.0",
+		"luxon": "^3.4.4",
 		"markdown-it-anchor": "^8.6.7"
 	}
 }