methanol 0.0.25 → 0.0.27

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "methanol",
-  "version": "0.0.25",
+  "version": "0.0.27",
   "description": "Static site generator powered by rEFui and MDX",
   "main": "./index.js",
   "type": "module",
@@ -31,21 +31,21 @@
     "@stefanprobst/rehype-extract-toc": "^3.0.0",
     "@wooorm/starry-night": "^3.9.0",
     "chokidar": "^5.0.0",
-    "esbuild": "^0.27.2",
+    "esbuild": "^0.28.0",
     "fast-glob": "^3.3.3",
     "gray-matter": "^4.0.3",
     "hast-util-is-element": "^3.0.0",
-    "htmlparser2": "^10.1.0",
+    "htmlparser2": "^12.0.0",
     "json5": "^2.2.3",
-    "null-prototype-object": "^1.2.5",
-    "picomatch": "^4.0.3",
-    "refui": "^0.17.1",
+    "null-prototype-object": "^1.2.7",
+    "picomatch": "^4.0.4",
+    "refui": "^0.17.2",
     "refurbish": "^0.1.8",
     "rehype-slug": "^6.0.0",
     "rehype-starry-night": "^2.2.0",
     "remark-gfm": "^4.0.1",
     "unist-util-visit": "^5.1.0",
-    "vite": "^7.3.1",
+    "vite": "^8.0.10",
     "workbox-core": "^7.4.0",
     "workbox-routing": "^7.4.0",
     "workbox-strategies": "^7.4.0",

package/src/client/sw.js

@@ -25,8 +25,6 @@ const MANIFEST_HASH = '__METHANOL_MANIFEST_HASH__'
 const DEFAULT_BATCH_SIZE = 5
 const REVISION_HEADER = 'X-Methanol-Revision'
 
