diff --git a/bun.lockb b/bun.lockb index 7c6c0129..353dd2ab 100644 Binary files a/bun.lockb and b/bun.lockb differ diff --git a/eleventy.config.js b/eleventy.config.js index 8724e893..3757897d 100644 --- a/eleventy.config.js +++ b/eleventy.config.js @@ -3,7 +3,6 @@ import pluginRss from "@11ty/eleventy-plugin-rss"; import pluginEleventyNavigation from "@11ty/eleventy-navigation"; import pluginSyntaxHighlight from "@11ty/eleventy-plugin-syntaxhighlight"; import pluginEmbedEverything from "eleventy-plugin-embed-everything"; -import pluginMetagen from "eleventy-plugin-metagen"; import pluginWordcount from "eleventy-plugin-wordcount-extended"; import pluginTOC from "@uncenter/eleventy-plugin-toc"; @@ -20,7 +19,6 @@ export default function(eleventyConfig) { eleventyConfig.addPlugin(pluginEleventyNavigation); eleventyConfig.addPlugin(pluginSyntaxHighlight, { preAttributes: { tabindex: 0 } }); eleventyConfig.addPlugin(pluginEmbedEverything, { add: ['soundcloud'] }); - eleventyConfig.addPlugin(pluginMetagen); eleventyConfig.addPlugin(pluginWordcount); eleventyConfig.addPlugin(pluginTOC, { tags: ['h2', 'h3', 'h4', 'h5', 'h6'], diff --git a/package.json b/package.json index 70a034f1..fa6bb1e7 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,6 @@ "@uncenter/eleventy-plugin-toc": "^1.0.3", "@zachleat/details-utils": "^2.0.2", "eleventy-plugin-embed-everything": "^1.19.0", - "eleventy-plugin-metagen": "^1.8.3", "eleventy-plugin-wordcount-extended": "^0.2.1", "install": "^0.13.0", "markdown-it-anchor": "^9.2.0", diff --git a/src/_includes/global/baselayout.njk b/src/_includes/global/baselayout.njk index 50279ed8..baf84cd3 100644 --- a/src/_includes/global/baselayout.njk +++ b/src/_includes/global/baselayout.njk @@ -1,11 +1,15 @@ - {# Meta data #} + + + + + {# Open Graph Meta #} {% block metaTitle %} {% endblock %} - {% include "global/metagen.njk" %} + {% include "global/meta.njk" %} {# Feeds #} {% include "global/feeds.njk" %} diff --git a/src/_includes/global/meta.njk b/src/_includes/global/meta.njk new file mode 100644 index 00000000..aff7b25f --- /dev/null +++ b/src/_includes/global/meta.njk @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/src/_includes/global/metagen.njk b/src/_includes/global/metagen.njk deleted file mode 100644 index 0ac460d4..00000000 --- a/src/_includes/global/metagen.njk +++ /dev/null @@ -1,10 +0,0 @@ -{% metagen - desc=desc or metadata.desc, - url=sitemeta.siteUrl + page.url, - locale=sitemeta.siteLocale, - name=sitemeta.siteAuthor.name, - site_name=sitemeta.siteName, - img=image, - img_alt=alt, - generator=eleventy.generator -%} diff --git a/src/_includes/misc/base.njk b/src/_includes/misc/base.njk index c086d526..bc9a2236 100644 --- a/src/_includes/misc/base.njk +++ b/src/_includes/misc/base.njk @@ -5,9 +5,9 @@ - {# Meta data #} + {# Open Graph meta #} - {% include "global/metagen.njk" %} + {% include "global/meta.njk" %} {# Feeds #} {% include "global/feeds.njk" %} diff --git a/src/shrines/starwarskotor/resources/resources.11tydata.js b/src/shrines/starwarskotor/resources/resources.11tydata.js index 7e095831..85de0363 100644 --- a/src/shrines/starwarskotor/resources/resources.11tydata.js +++ b/src/shrines/starwarskotor/resources/resources.11tydata.js @@ -2,6 +2,7 @@ export default { tags: ["contents", "kotor resources"], layout: "starwarskotor/content", hasBreadcrumbs: true, + articleElement: true, eleventyComputed: { title: "{{ pageTitle }} | Resources", eleventyNavigation: { diff --git a/src/slashes/statements/colophon.md b/src/slashes/statements/colophon.md index 302112aa..c305c471 100644 --- a/src/slashes/statements/colophon.md +++ b/src/slashes/statements/colophon.md @@ -1,7 +1,7 @@ --- title: Colophon keyword: colophon page -updated: 2024-10-06T18:31:36+0800 +updated: 2024-10-09T02:31:37+0800 toc: true eleventyNavigation: order: 14 @@ -31,7 +31,6 @@ Previously, this website was hosted on [Neocities](https://neocities.org/) until * [@zachleat/details-utils](https://www.npmjs.com/package/@zachleat/details-utils) ### Eleventy Community Plugins -* [eleventy-plugin-metagen](https://www.npmjs.com/package/eleventy-plugin-metagen) * [eleventy-plugin-wordcount-extended](https://www.npmjs.com/package/eleventy-plugin-wordcount-extended) * [eleventy-plugin-embed-everything](https://www.npmjs.com/package/eleventy-plugin-embed-everything) * [@uncenter/eleventy-plugin-toc](https://www.npmjs.com/package/@uncenter/eleventy-plugin-toc)