osmarks/website
1
0
Fork 0
mirror of https://github.com/osmarks/website synced 2025-07-04 11:02:51 +00:00
Code Issues Releases Wiki Activity

fix og:url

Browse Source
This commit is contained in:
osmarks 2025-02-06 21:59:39 +00:00
parent f8c2de3365
commit cc29431570
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/index.js
View File

@ -240,8 +240,10 @@ const applyTemplate = async (template, input, getOutput, options = {}) => {
const page = parseFrontMatter(await readFile(input)) const page = parseFrontMatter(await readFile(input))
if (options.processMeta) { options.processMeta(page.data, page) } if (options.processMeta) { options.processMeta(page.data, page) }
if (options.processContent) { page.originalContent = page.content; page.content = options.processContent(page.content) } if (options.processContent) { page.originalContent = page.content; page.content = options.processContent(page.content) }
const rendered = template({ ...globalData, ...page.data, content: page.content }) const output = await getOutput(page)
await fsp.writeFile(await getOutput(page), minifyHTML(rendered)) 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 page.data.full = page
return page.data return page.data
} }
@ -333,7 +335,8 @@ const processBlog = async () => {
await fse.ensureDir(out) await fse.ensureDir(out)
await fsp.writeFile(path.join(out, "index.html"), globalData.templates.blogPost({ await fsp.writeFile(path.join(out, "index.html"), globalData.templates.blogPost({
...globalData, ...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 writeBuildID = () => fsp.writeFile(path.join(outDir, "buildID.txt"), buildID)
const index = async () => { 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) await fsp.writeFile(path.join(outDir, "index.html"), index)
} }

2
templates/layout.pug
View File

@ -24,7 +24,7 @@ html(lang="en")
meta(property="og:description", content=description) meta(property="og:description", content=description)
meta(property="og:title", content=title) meta(property="og:title", content=title)
meta(property="og:type", content="website") 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) meta(property="og:site_name", content=name)
link(rel="manifest", href="/assets/manifest.webmanifest") link(rel="manifest", href="/assets/manifest.webmanifest")
link(rel="shortcut icon", href="/assets/images/logo256.png", type="image/png") link(rel="shortcut icon", href="/assets/images/logo256.png", type="image/png")