-self.skipWaiting()
-
 const resolveBasePrefix = cached(() => normalizeBasePrefix(import.meta.env?.BASE_URL || '/'))
 
 const withBase = cachedStr((path) => {
@@ -126,6 +124,7 @@ async function getManifestIndex() {
 
 // Precache prioritized entries during install
 self.addEventListener('install', (event) => {
+	self.skipWaiting()
 	event.waitUntil(
 		(async () => {
 			try {

package/src/dev-server.js

@@ -532,16 +532,18 @@ export const runViteDev = async () => {
 
 			let html = ''
 			try {
-				html = await renderHtml({
-					routePath: renderRoutePath,
-					path,
-					components: {
-						...themeComponents,
-						...components
-					},
-					pagesContext,
-					pageMeta
-				})
+				html = await enqueueRender(() =>
+					renderHtml({
+						routePath: renderRoutePath,
+						path,
+						components: {
+							...themeComponents,
+							...components
+						},
+						pagesContext,
+						pageMeta
+					})
+				)
 			} catch (err) {
 				logMdxError('MDX render', err, pageMeta || { path, routePath: renderRoutePath })
 				await sendDevError(res, err, req.url)
@@ -581,6 +583,13 @@ export const runViteDev = async () => {
 		return queue
 	}
 
+	let renderQueue = Promise.resolve()
+	const enqueueRender = (task) => {
+		const next = renderQueue.then(task, task)
+		renderQueue = next.catch(() => {})
+		return next
+	}
+
 	const reload = () => {
 		server.ws.send({ type: 'full-reload' })
 	}

package/src/feed.js

@@ -111,7 +111,7 @@ export const selectFeedPages = (pages, options) => {
 	const limit = resolveFeedLimit(options)
 	if (!limit) return []
 	return (Array.isArray(pages) ? pages : [])
-		.filter((page) => page && !page.hidden && !page.hiddenByParent)
+		.filter((page) => page && !page.hidden && !page.hiddenByParents)
 		.sort((a, b) => getSortTime(b) - getSortTime(a))
 		.slice(0, limit)
 }

package/src/pages-index.js

@@ -44,7 +44,7 @@ const sanitizePage = (page) => {
 
 export const serializePagesIndex = (pages) => {
 	const list = Array.isArray(pages)
-		? pages.filter((page) => !page?.hidden).map(sanitizePage)
+		? pages.filter((page) => !page.hidden && !page.hiddenByParents).map(sanitizePage)
 		: []
 	return JSON.stringify(JSON.stringify(list))
 }

package/src/pages.js

@@ -526,7 +526,7 @@ export const buildPageEntry = async ({ path, pagesDir, source }) => {
 	const hidden =
 		frontmatterHidden === false
 			? false
-			: frontmatterHidden === true
+			: hiddenByFrontmatter
 				? true
 				: isSpecialPage
 					? true
@@ -695,37 +695,48 @@ const buildNavSequence = (nodes, pagesByRoute) => {
 
 export const createPagesContextFromPages = ({ pages, excludedRoutes, excludedDirs } = {}) => {
 	const pageList = Array.isArray(pages) ? pages : []
-	const hiddenPrefixes = []
+	const pagesAll = pageList
+	const pagesByRoute = new Map()
 	for (const page of pageList) {
-		if (page.isIndex && page.hidden) {
-			const prefix = page.routePath.endsWith('/') ? page.routePath : `${page.routePath}/`
-			if (prefix !== '/') {
-				hiddenPrefixes.push(prefix)
-			}
+		if (!pagesByRoute.has(page.routePath)) {
+			pagesByRoute.set(page.routePath, page)
 		}
 	}
-	for (const page of pageList) {
-		page.hiddenByParent = false
-		for (const prefix of hiddenPrefixes) {
-			if (page.routePath.startsWith(prefix) && page.routePath !== prefix) {
-				page.hiddenByParent = true
-				break
+	const resolveParentDirRoute = (routePath) => {
+		const normalized = normalizeRoutePath(routePath || '/')
+		if (normalized === '/') return null
+		if (normalized.endsWith('/')) {
+			const stripped = stripTrailingSlash(normalized)
+			const index = stripped.lastIndexOf('/')
+			if (index <= 0) return '/'
+			return `${stripped.slice(0, index)}/`
+		}
+		const index = normalized.lastIndexOf('/')
+		if (index <= 0) return '/'
+		return `${normalized.slice(0, index)}/`
+	}
+	const resolveHiddenAncestor = (routePath) => {
+		let cursor = resolveParentDirRoute(routePath)
+		while (cursor && cursor !== '/') {
+			const page = pagesByRoute.get(cursor)
+			if (page?.isIndex && page?.hidden) {
+				return cursor
 			}
+			cursor = resolveParentDirRoute(cursor)
 		}
+		return null
+	}
+	for (const page of pageList) {
+		const nearestHidden = resolveHiddenAncestor(page.routePath)
+		page.hiddenByParent = nearestHidden
+		page.hiddenByParents = Boolean(nearestHidden)
 	}
-	const pagesAll = pageList
 	const isSpecialPage = (page) => page?.routePath === '/404' || page?.routePath === '/offline'
 	const listForNavigation = pageList.filter(
 		(page) => !(isSpecialPage(page) && page.hidden !== false)
 	)
 	const routeExcludes = excludedRoutes || new Set()
 	const dirExcludes = excludedDirs || new Set()
-	const pagesByRoute = new Map()
-	for (const page of pageList) {
-		if (!pagesByRoute.has(page.routePath)) {
-			pagesByRoute.set(page.routePath, page)
-		}
-	}
 	const getPageByRoute = (routePath, options = {}) => {
 		const { path } = options || {}
 		if (path) {
@@ -869,10 +880,31 @@ export const createPagesContextFromPages = ({ pages, excludedRoutes, excludedDir
 				index = sequence.findIndex((entry) => entry.routePath === routePath)
 			}
 			if (index < 0) return { prev: null, next: null }
+			const normalizedRoutePath = normalizeRoutePath(routePath)
+			const isUnderRoute = (routeValue, baseValue) => {
+				if (!routeValue || !baseValue) return false
+				const route = normalizeRoutePath(routeValue)
+				const base = normalizeRoutePath(baseValue)
+				if (stripTrailingSlash(route) === stripTrailingSlash(base)) return true
+				const basePrefix = base.endsWith('/') ? base : `${base}/`
+				return route.startsWith(basePrefix)
+			}
 			const isVisible = (entry) => {
 				if (!entry) return false
-				if (entry.isRoot === true && entry.hidden !== false) return false
-				return !entry.hidden
+				if (entry.isRoot) {
+					if (!entry.hidden || routePath.startsWith(entry.routePath)) {
+						return true
+					}
+					return false
+				}
+				if (entry.hidden) {
+					return isUnderRoute(normalizedRoutePath, entry.routePath)
+				}
+				const entryHiddenRoot = entry.hiddenByParent
+				if (entryHiddenRoot && !isUnderRoute(normalizedRoutePath, entryHiddenRoot)) {
+					return false
+				}
+				return true
 			}
 			let prevIndex = index - 1
 			while (prevIndex >= 0 && !isVisible(sequence[prevIndex])) {

package/src/vite-plugins.js

@@ -145,8 +145,7 @@ const virtualModuleMap = {
 	},
 	get pages() {
 		const pages = state.PAGES_CONTEXT?.pages || []
-		const filtered = pages.filter((p) => !p.hiddenByParent)
-		return `export const pages = ${serializePagesIndex(filtered)}\nexport default pages`
+		return `export const pages = JSON.parse(${serializePagesIndex(pages)})\nexport default pages`
 	}
 }
 

package/src/workers/build-worker.js

@@ -360,7 +360,7 @@ const handleRewrite = async (message) => {
 	}
 }
 
-parentPort?.on('message', async (message) => {
+const handleMessage = async (message) => {
 	const { type, stage } = message || {}
 	try {
 		await ensureInit()
@@ -397,4 +397,13 @@ parentPort?.on('message', async (message) => {
 	} catch (error) {
 		parentPort?.postMessage({ type: 'error', stage, error: serializeError(error) })
 	}
+}
+
+let messageQueue = Promise.resolve()
+parentPort?.on('message', (message) => {
+	messageQueue = messageQueue
+		.then(() => handleMessage(message))
+		.catch((error) => {
+			parentPort?.postMessage({ type: 'error', stage: message?.stage, error: serializeError(error) })
+		})
 })

package/themes/blog/sources/style.css

@@ -5,31 +5,51 @@ html {
 }
 
 :root {
-	--bg: #ffffff;
-	--text: #111827;
-	--text-muted: #6b7280;
-	--primary: #2563eb;
-	--primary-soft: #eff6ff;
-	--border: #f3f4f6;
-	--bg-soft: #f9fafb;
-	--selection-bg: #dbeafe;
+	color-scheme: light dark;
+	--bg: light-dark(#ffffff, #030712);
+	--text: light-dark(#111827, #f9fafb);
+	--text-muted: light-dark(#6b7280, #9ca3af);
+	--primary: light-dark(#2563eb, #60a5fa);
+	--primary-soft: light-dark(#eff6ff, #1e3a8a33);
+	--border: light-dark(#f3f4f6, #1f2937);
+	--bg-soft: light-dark(#f9fafb, #111827);
+	--selection-bg: light-dark(#dbeafe, #1e3a8a);
 	
 	--font-sans: "Inter", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, sans-serif;
 	--max-width: 820px;
     --container-px: 1.5rem;
-}
 
-@media (prefers-color-scheme: dark) {
-	:root {
-		--bg: #030712;
-		--text: #f9fafb;
-		--text-muted: #9ca3af;
-		--primary: #60a5fa;
-		--primary-soft: #1e3a8a33;
-		--border: #1f2937;
-		--bg-soft: #111827;
-		--selection-bg: #1e3a8a;
-	}
+	/* Starry Night Syntax Highlighting */
+	--color-prettylights-syntax-brackethighlighter-angle: light-dark(#59636e, #9198a1);
+	--color-prettylights-syntax-brackethighlighter-unmatched: light-dark(#82071e, #f85149);
+	--color-prettylights-syntax-carriage-return-bg: light-dark(#cf222e, #b62324);
+	--color-prettylights-syntax-carriage-return-text: light-dark(#f6f8fa, #f0f6fc);
+	--color-prettylights-syntax-comment: light-dark(#59636e, #9198a1);
+	--color-prettylights-syntax-constant: light-dark(#0550ae, #79c0ff);
+	--color-prettylights-syntax-constant-other-reference-link: light-dark(#0a3069, #a5d6ff);
+	--color-prettylights-syntax-entity: light-dark(#6639ba, #d2a8ff);
+	--color-prettylights-syntax-entity-tag: light-dark(#0550ae, #7ee787);
+	--color-prettylights-syntax-invalid-illegal-bg: light-dark(#82071e, #8e1519);
+	--color-prettylights-syntax-invalid-illegal-text: light-dark(#f6f8fa, #f0f6fc);
+	--color-prettylights-syntax-keyword: light-dark(#cf222e, #ff7b72);
+	--color-prettylights-syntax-markup-changed-bg: light-dark(#ffd8b5, #5a1e02);
+	--color-prettylights-syntax-markup-changed-text: light-dark(#953800, #ffdfb6);
+	--color-prettylights-syntax-markup-deleted-bg: light-dark(#ffebe9, #67060c);
+	--color-prettylights-syntax-markup-deleted-text: light-dark(#82071e, #ffdcd7);
+	--color-prettylights-syntax-markup-heading: light-dark(#0550ae, #1f6feb);
+	--color-prettylights-syntax-markup-ignored-bg: light-dark(#0550ae, #1158c7);
+	--color-prettylights-syntax-markup-ignored-text: light-dark(#d1d9e0, #f0f6fc);
+	--color-prettylights-syntax-markup-inserted-bg: light-dark(#dafbe1, #033a16);
+	--color-prettylights-syntax-markup-inserted-text: light-dark(#116329, #aff5b4);
+	--color-prettylights-syntax-markup-list: light-dark(#3b2300, #f2cc60);
+	--color-prettylights-syntax-meta-diff-range: light-dark(#8250df, #d2a8ff);
+	--color-prettylights-syntax-string: light-dark(#0a3069, #a5d6ff);
+	--color-prettylights-syntax-string-regexp: light-dark(#116329, #7ee787);
+	--color-prettylights-syntax-sublimelinter-gutter-mark: light-dark(#818b98, #3d444d);
+	--color-prettylights-syntax-variable: light-dark(#953800, #ffa657);
+	--color-prettylights-syntax-markup-bold: light-dark(#1f2328, #f0f6fc);
+	--color-prettylights-syntax-markup-italic: light-dark(#1f2328, #f0f6fc);
+	--color-prettylights-syntax-storage-modifier-import: light-dark(#1f2328, #f0f6fc);
 }
 
 *, *::before, *::after {

package/themes/blog/src/post-utils.js

@@ -21,7 +21,7 @@
 import { extractExcerpt } from 'methanol'
 
 const isBlogPost = (page) => {
-	if (!page || page.hidden || page.hiddenByParent) return false
+	if (!page || page.hidden || page.hiddenByParents) return false
 	const href = page.routeHref
 	if (!href) return false
 	if (href === '/' || href === '/404' || href === '/offline') return false

package/themes/default/src/nav-tree.jsx

@@ -18,7 +18,7 @@
  * under the License.
  */
 
-import { If, For, $, signal, onCondition, read, extract } from 'refui'
+import { If, For, $, signal, onCondition, read, extract, nextTick } from 'refui'
 import NullProtoObj from 'null-prototype-object'
 import { HTMLRenderer } from 'methanol'
 
@@ -50,21 +50,20 @@ const NavTree = ({ nodes, depth }) => {
 		<For entries={nodes}>
 			{({ item }) => {
 				const node = read(item)
-				const { routeHref: href, routePath, type, name, isRoot } = node
-				const { title, hidden } = extract(item, 'title', 'hidden')
+				const { routeHref: href, routePath, type, name, isRoot, hidden } = node
+				const { title } = extract(item, 'title')
 
 				const isActive = matchCurrentPath(routePath)
 				let show = isActive
-				if (type === 'directory') {
+				if (isRoot || type === 'directory') {
 					show = $(() => {
-						const _active = isActive.value
 						const _currentPath = currentPath.value
-						return _active || _currentPath.startsWith(routePath)
+						return _currentPath.startsWith(routePath)
 					})
 				}
 
 				return (
-					<If condition={hidden.inverseOr(show)}>
+					<If condition={!hidden || show}>
 						{() => {
 							if (type === 'directory') {
 								const label = title.or(name)
@@ -114,8 +113,9 @@ const _rootNodes = signal()
 const rootNodes = signal(_rootNodes, (nodes) => nodes?.map(toSignal))
 const rootTree = HTMLRenderer.createElement(NavTree, { nodes: rootNodes, depth: 0 })
 
-export const renderNavTree = (nodes, path) => {
+export const renderNavTree = async (nodes, path) => {
 	currentPath.value = path
 	_rootNodes.value = nodes
+	await nextTick()
 	return rootTree
 }

package/themes/default/src/page.jsx

@@ -22,7 +22,7 @@ import { DOCTYPE_HTML } from 'methanol'
 import { renderToc } from '../components/ThemeToCContainer.static.jsx'
 import { renderNavTree } from './nav-tree.jsx'
 
-const PAGE_TEMPLATE = ({ PageContent, ExtraHead, components, ctx }) => {
+const PAGE_TEMPLATE = async ({ PageContent, ExtraHead, components, ctx }) => {
 	const page = ctx.page
 	const pagesByRoute = ctx.pagesByRoute
 	const pages = ctx.pages || []
@@ -204,7 +204,7 @@ const PAGE_TEMPLATE = ({ PageContent, ExtraHead, components, ctx }) => {
 								{pagefindEnabled ? <ThemeSearchBox options={pagefindOptions} /> : null}
 							</div>
 							<nav>
-								<ul data-depth="0">{renderNavTree(pagesTree, page.routePath)}</ul>
+								<ul data-depth="0">{await renderNavTree(pagesTree, page.routePath)}</ul>
 							</nav>
 							<div class="sidebar-footer">
 								{languageSelector}