diff --git a/.eleventy.js b/.eleventy.js index 5c7fdd4..2eadfa6 100644 --- a/.eleventy.js +++ b/.eleventy.js @@ -3,11 +3,14 @@ const fs = require("fs"); const pluginRss = require("@11ty/eleventy-plugin-rss"); const pluginSyntaxHighlight = require("@11ty/eleventy-plugin-syntaxhighlight"); const pluginNavigation = require("@11ty/eleventy-navigation"); +const markdownIt = require("markdown-it"); +const markdownItAnchor = require("markdown-it-anchor"); module.exports = function(eleventyConfig) { eleventyConfig.addPlugin(pluginRss); eleventyConfig.addPlugin(pluginSyntaxHighlight); eleventyConfig.addPlugin(pluginNavigation); + eleventyConfig.setDataDeepMerge(true); eleventyConfig.addLayoutAlias("post", "layouts/post.njk"); @@ -35,24 +38,19 @@ module.exports = function(eleventyConfig) { eleventyConfig.addPassthroughCopy("img"); eleventyConfig.addPassthroughCopy("css"); - /* Markdown Plugins */ - let markdownIt = require("markdown-it"); - let markdownItAnchor = require("markdown-it-anchor"); - let options = { + /* Markdown Overrides */ + let markdownLibrary = markdownIt({ html: true, breaks: true, linkify: true - }; - let opts = { + }).use(markdownItAnchor, { permalink: true, permalinkClass: "direct-link", permalinkSymbol: "#" - }; - - eleventyConfig.setLibrary("md", markdownIt(options) - .use(markdownItAnchor, opts) - ); + }); + eleventyConfig.setLibrary("md", markdownLibrary); + // Browsersync Overrides eleventyConfig.setBrowserSyncConfig({ callbacks: { ready: function(err, browserSync) { @@ -76,15 +74,19 @@ module.exports = function(eleventyConfig) { ], // If your site lives in a different subdirectory, change this. - // Leading or trailing slashes are all normalized away, so don’t worry about it. + // Leading or trailing slashes are all normalized away, so don’t worry about those. + // If you don’t have a subdirectory, use "" or "/" (they do the same thing) - // This is only used for URLs (it does not affect your file structure) - pathPrefix: "/", + // This is only used for link URLs (it does not affect your file structure) + // You can also pass this in on the command line using `--pathprefix` + + // pathPrefix: "/", markdownTemplateEngine: "liquid", htmlTemplateEngine: "njk", dataTemplateEngine: "njk", - passthroughFileCopy: true, + + // These are all optional, defaults are shown: dir: { input: ".", includes: "_includes", diff --git a/_includes/layouts/base.njk b/_includes/layouts/base.njk index e144570..8866888 100644 --- a/_includes/layouts/base.njk +++ b/_includes/layouts/base.njk @@ -12,7 +12,8 @@

{{ metadata.title }}

- + + {#- Read more about `eleventy-navigation` at https://github.com/11ty/eleventy-navigation #} {{ collections.all | eleventyNavigation | eleventyNavigationToHtml({ listClass: "nav", listItemClass: "nav-item", diff --git a/about/index.md b/about/index.md index 56eb2c5..95f70a4 100644 --- a/about/index.md +++ b/about/index.md @@ -1,10 +1,10 @@ --- layout: layouts/post.njk title: About Me +templateClass: tmpl-post eleventyNavigation: key: About Me order: 2 -templateClass: tmpl-post --- I am a person that writes stuff. diff --git a/archive.njk b/archive.njk index 5dbd42e..232f770 100644 --- a/archive.njk +++ b/archive.njk @@ -1,9 +1,9 @@ --- layout: layouts/home.njk +permalink: /posts/ eleventyNavigation: key: Archive order: 3 -permalink: /posts/ ---

Archive

diff --git a/package.json b/package.json index ac0c313..e78baf3 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,7 @@ "homepage": "https://github.com/11ty/eleventy-base-blog#readme", "devDependencies": { "@11ty/eleventy": "^0.9.0", - "@11ty/eleventy-navigation": "^0.1.0", + "@11ty/eleventy-navigation": "^0.1.1", "@11ty/eleventy-plugin-rss": "^1.0.7", "@11ty/eleventy-plugin-syntaxhighlight": "^2.0.3", "luxon": "^1.12.0",