diff --git a/config/constants.js b/config/constants.js
deleted file mode 100644
index f9a391a..0000000
--- a/config/constants.js
+++ /dev/null
@@ -1,7 +0,0 @@
-export const dir = {
- assets: "assets",
- data: "_data",
- includes: "_includes",
- input: "src",
- output: "dist",
-};
diff --git a/config/constants/paths.js b/config/constants/paths.js
new file mode 100644
index 0000000..84c13ef
--- /dev/null
+++ b/config/constants/paths.js
@@ -0,0 +1 @@
+export const ASSETS_FONTS_PATH = "/assets/fonts";
diff --git a/config/filters/postcss/postcss.js b/config/filters/postcss/postcss.js
new file mode 100644
index 0000000..d622b43
--- /dev/null
+++ b/config/filters/postcss/postcss.js
@@ -0,0 +1,30 @@
+/*
+ * Implementation sourced from eleventyone starter kit
+ * https://github.com/philhawksworth/eleventyone
+ * ---
+ * https://github.com/philhawksworth/eleventyone/blob/master/src/site/css/styles.11ty.js
+ */
+import postcss from "postcss";
+import postcssImport from "postcss-import";
+import postcssImportExtGlob from "postcss-import-ext-glob";
+import autoprefixer from "autoprefixer";
+import cssnano from "cssnano";
+
+import colors from "./utils/colors.js";
+import fontFamily from "./utils/font-family.js";
+import fontVariables from "./utils/font-variables.js";
+import spacing from "./utils/spacing.js";
+
+const postCss = async (rawCss) => {
+ const css = `${rawCss}${fontFamily}${fontVariables}${colors}${spacing}`;
+ return await postcss([
+ postcssImportExtGlob,
+ postcssImport,
+ autoprefixer,
+ cssnano,
+ ])
+ .process(css, { from: "src/includes/css/styles.css" })
+ .then((result) => result.css);
+};
+
+export default postCss;
diff --git a/src/css-utils/colors.js b/config/filters/postcss/utils/colors.js
similarity index 93%
rename from src/css-utils/colors.js
rename to config/filters/postcss/utils/colors.js
index b03f18f..1aaff02 100644
--- a/src/css-utils/colors.js
+++ b/config/filters/postcss/utils/colors.js
@@ -1,4 +1,4 @@
-import colorSchemes from "../../config/design-tokens/colors.js";
+import colorSchemes from "../../../design-tokens/colors.js";
import { helperClassesToCss } from "./helper-classes.js";
const lightScheme = colorSchemes.light;
diff --git a/src/css-utils/font-family.js b/config/filters/postcss/utils/font-family.js
similarity index 84%
rename from src/css-utils/font-family.js
rename to config/filters/postcss/utils/font-family.js
index 4192a92..1693a69 100644
--- a/src/css-utils/font-family.js
+++ b/config/filters/postcss/utils/font-family.js
@@ -1,5 +1,9 @@
-import { getFontUrl } from "../utils/fonts.js";
-import fonts from "../../config/design-tokens/fonts.js";
+import path from "path";
+
+import { ASSETS_FONTS_PATH } from "../../../constants/paths.js";
+import fonts from "../../../design-tokens/fonts.js";
+
+const getFontUrl = (src) => path.join(ASSETS_FONTS_PATH, src);
const fontsToCss = (fonts) => {
return Object.entries(fonts).reduce((css, [, fontProperties]) => {
diff --git a/src/css-utils/font-variables.js b/config/filters/postcss/utils/font-variables.js
similarity index 95%
rename from src/css-utils/font-variables.js
rename to config/filters/postcss/utils/font-variables.js
index 9779bbb..b100180 100644
--- a/src/css-utils/font-variables.js
+++ b/config/filters/postcss/utils/font-variables.js
@@ -1,4 +1,4 @@
-import fonts from "../../config/design-tokens/fonts.js";
+import fonts from "../../../design-tokens/fonts.js";
const fallbacks = [
"-apple-system",
diff --git a/src/css-utils/helper-classes.js b/config/filters/postcss/utils/helper-classes.js
similarity index 100%
rename from src/css-utils/helper-classes.js
rename to config/filters/postcss/utils/helper-classes.js
diff --git a/src/css-utils/spacing.js b/config/filters/postcss/utils/spacing.js
similarity index 96%
rename from src/css-utils/spacing.js
rename to config/filters/postcss/utils/spacing.js
index 8f07f9d..22ae220 100644
--- a/src/css-utils/spacing.js
+++ b/config/filters/postcss/utils/spacing.js
@@ -1,4 +1,4 @@
-import spacing from "../../config/design-tokens/spacing.js";
+import spacing from "../../../design-tokens/spacing.js";
import { helperClassesToCss } from "./helper-classes.js";
const spacingToCss = (variant, value) =>
diff --git a/config/transforms/html-config.js b/config/transforms/html-config.js
index ab76345..2224d2c 100644
--- a/config/transforms/html-config.js
+++ b/config/transforms/html-config.js
@@ -8,7 +8,7 @@ export default function (eleventyConfig) {
collapseWhitespace: true,
decodeEntities: true,
includeAutoGeneratedTags: false,
- minifyCSS: true,
+ minifyCSS: false, // Disabled because of clean-css' lack of nested CSS support
minifyJS: true,
minifyURLs: true,
removeComments: true,
diff --git a/eleventy.config.js b/eleventy.config.js
index b134dcc..6b3c56b 100644
--- a/eleventy.config.js
+++ b/eleventy.config.js
@@ -5,7 +5,6 @@ import { eleventyImageTransformPlugin } from "@11ty/eleventy-img";
import { collectionByTag, postsByTag } from "./config/collections/index.js";
-import { dir } from "./config/constants.js";
import {
allTagCounts,
entries,
@@ -20,6 +19,7 @@ import {
pluralize,
values,
} from "./config/filters/index.js";
+import postcss from "./config/filters/postcss/postcss.js";
import markdown from "./config/plugins/markdown.js";
import liteYoutube from "./config/shortcodes/youtube.js";
@@ -61,6 +61,8 @@ export default function (eleventyConfig) {
eleventyConfig.addFilter("values", values);
eleventyConfig.addFilter("pluralize", pluralize);
+ eleventyConfig.addFilter("postcss", postcss);
+
// --------------------- Custom Transforms -----------------------
eleventyConfig.addPlugin(htmlConfigTransform);
@@ -81,6 +83,12 @@ export default function (eleventyConfig) {
},
failOnError: false,
+
+ cacheOptions: {
+ directory: ".cache",
+ duration: "30d",
+ removeUrlQueryParams: false,
+ },
});
// --------------------- Passthrough File Copy -----------------------
@@ -107,6 +115,12 @@ export default function (eleventyConfig) {
dataTemplateEngine: "njk",
htmlTemplateEngine: "njk",
- dir,
+ dir: {
+ assets: "assets",
+ data: "data",
+ includes: "includes",
+ input: "src",
+ output: "dist",
+ },
};
}
diff --git a/package-lock.json b/package-lock.json
index 48f67ec..4fa9558 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -28,8 +28,8 @@
"markdown-it-image-figures": "^2.1.1",
"markdown-it-prism": "^2.3.0",
"pluralize": "^8.0.0",
- "postcss": "^8.4.33",
- "postcss-import": "^16.0.0",
+ "postcss": "^8.5.3",
+ "postcss-import": "^16.1.0",
"postcss-import-ext-glob": "^2.1.1"
}
},
@@ -2207,10 +2207,11 @@
}
},
"node_modules/fast-sort": {
- "version": "3.4.0",
- "resolved": "https://registry.npmjs.org/fast-sort/-/fast-sort-3.4.0.tgz",
- "integrity": "sha512-c/cMBGA5mH3OYjaXedtLIM3hQjv+KuZuiD2QEH5GofNOZeQVDIYIN7Okc2AW1KPhk44g5PTZnXp8t2lOMl8qhQ==",
- "dev": true
+ "version": "3.4.1",
+ "resolved": "https://registry.npmjs.org/fast-sort/-/fast-sort-3.4.1.tgz",
+ "integrity": "sha512-76uvGPsF6So53sZAqenP9UVT3p5l7cyTHkLWVCMinh41Y8NDrK1IYXJgaBMfc1gk7nJiSRZp676kddFG2Aa5+A==",
+ "dev": true,
+ "license": "MIT"
},
"node_modules/fastq": {
"version": "1.17.1",
@@ -3107,9 +3108,9 @@
"dev": true
},
"node_modules/nanoid": {
- "version": "3.3.7",
- "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz",
- "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==",
+ "version": "3.3.10",
+ "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.10.tgz",
+ "integrity": "sha512-vSJJTG+t/dIKAUhUDw/dLdZ9s//5OxcHqLaDWWrW4Cdq7o6tdLIczUkMXt2MBNmk6sJRZBZRXVixs7URY1CmIg==",
"dev": true,
"funding": [
{
@@ -3117,6 +3118,7 @@
"url": "https://github.com/sponsors/ai"
}
],
+ "license": "MIT",
"bin": {
"nanoid": "bin/nanoid.cjs"
},
@@ -3438,10 +3440,11 @@
}
},
"node_modules/picocolors": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
- "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==",
- "dev": true
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
+ "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==",
+ "dev": true,
+ "license": "ISC"
},
"node_modules/picomatch": {
"version": "2.3.1",
@@ -3483,9 +3486,9 @@
}
},
"node_modules/postcss": {
- "version": "8.4.35",
- "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.35.tgz",
- "integrity": "sha512-u5U8qYpBCpN13BsiEB0CbR1Hhh4Gc0zLFuedrHJKMctHCHAGrMdG0PRM/KErzAL3CU6/eckEtmHNB3x6e3c0vA==",
+ "version": "8.5.3",
+ "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.3.tgz",
+ "integrity": "sha512-dle9A3yYxlBSrt8Fu+IpjGT8SY8hN0mlaA6GY8t0P5PjIOZemULz/E2Bnm/2dcUOena75OTNkHI76uZBNUUq3A==",
"dev": true,
"funding": [
{
@@ -3501,10 +3504,11 @@
"url": "https://github.com/sponsors/ai"
}
],
+ "license": "MIT",
"dependencies": {
- "nanoid": "^3.3.7",
- "picocolors": "^1.0.0",
- "source-map-js": "^1.0.2"
+ "nanoid": "^3.3.8",
+ "picocolors": "^1.1.1",
+ "source-map-js": "^1.2.1"
},
"engines": {
"node": "^10 || ^12 || >=14"
@@ -3609,10 +3613,11 @@
}
},
"node_modules/postcss-import": {
- "version": "16.0.0",
- "resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-16.0.0.tgz",
- "integrity": "sha512-e77lhVvrD1I2y7dYmBv0k9ULTdArgEYZt97T4w6sFIU5uxIHvDFQlKgUUyY7v7Barj0Yf/zm5A4OquZN7jKm5Q==",
+ "version": "16.1.0",
+ "resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-16.1.0.tgz",
+ "integrity": "sha512-7hsAZ4xGXl4MW+OKEWCnF6T5jqBw80/EE9aXg1r2yyn1RsVEU8EtKXbijEODa+rg7iih4bKf7vlvTGYR4CnPNg==",
"dev": true,
+ "license": "MIT",
"dependencies": {
"postcss-value-parser": "^4.0.0",
"read-cache": "^1.0.0",
@@ -3630,6 +3635,7 @@
"resolved": "https://registry.npmjs.org/postcss-import-ext-glob/-/postcss-import-ext-glob-2.1.1.tgz",
"integrity": "sha512-qd4ELOx2G0hyjgtmLnf/fSVJXXPhkcxcxhLT1y1mAnk53JYbMLoGg+AFtnJowOSvnv4CvjPAzpLpAcfWeofP5g==",
"dev": true,
+ "license": "MIT",
"dependencies": {
"fast-glob": "^3.2.12",
"fast-sort": "^3.2.0",
@@ -4429,10 +4435,11 @@
}
},
"node_modules/source-map-js": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
- "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==",
+ "version": "1.2.1",
+ "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz",
+ "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==",
"dev": true,
+ "license": "BSD-3-Clause",
"engines": {
"node": ">=0.10.0"
}
@@ -6383,9 +6390,9 @@
}
},
"fast-sort": {
- "version": "3.4.0",
- "resolved": "https://registry.npmjs.org/fast-sort/-/fast-sort-3.4.0.tgz",
- "integrity": "sha512-c/cMBGA5mH3OYjaXedtLIM3hQjv+KuZuiD2QEH5GofNOZeQVDIYIN7Okc2AW1KPhk44g5PTZnXp8t2lOMl8qhQ==",
+ "version": "3.4.1",
+ "resolved": "https://registry.npmjs.org/fast-sort/-/fast-sort-3.4.1.tgz",
+ "integrity": "sha512-76uvGPsF6So53sZAqenP9UVT3p5l7cyTHkLWVCMinh41Y8NDrK1IYXJgaBMfc1gk7nJiSRZp676kddFG2Aa5+A==",
"dev": true
},
"fastq": {
@@ -7055,9 +7062,9 @@
"dev": true
},
"nanoid": {
- "version": "3.3.7",
- "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz",
- "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==",
+ "version": "3.3.10",
+ "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.10.tgz",
+ "integrity": "sha512-vSJJTG+t/dIKAUhUDw/dLdZ9s//5OxcHqLaDWWrW4Cdq7o6tdLIczUkMXt2MBNmk6sJRZBZRXVixs7URY1CmIg==",
"dev": true
},
"no-case": {
@@ -7293,9 +7300,9 @@
}
},
"picocolors": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
- "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==",
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
+ "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==",
"dev": true
},
"picomatch": {
@@ -7326,14 +7333,14 @@
"dev": true
},
"postcss": {
- "version": "8.4.35",
- "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.35.tgz",
- "integrity": "sha512-u5U8qYpBCpN13BsiEB0CbR1Hhh4Gc0zLFuedrHJKMctHCHAGrMdG0PRM/KErzAL3CU6/eckEtmHNB3x6e3c0vA==",
+ "version": "8.5.3",
+ "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.3.tgz",
+ "integrity": "sha512-dle9A3yYxlBSrt8Fu+IpjGT8SY8hN0mlaA6GY8t0P5PjIOZemULz/E2Bnm/2dcUOena75OTNkHI76uZBNUUq3A==",
"dev": true,
"requires": {
- "nanoid": "^3.3.7",
- "picocolors": "^1.0.0",
- "source-map-js": "^1.0.2"
+ "nanoid": "^3.3.8",
+ "picocolors": "^1.1.1",
+ "source-map-js": "^1.2.1"
}
},
"postcss-calc": {
@@ -7397,9 +7404,9 @@
"requires": {}
},
"postcss-import": {
- "version": "16.0.0",
- "resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-16.0.0.tgz",
- "integrity": "sha512-e77lhVvrD1I2y7dYmBv0k9ULTdArgEYZt97T4w6sFIU5uxIHvDFQlKgUUyY7v7Barj0Yf/zm5A4OquZN7jKm5Q==",
+ "version": "16.1.0",
+ "resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-16.1.0.tgz",
+ "integrity": "sha512-7hsAZ4xGXl4MW+OKEWCnF6T5jqBw80/EE9aXg1r2yyn1RsVEU8EtKXbijEODa+rg7iih4bKf7vlvTGYR4CnPNg==",
"dev": true,
"requires": {
"postcss-value-parser": "^4.0.0",
@@ -7960,9 +7967,9 @@
"dev": true
},
"source-map-js": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
- "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==",
+ "version": "1.2.1",
+ "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz",
+ "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==",
"dev": true
},
"source-map-support": {
diff --git a/package.json b/package.json
index 0308c13..7c52c26 100644
--- a/package.json
+++ b/package.json
@@ -31,8 +31,8 @@
"markdown-it-image-figures": "^2.1.1",
"markdown-it-prism": "^2.3.0",
"pluralize": "^8.0.0",
- "postcss": "^8.4.33",
- "postcss-import": "^16.0.0",
+ "postcss": "^8.5.3",
+ "postcss-import": "^16.1.0",
"postcss-import-ext-glob": "^2.1.1"
}
}
diff --git a/src/css/styles.11ty.js b/src/css/styles.11ty.js
deleted file mode 100644
index c5b6d0f..0000000
--- a/src/css/styles.11ty.js
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Implementation sourced from eleventyone starter kit
- * https://github.com/philhawksworth/eleventyone
- * ---
- * https://github.com/philhawksworth/eleventyone/blob/master/src/site/css/styles.11ty.js
- */
-
-import fs from "fs";
-import postcss from "postcss";
-import postcssImport from "postcss-import";
-import postcssImportExtGlob from "postcss-import-ext-glob";
-import autoprefixer from "autoprefixer";
-import cssnano from "cssnano";
-import { posix as path } from "path";
-import { fileURLToPath } from "url";
-
-import colors from "../css-utils/colors.js";
-import fontFamily from "../css-utils/font-family.js";
-import fontVariables from "../css-utils/font-variables.js";
-import spacing from "../css-utils/spacing.js";
-
-export default class {
- async data() {
- const dirname = path.dirname(fileURLToPath(import.meta.url));
- const rawFilepath = path.join(dirname, "./global.css");
- const rawCss = fs.readFileSync(rawFilepath);
-
- const css = `${rawCss}${fontFamily}${fontVariables}${colors}${spacing}`;
-
- return {
- permalink: `css/styles.css`,
- excludeFromSitemap: true,
- eleventyExcludeFromCollections: true,
- rawFilepath,
- rawCss: css,
- };
- }
-
- async render({ rawCss, rawFilepath }) {
- return await postcss([
- postcssImportExtGlob,
- postcssImport,
- autoprefixer,
- cssnano,
- ])
- .process(rawCss, { from: rawFilepath })
- .then((result) => result.css);
- }
-}
diff --git a/src/_data/blogroll.js b/src/data/blogroll.js
similarity index 100%
rename from src/_data/blogroll.js
rename to src/data/blogroll.js
diff --git a/src/_data/letterboxd.js b/src/data/letterboxd.js
similarity index 100%
rename from src/_data/letterboxd.js
rename to src/data/letterboxd.js
diff --git a/src/_data/meta.js b/src/data/meta.js
similarity index 100%
rename from src/_data/meta.js
rename to src/data/meta.js
diff --git a/src/_data/navigation.js b/src/data/navigation.js
similarity index 100%
rename from src/_data/navigation.js
rename to src/data/navigation.js
diff --git a/src/_data/preloads.js b/src/data/preloads.js
similarity index 72%
rename from src/_data/preloads.js
rename to src/data/preloads.js
index 8640fdb..4f6f3a9 100644
--- a/src/_data/preloads.js
+++ b/src/data/preloads.js
@@ -1,6 +1,10 @@
-import { getFontUrl } from "../utils/fonts.js";
+import path from "path";
+
+import { ASSETS_FONTS_PATH } from "../../config/constants/paths.js";
import fonts from "../../config/design-tokens/fonts.js";
+const getFontUrl = (src) => path.join(ASSETS_FONTS_PATH, src);
+
const preloads = [
{
as: "font",
diff --git a/src/_data/robots.js b/src/data/robots.js
similarity index 100%
rename from src/_data/robots.js
rename to src/data/robots.js
diff --git a/src/css/blocks/button.css b/src/includes/css/blocks/button.css
similarity index 100%
rename from src/css/blocks/button.css
rename to src/includes/css/blocks/button.css
diff --git a/src/css/blocks/card.css b/src/includes/css/blocks/card.css
similarity index 100%
rename from src/css/blocks/card.css
rename to src/includes/css/blocks/card.css
diff --git a/src/css/blocks/catalogue.css b/src/includes/css/blocks/catalogue.css
similarity index 100%
rename from src/css/blocks/catalogue.css
rename to src/includes/css/blocks/catalogue.css
diff --git a/src/css/blocks/image-placeholder.css b/src/includes/css/blocks/image-placeholder.css
similarity index 100%
rename from src/css/blocks/image-placeholder.css
rename to src/includes/css/blocks/image-placeholder.css
diff --git a/src/css/blocks/media-display.css b/src/includes/css/blocks/media-display.css
similarity index 100%
rename from src/css/blocks/media-display.css
rename to src/includes/css/blocks/media-display.css
diff --git a/src/css/blocks/media-grid.css b/src/includes/css/blocks/media-grid.css
similarity index 100%
rename from src/css/blocks/media-grid.css
rename to src/includes/css/blocks/media-grid.css
diff --git a/src/css/blocks/now.css b/src/includes/css/blocks/now.css
similarity index 100%
rename from src/css/blocks/now.css
rename to src/includes/css/blocks/now.css
diff --git a/src/css/blocks/pill.css b/src/includes/css/blocks/pill.css
similarity index 100%
rename from src/css/blocks/pill.css
rename to src/includes/css/blocks/pill.css
diff --git a/src/css/blocks/posts.css b/src/includes/css/blocks/posts.css
similarity index 100%
rename from src/css/blocks/posts.css
rename to src/includes/css/blocks/posts.css
diff --git a/src/css/blocks/prism.css b/src/includes/css/blocks/prism.css
similarity index 100%
rename from src/css/blocks/prism.css
rename to src/includes/css/blocks/prism.css
diff --git a/src/css/blocks/site-header.css b/src/includes/css/blocks/site-header.css
similarity index 100%
rename from src/css/blocks/site-header.css
rename to src/includes/css/blocks/site-header.css
diff --git a/src/css/blocks/site-logo.css b/src/includes/css/blocks/site-logo.css
similarity index 100%
rename from src/css/blocks/site-logo.css
rename to src/includes/css/blocks/site-logo.css
diff --git a/src/css/blocks/stars.css b/src/includes/css/blocks/stars.css
similarity index 100%
rename from src/css/blocks/stars.css
rename to src/includes/css/blocks/stars.css
diff --git a/src/css/compositions/cluster.css b/src/includes/css/compositions/cluster.css
similarity index 100%
rename from src/css/compositions/cluster.css
rename to src/includes/css/compositions/cluster.css
diff --git a/src/css/compositions/repel.css b/src/includes/css/compositions/repel.css
similarity index 100%
rename from src/css/compositions/repel.css
rename to src/includes/css/compositions/repel.css
diff --git a/src/css/compositions/switcher.css b/src/includes/css/compositions/switcher.css
similarity index 100%
rename from src/css/compositions/switcher.css
rename to src/includes/css/compositions/switcher.css
diff --git a/src/css/global/global-styles.css b/src/includes/css/global/global-styles.css
similarity index 100%
rename from src/css/global/global-styles.css
rename to src/includes/css/global/global-styles.css
diff --git a/src/css/global/reset.css b/src/includes/css/global/reset.css
similarity index 100%
rename from src/css/global/reset.css
rename to src/includes/css/global/reset.css
diff --git a/src/css/global/variables.css b/src/includes/css/global/variables.css
similarity index 100%
rename from src/css/global/variables.css
rename to src/includes/css/global/variables.css
diff --git a/src/css/global.css b/src/includes/css/styles.css
similarity index 100%
rename from src/css/global.css
rename to src/includes/css/styles.css
diff --git a/src/css/utilities/flex.css b/src/includes/css/utilities/flex.css
similarity index 100%
rename from src/css/utilities/flex.css
rename to src/includes/css/utilities/flex.css
diff --git a/src/css/utilities/flow.css b/src/includes/css/utilities/flow.css
similarity index 100%
rename from src/css/utilities/flow.css
rename to src/includes/css/utilities/flow.css
diff --git a/src/css/utilities/fonts.css b/src/includes/css/utilities/fonts.css
similarity index 100%
rename from src/css/utilities/fonts.css
rename to src/includes/css/utilities/fonts.css
diff --git a/src/css/utilities/image.css b/src/includes/css/utilities/image.css
similarity index 100%
rename from src/css/utilities/image.css
rename to src/includes/css/utilities/image.css
diff --git a/src/css/utilities/list.css b/src/includes/css/utilities/list.css
similarity index 100%
rename from src/css/utilities/list.css
rename to src/includes/css/utilities/list.css
diff --git a/src/css/utilities/table.css b/src/includes/css/utilities/table.css
similarity index 100%
rename from src/css/utilities/table.css
rename to src/includes/css/utilities/table.css
diff --git a/src/css/utilities/visually-hidden.css b/src/includes/css/utilities/visually-hidden.css
similarity index 100%
rename from src/css/utilities/visually-hidden.css
rename to src/includes/css/utilities/visually-hidden.css
diff --git a/src/css/utilities/wrapper.css b/src/includes/css/utilities/wrapper.css
similarity index 100%
rename from src/css/utilities/wrapper.css
rename to src/includes/css/utilities/wrapper.css
diff --git a/src/_includes/layouts/base.html b/src/includes/layouts/base.html
similarity index 89%
rename from src/_includes/layouts/base.html
rename to src/includes/layouts/base.html
index dc9c2ce..0fa8c82 100644
--- a/src/_includes/layouts/base.html
+++ b/src/includes/layouts/base.html
@@ -8,7 +8,6 @@
{% if title %}{{ title }} •{% endif %}
{{ meta.siteName }}
-
{% include "partials/meta.html" %}
{% for preload in preloads %}
{% endif %}
+ {% set css %}
+ {% include "css/styles.css" %}
+ {% endset %}
+
{% noRobots %}
diff --git a/src/_includes/layouts/book.html b/src/includes/layouts/book.html
similarity index 100%
rename from src/_includes/layouts/book.html
rename to src/includes/layouts/book.html
diff --git a/src/_includes/layouts/game.html b/src/includes/layouts/game.html
similarity index 100%
rename from src/_includes/layouts/game.html
rename to src/includes/layouts/game.html
diff --git a/src/_includes/layouts/movie.html b/src/includes/layouts/movie.html
similarity index 100%
rename from src/_includes/layouts/movie.html
rename to src/includes/layouts/movie.html
diff --git a/src/_includes/layouts/post.html b/src/includes/layouts/post.html
similarity index 100%
rename from src/_includes/layouts/post.html
rename to src/includes/layouts/post.html
diff --git a/src/_includes/layouts/show.html b/src/includes/layouts/show.html
similarity index 100%
rename from src/_includes/layouts/show.html
rename to src/includes/layouts/show.html
diff --git a/src/_includes/macros/date.njk b/src/includes/macros/date.njk
similarity index 100%
rename from src/_includes/macros/date.njk
rename to src/includes/macros/date.njk
diff --git a/src/_includes/macros/media-grid.njk b/src/includes/macros/media-grid.njk
similarity index 100%
rename from src/_includes/macros/media-grid.njk
rename to src/includes/macros/media-grid.njk
diff --git a/src/_includes/macros/posts.njk b/src/includes/macros/posts.njk
similarity index 100%
rename from src/_includes/macros/posts.njk
rename to src/includes/macros/posts.njk
diff --git a/src/_includes/macros/tags.njk b/src/includes/macros/tags.njk
similarity index 100%
rename from src/_includes/macros/tags.njk
rename to src/includes/macros/tags.njk
diff --git a/src/_includes/macros/utils.njk b/src/includes/macros/utils.njk
similarity index 100%
rename from src/_includes/macros/utils.njk
rename to src/includes/macros/utils.njk
diff --git a/src/_includes/partials/footer.html b/src/includes/partials/footer.html
similarity index 100%
rename from src/_includes/partials/footer.html
rename to src/includes/partials/footer.html
diff --git a/src/_includes/partials/header.html b/src/includes/partials/header.html
similarity index 100%
rename from src/_includes/partials/header.html
rename to src/includes/partials/header.html
diff --git a/src/_includes/partials/menu.html b/src/includes/partials/menu.html
similarity index 100%
rename from src/_includes/partials/menu.html
rename to src/includes/partials/menu.html
diff --git a/src/_includes/partials/meta.html b/src/includes/partials/meta.html
similarity index 100%
rename from src/_includes/partials/meta.html
rename to src/includes/partials/meta.html
diff --git a/src/_includes/svgs/arrow-left.svg b/src/includes/svgs/arrow-left.svg
similarity index 100%
rename from src/_includes/svgs/arrow-left.svg
rename to src/includes/svgs/arrow-left.svg
diff --git a/src/_includes/svgs/arrow-right.svg b/src/includes/svgs/arrow-right.svg
similarity index 100%
rename from src/_includes/svgs/arrow-right.svg
rename to src/includes/svgs/arrow-right.svg
diff --git a/src/_includes/svgs/book.svg b/src/includes/svgs/book.svg
similarity index 100%
rename from src/_includes/svgs/book.svg
rename to src/includes/svgs/book.svg
diff --git a/src/_includes/svgs/calendar.svg b/src/includes/svgs/calendar.svg
similarity index 100%
rename from src/_includes/svgs/calendar.svg
rename to src/includes/svgs/calendar.svg
diff --git a/src/_includes/svgs/circle-info.svg b/src/includes/svgs/circle-info.svg
similarity index 100%
rename from src/_includes/svgs/circle-info.svg
rename to src/includes/svgs/circle-info.svg
diff --git a/src/_includes/svgs/dice.svg b/src/includes/svgs/dice.svg
similarity index 100%
rename from src/_includes/svgs/dice.svg
rename to src/includes/svgs/dice.svg
diff --git a/src/_includes/svgs/frame.svg b/src/includes/svgs/frame.svg
similarity index 100%
rename from src/_includes/svgs/frame.svg
rename to src/includes/svgs/frame.svg
diff --git a/src/_includes/svgs/game-controller.svg b/src/includes/svgs/game-controller.svg
similarity index 100%
rename from src/_includes/svgs/game-controller.svg
rename to src/includes/svgs/game-controller.svg
diff --git a/src/_includes/svgs/link.svg b/src/includes/svgs/link.svg
similarity index 100%
rename from src/_includes/svgs/link.svg
rename to src/includes/svgs/link.svg
diff --git a/src/_includes/svgs/list.svg b/src/includes/svgs/list.svg
similarity index 100%
rename from src/_includes/svgs/list.svg
rename to src/includes/svgs/list.svg
diff --git a/src/_includes/svgs/rss.svg b/src/includes/svgs/rss.svg
similarity index 100%
rename from src/_includes/svgs/rss.svg
rename to src/includes/svgs/rss.svg
diff --git a/src/_includes/svgs/social-github.svg b/src/includes/svgs/social-github.svg
similarity index 100%
rename from src/_includes/svgs/social-github.svg
rename to src/includes/svgs/social-github.svg
diff --git a/src/_includes/svgs/social-mastodon.svg b/src/includes/svgs/social-mastodon.svg
similarity index 100%
rename from src/_includes/svgs/social-mastodon.svg
rename to src/includes/svgs/social-mastodon.svg
diff --git a/src/_includes/svgs/star-empty.svg b/src/includes/svgs/star-empty.svg
similarity index 100%
rename from src/_includes/svgs/star-empty.svg
rename to src/includes/svgs/star-empty.svg
diff --git a/src/_includes/svgs/star.svg b/src/includes/svgs/star.svg
similarity index 100%
rename from src/_includes/svgs/star.svg
rename to src/includes/svgs/star.svg
diff --git a/src/_includes/svgs/triangle-exclamation.svg b/src/includes/svgs/triangle-exclamation.svg
similarity index 100%
rename from src/_includes/svgs/triangle-exclamation.svg
rename to src/includes/svgs/triangle-exclamation.svg
diff --git a/src/_includes/svgs/tv-retro.svg b/src/includes/svgs/tv-retro.svg
similarity index 100%
rename from src/_includes/svgs/tv-retro.svg
rename to src/includes/svgs/tv-retro.svg
diff --git a/src/_includes/svgs/user.svg b/src/includes/svgs/user.svg
similarity index 100%
rename from src/_includes/svgs/user.svg
rename to src/includes/svgs/user.svg
diff --git a/src/utils/fonts.js b/src/utils/fonts.js
deleted file mode 100644
index aa74de0..0000000
--- a/src/utils/fonts.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import path from "path";
-
-export const getFontUrl = (src) => path.join("/assets/fonts", src);