Upgrade to Eleventy 3.0 alpha 2

.eleventy.js

@@ -1,5 +1,12 @@
+import eleventyPluginRSS from "@11ty/eleventy-plugin-rss";
+import eleventyPluginTimeToRead from "eleventy-plugin-time-to-read";
+import highlightJs from "highlight.js";
+import markdownItAnchor from "markdown-it-anchor";
+import MarkdownIt from "markdown-it";
+import filters from "./lib/filters.js";
+
 /** @param {import("@11ty/eleventy").UserConfig} eleventyConfig */
-module.exports = function (eleventyConfig) {
+export default function (eleventyConfig) {
   setUpLiquid(eleventyConfig);
   setUpMarkdown(eleventyConfig);
   setUpCollections(eleventyConfig);
@@ -34,15 +41,15 @@ module.exports = function (eleventyConfig) {
       "assets/styles/highlight.js/github-dark.css",
   });
 
-  eleventyConfig.addPlugin(require("@11ty/eleventy-plugin-rss"));
-  eleventyConfig.addPlugin(require("eleventy-plugin-time-to-read"));
+  eleventyConfig.addPlugin(eleventyPluginRSS);
+  eleventyConfig.addPlugin(eleventyPluginTimeToRead);
 
   return {
     dir: {
       layouts: "_layouts",
     },
   };
-};
+}
 
 function setUpLiquid(eleventyConfig) {
   // Support unquoted filenames and a=b arguments in include tags like Jekyll
@@ -53,7 +60,6 @@ function setUpLiquid(eleventyConfig) {
   });
 
   // Import all filters in /lib/filters/index.js
-  const filters = require("./lib/filters");
   Object.keys(filters).forEach((filter) =>
     eleventyConfig.addFilter(filter, filters[filter]),
   );
