feat: upgrade to 11ty 3.0.0@alpha

2023-12-21 13:31:57 -08:00 · 2023-12-21 13:31:57 -08:00 · e16633653a
commit e16633653a
parent 2cd8e4a380
43 changed files with 578 additions and 5039 deletions
--- a/.editorconfig
+++ b/.editorconfig
@ -1,12 +0,0 @@
-root = true
-
-[*]
-indent_style = space
-indent_size = 2
-end_of_line = lf
-insert_final_newline = false
-trim_trailing_whitespace = true
-charset = utf-8
-
-[*.js]
-insert_final_newline = true
--- a/.eleventy.js
+++ b/.eleventy.js
@ -1,35 +1,32 @@
-const syntaxHighlight = require('@11ty/eleventy-plugin-syntaxhighlight')
-const tablerIcons = require('eleventy-plugin-tabler-icons')
-const pluginUnfurl = require('eleventy-plugin-unfurl')
-const pluginRss = require('@11ty/eleventy-plugin-rss')
-const embedYouTube = require('eleventy-plugin-youtube-embed')
-const postGraph = require('@rknightuk/eleventy-plugin-post-graph')
+import syntaxHighlight from '@11ty/eleventy-plugin-syntaxhighlight'
+import tablerIcons from 'eleventy-plugin-tabler-icons'
+import pluginUnfurl from 'eleventy-plugin-unfurl'
+import pluginRss from '@11ty/eleventy-plugin-rss'
+import embedYouTube from 'eleventy-plugin-youtube-embed'
+import postGraph from '@rknightuk/eleventy-plugin-post-graph'

-const markdownIt = require('markdown-it')
-const markdownItAnchor = require('markdown-it-anchor')
-const markdownItFootnote = require('markdown-it-footnote')
+import markdownIt from 'markdown-it'
+import markdownItAnchor from 'markdown-it-anchor'
+import markdownItFootnote from 'markdown-it-footnote'
+import htmlmin from 'html-minifier-terser'

-const filters = require('./config/filters/index.js')
-const { slugifyString } = require('./config/utils')
-const { svgToJpeg } = require('./config/events/index.js')
-const { tagList, tagMap, postStats } = require('./config/collections/index.js')
+import filters from './config/filters/index.js'
+import { slugifyString } from './config/utils/index.js'
+import { svgToJpeg } from './config/events/index.js'
+import { tagList, tagMap, postStats } from './config/collections/index.js'
+import { img } from './config/shortcodes/index.js'

-const CleanCSS = require('clean-css')
-const { execSync } = require('child_process')
+import CleanCSS from 'clean-css'
+import { execSync } from 'child_process'

 // load .env
-require('dotenv-flow').config()
+import dotenvFlow from 'dotenv-flow'
+dotenvFlow.config()

 /**
 *  @param {import("@11ty/eleventy/src/UserConfig")} eleventyConfig
 */
