diff --git a/.eleventy.js b/.eleventy.js index 731ecdd12..52ae1ae61 100644 --- a/.eleventy.js +++ b/.eleventy.js @@ -96,12 +96,12 @@ module.exports = function (eleventyConfig) { }, }); - sassBuild(domain_name); - eleventyConfig.on("beforeWatch", (changedFiles) => { - // changedFiles is an array of files that changed - // to trigger the watch/serve build - sassBuild(domain_name); - }); + // sassBuild(domain_name); + // eleventyConfig.on("beforeWatch", (changedFiles) => { + // // changedFiles is an array of files that changed + // // to trigger the watch/serve build + // sassBuild(domain_name); + // }); // https://www.npmjs.com/package/@quasibit/eleventy-plugin-sitemap @@ -115,35 +115,32 @@ module.exports = function (eleventyConfig) { eleventyConfig.addPassthroughCopy("src/img"); eleventyConfig.addPassthroughCopy("./CNAME"); // eleventyConfig.addPassthroughCopy("src/.gitignore"); - eleventyConfig.addPassthroughCopy({ "dinky/assets/js": "assets/js" }); - eleventyConfig.addPassthroughCopy({ - "dinky/assets/images": "assets/images", - }); - eleventyConfig.addPassthroughCopy({ - "dinky/_sass": "sass/dinky/_sass", - }); + // eleventyConfig.addPassthroughCopy({ "dinky/assets/js": "assets/js" }); + // eleventyConfig.addPassthroughCopy({ + // "dinky/assets/images": "assets/images", + // }); + // eleventyConfig.addPassthroughCopy({ + // "dinky/_sass": "sass/dinky/_sass", + // }); eleventyConfig.addPassthroughCopy({ "src/_sass": "sass/src/_sass", }); - const pathNormalizer = function(pathString){ - return normalize(path.normalize(path.resolve("."))) +const njkEngine = require("nunjucks").configure( + [ + path.join(siteConfiguration.dir.input, siteConfiguration.dir.includes), + path.join(siteConfiguration.dir.input, siteConfiguration.dir.layouts), + siteConfiguration.dir.input, + ], + { + autoescape: false, + throwOnUndefined: true } +); - // Nunjucks Filters - let nunjucksEnvironment = new Nunjucks.Environment( - new Nunjucks.FileSystemLoader([ - pathNormalizer(siteConfiguration.dir.includes), - pathNormalizer(siteConfiguration.dir.input), - pathNormalizer(".") - ]), - { - throwOnUndefined: throwOnUndefinedSetting, - autoescape: true - } - ); - eleventyConfig.setLibrary("njk", nunjucksEnvironment); - eleventyConfig.addNunjucksFilter("interpolate", function(value) { +eleventyConfig.setLibrary('njk', njkEngine ); //: autoescape for CSS rules + +eleventyConfig.addNunjucksFilter("interpolate", function(value) { return Nunjucks.renderString(text, this.ctx); }); diff --git a/src/_includes/base.njk b/src/_includes/base.njk index 1f31aa273..6e5d11270 100644 --- a/src/_includes/base.njk +++ b/src/_includes/base.njk @@ -4,7 +4,7 @@ {% block head %} -
{{ description }}
{% endblock %} diff --git a/src/_layouts/index.njk b/src/_layouts/index.njk index 589542139..709adccf7 100644 --- a/src/_layouts/index.njk +++ b/src/_layouts/index.njk @@ -1,4 +1,5 @@ {% extends "base.njk" %} + {%- from "postList/macros.njk" import postList -%} {% block postcontent %} diff --git a/src/_layouts/rss2-feed.njk b/src/_layouts/rss2-feed.njk index 2f53ec705..90ce26f97 100644 --- a/src/_layouts/rss2-feed.njk +++ b/src/_layouts/rss2-feed.njk @@ -6,10 +6,10 @@ "subtitle": "Notes on various projects", "url": (function(){ return process.env.DOMAIN + "/" })(), "feedUrl": (function(){ return process.env.DOMAIN + "/rss/" })(), - "lastBuildDate": (function(){ - var date = new Date(); - return date.toUTCString() - })(), + "lastBuildDate": (function(){ + var date = new Date(); + return date.toUTCString() + })(), "author": { "name": "Aram Zucker-Scharff", "email": "aramdevblog@aramzs.me" @@ -31,7 +31,7 @@