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 0fc5535..3b3261a 100644 Binary files a/package-lock.json and b/package-lock.json differ 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 - - + -