From 7242b2e55d0fd86236900b80e100c860e0b31294 Mon Sep 17 00:00:00 2001 From: "Florine W. Dekker" Date: Sun, 20 Nov 2022 23:13:24 +0100 Subject: [PATCH] Upgrade to template v3 --- .eleventy.js | 23 ++++++++++- package-lock.json | Bin 341438 -> 356493 bytes package.json | 9 +++-- src/main/_includes/default.njk | 19 ++++----- src/main/_includes/home.njk | 24 ++++++------ src/main/_includes/post.njk | 28 +++++++------- src/main/_posts/2017-03-01-raspi.md | 4 +- .../_posts/2021-07-18-rimworld-timelapse.md | 36 ++++++++---------- ...2-04-17-remember-us-state-abbreviations.md | 2 +- src/main/css/main.css | 21 ++-------- 10 files changed, 86 insertions(+), 80 deletions(-) diff --git a/.eleventy.js b/.eleventy.js index af50c81..4ef4482 100644 --- a/.eleventy.js +++ b/.eleventy.js @@ -1,8 +1,27 @@ +const externalLinks = require("eleventy-plugin-external-links"); +const markdownIt = require("markdown-it"); + module.exports = (eleventyConfig) => { - eleventyConfig.addFilter("isoDate", dateObj => { - return dateObj.toISOString().substr(0, 10); + // Format date + eleventyConfig.addFilter("isoDate", dateObj => dateObj.toISOString().substring(0, 10)); + + // Extract excerpts + eleventyConfig.setFrontMatterParsingOptions({ + excerpt: true, + excerpt_separator: "", }); + // Make external links go `target="_blank"` + eleventyConfig.addPlugin(externalLinks, { + name: "external-links", + regex: /^(?!https:\/\/.*fwdekker.com|\/.*)/i, + rel: null, + includeDoctype: true, + }); + + // Convert string to HTML + eleventyConfig.addFilter("toHTML", str => new markdownIt({}).renderInline(str)); + return { pathPrefix: "/blog/", dir: { diff --git a/package-lock.json b/package-lock.json index 0fc55353600a9f51b11b0b56d217c749bce13281..3b3261a7c552724797a7f9920ea50db5dba17150 100644 GIT binary patch delta 7632 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 bLg(XQY4WKm!E&;cuEz~aEO8Z<4r~7e+Ncz= diff --git a/package.json b/package.json index 9f5a8b2..a49e8d3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "blog", - "version": "1.3.1", + "version": "1.4.0", "description": "Florine's personal blog.", "author": "Florine W. Dekker", "browser": "dist/bundle.js", @@ -16,7 +16,9 @@ "deploy": "grunt deploy" }, "devDependencies": { - "@11ty/eleventy": "^1.0.1", + "@11ty/eleventy": "^1.0.2", + "eleventy-plugin-external-links": "^1.1.2", + "gray-matter": "^4.0.3", "grunt": "^1.5.3", "grunt-cli": "^1.4.3", "grunt-contrib-clean": "^2.0.1", @@ -24,6 +26,7 @@ "grunt-contrib-watch": "^1.1.0", "grunt-exec": "^3.0.0", "grunt-focus": "^1.0.0", - "grunt-text-replace": "^0.4.0" + "grunt-text-replace": "^0.4.0", + "markdown-it": "^13.0.1" } } diff --git a/src/main/_includes/default.njk b/src/main/_includes/default.njk index e7a3c58..20c6044 100644 --- a/src/main/_includes/default.njk +++ b/src/main/_includes/default.njk @@ -16,14 +16,13 @@ {% if title %}{{ title }} | {% endif %}Blog | FWDekker - - + -