Skip to content

#382 Cache busting, removing obsolete code for fonts #383

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
anneke wants to merge 4 commits into
base: main
Choose a base branch
from
Draft

#382 Cache busting, removing obsolete code for fonts #383

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ed1da52
Add bnijenhuis’ cache busting
anneke Oct 20, 2024
23b2655
Remove fonts from html head
anneke Oct 20, 2024
1ae0b92
Merge branch 'main' into cache-busting
anneke Oct 21, 2024
a578220
Merge branch 'main' into cache-busting
edwinm Oct 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 20 additions & 1 deletion .eleventy.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
const { exec } = require("child_process");
const glob = require("fast-glob");
const { DateTime } = require("luxon");
const { DateTime } = require("luxon");
const fs = require("fs");

const pluginAddIdToHeadings = require("@orchidjs/eleventy-plugin-ids");
const pluginRss = require("@11ty/eleventy-plugin-rss");
Expand Down Expand Up @@ -48,6 +49,24 @@ module.exports = function (eleventyConfig) {
eleventyConfig.ignores.add("src/nl/vereniging/bestuur/notulen");
}

// Custom date filter
eleventyConfig.addFilter("localizedDate", function (dateObj, locale = "en") {
return DateTime.fromJSDate(dateObj).setLocale(locale).toFormat("d LLLL yyyy");
});
eleventyConfig.addFilter("bust", (url) => {
const [urlPart, paramPart] = url.split("?");
const params = new URLSearchParams(paramPart || "");
const relativeUrl = (urlPart.charAt(0) == "/") ? urlPart.substring(1) : urlPart;

try {
const fileStats = fs.statSync(relativeUrl);
const dateTimeModified = new DateTime(fileStats.mtime).toFormat("X");
params.set("v", dateTimeModified);
} catch (error) { }

return `${urlPart}?${params}`;
});

// Custom date filter
eleventyConfig.addFilter("localizedDate", function (dateObj, locale = "en") {
return DateTime.fromJSDate(dateObj)
Expand Down
2 changes: 1 addition & 1 deletion src/_includes/partials/utility/html-head.liquid
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
{%- endif -%}
{%- endif -%}

<link rel="stylesheet" href="/assets/css/style.css?v=">
<link rel="stylesheet" href="/assets/css/style.css">

<link rel="preload" as="font" href="/assets/fonts/Fabrik-Bold.woff2" type="font/woff2" crossorigin="anonymous">
<link rel="preload" as="font" href="/assets/fonts/Roboto-Regular.woff2" type="font/woff2" crossorigin="anonymous">
Expand Down