vowel 0.1.6 → 0.1.8

package/package.json

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

package/server.js

@@ -13,8 +13,11 @@ const __dirname = fileURLToPath(new URL('.', import.meta.url));
 // If this is not a build, read the process argument
 const arg = !isBuild ? process.argv[2] : false;
 
+console.log({ directory });
+console.log({ process: process.cwd() });
+
 // Check if this is a user (process argument) or package dev (cwd)
-const $home = isBuild ? join(process.cwd(), 'content') : directory;
+const $home = isBuild ? process.cwd() : directory;
 
 const define = {
 	$home

package/src/lib/components/Nav.svelte

@@ -7,7 +7,7 @@
 	function filterFolder(folder) {
 		const filteredFolder = {};
 		for (let key in folder) {
-			if (!folder[key]['$']?.date && !key.startsWith('$')) {
+			if ((!folder[key]['$']?.date && !key.startsWith('$')) || key.length === 1) {
 				filteredFolder[key] = folder[key];
 			}
 		}
@@ -20,14 +20,14 @@
 {#if Object.keys(evergreen).some((key) => key !== '$' && key !== '_')}
 	<nav class="top-bar">
 		{#if !child}
-			<a aria-current={isActiveLink(segments)} href={evergreen['$']?.url}
+			<a aria-current={isActiveLink(segments)} href={evergreen?.url || evergreen['$']?.url}
 				>{getFolderLabel(evergreen)}</a
 			>
 		{/if}
 		{#each Object.keys(evergreen) as key}
 			{#if !key.match(/^[$_]$/) && key !== '.obsidian'}
 				<a
-					href={evergreen[key]['_']?.url || evergreen[key]['$']?.url}
+					href={evergreen?.url || evergreen[key]['_']?.url || evergreen[key]['$']?.url}
 					aria-current={isActiveLink(segments, key)}>{getFolderLabel(evergreen[key]) || key}</a
 				>
 			{/if}

package/src/lib/utilities/getPage.js

@@ -17,6 +17,7 @@ export default function getPage(website, path) {
 		.split('/');
 
 	segments.forEach((segment) => {
+		if (segment === '_') return page[segment];
 		if (typeof page === 'object' && page !== null) page = page[segment];
 	});
 

package/src/lib/utilities/processMarkdownFiles.js

@@ -132,7 +132,7 @@ async function readFile(file, parents, cache, folderPath, hidden) {
 
 	const extension = path.extname(file.name);
 
-	const hide = file.name.startsWith('$') || hidden;
+	const hide = (file.name.startsWith('$') && file.name.length > 1) || hidden;
 
 	if (file.isFile() && extension === '.md') {
 		const startLoad = performance.now();

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

@@ -60,10 +60,10 @@
 		// Update website on file change
 		if (import.meta.hot) {
 			import.meta.hot.on('vowel:update', ({ path, file }) => {
-				let page = getPage(website, path);
+				let updatedPage = getPage(website, path);
 
 				for (const key in file) {
-					page[key] = file[key];
+					updatedPage[key] = file[key];
 				}
 			});
 		}

package/svelte.config.js

@@ -6,11 +6,8 @@ const args = mri(process.argv);
 
 const isDev = args._.includes('dev');
 
-const demoDir = process.cwd() + '/content';
-// const NPMRunDev = process.argv[2] === 'dev';
-// const isBuild = process.argv[2] === 'build';
-const receivedHomePath = isDev || args.build ? false : args.directory;
-const homeDir = receivedHomePath || demoDir;
+const homeDir = isDev || args.build ? false : args.directory;
+
 const relativePathToHome = path.relative(process.cwd(), homeDir);
 
 /** @type {import('@sveltejs/kit').Config} */

package/vite.config.js

@@ -32,7 +32,8 @@ export default defineConfig({
 						const relativePath = path
 							.relative(homeDir, homePath)
 							.slice(0, -3)
-							.replace(/\/?(home|settings)$/, '');
+							.replace(/\/?(home)$/, '')
+							.replace(/\/?(settings)$/, '_');
 						server.ws.send('vowel:update', {
 							path: relativePath,
 							stats,

package/content/$features/cards.md

@@ -1,7 +0,0 @@
----
-icon: 🃏
----
-
-# Cards
-
-Create eye-catching content with no fuss. (Like this.)

package/content/$features/editing.md

@@ -1,7 +0,0 @@
----
-icon: 👩‍🎤
----
-
-# Live editing
-
-See updates live as you save.

package/content/$features/emoji.md

@@ -1,7 +0,0 @@
----
-icon: 🙃
----
-
-# Emoji favicons
-
-Use any emoji you want for your website's icon.

package/content/$features/frontmatter.md

@@ -1,7 +0,0 @@
----
-icon: 🧮
----
-
-# Frontmatter
-
-Display dates, lists, nested properties, links, and images in your frontmatter.

package/content/$features/lists.md

@@ -1,7 +0,0 @@
----
-icon: 🍱
----
-
-# Blog
-
-Write one line to list your blog posts.

package/content/$features/navigation.md

@@ -1,7 +0,0 @@
----
-icon: 🚏
----
-
-# Navigation
-
-Structure your content with smart nav menus.

package/content/$features/rich-previews.md

@@ -1,7 +0,0 @@
----
-icon: 🤿
----
-
-# Rich link previews
-
-Create rich links with titles and images.

package/content/$features/robots.md

@@ -1,7 +0,0 @@
----
-icon: 🤖
----
-
-# Robots
-
-Take control of your robots.txt.

package/content/$features/rss.md

@@ -1,7 +0,0 @@
----
-icon: 📡
----
-
-# RSS
-
-Deliver your content to RSS readers with an Atom feed.

package/content/$features/sitemap.md

@@ -1,7 +0,0 @@
----
-icon: 🗺️
----
-
-# Sitemap
-
-Submit your website to search engines with a sitemap that lists all of your pages.

package/content/$features/speed.md

@@ -1,7 +0,0 @@
----
-icon: 🏎️
----
-
-# Speed
-
-Get a blazing-fast, Svelte-rendered website.

package/content/$features/static.md

@@ -1,7 +0,0 @@
----
-icon: 🏛️
----
-
-# Static generation
-
-Load pages quickly with plain HTML.

package/content/$features/taxonomies.md

@@ -1,7 +0,0 @@
----
-icon: 🔖
----
-
-# Taxonomies
-
-Go beyond tags to create authors and categories.