From cc29431570829fc19c8441b29f903de709fa01f0 Mon Sep 17 00:00:00 2001 From: osmarks Date: Thu, 6 Feb 2025 21:59:39 +0000 Subject: [PATCH] fix og:url --- src/index.js | 11 +++++++---- templates/layout.pug | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/index.js b/src/index.js index 90e0905..cec0b56 100644 --- a/src/index.js +++ b/src/index.js @@ -240,8 +240,10 @@ const applyTemplate = async (template, input, getOutput, options = {}) => { const page = parseFrontMatter(await readFile(input)) if (options.processMeta) { options.processMeta(page.data, page) } if (options.processContent) { page.originalContent = page.content; page.content = options.processContent(page.content) } - const rendered = template({ ...globalData, ...page.data, content: page.content }) - await fsp.writeFile(await getOutput(page), minifyHTML(rendered)) + const output = await getOutput(page) + const urlPath = "/" + path.relative(outDir, output).replace(/index\.html$/, "") + const rendered = template({ ...globalData, ...page.data, content: page.content, path: output.replace(/index\.html$/, "") }) + await fsp.writeFile(output, minifyHTML(rendered)) page.data.full = page return page.data } @@ -333,7 +335,8 @@ const processBlog = async () => { await fse.ensureDir(out) await fsp.writeFile(path.join(out, "index.html"), globalData.templates.blogPost({ ...globalData, - ...page + ...page, + path: `/${page.slug}/` // TODO: inelegant })) } @@ -365,7 +368,7 @@ globalData.metricPrefix = applyMetricPrefix const writeBuildID = () => fsp.writeFile(path.join(outDir, "buildID.txt"), buildID) const index = async () => { - const index = globalData.templates.index({ ...globalData, title: "Index", posts: globalData.blog, description: globalData.siteDescription }) + const index = globalData.templates.index({ ...globalData, title: "Index", posts: globalData.blog, description: globalData.siteDescription, path: "/" }) await fsp.writeFile(path.join(outDir, "index.html"), index) } diff --git a/templates/layout.pug b/templates/layout.pug index 12977a1..a4387ae 100644 --- a/templates/layout.pug +++ b/templates/layout.pug @@ -24,7 +24,7 @@ html(lang="en") meta(property="og:description", content=description) meta(property="og:title", content=title) meta(property="og:type", content="website") - meta(property="og:url", content=`https://${domain}`) + meta(property="og:url", content=`https://${domain}${path}`) meta(property="og:site_name", content=name) link(rel="manifest", href="/assets/manifest.webmanifest") link(rel="shortcut icon", href="/assets/images/logo256.png", type="image/png")