Updates to use newest alpha release with on-request image optimization during --serve. Cleans up config and data

content/404.md

@@ -1,5 +1,4 @@
 ---
-layout: layouts/home.njk
 permalink: 404.html
 eleventyExcludeFromCollections: true
 ---

content/about/index.md

@@ -1,5 +1,4 @@
 ---
-layout: layouts/base.njk
 eleventyNavigation:
   key: About Me
   order: 3

content/blog.njk

@@ -1,5 +1,4 @@
 ---
-layout: layouts/home.njk
 eleventyNavigation:
   key: Archive
   order: 2

content/blog/blog.11tydata.js

@@ -1,6 +1,36 @@
+import { z } from "zod";
+import { fromZodError } from 'zod-validation-error';
+
 export default {
 	tags: [
 		"posts"
 	],
 	"layout": "layouts/post.njk",
+	eleventyDataSchema: function(data) {
+		let result = z.object({
+			draft: z.boolean().or(z.undefined()),
+		}).safeParse(data);
+
+		if(result.error) {
+			throw fromZodError(result.error);
+		}
+	},
+	eleventyComputed: {
+		permalink: (data) => {
+			// Always skip during non-watch/serve builds
+			if(data.draft && process.env.ELEVENTY_RUN_MODE === "build") {
+				return false;
+			}
+
+			return data.permalink;
+		},
+		eleventyExcludeFromCollections: (data) => {
+			// Always exclude from non-watch/serve builds
+			if(data.draft && process.env.ELEVENTY_RUN_MODE === "build") {
+				return true;
+			}
+
+			return data.eleventyExcludeFromCollections;
+		}
+	}
 };

content/content.11tydata.js

@@ -0,0 +1,3 @@
+export default {
+	layout: "layouts/home.njk",
+};

content/feed/feed.11tydata.js

@@ -1,3 +1,3 @@
 export default {
-	eleventyExcludeFromCollections: true
-}
+	layout: false,
+};

content/feed/feed.njk

@@ -1,6 +1,9 @@
 ---
 # Metadata comes from _data/metadata.js
 permalink: /feed/feed.xml
+eleventyNavigation:
+  key: Feed
+  order: 3
 ---
 <?xml version="1.0" encoding="utf-8"?>
 <feed xmlns="http://www.w3.org/2005/Atom" xml:base="{{ metadata.language }}">

content/index.njk

@@ -1,5 +1,4 @@
 ---
-layout: layouts/home.njk
 eleventyNavigation:
   key: Home
   order: 1

content/sitemap.xml.njk

@@ -1,5 +1,6 @@
 ---
 permalink: /sitemap.xml
+layout: false
 eleventyExcludeFromCollections: true
 ---
 <?xml version="1.0" encoding="utf-8"?>

content/tag-pages.njk

@@ -1,18 +1,19 @@
----
-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 }}/
+---node
+// <script>
+const pagination = {
+	data: "collections",
+	size: 1,
+	alias: "tag",
+	filter: ["all", "posts"],
+	addAllPagesToCollections: true,
+};
+
+const eleventyComputed = {
+	title: "Tagged '{{ tag }}'",
+	permalink: function(data) {
+		return `/tags/${this.slugify(data.tag)}/`;
+	}
+};
 ---
 <h1>Tagged “{{ tag }}”</h1>
 

content/tags.njk

@@ -1,10 +1,7 @@
----
-layout: layouts/home.njk
----
 <h1>Tags</h1>
 
 <ul>
-{% for tag in collections.all | getAllTags | filterTagList %}
+{% for tag in collections | getKeys | filterTagList %}
 	{% set tagUrl %}/tags/{{ tag | slugify }}/{% endset %}
 	<li><a href="{{ tagUrl }}" class="post-tag">{{ tag }}</a></li>
 {% endfor %}