From 5dafde8b602ea849cae2367e851de84d8ecb7904 Mon Sep 17 00:00:00 2001 From: Cory Dransfeldt Date: Mon, 20 May 2024 11:43:43 -0700 Subject: [PATCH] chore: cleanup --- .eleventy.js | 5 +-- package-lock.json | 59 ++-------------------------------- package.json | 3 +- src/_data/analytics.js | 1 + src/_data/blogroll.js | 66 +++++++++++++++++++-------------------- src/_data/movies.js | 1 - src/_data/tv.js | 1 - src/_includes/base.liquid | 10 +++--- 8 files changed, 44 insertions(+), 102 deletions(-) diff --git a/.eleventy.js b/.eleventy.js index 387da331..7719223d 100644 --- a/.eleventy.js +++ b/.eleventy.js @@ -1,12 +1,10 @@ import syntaxHighlight from '@11ty/eleventy-plugin-syntaxhighlight' import tablerIcons from '@cdransf/eleventy-plugin-tabler-icons' import lightningCSS from '@11tyrocks/eleventy-plugin-lightningcss' - import markdownIt from 'markdown-it' import markdownItAnchor from 'markdown-it-anchor' import markdownItFootnote from 'markdown-it-footnote' import htmlmin from 'html-minifier-terser' - import filters from './config/filters/index.js' import { minifyJsComponents } from './config/events/index.js' import { allContent, searchIndex, tagList, tagsSortedByCount, links, tagMap, booksToRead } from './config/collections/index.js' @@ -18,7 +16,6 @@ dotenvFlow.config() // get app version import { createRequire } from 'module' - const require = createRequire(import.meta.url) const appVersion = require('./package.json').version @@ -138,4 +135,4 @@ export default async function (eleventyConfig) { output: '_site', }, } -} +} \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index a8430443..bd75c730 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "coryd.dev", - "version": "16.4.0", + "version": "16.4.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "coryd.dev", - "version": "16.4.0", + "version": "16.4.1", "license": "MIT", "dependencies": { "@cdransf/api-text": "^1.2.2", @@ -20,7 +20,6 @@ "devDependencies": { "@11ty/eleventy": "3.0.0-alpha.10", "@11ty/eleventy-fetch": "^4.0.1", - "@11ty/eleventy-plugin-rss": "^1.2.0", "@11ty/eleventy-plugin-syntaxhighlight": "^5.0.0", "@11tyrocks/eleventy-plugin-lightningcss": "^1.4.0", "@aws-sdk/client-s3": "^3.577.0", @@ -189,21 +188,6 @@ "url": "https://opencollective.com/11ty" } }, - "node_modules/@11ty/eleventy-plugin-rss": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@11ty/eleventy-plugin-rss/-/eleventy-plugin-rss-1.2.0.tgz", - "integrity": "sha512-YzFnSH/5pObcFnqZ2sAQ782WmpOZHj1+xB9ydY/0j7BZ2jUNahn53VmwCB/sBRwXA/Fbwwj90q1MLo01Ru0UaQ==", - "dev": true, - "dependencies": { - "debug": "^4.3.4", - "posthtml": "^0.16.6", - "posthtml-urls": "1.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/11ty" - } - }, "node_modules/@11ty/eleventy-plugin-syntaxhighlight": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/@11ty/eleventy-plugin-syntaxhighlight/-/eleventy-plugin-syntaxhighlight-5.0.0.tgz", @@ -2610,12 +2594,6 @@ "node": ">=0.4.0" } }, - "node_modules/any-promise": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-0.1.0.tgz", - "integrity": "sha512-lqzY9o+BbeGHRCOyxQkt/Tgvz0IZhTmQiA+LxQW8wSNpcTbj8K+0cZiSEvbpNZZP9/11Gy7dnLO3GNWUXO4d1g==", - "dev": true - }, "node_modules/anymatch": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz", @@ -5515,30 +5493,6 @@ "node": ">=12" } }, - "node_modules/posthtml-urls": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/posthtml-urls/-/posthtml-urls-1.0.0.tgz", - "integrity": "sha512-CMJ0L009sGQVUuYM/g6WJdscsq6ooAwhUuF6CDlYPMLxKp2rmCYVebEU+wZGxnQstGJhZPMvXsRhtqekILd5/w==", - "dev": true, - "dependencies": { - "http-equiv-refresh": "^1.0.0", - "list-to-array": "^1.1.0", - "parse-srcset": "^1.0.2", - "promise-each": "^2.2.0" - }, - "engines": { - "node": ">= 4" - } - }, - "node_modules/posthtml-urls/node_modules/http-equiv-refresh": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/http-equiv-refresh/-/http-equiv-refresh-1.0.0.tgz", - "integrity": "sha512-TScO04soylRN9i/QdOdgZyhydXg9z6XdaGzEyOgDKycePeDeTT4KvigjBcI+tgfTlieLWauGORMq5F1eIDa+1w==", - "dev": true, - "engines": { - "node": ">= 0.10" - } - }, "node_modules/prismjs": { "version": "1.29.0", "resolved": "https://registry.npmjs.org/prismjs/-/prismjs-1.29.0.tgz", @@ -5557,15 +5511,6 @@ "asap": "~2.0.3" } }, - "node_modules/promise-each": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/promise-each/-/promise-each-2.2.0.tgz", - "integrity": "sha512-67roqt1k3QDA41DZ8xi0V+rF3GoaMiX7QilbXu0vXimut+9RcKBNZ/t60xCRgcsihmNUsEjh48xLfNqOrKblUg==", - "dev": true, - "dependencies": { - "any-promise": "^0.1.0" - } - }, "node_modules/prr": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz", diff --git a/package.json b/package.json index 8ba453f0..a2977407 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "coryd.dev", - "version": "16.4.0", + "version": "16.4.1", "description": "The source for my personal site. Built using 11ty.", "type": "module", "scripts": { @@ -32,7 +32,6 @@ "devDependencies": { "@11ty/eleventy": "3.0.0-alpha.10", "@11ty/eleventy-fetch": "^4.0.1", - "@11ty/eleventy-plugin-rss": "^1.2.0", "@11ty/eleventy-plugin-syntaxhighlight": "^5.0.0", "@11tyrocks/eleventy-plugin-lightningcss": "^1.4.0", "@aws-sdk/client-s3": "^3.577.0", diff --git a/src/_data/analytics.js b/src/_data/analytics.js index 8f12397d..44aa80da 100644 --- a/src/_data/analytics.js +++ b/src/_data/analytics.js @@ -10,5 +10,6 @@ export default async function () { }).catch() const data = await res const pages = data[0].dates[0].items + return pages.filter((p) => p.url.includes('posts')) } \ No newline at end of file diff --git a/src/_data/blogroll.js b/src/_data/blogroll.js index 4c981018..93ff5df7 100644 --- a/src/_data/blogroll.js +++ b/src/_data/blogroll.js @@ -1,36 +1,36 @@ export default async function () { return [ - { "name": "Adam Newbold", "url": "https://notes.neatnik.net", "feed": "https://notes.neatnik.net" }, - { "name": "Adrianna Tan", "url": "https://popagandhi.com", "feed": "https://popagandhi.com/feed.xml", "newsletter": "https://buttondown.email/skinnylatte" }, - { "name": "Ashur Cabrera", "url": "https://multiline.co/mment", "feed": "https://multiline.co/mment/feed.xml" }, - { "name": "BinaryDigit", "url": "https://binarydigit.cafe", "feed": "https://binarydigit.cafe/feed.xml" }, - { "name": "Chris Burnell", "url": "https://chrisburnell.com", "feed": "https://chrisburnell.com/feed.xml" }, - { "name": "Chris Coyier", "url": "https://chriscoyier.net", "feed": "https://chriscoyier.net/feed/" }, - { "name": "Chris Ferdinandi", "url": "https://gomakethings.com", "feed": "https://gomakethings.com/feed/index.xml", "newsletter": "https://gomakethings.com" }, - { "name": "Chris McLeod", "url": "https://chrismcleod.dev", "feed": "https://chrismcleod.dev/feed.xml" }, - { "name": "Dave Rupert", "url": "https://daverupert.com", "feed": "https://daverupert.com/atom.xml" }, - { "name": "Ethan Marcotte", "url": "https://ethanmarcotte.com/wrote/", "feed": "https://ethanmarcotte.com/wrote/feed.xml" }, - { "name": "fLaMEd", "url": "https://flamedfury.com", "feed": "https://flamedfury.com/feed.xml" }, - { "name": "Jim Nielsen", "url": "https://blog.jim-nielsen.com", "feed": "https://blog.jim-nielsen.com/feed.xml", "json": "https://blog.jim-nielsen.com/feed.json" }, - { "name": "Joe Steel", "url": "https://joe-steel.com", "feed": "https://joe-steel.com/feed.xml" }, - { "name": "Joan Westenberg", "url": "https://joanwestenberg.com", "feed": "https://joanwestenberg.com/blog?format=rss", "newsletter": "https://joanwestenberg.com/subscribe" }, - { "name": "Juha-Matti Santala", "url": "https://hamatti.org", "feed": "https://hamatti.org/feed/feed.xml", "newsletter":"https://www.syntaxerror.tech" }, - { "name": "Keenan", "url": "https://gkeenan.co/avgb", "feed": "https://gkeenan.co/avglb?format=rss" }, - { "name": "Kev Quirk", "url": "https://kevq.uk", "feed": "https://kevq.uk/feed.xml", "newsletter": "https://kevquirk.com/subscribe" }, - { "name": "Łukasz Wójcik", "url": "https://lukaszwojcik.net", "feed": "https://blog.lukaszwojcik.net/full.xml" }, - { "name": "Matt Birchler", "url": "https://birchtree.me", "feed": "https://birchtree.me/rss/" }, - { "name": "Mike Haynes", "url": "https://crashthearcade.com", "feed": "https://crashthearcade.com/feed/rss" }, - { "name": "Nick Heer", "url": "https://pxlnv.com", "feed": "https://feedpress.me/pxlnv", "json": "https://pxlnv.com/feed/json" }, - { "name": "Paris Marx", "url": "https://disconnect.blog", "feed": "https://disconnect.blog/rss/", "newsletter": "https://disconnect.blog/#/portal/signup" }, - { "name": "Paul Anthony Webb", "url": "https://webb.page" }, - { "name": "Raymond Camden", "url": "https://raymondcamden.com", "feed": "https://www.raymondcamden.com/feed.xml", "newsletter": "https://www.raymondcamden.com/subscribe/" }, - { "name": "Robb Knight", "url": "https://rknight.me", "feed": "https://rknight.me/subscribe/posts/rss.xml", "json": "https://rknight.me/subscribe/posts/feed.json" }, - { "name": "Robin Rendle", "url": "https://robinrendle.com", "feed": "https://robinrendle.com/feed.xml", "newsletter": "https://robinrendle.com/the-cascade" }, - { "name": "Ryan Broderick", "url": "https://www.garbageday.email", "feed": "https://rss.beehiiv.com/feeds/99VTTjt0N1.xml", "newsletter": "https://www.garbageday.email/subscribe" }, - { "name": "Sara Joy", "url": "https://sarajoy.dev", "feed": "https://sarajoy.dev/rss.xml" }, - { "name": "Sia Karamalegos", "url": "https://sia.codes", "feed": "https://sia.codes/feed/feed.xml", "newsletter": "https://sia.codes#inform" }, - { "name": "Sophie Koonin", "url": "https://localghost.dev", "feed": "https://localghost.dev/rss" }, - { "name": "Stephanie Eckles", "url": "https://thinkdobecreate.com", "feed": "https://thinkdobecreate.com/feed" }, - { "name": "Zach Leatherman", "url": "https://www.zachleat.com", "feed": "https://www.zachleat.com/web/feed/" } -] + { "name": "Adam Newbold", "url": "https://notes.neatnik.net", "feed": "https://notes.neatnik.net" }, + { "name": "Adrianna Tan", "url": "https://popagandhi.com", "feed": "https://popagandhi.com/feed.xml", "newsletter": "https://buttondown.email/skinnylatte" }, + { "name": "Ashur Cabrera", "url": "https://multiline.co/mment", "feed": "https://multiline.co/mment/feed.xml" }, + { "name": "BinaryDigit", "url": "https://binarydigit.cafe", "feed": "https://binarydigit.cafe/feed.xml" }, + { "name": "Chris Burnell", "url": "https://chrisburnell.com", "feed": "https://chrisburnell.com/feed.xml" }, + { "name": "Chris Coyier", "url": "https://chriscoyier.net", "feed": "https://chriscoyier.net/feed/" }, + { "name": "Chris Ferdinandi", "url": "https://gomakethings.com", "feed": "https://gomakethings.com/feed/index.xml", "newsletter": "https://gomakethings.com" }, + { "name": "Chris McLeod", "url": "https://chrismcleod.dev", "feed": "https://chrismcleod.dev/feed.xml" }, + { "name": "Dave Rupert", "url": "https://daverupert.com", "feed": "https://daverupert.com/atom.xml" }, + { "name": "Ethan Marcotte", "url": "https://ethanmarcotte.com/wrote/", "feed": "https://ethanmarcotte.com/wrote/feed.xml" }, + { "name": "fLaMEd", "url": "https://flamedfury.com", "feed": "https://flamedfury.com/feed.xml" }, + { "name": "Jim Nielsen", "url": "https://blog.jim-nielsen.com", "feed": "https://blog.jim-nielsen.com/feed.xml", "json": "https://blog.jim-nielsen.com/feed.json" }, + { "name": "Joe Steel", "url": "https://joe-steel.com", "feed": "https://joe-steel.com/feed.xml" }, + { "name": "Joan Westenberg", "url": "https://joanwestenberg.com", "feed": "https://joanwestenberg.com/blog?format=rss", "newsletter": "https://joanwestenberg.com/subscribe" }, + { "name": "Juha-Matti Santala", "url": "https://hamatti.org", "feed": "https://hamatti.org/feed/feed.xml", "newsletter":"https://www.syntaxerror.tech" }, + { "name": "Keenan", "url": "https://gkeenan.co/avgb", "feed": "https://gkeenan.co/avglb?format=rss" }, + { "name": "Kev Quirk", "url": "https://kevq.uk", "feed": "https://kevq.uk/feed.xml", "newsletter": "https://kevquirk.com/subscribe" }, + { "name": "Łukasz Wójcik", "url": "https://lukaszwojcik.net", "feed": "https://blog.lukaszwojcik.net/full.xml" }, + { "name": "Matt Birchler", "url": "https://birchtree.me", "feed": "https://birchtree.me/rss/" }, + { "name": "Mike Haynes", "url": "https://crashthearcade.com", "feed": "https://crashthearcade.com/feed/rss" }, + { "name": "Nick Heer", "url": "https://pxlnv.com", "feed": "https://feedpress.me/pxlnv", "json": "https://pxlnv.com/feed/json" }, + { "name": "Paris Marx", "url": "https://disconnect.blog", "feed": "https://disconnect.blog/rss/", "newsletter": "https://disconnect.blog/#/portal/signup" }, + { "name": "Paul Anthony Webb", "url": "https://webb.page" }, + { "name": "Raymond Camden", "url": "https://raymondcamden.com", "feed": "https://www.raymondcamden.com/feed.xml", "newsletter": "https://www.raymondcamden.com/subscribe/" }, + { "name": "Robb Knight", "url": "https://rknight.me", "feed": "https://rknight.me/subscribe/posts/rss.xml", "json": "https://rknight.me/subscribe/posts/feed.json" }, + { "name": "Robin Rendle", "url": "https://robinrendle.com", "feed": "https://robinrendle.com/feed.xml", "newsletter": "https://robinrendle.com/the-cascade" }, + { "name": "Ryan Broderick", "url": "https://www.garbageday.email", "feed": "https://rss.beehiiv.com/feeds/99VTTjt0N1.xml", "newsletter": "https://www.garbageday.email/subscribe" }, + { "name": "Sara Joy", "url": "https://sarajoy.dev", "feed": "https://sarajoy.dev/rss.xml" }, + { "name": "Sia Karamalegos", "url": "https://sia.codes", "feed": "https://sia.codes/feed/feed.xml", "newsletter": "https://sia.codes#inform" }, + { "name": "Sophie Koonin", "url": "https://localghost.dev", "feed": "https://localghost.dev/rss" }, + { "name": "Stephanie Eckles", "url": "https://thinkdobecreate.com", "feed": "https://thinkdobecreate.com/feed" }, + { "name": "Zach Leatherman", "url": "https://www.zachleat.com", "feed": "https://www.zachleat.com/web/feed/" } + ] } \ No newline at end of file diff --git a/src/_data/movies.js b/src/_data/movies.js index 47a725cc..7bdbab74 100644 --- a/src/_data/movies.js +++ b/src/_data/movies.js @@ -4,7 +4,6 @@ import { DateTime } from 'luxon' const SUPABASE_URL = process.env.SUPABASE_URL const SUPABASE_KEY = process.env.SUPABASE_KEY const supabase = createClient(SUPABASE_URL, SUPABASE_KEY) - const PAGE_SIZE = 1000 const fetchAllMovies = async () => { diff --git a/src/_data/tv.js b/src/_data/tv.js index cbf33f18..8f08276e 100644 --- a/src/_data/tv.js +++ b/src/_data/tv.js @@ -3,7 +3,6 @@ import { createClient } from '@supabase/supabase-js' const SUPABASE_URL = process.env.SUPABASE_URL const SUPABASE_KEY = process.env.SUPABASE_KEY const supabase = createClient(SUPABASE_URL, SUPABASE_KEY) - const PAGE_SIZE = 1000 const fetchAllShows = async () => { diff --git a/src/_includes/base.liquid b/src/_includes/base.liquid index 2c0a93b9..0b6d7977 100644 --- a/src/_includes/base.liquid +++ b/src/_includes/base.liquid @@ -49,10 +49,12 @@ - - - - + + + + + + {% if schema == 'blog' %}