cdransf/coryd.dev-eleventy
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore: formatting

Browse source
This commit is contained in:
Cory Dransfeldt 2024-10-19 19:56:23 -07:00
parent 55286f8c3b
commit 2fb4c362f3
No known key found for this signature in database
2 changed files with 177 additions and 143 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

127
.eleventy.js
View file

@ -1,81 +1,90 @@
import { createRequire } from 'module' import { createRequire } from "module";
import dotenvFlow from 'dotenv-flow' import dotenvFlow from "dotenv-flow";
import filters from './config/filters/index.js' import filters from "./config/filters/index.js";
import htmlmin from 'html-minifier-terser' import htmlmin from "html-minifier-terser";
import markdownIt from 'markdown-it' import markdownIt from "markdown-it";
import markdownItAnchor from 'markdown-it-anchor' import markdownItAnchor from "markdown-it-anchor";
import markdownItFootnote from 'markdown-it-footnote' import markdownItFootnote from "markdown-it-footnote";
import markdownItPrism from 'markdown-it-prism' import markdownItPrism from "markdown-it-prism";
import syntaxHighlight from '@11ty/eleventy-plugin-syntaxhighlight' import syntaxHighlight from "@11ty/eleventy-plugin-syntaxhighlight";
import tablerIcons from '@cdransf/eleventy-plugin-tabler-icons' import tablerIcons from "@cdransf/eleventy-plugin-tabler-icons";
import { copyErrorPages, minifyJsComponents } from './config/events/index.js' import { copyErrorPages, minifyJsComponents } from "./config/events/index.js";
import { albumReleasesCalendar } from './config/collections/index.js' import { albumReleasesCalendar } from "./config/collections/index.js";
import { cssConfig } from './config/plugins/css-config.js' import { cssConfig } from "./config/plugins/css-config.js";
// load .env // load .env
dotenvFlow.config() dotenvFlow.config();
// get app version // get app version
const require = createRequire(import.meta.url) const require = createRequire(import.meta.url);
const appVersion = require('./package.json').version const appVersion = require("./package.json").version;
export default async function (eleventyConfig) { export default async function (eleventyConfig) {
eleventyConfig.addPlugin(syntaxHighlight) eleventyConfig.addPlugin(syntaxHighlight);
eleventyConfig.addPlugin(tablerIcons) eleventyConfig.addPlugin(tablerIcons);
if (process.env.ELEVENTY_PRODUCTION) eleventyConfig.addPlugin(cssConfig) if (process.env.ELEVENTY_PRODUCTION) eleventyConfig.addPlugin(cssConfig);
eleventyConfig.setServerOptions({ domdiff: false }) eleventyConfig.setServerOptions({ domdiff: false });
eleventyConfig.setWatchThrottleWaitTime(200) eleventyConfig.setWatchThrottleWaitTime(200);
eleventyConfig.setQuietMode(true) eleventyConfig.setQuietMode(true);
eleventyConfig.configureErrorReporting({ allowMissingExtensions: true }) eleventyConfig.configureErrorReporting({ allowMissingExtensions: true });
eleventyConfig.setLiquidOptions({ eleventyConfig.setLiquidOptions({
jsTruthy: true, jsTruthy: true,
}) });
eleventyConfig.addPassthroughCopy('src/assets') eleventyConfig.addPassthroughCopy("src/assets");
eleventyConfig.addPassthroughCopy('_redirects') eleventyConfig.addPassthroughCopy("_redirects");
eleventyConfig.addPassthroughCopy('_headers') eleventyConfig.addPassthroughCopy("_headers");
eleventyConfig.addPassthroughCopy({ eleventyConfig.addPassthroughCopy({
'node_modules/@cdransf/api-text/api-text.js': 'assets/scripts/components/api-text.js', "node_modules/@cdransf/api-text/api-text.js":
'node_modules/@cdransf/select-pagination/select-pagination.js': 'assets/scripts/components/select-pagination.js', "assets/scripts/components/api-text.js",
'node_modules/@cdransf/theme-toggle/theme-toggle.js': 'assets/scripts/components/theme-toggle.js', "node_modules/@cdransf/select-pagination/select-pagination.js":
'node_modules/@daviddarnes/mastodon-post/mastodon-post.js': 'assets/scripts/components/mastodon-post.js', "assets/scripts/components/select-pagination.js",
'node_modules/minisearch/dist/umd/index.js': 'assets/scripts/components/minisearch.js', "node_modules/@cdransf/theme-toggle/theme-toggle.js":
'node_modules/youtube-video-element/youtube-video-element.js': 'assets/scripts/components/youtube-video-element.js' "assets/scripts/components/theme-toggle.js",
}) "node_modules/@daviddarnes/mastodon-post/mastodon-post.js":
"assets/scripts/components/mastodon-post.js",
"node_modules/minisearch/dist/umd/index.js":
"assets/scripts/components/minisearch.js",
"node_modules/youtube-video-element/youtube-video-element.js":
"assets/scripts/components/youtube-video-element.js",
});
eleventyConfig.addCollection('albumReleasesCalendar', albumReleasesCalendar) eleventyConfig.addCollection("albumReleasesCalendar", albumReleasesCalendar);
const md = markdownIt({ html: true, linkify: true }) const md = markdownIt({ html: true, linkify: true });
md.use(markdownItAnchor, { md.use(markdownItAnchor, {
level: [1, 2], level: [1, 2],
permalink: markdownItAnchor.permalink.headerLink({ permalink: markdownItAnchor.permalink.headerLink({
safariReaderFix: true, safariReaderFix: true,
}), }),
}) });
md.use(markdownItFootnote) md.use(markdownItFootnote);
md.use(markdownItPrism) md.use(markdownItPrism);
eleventyConfig.setLibrary('md', md) eleventyConfig.setLibrary("md", md);
eleventyConfig.addLiquidFilter('markdown', (content) => { eleventyConfig.addLiquidFilter("markdown", (content) => {
if (!content) return if (!content) return;
return md.render(content) return md.render(content);
}) });
Object.keys(filters).forEach((filterName) => { Object.keys(filters).forEach((filterName) => {
eleventyConfig.addLiquidFilter(filterName, filters[filterName]) eleventyConfig.addLiquidFilter(filterName, filters[filterName]);
}) });
eleventyConfig.addShortcode('appVersion', () => appVersion) eleventyConfig.addShortcode("appVersion", () => appVersion);
// events // events
if (process.env.ELEVENTY_PRODUCTION) eleventyConfig.on('afterBuild', copyErrorPages) if (process.env.ELEVENTY_PRODUCTION)
if (process.env.ELEVENTY_PRODUCTION) eleventyConfig.on('afterBuild', minifyJsComponents) eleventyConfig.on("afterBuild", copyErrorPages);
if (process.env.ELEVENTY_PRODUCTION)
eleventyConfig.on("afterBuild", minifyJsComponents);
// transforms // transforms
if (process.env.ELEVENTY_PRODUCTION) eleventyConfig.addTransform('html-minify', (content, path) => { if (process.env.ELEVENTY_PRODUCTION)
if (path && path.endsWith('.html')) { eleventyConfig.addTransform("html-minify", (content, path) => {
if (path && path.endsWith(".html")) {
return htmlmin.minify(content, { return htmlmin.minify(content, {
collapseBooleanAttributes: true, collapseBooleanAttributes: true,
collapseWhitespace: true, collapseWhitespace: true,
@ -90,18 +99,18 @@ export default async function (eleventyConfig) {
sortAttributes: true, sortAttributes: true,
sortClassName: true, sortClassName: true,
useShortDoctype: true, useShortDoctype: true,
}) });
} }
return content return content;
}) });
return { return {
passthroughFileCopy: true, passthroughFileCopy: true,
dir: { dir: {
input: 'src', input: "src",
includes: 'includes', includes: "includes",
data: 'data', data: "data",
output: '_site', output: "_site",
}, },
} };
} }

161
server.js
View file

@ -1,60 +1,79 @@
import express from 'express' import express from "express";
import { createProxyMiddleware } from 'http-proxy-middleware' import { createProxyMiddleware } from "http-proxy-middleware";
import path from 'path' import path from "path";
import { fileURLToPath } from 'url' import { fileURLToPath } from "url";
import { spawn } from 'child_process' import { spawn } from "child_process";
const __filename = fileURLToPath(import.meta.url) const __filename = fileURLToPath(import.meta.url);
const __dirname = path.dirname(__filename) const __dirname = path.dirname(__filename);
const PORT = 8080 const PORT = 8080;
const ELEVENTY_PORT = 8081 const ELEVENTY_PORT = 8081;
const WORKER_PORT = 8787 const WORKER_PORT = 8787;
const WORKER_ENTRY = './workers/dynamic-pages/index.js' const WORKER_ENTRY = "./workers/dynamic-pages/index.js";
const startProcess = (command, args, name) => { const startProcess = (command, args, name) => {
console.log(`Starting ${name}...`) console.log(`Starting ${name}...`);
const process = spawn(command, args, { stdio: 'inherit' }) const process = spawn(command, args, { stdio: "inherit" });
process.on('error', err => { process.on("error", (err) => {
console.error(`${name} error: ${err.message}`) console.error(`${name} error: ${err.message}`);
process.exit(1) process.exit(1);
}) });
process.on('exit', code => { process.on("exit", (code) => {
console.log(`${name} exited with code ${code}`) console.log(`${name} exited with code ${code}`);
if (code !== 0) process.exit(code) if (code !== 0) process.exit(code);
}) });
return process return process;
} };
const startEleventy = () => const startEleventy = () =>
startProcess('npx', ['eleventy', '--serve', '--port', ELEVENTY_PORT], 'Eleventy') startProcess(
"npx",
["eleventy", "--serve", "--port", ELEVENTY_PORT],
"Eleventy"
);
const startWorker = () => const startWorker = () =>
startProcess('npx', ['wrangler', 'dev', WORKER_ENTRY, '--port', WORKER_PORT], 'Wrangler Worker') startProcess(
"npx",
["wrangler", "dev", WORKER_ENTRY, "--port", WORKER_PORT],
"Wrangler Worker"
);
const app = express() const app = express();
app.use((req, res, next) => { app.use((req, res, next) => {
if (req.path === '/js/script.js') { if (req.path === "/js/script.js") {
res.setHeader('Content-Type', 'application/javascript') res.setHeader("Content-Type", "application/javascript");
return res.send('') return res.send("");
} }
if (req.path.endsWith('.css')) res.setHeader('Content-Type', 'text/css') if (req.path.endsWith(".css")) res.setHeader("Content-Type", "text/css");
else if (req.path.endsWith('.js')) res.setHeader('Content-Type', 'application/javascript') else if (req.path.endsWith(".js"))
else if (req.path.endsWith('.json')) res.setHeader('Content-Type', 'application/json') res.setHeader("Content-Type", "application/javascript");
else if (req.path.startsWith('/api/')) res.setHeader('Content-Type', 'application/json') else if (req.path.endsWith(".json"))
else if (req.path.startsWith('/feeds/all')) res.setHeader('Content-Type', 'application/xml') res.setHeader("Content-Type", "application/json");
else if (req.path.startsWith('/feeds/books')) res.setHeader('Content-Type', 'application/xml') else if (req.path.startsWith("/api/"))
else if (req.path.startsWith('/feeds/links')) res.setHeader('Content-Type', 'application/xml') res.setHeader("Content-Type", "application/json");
else if (req.path.startsWith('/feeds/movies')) res.setHeader('Content-Type', 'application/xml') else if (req.path.startsWith("/feeds/all"))
else if (req.path.startsWith('/feeds/posts')) res.setHeader('Content-Type', 'application/xml') res.setHeader("Content-Type", "application/xml");
else if (req.path.startsWith('/feeds/syndication')) res.setHeader('Content-Type', 'application/xml') else if (req.path.startsWith("/feeds/books"))
next() res.setHeader("Content-Type", "application/xml");
}) else if (req.path.startsWith("/feeds/links"))
res.setHeader("Content-Type", "application/xml");
else if (req.path.startsWith("/feeds/movies"))
res.setHeader("Content-Type", "application/xml");
else if (req.path.startsWith("/feeds/posts"))
res.setHeader("Content-Type", "application/xml");
else if (req.path.startsWith("/feeds/syndication"))
res.setHeader("Content-Type", "application/xml");
next();
});
app.use(express.static(path.join(__dirname, '_site'), { extensions: ['html'] })) app.use(
express.static(path.join(__dirname, "_site"), { extensions: ["html"] })
);
const proxy = createProxyMiddleware({ const proxy = createProxyMiddleware({
target: `http://localhost:${WORKER_PORT}`, target: `http://localhost:${WORKER_PORT}`,
@ -62,48 +81,54 @@ const proxy = createProxyMiddleware({
ws: true, ws: true,
pathRewrite: (path, req) => req.originalUrl, pathRewrite: (path, req) => req.originalUrl,
onError: (err, req, res) => { onError: (err, req, res) => {
console.error(`Proxy error: ${err.message}`) console.error(`Proxy error: ${err.message}`);
res.status(504).send('Worker timeout or unreachable') res.status(504).send("Worker timeout or unreachable");
}, },
}) });
app.use( app.use(
['/watching/movies', '/watching/shows', '/music/artists', '/music/genres', '/books'], [
"/watching/movies",
"/watching/shows",
"/music/artists",
"/music/genres",
"/books",
],
proxy proxy
) );
app.use((req, res) => { app.use((req, res) => {
res.status(404).sendFile(path.join(__dirname, '_site', '404.html'), err => { res.status(404).sendFile(path.join(__dirname, "_site", "404.html"), (err) => {
if (err) res.status(404).send('Page not found') if (err) res.status(404).send("Page not found");
}) });
}) });
const startServer = () => { const startServer = () => {
const server = app.listen(PORT, () => { const server = app.listen(PORT, () => {
console.log(`Server running at http://localhost:${PORT}`) console.log(`Server running at http://localhost:${PORT}`);
}) });
const shutdown = () => { const shutdown = () => {
console.log('Shutting down...') console.log("Shutting down...");
server.close(() => { server.close(() => {
console.log('Express server closed') console.log("Express server closed");
process.exit(0) process.exit(0);
}) });
} };
process.on('SIGINT', shutdown) process.on("SIGINT", shutdown);
process.on('SIGTERM', shutdown) process.on("SIGTERM", shutdown);
} };
const initialize = async () => { const initialize = async () => {
try { try {
startEleventy() startEleventy();
startWorker() startWorker();
startServer() startServer();
} catch (err) { } catch (err) {
console.error(`Initialization error: ${err.message}`) console.error(`Initialization error: ${err.message}`);
process.exit(1) process.exit(1);
} }
} };
initialize() initialize();