vowel 0.1.20 → 0.1.22

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "vowel",
-	"version": "0.1.20",
+	"version": "0.1.22",
 	"bin": "./bin.js",
 	"scripts": {
 		"dev": "vite dev",

package/src/lib/components/DefaultStyles.svelte

@@ -269,6 +269,10 @@
 			order: -1;
 		}
 
+		article.thumbnail dl.link {
+			display: none;
+		}
+
 		aside.note {
 			&.note {
 				--icon: 'ℹ️';

package/src/lib/components/Frontmatter.svelte

@@ -24,7 +24,8 @@
 		'date',
 		'image',
 		'breadcrumb',
-		'imputedProperties'
+		'imputedProperties',
+		'toc'
 	];
 
 	// const { website } = $page.data;

package/src/lib/components/Markdown/LinkPreview.svelte

@@ -1,10 +1,10 @@
 <script>
 	let { metadata, url, format } = $props();
-	let { image, description, author } = $derived(metadata || {});
+	let { image, description, og_description, author } = $derived(metadata || {});
 
-	const href = $derived(metadata?.ogURL || metadata?.canonicalURL || url || '');
+	const href = $derived(metadata?.og_url || metadata?.canonical || url || '');
 
-	const title = $derived(metadata?.ogTitle || metadata?.title || '');
+	const title = $derived(metadata?.og_title || metadata?.title || '');
 
 	const urlObject = new URL(url);
 </script>
@@ -24,9 +24,9 @@
 						By {author}
 					</p>
 				{/if}
-				{#if description}
+				{#if description || og_description}
 					<p>
-						{description}
+						{description || og_description}
 					</p>
 				{/if}
 			</a>

package/src/lib/utilities/mutateMarkdownFrontmatter.js

@@ -81,15 +81,29 @@ export default async function mutateMarkdownFrontmatter(frontmatter, cache) {
 							includeResponseBody: false,
 							ensureSecureImageRequest: true
 						});
-						cache[input] = metadata;
+
+						const selectedMetadata = {
+							url: metadata.url,
+							canonical: metadata.canonical,
+							title: metadata.title,
+							image: metadata.image,
+							favicons: url.favicons,
+							og_url: url['og:url'],
+							og_title: url['og:title'],
+							og_description: url['og:description'],
+							og_site_name: url['og:side_name'],
+							og_image: url['og:image']
+						};
+
+						cache[input] = selectedMetadata;
 
 						frontmatter[key] = {
 							type: 'url',
-							output: metadata,
+							output: selectedMetadata,
 							input
 						};
 					} catch (e) {
-						// console.error(`Error on URL in frontmatter: ${frontmatter[key]}`);
+						console.error(`Error on URL in frontmatter: ${frontmatter[key]}`);
 						frontmatter[key] = {
 							type: 'string',
 							output: input,

package/src/lib/utilities/writeCache.js

@@ -2,6 +2,7 @@ import fs from 'fs/promises';
 import { resolveHomeDirPath } from '.';
 
 export default async function writeCache(data, homeDir) {
+	console.log({ data });
 	const cachePath = resolveHomeDirPath('.cache.json', homeDir);
 
 	try {

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

@@ -29,7 +29,9 @@ async function checkFileExists(filePath, homeDir) {
 export async function load() {
 	// const startLoad = performance.now();
 
-	const initialURLCache = await loadCache($home[0]);
+	const hotURLCache = await loadCache($home[0]);
+
+	const initialURLCache = JSON.parse(JSON.stringify(hotURLCache));
 
 	const cssExists = await checkFileExists(normalize('/assets/styles.css'), $home[0]);
 
@@ -56,15 +58,15 @@ export async function load() {
 		data = contentCache;
 	} else {
 		console.log('Not using content cache');
-		data = await processMarkdownFiles(initialURLCache);
+		data = await processMarkdownFiles(hotURLCache);
 		if ($build[0]) contentCache = data;
 	}
 
 	// const { folder: website, finalCache } = await processMarkdownFiles(initialCache);
-	const { folder: website, finalCache } = data;
+	const { folder: website } = data;
 
-	if (JSON.stringify(initialURLCache) !== JSON.stringify(finalCache)) {
-		writeCache(finalCache, $home[0]);
+	if (JSON.stringify(initialURLCache) !== JSON.stringify(hotURLCache)) {
+		writeCache(hotURLCache, $home[0]);
 	}
 
 	// console.log(`Load time: ${(performance.now() - startLoad).toFixed(2)} ms`);

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

@@ -19,5 +19,9 @@ export async function entries() {
 		return { path: page.url?.replace('/', '') };
 	});
 
+	pages.push({ path: '404' });
+
+	console.log({ pages });
+
 	return pages;
 }

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

@@ -27,8 +27,6 @@
 
 	const { website, folderName } = $derived(data);
 
-	throw error(404, { message: 'Page not found', ...data });
-
 	const { slogan, theme } = $derived(website._);
 
 	// Import CSS for HMR in dev mode
@@ -38,8 +36,8 @@
 
 	const page = $derived(getPage(website, data.path));
 
-	if (!page) {
-		error(404, 'Page not found');
+	if (!page || page.url === '/404') {
+		throw error(404, { message: 'Page not found', ...data });
 	}
 
 	const websiteTitle = data.website._.title || data.folderName;

package/svelte.config.js

@@ -22,7 +22,7 @@ const config = {
 		},
 		prerender: {
 			handleHttpError: 'warn',
-			entries: ['*', '/', '/robots.txt', '/sitemap.xml', '/feed.xml']
+			entries: ['*', '/', '/robots.txt', '/sitemap.xml', '/feed.xml', '/404']
 		}
 	}
 };