-
-const packageVersion = require('./package.json').version
-
-// module import shortcodes
-const { img } = require('./config/shortcodes/index.js')
-
-module.exports = function (eleventyConfig) {
+export default async function (eleventyConfig) {
  eleventyConfig.addPlugin(syntaxHighlight)
  eleventyConfig.addPlugin(tablerIcons)
  eleventyConfig.addPlugin(pluginUnfurl)
@ -64,9 +61,6 @@ module.exports = function (eleventyConfig) {
  eleventyConfig.addPassthroughCopy('src/assets')
  eleventyConfig.addPassthroughCopy('_redirects')

-  // shortcodes
-  eleventyConfig.addShortcode('version', () => packageVersion)
-
  // enable merging of tags
  eleventyConfig.setDataDeepMerge(true)

@ -108,9 +102,23 @@ module.exports = function (eleventyConfig) {

  // shortcodes
  eleventyConfig.addShortcode('image', img)
+  eleventyConfig.addShortcode('assetHash', () => Math.random())

  // transforms
-  eleventyConfig.addPlugin(require('./config/transforms/html-config.js'))
+  eleventyConfig.addTransform('html-minify', (content, path) => {
+    if (path && path.endsWith('.html')) {
+      return htmlmin.minify(content, {
+        collapseBooleanAttributes: true,
+        collapseWhitespace: true,
+        decodeEntities: true,
+        includeAutoGeneratedTags: false,
+        minifyCSS: true,
+        minifyJS: true,
+        removeComments: true,
+      })
+    }
+    return content
+  })

  // events
  eleventyConfig.on('afterBuild', svgToJpeg)
--- a/.eslintignore
+++ b/.eslintignore
@ -1,3 +0,0 @@
-_site/*
-!.eleventy.js
-**/yt-lite.js
--- a/.eslintrc.js
+++ b/.eslintrc.js
@ -1,33 +0,0 @@
-module.exports = {
-  root: true,
-  parser: '@typescript-eslint/parser',
-  env: {
-    browser: true,
-    amd: true,
-    node: true,
-    es6: true,
-  },
-  plugins: ['@typescript-eslint'],
-  extends: [
-    'eslint:recommended',
-    'plugin:@typescript-eslint/eslint-recommended',
-    'plugin:@typescript-eslint/recommended',
-    'plugin:jsx-a11y/recommended',
-    'plugin:prettier/recommended',
-  ],
-  rules: {
-    'prettier/prettier': 'error',
-    'jsx-a11y/anchor-is-valid': [
-      'error',
-      {
-        components: ['Link'],
-        specialLink: ['hrefLeft', 'hrefRight'],
-        aspects: ['invalidHref', 'preferButton'],
-      },
-    ],
-    'no-unused-vars': 0,
-    '@typescript-eslint/explicit-module-boundary-types': 'off',
-    '@typescript-eslint/no-var-requires': 'off',
-    '@typescript-eslint/ban-ts-comment': 'off',
-  },
-}
--- a/.eslintrc.json
+++ b/.eslintrc.json
@ -1,25 +0,0 @@
-{
-  "env": {
-    "browser": true,
-    "commonjs": true,
-    "es2020": true,
-    "node": true
-  },
-  "extends": "eslint:recommended",
-  "parserOptions": {
-    "ecmaVersion": 11
-  },
-  "rules": {
-    "indent": ["error", 2],
-    "linebreak-style": ["error", "unix"],
-    "quotes": ["error", "single"],
-    "semi": ["error", "never"],
-    "array-element-newline": [
-      "error",
-      {
-        "ArrayExpression": "consistent",
-        "ArrayPattern": { "minItems": 3 }
-      }
-    ]
-  }
-}
--- a/.husky/pre-commit
+++ b/.husky/pre-commit
@ -1,5 +0,0 @@
-#!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
-
-npx lint-staged
-npx --no -- commitlint --edit "${1}"
--- a/.prettierignore
+++ b/.prettierignore
@ -1,2 +0,0 @@
-src/feed.11ty.liquid
-src/follow.11ty.liquid
--- a/commitlint.config.js
+++ b/commitlint.config.js
@ -1 +0,0 @@
-module.exports = { extends: ['@commitlint/config-conventional'] }
--- a/config/collections/index.js
+++ b/config/collections/index.js
@ -1,8 +1,8 @@
-const { DateTime } = require('luxon')
-const tagAliases = require('../data/tag-aliases.json')
-const { makeYearStats, processPostFile } = require('./utils')
+import { DateTime } from 'luxon'
+import tagAliases from '../data/tag-aliases.js'
+import { makeYearStats, processPostFile } from './utils.js'

-const tagList = (collection) => {
+export const tagList = (collection) => {
  const tagsSet = new Set()
  collection.getAll().forEach((item) => {
    if (!item.data.tags) return
@ -13,7 +13,7 @@ const tagList = (collection) => {
  return Array.from(tagsSet).sort()
 }

-const tagMap = (collection) => {
+export const tagMap = (collection) => {
  const tags = {}
  collection.getAll().forEach((item) => {
    if (item.data.collections.posts) {
@ -38,7 +38,7 @@ const tagMap = (collection) => {
  return tags
 }

-const postStats = (collectionApi) => {
+export const postStats = (collectionApi) => {
  const oneDayMilliseconds = 1000 * 60 * 60 * 24
  const statsObject = {
    avgDays: 0,
@ -164,9 +164,3 @@ const postStats = (collectionApi) => {
  statsObject.highPostCount = highPostCount
  return statsObject
 }
-
-module.exports = {
-  tagList,
-  tagMap,
-  postStats,
-}
--- a/config/collections/utils.js
+++ b/config/collections/utils.js
@ -1,7 +1,7 @@
-const fs = require('fs')
-const writingStats = require('writing-stats')
+import fs from 'fs'
+import writingStats from 'writing-stats'

-const processPostFile = (filePath) => {
+export const processPostFile = (filePath) => {
  try {
    let content = fs.readFileSync(filePath, 'utf8')
    // remove front matter
@ -30,7 +30,7 @@ const processPostFile = (filePath) => {
  }
 }

-const makeYearStats = (
+export const makeYearStats = (
  currentYear,
  yearPostCount,
  yearWordCount,
@ -57,8 +57,3 @@ const makeYearStats = (
    yearProgress,
  }
 }
-
-module.exports = {
-  processPostFile,
-  makeYearStats,
-}
--- a/config/data/tag-aliases.js
+++ b/config/data/tag-aliases.js
@ -0,0 +1,21 @@
+export default {
+  '11ty': '#Eleventy',
+  accessibility: '#Accessibility',
+  development: '#WebDev',
+  eleventy: '#Eleventy',
+  email: '#Email',
+  fastmail: '#Email',
+  gmail: '#Email',
+  ios: '#iOS #Apple',
+  javascript: '#JavaScript',
+  'last.fm': '#Music',
+  lastfm: '#Music',
+  macos: '#macOS #Apple',
+  music: '#Music',
+  react: '#JavaScript',
+  rss: '#RSS',
+  'social media': '#Tech',
+  spotify: '#Music',
+  tech: '#Tech',
+  technology: '#Tech',
+}
--- a/config/data/tag-aliases.json
+++ b/config/data/tag-aliases.json
@ -1,21 +0,0 @@
-{
-  "11ty": "#Eleventy",
-  "accessibility": "#Accessibility",
-  "development": "#WebDev",
-  "eleventy": "#Eleventy",
-  "email": "#Email",
-  "fastmail": "#Email",
-  "gmail": "#Email",
-  "ios": "#iOS #Apple",
-  "javascript": "#JavaScript",
-  "last.fm": "#Music",
-  "lastfm": "#Music",
-  "macos": "#macOS #Apple",
-  "music": "#Music",
-  "react": "#JavaScript",
-  "rss": "#RSS",
-  "social media": "#Tech",
-  "spotify": "#Music",
-  "tech": "#Tech",
-  "technology": "#Tech"
-}
--- a/config/events/index.js
+++ b/config/events/index.js
@ -1,7 +1,7 @@
-const fs = require('fs')
-const Image = require('@11ty/eleventy-img')
+import fs from 'fs'
+import Image from '@11ty/eleventy-img'

-const svgToJpeg = function () {
+export const svgToJpeg = function () {
  const socialPreviewImagesDir = '_site/assets/img/social-preview/'
  fs.readdir(socialPreviewImagesDir, (err, files) => {
    if (!!files && files.length > 0) {
@ -23,7 +23,3 @@ const svgToJpeg = function () {
    }
  })
 }
-
-module.exports = {
-  svgToJpeg,
-}
--- a/config/filters/index.js
+++ b/config/filters/index.js
@ -1,12 +1,12 @@
-const { DateTime } = require('luxon')
-const markdownIt = require('markdown-it')
-const { URL } = require('url')
-const sanitizeHTML = require('sanitize-html')
+import { DateTime } from 'luxon'
+import markdownIt from 'markdown-it'
+import { URL } from 'url'
+import sanitizeHTML from 'sanitize-html'

 const utmPattern = /[?&](utm_[^&=]+=[^&#]*)/gi
 const BASE_URL = 'https://coryd.dev'

-module.exports = {
+export default {
  // general
  trim: (string, limit) => {
    return string.length <= limit ? string : `${string.slice(0, limit)}...`
--- a/config/shortcodes/img/index.js
+++ b/config/shortcodes/img/index.js
@ -1,70 +0,0 @@
-const outdent = require('outdent')
-const Image = require('@11ty/eleventy-img')
-
-const img = async (
-  src,
-  alt,
-  className = undefined,
-  loading = 'lazy',
-  widths = [75, 150, 300, 600, 900, 1200],
-  formats = ['webp', 'jpeg'],
-  sizes = '100vw'
-) => {
-  const imageMetadata = await Image(src, {
-    widths: [...widths, null],
-    formats: [...formats, null],
-    outputDir: './_site/assets/img/cache/',
-    urlPath: '/assets/img/cache/',
-  })
-
-  const stringifyAttributes = (attributeMap) => {
-    return Object.entries(attributeMap)
-      .map(([attribute, value]) => {
-        if (typeof value === 'undefined') return ''
-        return `${attribute}="${value}"`
-      })
-      .join(' ')
-  }
-
-  const sourceHtmlString = Object.values(imageMetadata)
-    .map((images) => {
-      const { sourceType } = images[0]
-      const sourceAttributes = stringifyAttributes({
-        type: sourceType,
-        srcset: images.map((image) => image.srcset).join(', '),
-        sizes,
-      })
-
-      return `<source ${sourceAttributes}>`
-    })
-    .join('\n')
-
-  const getLargestImage = (format) => {
-    const images = imageMetadata[format]
-    return images[images.length - 1]
-  }
-
-  const largestUnoptimizedImg = getLargestImage(formats[0])
-  const imgAttributes = stringifyAttributes({
-    src: largestUnoptimizedImg.url,
-    width: largestUnoptimizedImg.width,
-    height: largestUnoptimizedImg.height,
-    alt,
-    loading,
-    decoding: 'async',
-  })
-
-  const imgHtmlString = `<img ${imgAttributes}>`
-  const pictureAttributes = stringifyAttributes({
-    class: className,
-  })
-
-  const picture = `<picture ${pictureAttributes}>
-    ${sourceHtmlString}
-    ${imgHtmlString}
-  </picture>`
-
-  return outdent`${picture}`
-}
-
-module.exports = img
--- a/config/shortcodes/index.js
+++ b/config/shortcodes/index.js
@ -1,4 +1,68 @@
-const img = require('./img')
-module.exports = {
-  img,
+import outdent from 'outdent'
+import Image from '@11ty/eleventy-img'
+
+export const img = async (
+  src,
+  alt,
+  className = undefined,
+  loading = 'lazy',
+  widths = [75, 150, 300, 600, 900, 1200],
+  formats = ['webp', 'jpeg'],
+  sizes = '100vw'
+) => {
+  const imageMetadata = await Image(src, {
+    widths: [...widths, null],
+    formats: [...formats, null],
+    outputDir: './_site/assets/img/cache/',
+    urlPath: '/assets/img/cache/',
+  })
+
+  const stringifyAttributes = (attributeMap) => {
+    return Object.entries(attributeMap)
+      .map(([attribute, value]) => {
+        if (typeof value === 'undefined') return ''
+        return `${attribute}="${value}"`
+      })
+      .join(' ')
+  }
+
+  const sourceHtmlString = Object.values(imageMetadata)
+    .map((images) => {
+      const { sourceType } = images[0]
+      const sourceAttributes = stringifyAttributes({
+        type: sourceType,
+        srcset: images.map((image) => image.srcset).join(', '),
+        sizes,
+      })
+
+      return `<source ${sourceAttributes}>`
+    })
+    .join('\n')
+
+  const getLargestImage = (format) => {
+    const images = imageMetadata[format]
+    return images[images.length - 1]
+  }
+
+  const largestUnoptimizedImg = getLargestImage(formats[0])
+  const imgAttributes = stringifyAttributes({
+    src: largestUnoptimizedImg.url,
+    width: largestUnoptimizedImg.width,
+    height: largestUnoptimizedImg.height,
+    alt,
+    loading,
+    decoding: 'async',
+  })
+
+  const imgHtmlString = `<img ${imgAttributes}>`
+  const pictureAttributes = stringifyAttributes({
+    class: className,
+  })
+
+  const picture = `<picture ${pictureAttributes}>
+    ${sourceHtmlString}
+    ${imgHtmlString}
+  </picture>`
+
+  return outdent`${picture}`
 }
--- a/config/transforms/html-config.js
+++ b/config/transforms/html-config.js
@ -1,19 +0,0 @@
-const htmlmin = require('html-minifier-terser')
-
-module.exports = (eleventyConfig) => {
-  eleventyConfig.addTransform('html-minify', (content, path) => {
-    if (path && path.endsWith('.html')) {
-      return htmlmin.minify(content, {
-        collapseBooleanAttributes: true,
-        collapseWhitespace: true,
-        decodeEntities: true,
-        includeAutoGeneratedTags: false,
-        minifyCSS: true,
-        minifyJS: true,
-        removeComments: true,
-        processScripts: ['application/ld+json'], // minify JSON-LD scripts
-      })
-    }
-    return content
-  })
-}
--- a/config/utils/index.js
+++ b/config/utils/index.js
@ -1,13 +1,9 @@
-const slugify = require('slugify')
+import slugify from 'slugify'

-const slugifyString = (str) => {
+export const slugifyString = (str) => {
  return slugify(str, {
    replacement: '-',
    remove: /[#,&,+()$~%.'":*?<>{}]/g,
    lower: true,
  })
 }
-
-module.exports = {
-  slugifyString,
-}
--- a/markdownlint.config.json
+++ b/markdownlint.config.json
@ -1,9 +0,0 @@
-{
-  "default": true,
-  "MD013": { "line_length": "5000" },
-  "MD033": false,
-  "MD036": false,
-  "MD054": false,
-  "no-hard-tabs": false,
-  "whitespace": false
-}
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@ -1,8 +1,8 @@
 {
  "name": "coryd.dev",
-  "version": "2.9.0",
+  "version": "3.0.0",
  "description": "The source for my personal site, blog and portfolio. Built using 11ty and hosted on Netlify.",
-  "main": "index.html",
+  "type": "module",
  "scripts": {
    "start": "NODE_ENV=development npx tailwindcss -i ./tailwind.css -o src/assets/styles/tailwind.css && rm -rf .cache && ELEVENTY_PRODUCTION=false eleventy --serve",
    "debug": "NODE_ENV=development npx tailwindcss -i ./tailwind.css -o src/styles/tailwind.css && DEBUG=Eleventy* npx @11ty/eleventy --serve",
@ -18,21 +18,17 @@
  "author": "Cory Dransfeldt",
  "license": "ISC",
  "devDependencies": {
-    "@11ty/eleventy": "^2.0.1",
+    "@11ty/eleventy": "3.0.0-alpha.3",
    "@11ty/eleventy-activity-feed": "^1.0.9",
    "@11ty/eleventy-fetch": "^4.0.0",
    "@11ty/eleventy-img": "^3.1.8",
    "@11ty/eleventy-plugin-rss": "^1.2.0",
    "@11ty/eleventy-plugin-syntaxhighlight": "^5.0.0",
    "@catppuccin/tailwindcss": "^0.1.6",
-    "@commitlint/cli": "^18.4.3",
-    "@commitlint/config-conventional": "^18.4.3",
    "@rknightuk/eleventy-plugin-post-graph": "^1.0.3",
    "@tailwindcss/aspect-ratio": "^0.4.2",
    "@tailwindcss/line-clamp": "^0.4.4",
    "@tailwindcss/typography": "^0.5.10",
-    "@typescript-eslint/eslint-plugin": "^6.15.0",
-    "@typescript-eslint/parser": "^6.15.0",
    "autoprefixer": "^10.4.16",
    "child_process": "^1.0.2",
    "clean-css": "^5.3.3",
@ -40,15 +36,9 @@
    "eleventy-plugin-tabler-icons": "^2.2.0",
    "eleventy-plugin-unfurl": "^1.0.0",
    "eleventy-plugin-youtube-embed": "^1.9.1",
-    "eslint": "^8.56.0",
-    "eslint-config-prettier": "^9.1.0",
-    "eslint-plugin-jsx-a11y": "^6.8.0",
-    "eslint-plugin-prettier": "^5.1.0",
    "html-minifier-terser": "^7.2.0",
-    "husky": "^8.0.3",
    "ics-to-json-extended": "^1.1.4",
    "jsdom": "^23.0.1",
-    "lint-staged": "^15.2.0",
    "liquidjs": "^10.10.0",
    "luxon": "^3.4.4",
    "markdown-it": "^14.0.0",
@ -59,8 +49,6 @@
    "outdent": "^0.8.0",
    "pagefind": "^1.0.4",
    "postcss": "^8.4.32",
-    "prettier": "^3.1.1",
-    "prettier-plugin-tailwindcss": "^0.5.9",
    "sanitize-html": "^2.11.0",
    "slugify": "^1.6.6",
    "striptags": "^3.2.0",
--- a/postcss.config.js
+++ b/postcss.config.js
@ -1,4 +1,4 @@
-module.exports = {
+export default {
  plugins: {
    tailwindcss: {},
    autoprefixer: {},
--- a/prettier.config.js
+++ b/prettier.config.js
@ -1,9 +0,0 @@
-module.exports = {
-  semi: false,
-  singleQuote: true,
-  printWidth: 100,
-  tabWidth: 2,
-  useTabs: false,
-  trailingComma: 'es5',
-  bracketSpacing: true,
-}
--- a/src/_data/albumReleases.js
+++ b/src/_data/albumReleases.js
@ -1,8 +1,8 @@
-const { AssetCache } = require('@11ty/eleventy-fetch')
-const ics = require('ics-to-json-extended')
-const { DateTime } = require('luxon')
+import { AssetCache } from '@11ty/eleventy-fetch'
+import ics from 'ics-to-json-extended'
+import { DateTime } from 'luxon'

-module.exports = async function () {
+export default async function () {
  const URL = process.env.SECRET_FEED_ALBUM_RELEASES
  const icsToJson = ics.default
  const asset = new AssetCache('album_release_data')
--- a/src/_data/albums.js
+++ b/src/_data/albums.js
@ -1,7 +1,7 @@
-const EleventyFetch = require('@11ty/eleventy-fetch')
+import EleventyFetch from '@11ty/eleventy-fetch'
 const ALBUM_DENYLIST = ['no-love-deep-web', 'unremittance']

-module.exports = async function () {
+export default async function () {
  const MUSIC_KEY = process.env.API_KEY_LASTFM
  const url = `https://ws.audioscrobbler.com/2.0/?method=user.gettopalbums&user=coryd_&api_key=${MUSIC_KEY}&limit=8&format=json&period=7day`
  const res = EleventyFetch(url, {
--- a/src/_data/analytics.js
+++ b/src/_data/analytics.js
@ -1,6 +1,6 @@
-const EleventyFetch = require('@11ty/eleventy-fetch')
+import EleventyFetch from '@11ty/eleventy-fetch'

-module.exports = async function () {
+export default async function () {
  const API_KEY_PLAUSIBLE = process.env.API_KEY_PLAUSIBLE
  const url =
    'https://plausible.io/api/v1/stats/breakdown?site_id=coryd.dev&period=6mo&property=event:page&limit=30'
--- a/src/_data/artists.js
+++ b/src/_data/artists.js
@ -1,11 +1,11 @@
-const EleventyFetch = require('@11ty/eleventy-fetch')
-const mbidPatches = require('./json/mbid-patches.json')
+import EleventyFetch from '@11ty/eleventy-fetch'
+import mbidPatches from './json/mbid-patches.js'

 const mbidMap = (artist) => {
  return mbidPatches[artist.toLowerCase()] || ''
 }

-module.exports = async function () {
+export default async function () {
  const MUSIC_KEY = process.env.API_KEY_LASTFM
  const url = `https://ws.audioscrobbler.com/2.0/?method=user.gettopartists&user=coryd_&api_key=${MUSIC_KEY}&limit=8&format=json&period=7day`
  const res = EleventyFetch(url, {
--- a/src/_data/books.js
+++ b/src/_data/books.js
@ -1,8 +1,9 @@
-const jsdom = require('jsdom')
-const { AssetCache } = require('@11ty/eleventy-fetch')
+import jsdom from 'jsdom'
+import { AssetCache } from '@11ty/eleventy-fetch'
+
 const { JSDOM } = jsdom

-module.exports = async function () {
+export default async function () {
  const COOKIE = process.env.COOKIE_STORYGRAPH
  const url = 'https://app.thestorygraph.com/currently-reading/coryd'
  const asset = new AssetCache('books_data')
--- a/src/_data/env.js
+++ b/src/_data/env.js
@ -1,3 +1,3 @@
-module.exports = async function () {
+export default async function () {
  return process.env.NODE_ENV
 }
--- a/src/_data/follow.js
+++ b/src/_data/follow.js
@ -1,4 +1,4 @@
-module.exports = async function () {
+export default async function () {
  const { ActivityFeed } = await import('@11ty/eleventy-activity-feed')
  const feed = new ActivityFeed()
  feed.addSource('rss', '📝', 'https://coryd.dev/feeds/posts')
--- a/src/_data/json/mbid-patches.js
+++ b/src/_data/json/mbid-patches.js
@ -0,0 +1,21 @@
+export default {
+  adramelech: '259e6968-a841-4fc5-b02b-54665b85977b',
+  afi: '1c3919b2-43ca-4a4a-935d-9d50135ec0ef',
+  'carnal tomb': 'e24534dc-d29e-4e0b-84fa-26d487b0790a',
+  'carpe noctem': 'aa349181-1cb9-4340-bb3f-82eefba3e697',
+  cruciamentum: '9a783663-db0c-4237-a3a9-afe72d055ddc',
+  'edge of sanity': '82d1972f-f815-480d-ba78-9873b799bdd1',
+  envy: '8c4519da-59e7-44b5-868d-350dffb30b51',
+  fumes: 'a5139ca1-f4f3-4bea-ae4c-ae4e2efd857d',
+  ghastly: '70f969df-7fc1-421e-afad-678c0bbd1aea',
+  'home is where': '76ead0bf-51e0-43c8-ae8f-59caefdd84a2',
+  krallice: 'b4e4b359-76a3-447e-be1d-80a24887134e',
+  nucleus: '9eefaa74-8dea-41af-8bb3-0d9616bec16f',
+  oasis: '39ab1aed-75e0-4140-bd47-540276886b60',
+  obliteration: '5c241a91-d7e9-447a-807c-e4a8435f10ef',
+  osees: '194272cc-dcc8-4640-a4a6-66da7d250d5c',
+  panopticon: 'd9b1f00a-31a7-4f64-9f29-8481e7be8911',
+  'pigment vehicle': 'c421f86c-991c-4b2d-9058-516375903deb',
+  'regional justice center': '64ad5550-e93f-4add-80c3-e6b651f4f250',
+  worm: '6313658e-cd68-4c81-9778-17ce3825748e',
+}
--- a/src/_data/json/mbid-patches.json
+++ b/src/_data/json/mbid-patches.json
@ -1,21 +0,0 @@
-{
-  "adramelech": "259e6968-a841-4fc5-b02b-54665b85977b",
-  "afi": "1c3919b2-43ca-4a4a-935d-9d50135ec0ef",
-  "carnal tomb": "e24534dc-d29e-4e0b-84fa-26d487b0790a",
-  "carpe noctem": "aa349181-1cb9-4340-bb3f-82eefba3e697",
-  "cruciamentum": "9a783663-db0c-4237-a3a9-afe72d055ddc",
-  "edge of sanity": "82d1972f-f815-480d-ba78-9873b799bdd1",
-  "envy": "8c4519da-59e7-44b5-868d-350dffb30b51",
-  "fumes": "a5139ca1-f4f3-4bea-ae4c-ae4e2efd857d",
-  "ghastly": "70f969df-7fc1-421e-afad-678c0bbd1aea",
-  "home is where": "76ead0bf-51e0-43c8-ae8f-59caefdd84a2",
-  "krallice": "b4e4b359-76a3-447e-be1d-80a24887134e",
-  "nucleus": "9eefaa74-8dea-41af-8bb3-0d9616bec16f",
-  "oasis": "39ab1aed-75e0-4140-bd47-540276886b60",
-  "obliteration": "5c241a91-d7e9-447a-807c-e4a8435f10ef",
-  "osees": "194272cc-dcc8-4640-a4a6-66da7d250d5c",
-  "panopticon": "d9b1f00a-31a7-4f64-9f29-8481e7be8911",
-  "pigment vehicle": "c421f86c-991c-4b2d-9058-516375903deb",
-  "regional justice center": "64ad5550-e93f-4add-80c3-e6b651f4f250",
-  "worm": "6313658e-cd68-4c81-9778-17ce3825748e"
-}
--- a/src/_data/links.js
+++ b/src/_data/links.js
@ -1,6 +1,6 @@
-const EleventyFetch = require('@11ty/eleventy-fetch')
+import EleventyFetch from '@11ty/eleventy-fetch'

-module.exports = async function () {
+export default async function () {
  const API_TOKEN_READWISE = process.env.API_TOKEN_READWISE
  const url = 'https://readwise.io/api/v3/list?location=archive'
  const res = EleventyFetch(url, {
--- a/src/_data/mbidPatches.js
+++ b/src/_data/mbidPatches.js
@ -1,5 +1,5 @@
-const mbidPatches = require('./json/mbid-patches.json')
+import mbidPatches from './json/mbid-patches.js'

-module.exports = async function () {
+export default async function () {
  return mbidPatches
 }
--- a/src/_data/meta.js
+++ b/src/_data/meta.js
@ -1,4 +1,4 @@
-module.exports = {
+export default {
  siteName: 'Cory Dransfeldt',
  siteDescription:
    "I'm a software developer in Camarillo, California. I enjoy hanging out with my beautiful family and 4 rescue dogs, technology, automation, music, writing, reading and tv and movies.",
--- a/src/_data/movies.js
+++ b/src/_data/movies.js
@ -1,6 +1,6 @@
-const EleventyFetch = require('@11ty/eleventy-fetch')
+import EleventyFetch from '@11ty/eleventy-fetch'

-module.exports = async function () {
+export default async function () {
  const TV_KEY = process.env.API_KEY_TRAKT
  const MOVIEDB_KEY = process.env.API_KEY_MOVIEDB
  const url = 'https://api.trakt.tv/users/cdransf/history/movies?page=1&limit=6&extended=full'
--- a/src/_data/nav.js
+++ b/src/_data/nav.js
@ -1,4 +1,4 @@
-module.exports = async function () {
+export default async function () {
  return {
    footer: [
      { name: 'Uses' },
--- a/src/_data/status.js
+++ b/src/_data/status.js
@ -1,6 +1,6 @@
-const EleventyFetch = require('@11ty/eleventy-fetch')
+import EleventyFetch from '@11ty/eleventy-fetch'

-module.exports = async function () {
+export default async function () {
  const url = 'https://api.omg.lol/address/cory/statuses/'
  const res = EleventyFetch(url, {
    duration: '1h',
--- a/src/_data/tracks.js
+++ b/src/_data/tracks.js
@ -1,11 +1,11 @@
-const EleventyFetch = require('@11ty/eleventy-fetch')
-const mbidPatches = require('./json/mbid-patches.json')
+import EleventyFetch from '@11ty/eleventy-fetch'
+import mbidPatches from './json/mbid-patches.js'

 const mbidMap = (artist) => {
  return mbidPatches[artist.toLowerCase()] || ''
 }

-module.exports = async function () {
+export default async function () {
  const MUSIC_KEY = process.env.API_KEY_LASTFM
  const LISTENBRAINZ_TOKEN = process.env.LISTENBRAINZ_TOKEN
  const url = `https://ws.audioscrobbler.com/2.0/?method=user.getrecenttracks&user=coryd_&api_key=${MUSIC_KEY}&format=json&limit=200`
--- a/src/_data/tv.js
+++ b/src/_data/tv.js
@ -1,6 +1,6 @@
-const EleventyFetch = require('@11ty/eleventy-fetch')
+import EleventyFetch from '@11ty/eleventy-fetch'

-module.exports = async function () {
+export default async function () {
  const TV_KEY = process.env.API_KEY_TRAKT
  const MOVIEDB_KEY = process.env.API_KEY_MOVIEDB
  const url = 'https://api.trakt.tv/users/cdransf/history/shows?page=1&limit=36'
--- a/src/_data/webmentions.js
+++ b/src/_data/webmentions.js
@ -1,6 +1,6 @@
-const EleventyFetch = require('@11ty/eleventy-fetch')
+import EleventyFetch from '@11ty/eleventy-fetch'

-module.exports = async function () {
+export default async function () {
  const KEY_CORYD = process.env.API_KEY_WEBMENTIONS_CORYD_DEV
  const url = `https://webmention.io/api/mentions.jf2?token=${KEY_CORYD}&per-page=1000`
  const res = EleventyFetch(url, {
--- a/src/_data/weeklyArtistChart.js
+++ b/src/_data/weeklyArtistChart.js
@ -1,13 +1,16 @@
+import { createRequire } from 'module'
+
+const require = createRequire(import.meta.url)
 const chartData = require('./json/weekly-artist-charts.json')
 const charts = chartData['charts']

-module.exports = async function () {
+export default async function () {
  return charts.map((chart) => {
    const artists = chart['weeklyartistchart']['artist'].splice(0, 8)
    const date = parseInt(chart['weeklyartistchart']['@attr']['to']) * 1000
    let content = 'My top artists for the week: '
    artists.forEach((artist, index) => {
-      const artistName = artist['name'].replace('&', 'and');
+      const artistName = artist['name'].replace('&', 'and')
      content += `${artistName} @ ${artist['playcount']} play${
        parseInt(artist['playcount']) > 1 ? 's' : ''
      }`
--- a/src/_includes/base.liquid
+++ b/src/_includes/base.liquid
@ -1,5 +1,4 @@
-{%- capture fullUrl %}
-  {{ meta.url }}{{ page.url }}{% endcapture -%}
+{%- capture fullUrl %}{{ meta.url }}{{ page.url }}{% endcapture -%}
 <!doctype html>
 <html class="scrollbar-thin scrollbar-thumb-blue-600 dark:scrollbar-thumb-blue-400 scrollbar-track-blue-100" lang="en">
  <head>
@ -23,14 +22,14 @@
    <meta name="generator" content="{{ eleventy.generator }}">
    <meta name="robots" content="noai, noimageai">
    <link
-      href="/assets/icons/favicon.ico?v={% version %}"
+      href="/assets/icons/favicon.ico?v={% assetHash %}"
      rel="icon"
      sizes="any">
    <link
-      href="/assets/icons/favicon.svg?v={% version %}"
+      href="/assets/icons/favicon.svg?v={% assetHash %}"
      rel="icon"
      type="image/svg+xml">
-    <link href="/assets/icons/apple-touch-icon.png?v={% version %}" rel="apple-touch-icon">
+    <link href="/assets/icons/apple-touch-icon.png?v={% assetHash %}" rel="apple-touch-icon">
    {% capture css %}
      {% render "../assets/styles/prism.css" %}
      {% render "../assets/styles/tailwind.css" %}
				`@ -1 +0,0 @@`
				`module.exports = { extends: ['@commitlint/config-conventional'] }`