vowel 0.1.38 → 0.1.40

package/CHANGELOG.md

@@ -2,6 +2,20 @@
 
 All notable changes to this project will be documented in this file. See [commit-and-tag-version](https://github.com/absolute-version/commit-and-tag-version) for commit guidelines.
 
+## [0.1.40](https://github.com/samlfair/vowel/compare/v0.1.39...v0.1.40) (2024-10-17)
+
+
+### Features
+
+* add h-entry microformat markup ([875b509](https://github.com/samlfair/vowel/commit/875b5092e5cf050149114ba31e1972a9c0f1dfa7))
+
+
+### Bug Fixes
+
+* link preview bug ([293f88f](https://github.com/samlfair/vowel/commit/293f88fcb089d70c4d1e9e4c08668f03a6244b63))
+
+## [0.1.39](https://github.com/samlfair/vowel/compare/v0.1.38...v0.1.39) (2024-10-17)
+
 ## [0.1.38](https://github.com/samlfair/vowel/compare/v0.1.37...v0.1.38) (2024-10-17)
 
 ## [0.1.37](https://github.com/samlfair/vowel/compare/v0.1.36...v0.1.37) (2024-10-17)

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "vowel",
-	"version": "0.1.38",
+	"version": "0.1.40",
 	"homepage": "https://vowel.cc",
 	"author": "Sam Littlefair (https://littlefair.ca)",
 	"repository": {

package/src/lib/components/Page.svelte

@@ -4,7 +4,7 @@
 	import { kebabCase } from 'change-case';
 	import Image from './Markdown/Image.svelte';
 
-	let { page, content = true, link, level = 0, website = {}, format = 'html' } = $props();
+	let { page, content = true, link, level = 0, website = {}, format = 'html', webmentions } = $props();
 	let { ast, title, date, image, imputedProperties } = $derived(page || {});
 
 	let headerImage = $derived(image?.output || !content && imputedProperties.image)
@@ -29,7 +29,7 @@
 <!-- Title -->
 {#if title}
 	{#if link && page.url}
-		<h1>
+		<h1 class="p-name">
 			<a href={page.url}>
 				{page.imputedProperties.title || title || page.imputedProperties?.fileName}
 			</a>
@@ -42,7 +42,7 @@
 <!-- Date -->
 {#if link}
 	{#if dateObject}
-		<time datetime={dateObject.toISOString()}>
+		<time class="dt-published" datetime={dateObject.toISOString()}>
 			<a href={page.url}>
 				{dateObject.toLocaleDateString()}
 			</a>
@@ -55,7 +55,7 @@
 <Frontmatter props={{ properties: page, website, format }} />
 
 {#if page?.description || (!content && page?.imputedProperties?.description)}
-	<p class="description">{page?.description || page?.imputedProperties.description}</p>
+	<p class="description p-summary">{page?.description || page?.imputedProperties.description}</p>
 {/if}
 
 {#if format === 'html' && page.toc && headings.length > 1}
@@ -75,7 +75,16 @@
 {/if}
 
 {#if level < 2 && content}
-	<div class="content">
+	<section class="content e-content">
 		<Markdown props={{ ast, level, website, format }} />
-	</div>
+	</section>
 {/if}
+
+{#if level < 2 && content && website._.webmentions && webmentions.children.length}
+	<section class="webmentions">
+		<h2>Webmentions</h2>
+		{#each webmentions.children as webmention}
+			<a href={webmention.url} target="_blank">{webmention.url}</a>
+		{/each}
+	</section>
+{/if}

package/src/lib/utilities/mutateMarkdownAST.js

@@ -33,6 +33,10 @@ export default async function mutateMarkdownAST(ast, cache, webmentions) {
 							ensureSecureImageRequest: true
 						});
 
+						console.log(!!webmentions)
+						console.log({webmentions})
+						console.log(webmentions.find(webmention => webmention.target === url))
+
 						
 						if(webmentions && !webmentions.find(webmention => webmention.target === url)) {
 							webmentions.push({
@@ -67,7 +71,7 @@ export default async function mutateMarkdownAST(ast, cache, webmentions) {
 						node.value = url;
 					}
 				} else {
-					node.metadata = cache[node.value];
+					node.metadata = cache[url];
 				}
 
 			} else if (node.children[0].type === 'image') {

package/src/routes/$vowel/published.json/+server.js

@@ -11,7 +11,6 @@ export const prerender = true;
 
 async function getPublishedData(domain) {
 	try {
-		console.log({domain})
 		const publishedURL = new URL("/$vowel/published.json", domain)
 		const publishedDataResponse = await fetch(publishedURL.href)
 		const publushedDataJSON = await publishedDataResponse.json()
@@ -31,12 +30,13 @@ export async function GET() {
 	const settingsExists = await checkFileExists(settingsPath);
 	if(settingsExists) {
 		settings = await readMarkdownFile(settingsPath)
-		console.log({settings})
 	}
 
 	// Get published articles from live site
 	const publishedData = await getPublishedData(settings.frontmatter.domain)
 
+	console.log({publish: $publish[0]})
+
 	if($publish[0]) {
 		const initialCache = await loadCache($home[0]);
 		

package/src/routes/[...path]/+page.server.js

@@ -3,11 +3,18 @@ import { getPagesByFolder, processMarkdownFiles, loadCache } from '../../lib/uti
 export const prerender = true;
 
 /** @type {import('./$types').PageLoad} */
-export async function load({ params }) {
+export async function load({ params, parent }) {
+	const { website } = await parent()
+	const url = new URL(params.path, website._.domain)
+	
+	const webmentionTarget = params.path === "" ? url.origin : url.href
+
+	const webmentions = await (await fetch(`https://webmention.io/api/mentions.jf2?target=${webmentionTarget}`)).json()
+
 	const { path } = params;
 	const segments = path ? params.path.split('/') : [];
 
-	return { path, segments };
+	return { path, segments, webmentions };
 }
 
 export async function entries() {

package/src/routes/[...path]/+page.svelte

@@ -173,8 +173,8 @@
 			<Breadcrumbs level={0} />
 		</nav>
 	</header>
-	<main>
-		<Page level={0} {page} {website} path={data.path} />
+	<main class="h-entry">
+		<Page level={0} {page} {website} path={data.path} webmentions={data.webmentions} />
 	</main>
 	<nav class="sidebar">
 		<Sitemap section={website} segments={data.path.split('/')} root />