audit fix

.drone.yml

@@ -0,0 +1,25 @@
+kind: pipeline
+type: docker
+name: default
+
+steps:
+  - name: build
+    image: node:current
+    environment:
+      REPOSITORY: <dest-repo>
+      GIT_USER: <username>
+      GIT_TOKEN:
+        from_secret: GIT_TOKEN
+    commands:
+      - git config credential.helper '!f() { echo username=$GIT_USER; echo "password=$GIT_TOKEN"; };f'
+      - git submodule update --remote --init --merge
+      - npm install
+      - npm run build
+      - apt-get update && apt-get install -y rsync
+      - rsync -uavh _site/ $REPOSITORY --delete --exclude .git
+      - cd $REPOSITORY
+      - git checkout main
+      - git config --global --add safe.directory /drone/src/$REPOSITORY
+      - git add -A
+      - git commit -m "drone build $(TZ=':America/Los_Angeles' date)"
+      - git push

.gitignore

@@ -1,3 +1,2 @@
-_live
 _site
 node_modules

README.md

@@ -8,50 +8,22 @@ Template repository for my 11ty projects.
 
 in heckin gitea, create destination repo.
 
-### 2. add dronefile to source repo
+### 2. update dronefile in source repo
 
-Filename: `.drone.yml`, in root of repo. Note the `<vars>` to replace.
+Update the `<placeholder values>` in [.drone.yml](.drone.yml).
 
-```yaml
+### 3. create and add PAT (one-time, not per repo)
-kind: pipeline
-type: docker
-name: default
-
-steps:
-  - name: build
-    image: node:current
-    environment:
-      REPOSITORY: <dest-repo>
-      GIT_USER: <username>
-      GIT_TOKEN:
-        from_secret: GIT_TOKEN
-    commands:
-      - git config credential.helper '!f() { echo username=$GIT_USER; echo "password=$GIT_TOKEN"; };f'
-      - git submodule update --remote --init --merge
-      - npm install
-      - npm run build
-      - apt-get update && apt-get install -y rsync
-      - rsync -uavh _site/ $REPOSITORY --delete --exclude .git
-      - cd $REPOSITORY
-      - git checkout main
-      - git config --global --add safe.directory /drone/src/$REPOSITORY
-      - git add -A
-      - git commit -m "drone build $(TZ=':America/Los_Angeles' date)"
-      - git push
-```
-
-### 3. create PAT (one-time, not per repo)
 
 in heckin, go to settings > applications, and create a PAT with read & write permissions to repositories.
 
-### 4. activate project in drone and add PAT
+in drone, you can set your PAT either as a project secret or an organization secret. In either case call it `GIT_TOKEN`.
+
+### 4. activate project in drone
 
 in drone, find your project and activate it.
 
 in the settings, I chose to disable pull requests and forks. I set my runner timeout to 15m.
 
-you can set your PAT either as a project secret or an organization secret. In either case call it `GIT_TOKEN`.
-
 ### 5. first commit to submodule
 
 assuming we are committing the _site folder...