@@ -82,10 +88,10 @@ function setUpLiquid(eleventyConfig) {
 }
 
 function setUpMarkdown(eleventyConfig) {
-  const anchor = require("markdown-it-anchor");
-  const hljs = require("highlight.js");
+  const anchor = markdownItAnchor;
+  const hljs = highlightJs;
 
-  let markdownIt = require("markdown-it")({
+  let markdownIt = MarkdownIt({
     highlight: function (str, lang) {
       if (lang && hljs.getLanguage(lang)) {
         try {

_data/layout.js

@@ -1 +1 @@
-module.exports = "default";
+export default "default";

lib/filters.js

@@ -0,0 +1,15 @@
+import { collapseWhitespace } from "./filters/collapse-whitespace.js";
+import { exclude } from "./filters/exclude.js";
+import { findBySlug } from "./filters/find-by-slug.js";
+import { toHTMLDatetime } from "./filters/to-html-datetime.js";
+import { whereExcludes } from "./filters/where-excludes.js";
+import { whereIncludes } from "./filters/where-includes.js";
+
+export default {
+  collapseWhitespace,
+  exclude,
+  findBySlug,
+  toHTMLDatetime,
+  whereExcludes,
+  whereIncludes,
+};

lib/filters/collapse-whitespace.js

@@ -1,5 +1,3 @@
-module.exports = {
-  collapseWhitespace: function (str) {
-    return str.replace(/\s+/g, " ");
-  },
-};
+export function collapseWhitespace(str) {
+  return str.replace(/\s+/g, " ");
+}

lib/filters/exclude.js

@@ -1,6 +1,4 @@
-module.exports = {
-  exclude: function (arr, toExclude) {
-    const arrayToExclude = [toExclude].flat();
-    return arr.filter((item) => !arrayToExclude.includes(item));
-  },
-};
+export function exclude(arr, toExclude) {
+  const arrayToExclude = [toExclude].flat();
+  return arr.filter((item) => !arrayToExclude.includes(item));
+}

lib/filters/find-by-slug.js

@@ -1,5 +1,3 @@
-module.exports = {
-  findBySlug: function (collection, slug) {
-    return collection.find(({ fileSlug }) => fileSlug === slug);
-  },
-};
+export function findBySlug(collection, slug) {
+  return collection.find(({ fileSlug }) => fileSlug === slug);
+}

lib/filters/to-html-datetime.js

@@ -1,5 +1,3 @@
-module.exports = {
-  toHTMLDatetime: function (date) {
-    return date.toISOString();
-  },
-};
+export function toHTMLDatetime(date) {
+  return date.toISOString();
+}

lib/filters/where-excludes.js

@@ -1,31 +1,29 @@
-const { isFalsy, toValue } = require("liquidjs");
-
-module.exports = {
-  /**
-   * An enhancement to LiquidJS's where filter that looks for the specified
-   * value in an array, if one is found in the named field of each object,
-   * and filters *out* matching items.
-   *
-   * Most of the code in this file is borrowed from LiquidJS with types removed.
-   *
-   * TODO: Convert this back to TypeScript.
-   */
-  whereExcludes: function* (arr, property, doNotWant) {
-    const values = [];
-    arr = toArray(toValue(arr));
-    for (const item of arr) {
-      values.push(
-        yield this.context._getFromScope(item, stringify(property).split("."))
-      );
-    }
-    return arr.filter((_, i) => {
-      if (doNotWant === undefined) return isFalsy(values[i], this.context);
-      if (isArray(values[i])) return !values[i].includes(doNotWant);
-      if (isComparable(doNotWant)) return !doNotWant.equals(values[i]);
-      return values[i] !== doNotWant;
-    });
-  },
-};
+import { isFalsy, toValue } from "liquidjs";
+
+/**
+ * An enhancement to LiquidJS's where filter that looks for the specified
+ * value in an array, if one is found in the named field of each object,
+ * and filters *out* matching items.
+ *
+ * Most of the code in this file is borrowed from LiquidJS with types removed.
+ *
+ * TODO: Convert this back to TypeScript.
+ */
+export function* whereExcludes(arr, property, doNotWant) {
+  const values = [];
+  arr = toArray(toValue(arr));
+  for (const item of arr) {
+    values.push(
+      yield this.context._getFromScope(item, stringify(property).split(".")),
+    );
+  }
+  return arr.filter((_, i) => {
+    if (doNotWant === undefined) return isFalsy(values[i], this.context);
+    if (isArray(values[i])) return !values[i].includes(doNotWant);
+    if (isComparable(doNotWant)) return !doNotWant.equals(values[i]);
+    return values[i] !== doNotWant;
+  });
+}
 
 function toArray(val) {
   if (isNil(val)) return [];

lib/filters/where-includes.js

@@ -1,30 +1,28 @@
-const { isTruthy, toValue } = require("liquidjs");
-
-module.exports = {
-  /**
-   * An enhancement to LiquidJS's where filter that looks for the specified
-   * value in an array, if one is found in the named field of each object.
-   *
-   * Most of the code in this file is borrowed from LiquidJS with types removed.
-   *
-   * TODO: Convert this back to TypeScript.
-   */
-  whereIncludes: function* (arr, property, expected) {
-    const values = [];
-    arr = toArray(toValue(arr));
-    for (const item of arr) {
-      values.push(
-        yield this.context._getFromScope(item, stringify(property).split("."))
-      );
-    }
-    return arr.filter((_, i) => {
-      if (expected === undefined) return isTruthy(values[i], this.context);
-      if (isArray(values[i])) return values[i].includes(expected);
-      if (isComparable(expected)) return expected.equals(values[i]);
-      return values[i] === expected;
-    });
-  },
-};
+import { isTruthy, toValue } from "liquidjs";
+
+/**
+ * An enhancement to LiquidJS's where filter that looks for the specified
+ * value in an array, if one is found in the named field of each object.
+ *
+ * Most of the code in this file is borrowed from LiquidJS with types removed.
+ *
+ * TODO: Convert this back to TypeScript.
+ */
+export function* whereIncludes(arr, property, expected) {
+  const values = [];
+  arr = toArray(toValue(arr));
+  for (const item of arr) {
+    values.push(
+      yield this.context._getFromScope(item, stringify(property).split(".")),
+    );
+  }
+  return arr.filter((_, i) => {
+    if (expected === undefined) return isTruthy(values[i], this.context);
+    if (isArray(values[i])) return values[i].includes(expected);
+    if (isComparable(expected)) return expected.equals(values[i]);
+    return values[i] === expected;
+  });
+}
 
 function toArray(val) {
   if (isNil(val)) return [];