methanol 0.0.7 → 0.0.9

package/src/mdx.js

@@ -25,6 +25,7 @@ import rehypeSlug from 'rehype-slug'
 import extractToc from '@stefanprobst/rehype-extract-toc'
 import withTocExport from '@stefanprobst/rehype-extract-toc/mdx'
 import rehypeStarryNight from 'rehype-starry-night'
+import remarkGfm from 'remark-gfm'
 import { HTMLRenderer } from './renderer.js'
 import { signal, computed, read, Suspense, nextTick } from 'refui'
 import { createPortal } from 'refui/extras'
@@ -32,12 +33,13 @@ import { pathToFileURL } from 'url'
 import { existsSync } from 'fs'
 import { resolve, dirname, basename, relative } from 'path'
 import { state } from './state.js'
-import { resolveUserMdxConfig } from './config.js'
+import { resolveUserMdxConfig, withBase } from './config.js'
 import { methanolCtx } from './rehype-plugins/methanol-ctx.js'
 import { linkResolve } from './rehype-plugins/link-resolve.js'
 
 // Workaround for Vite: it doesn't support resolving module/virtual modules in script src in dev mode
-const RWND_INJECT = HTMLRenderer.rawHTML`<script type="module" src="/.methanol_virtual_module/inject.js"></script>`
+const resolveRewindInject = () =>
+	HTMLRenderer.rawHTML(`<script type="module" src="${withBase('/.methanol_virtual_module/inject.js')}"></script>`)
 const RWND_FALLBACK = HTMLRenderer.rawHTML`<script>
 	if (!window.$$rwnd) {
 		const l = []
@@ -59,12 +61,12 @@ const resolveUserHeadAssets = () => {
 	const pagesDir = state.PAGES_DIR
 	if (!pagesDir) return assets
 	if (existsSync(resolve(pagesDir, 'style.css'))) {
-		assets.push(HTMLRenderer.c('link', { rel: 'stylesheet', href: '/style.css' }))
+		assets.push(HTMLRenderer.c('link', { rel: 'stylesheet', href: withBase('/style.css') }))
 	}
 	if (existsSync(resolve(pagesDir, 'index.js'))) {
-		assets.push(HTMLRenderer.c('script', { type: 'module', src: '/index.js' }))
+		assets.push(HTMLRenderer.c('script', { type: 'module', src: withBase('/index.js') }))
 	} else if (existsSync(resolve(pagesDir, 'index.ts'))) {
-		assets.push(HTMLRenderer.c('script', { type: 'module', src: '/index.ts' }))
+		assets.push(HTMLRenderer.c('script', { type: 'module', src: withBase('/index.ts') }))
 	}
 	if (state.CURRENT_MODE === 'production') {
 		cachedHeadAssets = assets
@@ -73,17 +75,17 @@ const resolveUserHeadAssets = () => {
 }
 
 const resolvePageAssetUrl = (page, filePath) => {
-	const root = page?.source === 'theme' && state.THEME_PAGES_DIR
+	const root = page.source === 'theme' && state.THEME_PAGES_DIR
 		? state.THEME_PAGES_DIR
 		: state.PAGES_DIR
 	if (!root) return null
 	const relPath = relative(root, filePath).replace(/\\/g, '/')
 	if (!relPath || relPath.startsWith('..')) return null
-	return `/${relPath}`
+	return withBase(`/${relPath}`)
 }
 
 const resolvePageHeadAssets = (page) => {
-	if (!page?.filePath) return []
+	if (!page.filePath) return []
 	const baseDir = dirname(page.filePath)
 	const baseName = basename(page.filePath).replace(/\.(mdx|md)$/, '')
 	const pagesRoot = state.PAGES_DIR ? resolve(state.PAGES_DIR) : null
@@ -138,26 +140,28 @@ export const buildPageContext = ({
 	lazyPagesTree = false
 }) => {
 	const page = pageMeta
-	const language = pagesContext?.getLanguageForRoute ? pagesContext.getLanguageForRoute(routePath) : null
-	const getSiblings = pagesContext?.getSiblings
-		? () => pagesContext.getSiblings(routePath, page?.filePath || filePath)
+	const language = pagesContext.getLanguageForRoute ? pagesContext.getLanguageForRoute(routePath) : null
+	const getSiblings = pagesContext.getSiblings
+		? () => pagesContext.getSiblings(routePath, page.filePath || filePath)
 		: null
 	if (page && getSiblings && page.getSiblings !== getSiblings) {
 		page.getSiblings = getSiblings
 	}
 	const ctx = {
 		routePath,
+		routeHref: withBase(routePath),
 		filePath,
 		page,
-		pages: pagesContext?.pages || [],
-		pagesByRoute: pagesContext?.pagesByRoute || new Map(),
-		languages: pagesContext?.languages || [],
+		pages: pagesContext.pages || [],
+		pagesByRoute: pagesContext.pagesByRoute || new Map(),
+		languages: pagesContext.languages || [],
 		language,
-		site: pagesContext?.site || null,
-		getSiblings
+		site: pagesContext.site || null,
+		getSiblings,
+		withBase
 	}
 	const resolvePagesTree = () =>
-		pagesContext?.getPagesTree ? pagesContext.getPagesTree(routePath) : pagesContext?.pagesTree || []
+		pagesContext.getPagesTree ? pagesContext.getPagesTree(routePath) : pagesContext.pagesTree || []
 	if (lazyPagesTree) {
 		let cachedTree = null
 		let hasTree = false
@@ -257,11 +261,21 @@ const resolveBaseMdxConfig = async () => {
 		jsxImportSource: 'refui',
 		development: state.CURRENT_MODE !== 'production',
 		elementAttributeNameCase: 'html',
-		rehypePlugins: [rehypeSlug, extractToc, [withTocExport, { name: 'toc' }]]
+		rehypePlugins: [rehypeSlug, extractToc, [withTocExport, { name: 'toc' }]],
+		remarkPlugins: []
 	}
+
+	if (state.GFM_ENABLED) {
+		baseMdxConfig.remarkPlugins.push(remarkGfm)
+	}
+
 	const mdxConfig = { ...baseMdxConfig, ...userMdxConfig }
 	const userRehypePlugins = Array.isArray(userMdxConfig.rehypePlugins) ? userMdxConfig.rehypePlugins : []
 	mdxConfig.rehypePlugins = [...baseMdxConfig.rehypePlugins, ...userRehypePlugins]
+
+	const userRemarkPlugins = Array.isArray(userMdxConfig.remarkPlugins) ? userMdxConfig.remarkPlugins : []
+	mdxConfig.remarkPlugins = [...baseMdxConfig.remarkPlugins, ...userRemarkPlugins]
+
 	mdxConfig.rehypePlugins.push(linkResolve)
 	mdxConfig.rehypePlugins.push(methanolCtx)
 	return (cachedMdxConfig = mdxConfig)
@@ -286,7 +300,7 @@ const resolveMdxConfigForPage = async (frontmatter) => {
 }
 
 export const compileMdx = async ({ content, filePath, ctx }) => {
-	const mdxConfig = await resolveMdxConfigForPage(ctx?.page?.frontmatter)
+	const mdxConfig = await resolveMdxConfigForPage(ctx.page.frontmatter)
 	const runtimeFactory = mdxConfig.development ? JSXDevFactory : JSXFactory
 	const compiled = await compile({ value: content, path: filePath }, mdxConfig)
 
@@ -322,15 +336,15 @@ export const compilePageMdx = async (page, pagesContext, options = {}) => {
 		const nextTitle = findTitleFromToc(page.toc) || page.title
 		if (nextTitle !== page.title) {
 			page.title = nextTitle
-			if (typeof pagesContext?.refreshPagesTree === 'function') {
+			if (typeof pagesContext.refreshPagesTree === 'function') {
 				pagesContext.refreshPagesTree()
 			}
 		}
 	}
-	if (typeof pagesContext?.setDerivedTitle === 'function') {
+	if (typeof pagesContext.setDerivedTitle === 'function') {
 		pagesContext.setDerivedTitle(page.filePath, shouldUseTocTitle ? page.title : null, page.toc)
 	}
-	if (ctx && refreshPagesTree && pagesContext?.getPagesTree) {
+	if (ctx && refreshPagesTree && pagesContext.getPagesTree) {
 		ctx.pagesTree = pagesContext.getPagesTree(activeCtx.routePath)
 	}
 }
@@ -340,14 +354,8 @@ export const renderHtml = async ({
 	filePath,
 	components,
 	pagesContext,
-	pageMeta: explicitPageMeta = null
+	pageMeta
 }) => {
-	const pageMeta =
-		explicitPageMeta ||
-		(pagesContext.getPageByRoute
-			? pagesContext.getPageByRoute(routePath, { filePath })
-			: pagesContext.pagesByRoute.get(routePath))
-
 	const ctx = buildPageContext({
 		routePath,
 		filePath,
@@ -359,7 +367,7 @@ export const renderHtml = async ({
 	const [Head, Outlet] = createPortal()
 	const ExtraHead = () => {
 		return [
-			RWND_INJECT,
+			resolveRewindInject(),
 			...resolveUserHeadAssets(),
 			...resolvePageHeadAssets(pageMeta),
 			Outlet(),
@@ -367,9 +375,9 @@ export const renderHtml = async ({
 		]
 	}
 
-	const mdxComponent = pageMeta?.mdxComponent
+	const mdxComponent = pageMeta.mdxComponent
 
-	const Page = ({ components: extraComponents, ...props }, ...children) =>
+	const PageContent = ({ components: extraComponents, ...props }, ...children) =>
 		mdxComponent({
 			children,
 			...props,
@@ -394,7 +402,9 @@ export const renderHtml = async ({
 			() =>
 				template({
 					ctx,
-					Page,
+					page: ctx.page,
+					withBase,
+					PageContent,
 					ExtraHead,
 					HTMLRenderer,
 					components

package/src/pagefind.js

@@ -22,7 +22,9 @@ import { access } from 'fs/promises'
 import { constants } from 'fs'
 import { join, delimiter } from 'path'
 import { spawn } from 'child_process'
-import { state } from './state.js'
+import { state, cli } from './state.js'
+import { createStageLogger } from './stage-logger.js'
+import { logger } from './logger.js'
 
 const resolvePagefindBin = async () => {
 	const binName = process.platform === 'win32' ? 'pagefind.cmd' : 'pagefind'
@@ -92,16 +94,25 @@ const runCommand = (command, args, options) =>
 export const runPagefind = async () => {
 	const bin = await resolvePagefindBin()
 	if (!bin) {
-		console.log('Pagefind not found; skipping search indexing.')
+		logger.warn('Pagefind not found; skipping search indexing.')
 		return false
 	}
-	console.log('Running Pagefind search indexing...')
+	const logEnabled = state.CURRENT_MODE === 'production' && cli.command === 'build' && !cli.CLI_VERBOSE
+	const stageLogger = createStageLogger(logEnabled)
+	const token = stageLogger.start('Indexing search')
+
+	if (cli.CLI_VERBOSE) {
+		logger.info('Running Pagefind search indexing...')
+	}
+
 	const extraArgs = buildArgsFromOptions(state.PAGEFIND_BUILD)
 	const ok = await runCommand(bin, ['--site', state.DIST_DIR, ...extraArgs], {
-		cwd: state.PROJECT_ROOT
+		cwd: state.PROJECT_ROOT,
+		stdio: cli.CLI_VERBOSE ? 'inherit' : 'ignore'
 	})
 	if (!ok) {
-		console.warn('Pagefind failed to build search index.')
+		logger.warn('Pagefind failed to build search index.')
 	}
+	stageLogger.end(token)
 	return ok
 }

package/src/pages.js

@@ -23,6 +23,7 @@ import { readdir, readFile, stat } from 'fs/promises'
 import { existsSync } from 'fs'
 import { resolve, join, relative } from 'path'
 import { state, cli } from './state.js'
+import { withBase } from './config.js'
 import { compilePageMdx } from './mdx.js'
 import { createStageLogger } from './stage-logger.js'
 
@@ -36,12 +37,11 @@ const pageDerivedCache = new Map()
 const collectLanguagesFromPages = (pages = []) => {
 	const languages = new Map()
 	for (const page of pages) {
-		if (!page?.isIndex) continue
-		const label = page?.frontmatter?.lang
+		if (!page.isIndex) continue
+		const label = page.frontmatter?.lang
 		if (label == null || label === '') continue
 		const routePath = page.routePath || '/'
-		const href = page.routeHref || routePath || '/'
-		const frontmatterCode = page?.frontmatter?.langCode
+		const frontmatterCode = page.frontmatter?.langCode
 		const code =
 			typeof frontmatterCode === 'string' && frontmatterCode.trim()
 				? frontmatterCode.trim()
@@ -50,19 +50,39 @@ const collectLanguagesFromPages = (pages = []) => {
 					: routePath.replace(/^\/+/, '')
 		languages.set(routePath, {
 			routePath,
-			href,
+			routeHref: withBase(routePath),
 			label: String(label),
 			code: code || null
 		})
 	}
-	return Array.from(languages.values()).sort((a, b) => a.href.localeCompare(b.href))
+	return Array.from(languages.values()).sort((a, b) => a.routePath.localeCompare(b.routePath))
 }
 
 const normalizeRoutePath = (value) => {
+	if (!value) return '/'
+	let normalized = value
+	if (!normalized.startsWith('/')) {
+		normalized = `/${normalized}`
+	}
+	normalized = normalized.replace(/\/{2,}/g, '/')
+	if (normalized === '/') return '/'
+	if (normalized.endsWith('/')) {
+		return normalized.replace(/\/+$/, '/')
+	}
+	return normalized
+}
+
+const stripTrailingSlash = (value) => {
 	if (!value || value === '/') return '/'
 	return value.replace(/\/+$/, '')
 }
 
+const toRoutePrefix = (value) => {
+	const normalized = normalizeRoutePath(value)
+	const stripped = stripTrailingSlash(normalized)
+	return stripped === '/' ? '' : stripped
+}
+
 const resolveLanguageForRoute = (languages = [], routePath = '/') => {
 	if (!languages.length) return null
 	const normalizedRoute = normalizeRoutePath(routePath)
@@ -70,16 +90,17 @@ const resolveLanguageForRoute = (languages = [], routePath = '/') => {
 	let bestLength = -1
 	let rootLanguage = null
 	for (const lang of languages) {
-		const base = normalizeRoutePath(lang?.routePath || lang?.href)
+		const base = normalizeRoutePath(lang.routePath)
+		const basePrefix = toRoutePrefix(base)
 		if (!base) continue
 		if (base === '/') {
 			rootLanguage = lang
 			continue
 		}
-		if (normalizedRoute === base || normalizedRoute.startsWith(`${base}/`)) {
-			if (base.length > bestLength) {
+		if (normalizedRoute === base || (basePrefix && normalizedRoute.startsWith(`${basePrefix}/`))) {
+			if (basePrefix.length > bestLength) {
 				best = lang
-				bestLength = base.length
+				bestLength = basePrefix.length
 			}
 		}
 	}
@@ -104,7 +125,7 @@ export const routePathFromFile = (filePath, pagesDir = state.PAGES_DIR) => {
 		return '/'
 	}
 	if (normalized.endsWith('/index')) {
-		return `/${normalized.slice(0, -'/index'.length)}`
+		return `/${normalized.slice(0, -'/index'.length)}/`
 	}
 	return `/${normalized}`
 }
@@ -162,7 +183,8 @@ const stripRootPrefix = (value, rootDir) => {
 
 const buildPagesTree = (pages, options = {}) => {
 	const rootPath = normalizeRoutePath(options.rootPath || '/')
-	const rootDir = rootPath === '/' ? '' : rootPath.replace(/^\/+/, '')
+	const rootPrefix = toRoutePrefix(rootPath)
+	const rootDir = rootPrefix ? rootPrefix.replace(/^\/+/, '') : ''
 	const includeHiddenRoot = Boolean(options.includeHiddenRoot)
 	const currentRoutePath = normalizeRoutePath(options.currentRoutePath || '/')
 	const rootSegments = rootDir ? rootDir.split('/') : []
@@ -170,8 +192,8 @@ const buildPagesTree = (pages, options = {}) => {
 		if (!routePath) return '/'
 		if (!rootDir) return routePath
 		if (routePath === rootPath) return '/'
-		if (routePath.startsWith(`${rootPath}/`)) {
-			const stripped = routePath.slice(rootPath.length)
+		if (rootPrefix && routePath.startsWith(`${rootPrefix}/`)) {
+			const stripped = routePath.slice(rootPrefix.length)
 			return stripped.startsWith('/') ? stripped : `/${stripped}`
 		}
 		return routePath
@@ -179,7 +201,7 @@ const buildPagesTree = (pages, options = {}) => {
 	const currentRouteWithinRoot = resolveRouteWithinRoot(currentRoutePath)
 	const isUnderRoot = (page) => {
 		if (!rootDir) return true
-		return page.routePath === rootPath || page.routePath.startsWith(`${rootPath}/`)
+		return page.routePath === rootPath || (rootPrefix && page.routePath.startsWith(`${rootPrefix}/`))
 	}
 	const treePages = pages
 		.filter((page) => !page.isInternal)
@@ -249,10 +271,10 @@ const buildPagesTree = (pages, options = {}) => {
 			children: [],
 			depth,
 			routePath: null,
+			routeHref: null,
 			title: null,
 			weight: null,
 			date: null,
-			routeHref: null,
 			isRoot: false
 		}
 		dirs.set(path, dir)
@@ -306,7 +328,7 @@ const buildPagesTree = (pages, options = {}) => {
 		if (page.isIndex && page.dir) {
 			const dir = getDirNode(page.dir, page.dir.split('/').pop(), page.depth)
 			dir.routePath = page.routePath
-			dir.routeHref = page.routeHref || page.routePath
+			dir.routeHref = page.routeHref
 			dir.title = page.title
 			dir.weight = page.weight ?? null
 			dir.date = page.date ?? null
@@ -381,9 +403,8 @@ const walkPages = async function* (dir, basePath = '') {
 		const name = entry.replace(/\.(mdx|md)$/, '')
 		const relativePath = join(basePath, name).replace(/\\/g, '/')
 		const isIndex = name === 'index'
-		const routePath = isIndex ? (basePath ? `/${basePath}` : '/') : `/${relativePath}`
-		const routeHref = isIndex && basePath ? `/${basePath}/` : routePath
-		yield { routePath, routeHref, filePath: fullPath, isIndex }
+		const routePath = isIndex ? (basePath ? `/${basePath}/` : '/') : `/${relativePath}`
+		yield { routePath, filePath: fullPath, isIndex }
 	}
 
 	for (const { entry, fullPath } of dirs) {
@@ -400,7 +421,6 @@ export const buildPageEntry = async ({ filePath, pagesDir, source }) => {
 	const dir = name.split('/').slice(0, -1).join('/')
 	const dirName = dir ? dir.split('/').pop() : ''
 	const isIndex = baseName === 'index'
-	const routeHref = isIndex && dir ? `/${dir}/` : routePath
 	const segments = routePath.split('/').filter(Boolean)
 	const stats = await stat(filePath)
 	const cached = pageMetadataCache.get(filePath)
@@ -423,7 +443,7 @@ export const buildPageEntry = async ({ filePath, pagesDir, source }) => {
 			: isNotFoundPage || Boolean(metadata.frontmatter?.isRoot)
 	return {
 		routePath,
-		routeHref,
+		routeHref: withBase(routePath),
 		filePath,
 		source,
 		relativePath: relPath,
@@ -466,7 +486,6 @@ const collectPagesFromDir = async (pagesDir, source) => {
 			source
 		})
 		if (entry) {
-			entry.routeHref = page.routeHref || entry.routeHref
 			entry.isIndex = page.isIndex || entry.isIndex
 			pages.push(entry)
 		}
@@ -529,15 +548,22 @@ const buildIndexFallback = (pages, siteName) => {
 	return lines.join('\n')
 }
 
-const resolveRootPath = (routePath, pagesByRoute, pagesByRouteIndex = null) => {
+const resolveRootPath = (routePath, pagesByRoute) => {
 	const normalized = normalizeRoutePath(routePath || '/')
 	const segments = normalized.split('/').filter(Boolean)
-	const lookup = pagesByRouteIndex || pagesByRoute
 	for (let i = segments.length; i >= 1; i--) {
 		const candidate = `/${segments.slice(0, i).join('/')}`
-		const page = lookup.get(candidate)
+		const page = pagesByRoute.get(candidate)
 		if (page?.isIndex && page?.isRoot) {
-			return candidate
+			return page.routePath
+		}
+		const isExact = normalized === candidate
+		if (!isExact) {
+			const indexCandidate = candidate === '/' ? '/' : `${candidate}/`
+			const indexPage = pagesByRoute.get(indexCandidate)
+			if (indexPage?.isIndex && indexPage?.isRoot) {
+				return indexPage.routePath
+			}
 		}
 	}
 	return '/'
@@ -547,7 +573,7 @@ const buildNavSequence = (nodes, pagesByRoute) => {
 	const result = []
 	const seen = new Set()
 	const addEntry = (entry) => {
-		if (!entry?.routePath) return
+		if (!entry.routePath) return
 		const key = entry.filePath || entry.routePath
 		if (seen.has(key)) return
 		seen.add(key)
@@ -587,54 +613,42 @@ export const buildPagesContext = async ({ compileAll = true } = {}) => {
 	const hasIndex = pages.some((page) => page.routePath === '/')
 	if (!hasIndex) {
 		const content = buildIndexFallback(pages, state.SITE_NAME)
-		pages = [
-			{
-				routePath: '/',
-				routeHref: '/',
-				filePath: resolve(state.PAGES_DIR, 'index.md'),
-				relativePath: 'index.md',
-				name: 'index',
-				dir: '',
-				segments: [],
-				depth: 0,
-				isIndex: true,
-				isInternal: false,
-				title: state.SITE_NAME || 'Methanol Site',
-				weight: null,
-				date: null,
-				isRoot: false,
-				hidden: false,
-				content,
-				frontmatter: {},
-				matter: null,
-				stats: { size: content.length, createdAt: null, updatedAt: null },
-				createdAt: null,
-				updatedAt: null
-			},
-			...pages
-		]
+		pages.unshift({
+			routePath: '/',
+			routeHref: withBase('/'),
+			filePath: resolve(state.PAGES_DIR, 'index.md'),
+			relativePath: 'index.md',
+			name: 'index',
+			dir: '',
+			segments: [],
+			depth: 0,
+			isIndex: true,
+			isInternal: false,
+			title: state.SITE_NAME || 'Methanol Site',
+			weight: null,
+			date: null,
+			isRoot: false,
+			hidden: false,
+			content,
+			frontmatter: {},
+			matter: null,
+			stats: { size: content.length, createdAt: null, updatedAt: null },
+			createdAt: null,
+			updatedAt: null
+		})
 		if (excludedRoutes?.has('/')) {
 			excludedRoutes.delete('/')
 		}
 	}
 
 	const pagesByRoute = new Map()
-	const pagesByRouteIndex = new Map()
 	for (const page of pages) {
-		if (page.isIndex) {
-			pagesByRouteIndex.set(page.routePath, page)
-			if (!pagesByRoute.has(page.routePath)) {
-				pagesByRoute.set(page.routePath, page)
-			}
-			continue
-		}
-		const existing = pagesByRoute.get(page.routePath)
-		if (!existing || existing.isIndex) {
+		if (!pagesByRoute.has(page.routePath)) {
 			pagesByRoute.set(page.routePath, page)
 		}
 	}
 	const getPageByRoute = (routePath, options = {}) => {
-		const { filePath, preferIndex } = options || {}
+		const { filePath } = options || {}
 		if (filePath) {
 			for (const page of pages) {
 				if (page.routePath === routePath && page.filePath === filePath) {
@@ -642,18 +656,12 @@ export const buildPagesContext = async ({ compileAll = true } = {}) => {
 				}
 			}
 		}
-		if (preferIndex === true) {
-			return pagesByRouteIndex.get(routePath) || pagesByRoute.get(routePath) || null
-		}
-		if (preferIndex === false) {
-			return pagesByRoute.get(routePath) || pagesByRouteIndex.get(routePath) || null
-		}
-		return pagesByRoute.get(routePath) || pagesByRouteIndex.get(routePath) || null
+		return pagesByRoute.get(routePath) || null
 	}
 	const pagesTreeCache = new Map()
 	const navSequenceCache = new Map()
 	const getPagesTree = (routePath) => {
-		const rootPath = resolveRootPath(routePath, pagesByRoute, pagesByRouteIndex)
+		const rootPath = resolveRootPath(routePath, pagesByRoute)
 		const normalizedRoute = normalizeRoutePath(routePath || '/')
 		const cacheKey = `${rootPath}::${normalizedRoute}`
 		if (pagesTreeCache.has(cacheKey)) {
@@ -668,7 +676,7 @@ export const buildPagesContext = async ({ compileAll = true } = {}) => {
 		return tree
 	}
 	const getNavSequence = (routePath) => {
-		const rootPath = resolveRootPath(routePath, pagesByRoute, pagesByRouteIndex)
+		const rootPath = resolveRootPath(routePath, pagesByRoute)
 		const normalizedRoute = normalizeRoutePath(routePath || '/')
 		const cacheKey = `${rootPath}::${normalizedRoute}`
 		if (navSequenceCache.has(cacheKey)) {
@@ -683,8 +691,10 @@ export const buildPagesContext = async ({ compileAll = true } = {}) => {
 	const notFound = pagesByRoute.get('/404') || null
 	const languages = collectLanguagesFromPages(pages)
 	const userSite = state.USER_SITE || {}
+	const siteBase = state.VITE_BASE ?? userSite.base ?? null
 	const site = {
 		...userSite,
+		base: siteBase,
 		name: state.SITE_NAME,
 		root: state.ROOT_DIR,
 		pagesDir: state.PAGES_DIR,
@@ -703,7 +713,6 @@ export const buildPagesContext = async ({ compileAll = true } = {}) => {
 	const pagesContext = {
 		pages,
 		pagesByRoute,
-		pagesByRouteIndex,
 		getPageByRoute,
 		pagesTree,
 		getPagesTree,
@@ -737,7 +746,7 @@ export const buildPagesContext = async ({ compileAll = true } = {}) => {
 				if (!entry) return null
 				return {
 					routePath: entry.routePath,
-					routeHref: entry.routeHref || entry.routePath,
+					routeHref: entry.routeHref,
 					title: entry.title || entry.name || entry.routePath,
 					filePath: entry.filePath || null
 				}

package/src/preview-server.js

@@ -28,8 +28,8 @@ import { methanolPreviewRoutingPlugin } from './vite-plugins.js'
 export const runVitePreview = async () => {
 	const baseConfig = {
 		configFile: false,
+		appType: 'mpa',
 		root: state.PAGES_DIR,
-		base: '/',
 		build: {
 			outDir: state.DIST_DIR
 		}

package/src/rehype-plugins/link-resolve.js

@@ -27,7 +27,6 @@ import { state } from '../state.js'
 const extensionRegex = /\.(mdx?|html)$/i
 
 const isRelativeHref = (href) => {
-	if (typeof href !== 'string') return false
 	if (!href) return false
 	if (href.startsWith('#') || href.startsWith('?') || href.startsWith('/')) return false
 	if (href.startsWith('//')) return false

package/src/stage-logger.js

@@ -18,6 +18,8 @@
  * under the License.
  */
 
+import { style } from './logger.js'
+
 const now = () => (typeof performance !== 'undefined' ? performance.now() : Date.now())
 
 export const createStageLogger = (enabled) => {
@@ -43,17 +45,18 @@ export const createStageLogger = (enabled) => {
 	}
 	const start = (label) => {
 		if (!enabled) return null
-		writeLine(`${label}...`, false)
+		writeLine(`${style.cyan('◼')}  ${label}...`, false)
 		return { label, start: now() }
 	}
 	const update = (token, message) => {
 		if (!enabled || !token || !message) return
-		writeLine(message, false)
+		writeLine(`${style.cyan('◼')}  ${message}`, false)
 	}
 	const end = (token) => {
 		if (!enabled || !token) return
-		const duration = Math.round(now() - token.start)
-		writeLine(`${token.label}...\t${duration}ms`, true)
+		const duration = now() - token.start
+		const timeString = duration > 1000 ? `${(duration / 1000).toFixed(2)}s` : `${Math.round(duration)}ms`
+		writeLine(`${style.green('✔')}  ${token.label}\t${style.dim(timeString)}`, true)
 	}
 	return { start, update, end }
 }