@@ -68,6 +40,8 @@ git remote add origin <remote-url>
 git push -u origin main
 ```
 
+then you can delete the temp directory.
+
 ### 6. add submodule to local repo
 
 in root dir of local repo, add the submodule.

_includes/layouts/page.njk

@@ -1,7 +0,0 @@
----
-layout: base.njk
----
-
-<h1>{{ title }}</h1>
-
-{{ content | safe }}

css/main.css

@@ -3,6 +3,10 @@
 }
 
 /* numbered components are from https://www.joshwcomeau.com/css/custom-css-reset/ */
+#root, #__next {
+  isolation: isolate; /* 10. Create a root stacking context */
+}
+
 *, *::before, *::after {
   box-sizing: border-box; /* 1. Use a more-intuitive box-sizing model */
 }
@@ -32,18 +36,14 @@ input, button, textarea, select {
   font: inherit; /* 7. Inherit fonts for form controls */
 }
 
-p, h1, h2, h3, h4, h5, h6 {
+h1, h2, h3, h4, h5, h6, p {
   overflow-wrap: break-word; /* 8. Avoid text overflows */
 }
 
-p {
-  text-wrap: pretty; /* 9. Improve line wrapping */
-}
-
 h1, h2, h3, h4, h5, h6 {
   text-wrap: balance; /* 9. Improve line wrapping */
 }
 
-#root, #__next {
+p {
-  isolation: isolate; /* 10. Create a root stacking context */
+  text-wrap: pretty; /* 9. Improve line wrapping */
 }

eleventy.config.js

@@ -1,5 +1,10 @@
-import { attrs } from "@mdit/plugin-attrs";
+import { HtmlBasePlugin } from "@11ty/eleventy";
 import { eleventyImageTransformPlugin } from "@11ty/eleventy-img";
+
+import { attrs } from "@mdit/plugin-attrs";
+import { markdownitLinkAttributes } from 'markdown-it-link-attributes';
+import markdownitIdAttributes from "markdown-it-anchor";
+
 import path from "node:path";
 
 import pluginFilters from "./_config/filters.js";
@@ -8,6 +13,23 @@ export default async function (eleventyConfig) {
 	/* Markdown HTML attribute parsing */
 	eleventyConfig.amendLibrary("md", (mdLib) => mdLib.use(attrs));
 
+	/* Markdown apply target="_blank" to all external links */
+	eleventyConfig.amendLibrary("md", (mdLib) => mdLib.use(markdownitLinkAttributes, {
+    matcher(href) {
+      return href.match(/^https?:\/\//);
+    },
+    attrs: {
+      target: "_blank",
+      rel: "external",
+    },
+  }));
+
+	/* Markdown apply ID attributes to headers */
+	eleventyConfig.amendLibrary("md", (mdLib) => mdLib.use(markdownitIdAttributes, {
+		level: [2, 3, 4],
+		tabIndex: false,
+	}));
+
 	/* Bundles */
 	/* CSS */
 	eleventyConfig.addBundle("css", {
@@ -26,6 +48,9 @@ export default async function (eleventyConfig) {
 		.addPassthroughCopy("favicon.ico")
 		.addPassthroughCopy("robots.txt");
 
+	/* HTML base */
+	eleventyConfig.addPlugin(HtmlBasePlugin);
+
 	/* Images */
 	eleventyConfig.addPlugin(eleventyImageTransformPlugin, {
 		// output image formats
@@ -41,6 +66,7 @@ export default async function (eleventyConfig) {
 				decoding: "async",
 			},
 		},
+		/* If you want to use specific images as the OG image...
 		filenameFormat: function (hash, src, width, format, options) {
 			// If you're building multiple widths
 			// const extension = path.extname(src);
@@ -49,11 +75,23 @@ export default async function (eleventyConfig) {
 
 			return path.basename(src);
 		},
+		*/
 	});
 
 	/* All filters from _config/filters.js */
 	eleventyConfig.addPlugin(pluginFilters);
 
+	/* Draft handling */
+	eleventyConfig.addPreprocessor("drafts", "*", (data, content) => {
+		if (data.draft) {
+			data.title = `${data.title} (draft)`;
+		}
+
+		if(data.draft && process.env.ELEVENTY_RUN_MODE === "build") {
+			return false;
+		}
+	});
+
 	/* Shortcodes */
 	eleventyConfig.addShortcode("currentBuildDate", () => {
 		return new Date().toISOString();

package-lock.json

@@ -5,13 +5,16 @@
 	"requires": true,
 	"packages": {
 		"": {
+			"name": "11ty",
 			"version": "1.0.0",
 			"license": "AGPL-3.0-only",
 			"devDependencies": {
 				"@11ty/eleventy": "^3.1.5",
 				"@11ty/eleventy-img": "^6.0.4",
 				"@mdit/plugin-attrs": "^0.25.1",
-				"luxon": "^3.7.2"
+				"luxon": "^3.7.2",
+				"markdown-it-anchor": "^10.0.0",
+				"markdown-it-link-attributes": "https://github.com/lee0c/markdown-it-link-attributes/tarball/main"
 			}
 		},
 		"node_modules/@11ty/dependency-tree": {
@@ -38,9 +41,9 @@
 			}
 		},
 		"node_modules/@11ty/eleventy": {
-			"version": "3.1.5",
+			"version": "3.1.6",
-			"resolved": "https://registry.npmjs.org/@11ty/eleventy/-/eleventy-3.1.5.tgz",
+			"resolved": "https://registry.npmjs.org/@11ty/eleventy/-/eleventy-3.1.6.tgz",
-			"integrity": "sha512-hZ0g6MwZyRxCqXsPm82gIM304LraKbUz3ZmezOSjsqxttZG6cHTib3Qq8QkESJoKwnr+yX1eyfOkPC5/mEgZnQ==",
+			"integrity": "sha512-ZlSiR1PLdS2lv7TelBgWAhcvMiLNZkPBlLEb+lh7kGYZ+Mk0bo9qcYgVsewvw9W7Em0RH3wd01h5fAstNDh0zA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -50,7 +53,7 @@
 				"@11ty/eleventy-plugin-bundle": "^3.0.7",
 				"@11ty/eleventy-utils": "^2.0.7",
 				"@11ty/lodash-custom": "^4.17.21",
-				"@11ty/posthtml-urls": "^1.0.2",
+				"@11ty/posthtml-urls": "^1.0.3",
 				"@11ty/recursive-copy": "^4.0.4",
 				"@sindresorhus/slugify": "^2.2.1",
 				"bcp-47-normalize": "^2.3.0",
@@ -63,20 +66,20 @@
 				"iso-639-1": "^3.1.5",
 				"js-yaml": "^4.1.1",
 				"kleur": "^4.1.5",
-				"liquidjs": "^10.25.0",
+				"liquidjs": "^10.27.0",
 				"luxon": "^3.7.2",
-				"markdown-it": "^14.1.1",
+				"markdown-it": "^14.2.0",
 				"minimist": "^1.2.8",
 				"moo": "0.5.2",
 				"node-retrieve-globals": "^6.0.1",
 				"nunjucks": "^3.2.4",
-				"picomatch": "^4.0.3",
+				"picomatch": "^4.0.4",
 				"please-upgrade-node": "^3.2.0",
 				"posthtml": "^0.16.7",
 				"posthtml-match-helper": "^2.0.3",
-				"semver": "^7.7.4",
+				"semver": "^7.8.1",
-				"slugify": "^1.6.8",
+				"slugify": "^1.6.9",
-				"tinyglobby": "^0.2.15"
+				"tinyglobby": "^0.2.16"
 			},
 			"bin": {
 				"eleventy": "cmd.cjs"
@@ -919,9 +922,9 @@
 			}
 		},
 		"node_modules/brace-expansion": {
-			"version": "1.1.14",
+			"version": "1.1.21",
-			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.14.tgz",
+			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.21.tgz",
-			"integrity": "sha512-MWPGfDxnyzKU7rNOW9SP/c50vi3xrmrua/+6hfPbCS2ABNWfx24vPidzvC7krjU/RTo235sV776ymlsMtGKj8g==",
+			"integrity": "sha512-9zeA+KLZNNzglF2TPKRQEDyx6Yby7daAkuy8MiPzpXPsYDWi/DRM8jmwUDxokQjYqBpv5DgPiwD4h4ZZSy1Ujw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -1441,9 +1444,9 @@
 			}
 		},
 		"node_modules/gray-matter/node_modules/js-yaml": {
-			"version": "3.14.2",
+			"version": "3.15.2",
-			"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.2.tgz",
+			"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.15.2.tgz",
-			"integrity": "sha512-PMSmkqxr106Xa156c2M265Z+FTrPl+oxd/rgOQy2tijQeK5TxQ43psO1ZCwhVOSdnn+RzkzlRz/eY4BgJBYVpg==",
+			"integrity": "sha512-6EuL879VkRA+1Cz578mKMiKvjPNEuk6+r1JaFzoSWejZmtf7xWbIyw1e3KkxlkzTIt9Taw6JBhEppG7utc1P+w==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -1659,10 +1662,20 @@
 			}
 		},
 		"node_modules/js-yaml": {
-			"version": "4.1.1",
+			"version": "4.3.2",
-			"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.1.tgz",
+			"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.3.2.tgz",
-			"integrity": "sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==",
+			"integrity": "sha512-SFNOvSJ+Dgf/9An904Yx+CgSlIPCkIpao4qo51lpee25TIRejdH3rhR4EZMGoNx3/TP3O+wzWuiTFl4sqbltzA==",
 			"dev": true,
+			"funding": [
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/puzrin"
+				},
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/nodeca"
+				}
+			],
 			"license": "MIT",
 			"dependencies": {
 				"argparse": "^2.0.1"
@@ -1702,19 +1715,29 @@
 			}
 		},
 		"node_modules/linkify-it": {
-			"version": "5.0.0",
+			"version": "5.0.2",
-			"resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-5.0.0.tgz",
+			"resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-5.0.2.tgz",
-			"integrity": "sha512-5aHCbzQRADcdP+ATqnDuhhJ/MRIqDkZX5pyjFHRRysS8vZ5AbqGEoFIb6pYHPZ+L/OC2Lc+xT8uHVVR5CAK/wQ==",
+			"integrity": "sha512-ONTm2jCMAVZjgQa/Fy1kScXsuOoF5NPTsoFBdE1KVIZ2vAh/r9+Bqo+0jINCBYnavTPQZz38QzFTme79ENoN3Q==",
 			"dev": true,
+			"funding": [
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/puzrin"
+				},
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/markdown-it"
+				}
+			],
 			"license": "MIT",
 			"dependencies": {
 				"uc.micro": "^2.0.0"
 			}
 		},
 		"node_modules/liquidjs": {
-			"version": "10.25.7",
+			"version": "10.29.0",
-			"resolved": "https://registry.npmjs.org/liquidjs/-/liquidjs-10.25.7.tgz",
+			"resolved": "https://registry.npmjs.org/liquidjs/-/liquidjs-10.29.0.tgz",
-			"integrity": "sha512-rPCjJLiD4eDhQjvv964AeXFC+HbeYBbZrd7Z82Q6hqv1lX7G+5w4SJcKLn9CAAAwHI4aS3dTdo083UB79K3pDA==",
+			"integrity": "sha512-pCVOhs6FLAR8su3ItJ07diN26t6W5dHQRnmTMy8HPyTFuv1+oSCVJIGp5pGjfQyOZfh50KswvKtMTp6p4JEIdw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -1750,15 +1773,25 @@
 			}
 		},
 		"node_modules/markdown-it": {
-			"version": "14.1.1",
+			"version": "14.3.2",
-			"resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-14.1.1.tgz",
+			"resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-14.3.2.tgz",
-			"integrity": "sha512-BuU2qnTti9YKgK5N+IeMubp14ZUKUUw7yeJbkjtosvHiP0AZ5c8IAgEMk79D0eC8F23r4Ac/q8cAIFdm2FtyoA==",
+			"integrity": "sha512-sHHjZ5fJKlgrG4qns2YwVcdNep35h5fERrfkD2YNsb9UFk0UIHarbiTaHKVMlPuWAoiilyK8Fv/jAm11slsY7Q==",
 			"dev": true,
+			"funding": [
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/puzrin"
+				},
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/markdown-it"
+				}
+			],
 			"license": "MIT",
 			"dependencies": {
 				"argparse": "^2.0.1",
-				"entities": "^4.4.0",
+				"entities": "^4.5.0",
-				"linkify-it": "^5.0.0",
+				"linkify-it": "^5.0.2",
 				"mdurl": "^2.0.0",
 				"punycode.js": "^2.3.1",
 				"uc.micro": "^2.1.0"
@@ -1767,6 +1800,24 @@
 				"markdown-it": "bin/markdown-it.mjs"
 			}
 		},
+		"node_modules/markdown-it-anchor": {
+			"version": "10.0.0",
+			"resolved": "https://registry.npmjs.org/markdown-it-anchor/-/markdown-it-anchor-10.0.0.tgz",
+			"integrity": "sha512-Q8g7Z6OBdH3eXF0lujFqukIxUvgCDZcjzCrJxmD6QiEzU1HWR9fVN+Bf6gxmM+0yrPFs+jUw8gNjLmUQqt6Eew==",
+			"dev": true,
+			"license": "Unlicense",
+			"peerDependencies": {
+				"@types/markdown-it": "*",
+				"markdown-it": "*"
+			}
+		},
+		"node_modules/markdown-it-link-attributes": {
+			"version": "4.0.1",
+			"resolved": "https://github.com/lee0c/markdown-it-link-attributes/tarball/main",
+			"integrity": "sha512-AWUn7JiBi431HkZyXR2MRJxU0wQolHmG/TFCrRSq+w/q4mIzY7c3QKBF1eYEQwXx8IKLdmBVxZA37tp3S1ZkYQ==",
+			"dev": true,
+			"license": "MIT"
+		},
 		"node_modules/markdown-it/node_modules/entities": {
 			"version": "4.5.0",
 			"resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
@@ -2163,9 +2214,9 @@
 			}
 		},
 		"node_modules/semver": {
-			"version": "7.8.0",
+			"version": "7.8.5",
-			"resolved": "https://registry.npmjs.org/semver/-/semver-7.8.0.tgz",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-7.8.5.tgz",
-			"integrity": "sha512-AcM7dV/5ul4EekoQ29Agm5vri8JNqRyj39o0qpX6vDF2GZrtutZl5RwgD1XnZjiTAfncsJhMI48QQH3sN87YNA==",
+			"integrity": "sha512-Y7/KDsb8LjooZpwaqGyulO6DQlksgCncchHGk+sZIY4SBvUocMBEFH5Ur1fI4dV+Jvl0w6cjvucaIi40puRioA==",
 			"dev": true,
 			"license": "ISC",
 			"bin": {
@@ -2399,9 +2450,9 @@
 			"license": "MIT"
 		},
 		"node_modules/ws": {
-			"version": "8.20.1",
+			"version": "8.21.3",
-			"resolved": "https://registry.npmjs.org/ws/-/ws-8.20.1.tgz",
+			"resolved": "https://registry.npmjs.org/ws/-/ws-8.21.3.tgz",
-			"integrity": "sha512-It4dO0K5v//JtTXuPkfEOaI3uUN87iYPnqo/ZzqCoG3g8uhA66QUMs/SrM0YK7/NAu+r4LMh/9dq2A7k+rHs+w==",
+			"integrity": "sha512-201TZ/kPWxoPr/OKWjquZR1SWKXcvxdH+e1xrx89b3YbmzLMFCLfnaG1HFIgWzJOEWZ7MvpK++odZufgYR50Rw==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {

package.json

@@ -4,7 +4,7 @@
 	"description": "",
 	"scripts": {
 		"build": "rm -rf _site && npx @11ty/eleventy --quiet",
-		"dev": "rm -rf _live && npx @11ty/eleventy --serve --quiet --output _live"
+		"dev": "rm -rf _site && npx @11ty/eleventy --serve --quiet"
 	},
 	"author": "Lee Cattarin",
 	"license": "AGPL-3.0-only",
@@ -13,6 +13,8 @@
 		"@11ty/eleventy": "^3.1.5",
 		"@11ty/eleventy-img": "^6.0.4",
 		"@mdit/plugin-attrs": "^0.25.1",
-		"luxon": "^3.7.2"
+		"luxon": "^3.7.2",
+		"markdown-it-anchor": "^10.0.0",
+		"markdown-it-link-attributes": "https://github.com/lee0c/markdown-it-link-attributes/tarball/main"
 	}
 }

src/404.md

@@ -0,0 +1,8 @@
+---
+permalink: 404.html
+eleventyExcludeFromCollections: true
+---
+
+# Content not found.
+
+Sorry, can't find this page. Return [home](/).

src/sitemap.xml.njk

@@ -0,0 +1,18 @@
+---
+permalink: sitemap.xml
+layout: false
+eleventyExcludeFromCollections: true
+---
+
+<?xml version="1.0" encoding="utf-8"?>
+<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:xhtml="http://www.w3.org/1999/xhtml">
+{% for page in collections.all %}
+	{% if page.data.permalink != false %}
+		{% set absoluteUrl %}{{ page.url | htmlBaseUrl(metadata.url) }}{% endset %}
+		<url>
+			<loc>{{ absoluteUrl }}</loc>
+			<lastmod>{{ page.date | htmlDateString }}</lastmod>
+		</url>
+	{% endif %}
+{% endfor %}
+</urlset>

src/src.11tydata.js

@@ -1,3 +1,3 @@
 export default {
-	layout: "page.njk",
+	layout: "base.njk",
 };