Merge branch 'master' into prepare-for-main-rename

Author: dannystaple

.editorconfig

@@ -0,0 +1,13 @@
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+indent_size = 2
+tab_width = 2
+indent_style = space
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*{sh,py}]
+indent_size = 4

.eleventy.js

@@ -17,12 +17,27 @@ const {
 } = require('@vidhill/fortawesome-brands-11ty-shortcode');
 
 
-module.exports = function(eleventyConfig) {
+const media_filetypes = "jpg,jpeg,JPG,png,gif,svg,avif";
+
+async function img_responsive(src, alt, sizes = "100vw, 720, 820, 940, 1140, 1280", class_names = "img-responsive") {
+    let metadata = await fetch_image(src);
+    let imageAttributes = {
+        alt,
+        sizes,
+        class: class_names,
+        loading: "lazy",
+        decoding: "async",
+    };
+
+    return Image.generateHTML(metadata, imageAttributes);
+}
+
+module.exports = function (eleventyConfig) {
     // Configure markdown parser
-    const markdownLib = markdownIt({html: true, typographer: true});
+    const markdownLib = markdownIt({ html: true, typographer: true });
     markdownLib.use(markdownItAnchor);
     markdownLib.use(markdownItAttrs);
-    
+
     eleventyConfig.setLibrary("md", markdownLib);
     eleventyConfig.addPlugin(fortawesomeBrandsPlugin);
     eleventyConfig.addPlugin(syntaxHighlight);
@@ -34,11 +49,11 @@ module.exports = function(eleventyConfig) {
     eleventyConfig.addPassthroughCopy("assets");
     eleventyConfig.addPassthroughCopy("dist");
     eleventyConfig.addPassthroughCopy("favicon.png");
-    eleventyConfig.addPassthroughCopy("galleries/**/*.{jpg,jpeg,JPG,png,gif,svg}");
+    eleventyConfig.addPassthroughCopy("galleries/**/*." + media_filetypes);
     eleventyConfig.addPassthroughCopy("google5458abc1104b04dd.html");
-    eleventyConfig.addPassthroughCopy({"htaccess": ".htaccess"});
-    eleventyConfig.addPassthroughCopy({"content": "."}, {
-        filter: ["**/*.{jpg,jpeg,JPG,png,gif,svg}"],
+    eleventyConfig.addPassthroughCopy({ "htaccess": ".htaccess" });
+    eleventyConfig.addPassthroughCopy({ "content": "." }, {
+        filter: ["**/*." + + media_filetypes],
         rename: function (path) {
             return path.replace("content/", "");
         }
@@ -47,7 +62,7 @@ module.exports = function(eleventyConfig) {
     eleventyConfig.addWatchTarget("src/**/*");
     let $collectionApi = null;
 
-    eleventyConfig.addCollection("posts", function(collectionApi) {
+    eleventyConfig.addCollection("posts", function (collectionApi) {
         $collectionApi = collectionApi;
         return collectionApi.getFilteredByGlob("_posts/*.md");
     });
@@ -56,55 +71,12 @@ module.exports = function(eleventyConfig) {
         dynamicPartials: false,
     });
 
-    eleventyConfig.addFilter("cssmin", function(code) {
+    eleventyConfig.addFilter("cssmin", function (code) {
         return new CleanCSS({}).minify(code).styles;
     });
 
-    eleventyConfig.addShortcode("image", async function(src, alt, sizes) {
-        let metadata = await fetch_image(src);
-
-		let imageAttributes = {
-			alt,
-			sizes,
-			loading: "lazy",
-			decoding: "async",
-		};
-
-		// You bet we throw an error on a missing alt (alt="" works okay)
-		return Image.generateHTML(metadata, imageAttributes);
-	});
-
-    eleventyConfig.addShortcode("img_responsive", async function(src, alt, sizes="100vw, 720, 820, 940, 1140, 1280") {
-        let metadata = await fetch_image(src);
-		let imageAttributes = {
-			alt,
-			sizes,
-            class: "img-responsive",
-			loading: "lazy",
-			decoding: "async",
-		};
-
-		return Image.generateHTML(metadata, imageAttributes);
-    });
-
-    eleventyConfig.addShortcode("image_with_class", async function(src, alt, sizes, class_names) {
-        let metadata = await fetch_image(src);
-
-        if (sizes==undefined || sizes=="_") {
-            sizes="720, 940, 1140, 1280, 2048";
-        }
-
-		let imageAttributes = {
-			alt,
-			sizes,
-            class: class_names,
-			loading: "lazy",
-			decoding: "async",
-		};
-
-		// You bet we throw an error on a missing alt (alt="" works okay)
-		return Image.generateHTML(metadata, imageAttributes);
-	});
+    eleventyConfig.addShortcode("image", img_responsive);
+    eleventyConfig.addShortcode("img_responsive", img_responsive);
 
     // Thumbnails
     eleventyConfig.addShortcode("thumbnail_for_post", thumbnails.thumbnail_for_post);
@@ -122,15 +94,15 @@ module.exports = function(eleventyConfig) {
     });
 
     // Liquid filter to convert a date to a string
-    eleventyConfig.addLiquidFilter("to_utc_string", date => date.toUTCString() );
+    eleventyConfig.addLiquidFilter("to_utc_string", date => date.toUTCString());
 
     // Liquid filter for long date string
-    eleventyConfig.addLiquidFilter("date_to_long_string", function(date) {
+    eleventyConfig.addLiquidFilter("date_to_long_string", function (date) {
         return date.toLocaleDateString("en-GB", { weekday: 'long', year: 'numeric', month: 'long', day: 'numeric' });
     });
 
     // Universal filter for jsonify
-    eleventyConfig.addFilter("jsonify", JSON.stringify );
+    eleventyConfig.addFilter("jsonify", JSON.stringify);
 
     eleventyConfig.addFilter("with_explicit_date", items => items.filter(item => "date" in item.data));
 
@@ -140,14 +112,14 @@ module.exports = function(eleventyConfig) {
 
     // Read the menu data from _config.yml and add it to the global data
     eleventyConfig.addGlobalData("menu", () => getDataFromConfigYaml("menu"));
-    eleventyConfig.addGlobalData("site_title",  () => getDataFromConfigYaml("title"));
-    eleventyConfig.addGlobalData("site_tagline",  () => getDataFromConfigYaml("tagline"));
-    eleventyConfig.addGlobalData("production_url",  () => getDataFromConfigYaml("production_url"));
-    eleventyConfig.addGlobalData("JB",  () => getDataFromConfigYaml("JB"));
-    eleventyConfig.addGlobalData("author",  () => getDataFromConfigYaml("author"));
-    eleventyConfig.addGlobalData("now" , () => new Date());
-
-    eleventyConfig.addNunjucksFilter("date", function(date, format) {
+    eleventyConfig.addGlobalData("site_title", () => getDataFromConfigYaml("title"));
+    eleventyConfig.addGlobalData("site_tagline", () => getDataFromConfigYaml("tagline"));
+    eleventyConfig.addGlobalData("production_url", () => getDataFromConfigYaml("production_url"));
+    eleventyConfig.addGlobalData("JB", () => getDataFromConfigYaml("JB"));
+    eleventyConfig.addGlobalData("author", () => getDataFromConfigYaml("author"));
+    eleventyConfig.addGlobalData("now", () => new Date());
+
+    eleventyConfig.addNunjucksFilter("date", function (date, format) {
         return moment(date).format(format);
     });
 

.gitattributes

@@ -1,22 +1,14 @@
-# Auto detect text files and perform LF normalization
-* text=lf
-
-# Custom for Visual Studio
-*.cs     diff=csharp
-*.sln    merge=union
-*.csproj merge=union
-*.vbproj merge=union
-*.fsproj merge=union
-*.dbproj merge=union
-
-# Standard to msysgit
-*.doc	 diff=astextplain
-*.DOC	 diff=astextplain
-*.docx diff=astextplain
-*.DOCX diff=astextplain
-*.dot  diff=astextplain
-*.DOT  diff=astextplain
-*.pdf  diff=astextplain
-*.PDF	 diff=astextplain
-*.rtf	 diff=astextplain
-*.RTF	 diff=astextplain
+# Auto detect text files and perform LF normalization
+* text=lf
+
+# Standard to msysgit
+*.doc	 diff=astextplain
+*.DOC	 diff=astextplain
+*.docx diff=astextplain
+*.DOCX diff=astextplain
+*.dot  diff=astextplain
+*.DOT  diff=astextplain
+*.pdf  diff=astextplain
+*.PDF	 diff=astextplain
+*.rtf	 diff=astextplain
+*.RTF	 diff=astextplain

.github/dependabot.yml

@@ -9,12 +9,20 @@ updates:
     schedule:
       # Check for updates to GitHub Actions every week
       interval: "weekly"
+
   - package-ecosystem: "npm"
     directory: "/"
-    versioning-strategy: auto
     schedule:
       # Check for updates to npm dependencies every week
       interval: "weekly"
     ignore:
       - dependency-name: "*"
         update-types: ["version-update:semver-patch"]
+
+
+  - package-ecosystem: "docker"
+    directories: 
+      - "**/*"
+    schedule:
+      # Check for updates to Docker images every week
+      interval: "weekly"

.github/scripts/new_post.sh

@@ -0,0 +1,81 @@
+#!/bin/bash
+# Helper to create a new blog post, and folder structure, open it in vs code.
+# Usage:
+#   ./.github/scripts/new_post.sh "Post title not slugged but in quotes"
+
+set -eu -o pipefail
+
+
+function slug_from_title_and_date {
+    echo "$POST_DAY-$1" | tr '[:upper:]' '[:lower:]' | tr -s ' ' '-' | tr -s '[:punct:]' '-'
+}
+
+function make_folder_path {
+    local slug="$1"
+    echo "content/$POST_YEAR/$POST_MONTH/$slug"
+}
+
+function file_path {
+    local slug="$1"
+    local folder_path="$2"
+    echo "$folder_path/${slug}.md"
+}
+
+function create_post {
+    local file_path="$1"
+    echo "Creating post at $file_path"
+    touch "$file_path"
+    (
+        echo "---"
+        echo "title: $POST_TITLE"
+        echo "date: $POST_DATE"
+        echo "thumbnail: /content/${POST_YEAR}/${POST_MONTH}/${slug}.jpg"
+        echo "---"
+    ) >"$file_path"
+}
+
+# Bash argument handler
+function usage {
+    echo "Usage: $0 [--date <date>|defaults to today]  <\"Post title not slugged but in quotes\">"
+    echo "Example: $0 \"My New Blog Post\""
+    echo "This script creates a new blog post with the given title, slugifies it, and opens it in VS Code."
+    echo "Example with date: $0 --date 2023-10-01 \"My New Blog Post\""
+    exit 1
+}
+
+function extract_date_elements {
+    # Extract the year, month, and day from the post date
+    POST_YEAR=$(date -d "$POST_DATE" +"%Y")
+    POST_MONTH=$(date -d "$POST_DATE" +"%m")
+    POST_DAY=$(date -d "$POST_DATE" +"%d")
+}
+
+function handle_arguments {
+    # Handle an optional argument for the post date (defaults to today)
+    if [ "$#" -eq 3 ] && [ "$1" == "--date" ]; then
+        POST_DATE="$2"
+        shift 2
+    else
+        POST_DATE=$(date +"%Y-%m-%d")
+    fi
+
+    # Handle no arguments, -h or --help
+    if [ "$#" -eq 0 ] || [ "$1" == "-h" ] || [ "$1" == "--help" ]; then
+        usage
+    fi
+
+    extract_date_elements
+    POST_TITLE=$1
+}
+
+function main {
+    local slug="$(slug_from_title_and_date "$POST_TITLE")"
+    local folder_path="$(make_folder_path "$slug")"
+    local file_path="$(file_path "$slug" "$folder_path")"
+    mkdir -p "$folder_path"
+    create_post "$file_path"
+    code "$file_path"
+}
+
+handle_arguments "$@"
+main

.github/workflows/on_call_build_site.yaml

@@ -31,14 +31,14 @@ jobs:
           tar -czf _site.tar.gz _site
 
       - name: upload site artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:
           name: _site
           path: _site.tar.gz
           if-no-files-found: error
 
       - name: upload httpd.conf artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:
           name: httpd.conf
           path: _drafts/staging/httpd.conf

.github/workflows/on_call_staging_test.yaml

@@ -8,7 +8,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Fetch site artifact
-        uses: actions/download-artifact@v4.1.8
+        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
         with:
           name: _site
       - name: extract site artifact

.github/workflows/on_pr_lint.yaml

@@ -0,0 +1,37 @@
+---
+name: "On PR Lint"
+on:
+  pull_request:
+    branches:
+      - master
+
+jobs:
+  check_dependabot:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout source code
+        uses: actions/checkout@v4
+
+      - name: Check Changes
+        id: changed-env
+        uses: tj-actions/changed-files@ed68ef82c095e0d48ec87eccea555d944a631a4c # v46.0.5
+        with:
+          files: |
+            .github/dependabot.yml
+
+      - if: |
+          steps.changed-env.outputs.any_modified == 'true'
+        run: |
+          npx -y @bugron/validate-dependabot-yaml@latest
+
+  lint_cupcake:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout source code
+        uses: actions/checkout@v4
+
+      - name: Lint Code Base
+        continue-on-error: true
+        uses: oxsecurity/megalinter/flavors/cupcake@v8.7.0
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/on_pr_test.yaml

@@ -4,6 +4,11 @@ on:
     branches:
       - master
       - main
+    paths-ignore:
+      - README.md
+      - .github/on_pr_lint.yaml
+      - _drafts/**
+      - .vscode/**
 
 jobs:
   build_site:
@@ -12,4 +17,3 @@ jobs:
   staging_test:
     uses: ./.github/workflows/on_call_staging_test.yaml
     needs: build_site
-