methanol 0.0.8 → 0.0.10

package/src/main.js

@@ -26,6 +26,7 @@ import { runVitePreview } from './preview-server.js'
 import { cli, state } from './state.js'
 import { HTMLRenderer } from './renderer.js'
 import { readFile } from 'fs/promises'
+import { style, logger } from './logger.js'
 
 const printBanner = async () => {
 	try {
@@ -107,6 +108,7 @@ const main = async () => {
 		return
 	}
 	if (isBuild) {
+		const startTime = performance.now()
 		await runHooks(state.USER_PRE_BUILD_HOOKS)
 		await runHooks(state.THEME_PRE_BUILD_HOOKS)
 		const { entry, htmlCache, pagesContext } = await buildHtmlEntries()
@@ -129,6 +131,15 @@ const main = async () => {
 		}
 		await runHooks(state.THEME_POST_BUILD_HOOKS, buildContext)
 		await runHooks(state.USER_POST_BUILD_HOOKS, buildContext)
+		const endTime = performance.now()
+		const duration = endTime - startTime
+		const timeString = duration > 1000 ? `${(duration / 1000).toFixed(2)}s` : `${Math.round(duration)}ms`
+		const totalPages = pagesContext?.pages?.length ?? 0
+		const pageLabel = totalPages === 1 ? 'page' : 'pages'
+		console.log()
+		logger.success(
+			`Build complete! Processed ${style.bold(totalPages)} ${pageLabel} in ${style.bold(timeString)}.`
+		)
 		return
 	}
 	cli.showHelp()

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'
@@ -40,13 +41,13 @@ import { linkResolve } from './rehype-plugins/link-resolve.js'
 const resolveRewindInject = () =>
 	HTMLRenderer.rawHTML(`<script type="module" src="${withBase('/.methanol_virtual_module/inject.js')}"></script>`)
 const RWND_FALLBACK = HTMLRenderer.rawHTML`<script>
-	if (!window.$$rwnd) {
+	if (!window.$$rfrm) {
 		const l = []
 		const r = function(k,i,p) {
 			l.push([k,i,p,document.currentScript])
 		}
 		r.$$loaded = l
-		window.$$rwnd = r
+		window.$$rfrm = r
 	}
 </script>`
 
@@ -73,25 +74,21 @@ const resolveUserHeadAssets = () => {
 	return assets
 }
 
-const resolvePageAssetUrl = (page, filePath) => {
-	const root = page.source === 'theme' && state.THEME_PAGES_DIR
-		? state.THEME_PAGES_DIR
-		: state.PAGES_DIR
+const resolvePageAssetUrl = (page, path) => {
+	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, '/')
+	const relPath = relative(root, path).replace(/\\/g, '/')
 	if (!relPath || relPath.startsWith('..')) return null
 	return withBase(`/${relPath}`)
 }
 
 const resolvePageHeadAssets = (page) => {
-	if (!page.filePath) return []
-	const baseDir = dirname(page.filePath)
-	const baseName = basename(page.filePath).replace(/\.(mdx|md)$/, '')
+	if (!page.path) return []
+	const baseDir = dirname(page.path)
+	const baseName = basename(page.path).replace(/\.(mdx|md)$/, '')
 	const pagesRoot = state.PAGES_DIR ? resolve(state.PAGES_DIR) : null
-	const isRootIndex =
-		pagesRoot && baseName === 'index' && resolve(baseDir) === pagesRoot && page.source !== 'theme'
-	const isRootStylePage =
-		pagesRoot && baseName === 'style' && resolve(baseDir) === pagesRoot && page.source !== 'theme'
+	const isRootIndex = pagesRoot && baseName === 'index' && resolve(baseDir) === pagesRoot && page.source !== 'theme'
+	const isRootStylePage = pagesRoot && baseName === 'style' && resolve(baseDir) === pagesRoot && page.source !== 'theme'
 	const assets = []
 	const cssPath = resolve(baseDir, `${baseName}.css`)
 	if (existsSync(cssPath)) {
@@ -131,17 +128,11 @@ const resolvePageHeadAssets = (page) => {
 	return assets
 }
 
-export const buildPageContext = ({
-	routePath,
-	filePath,
-	pageMeta,
-	pagesContext,
-	lazyPagesTree = false
-}) => {
+export const buildPageContext = ({ routePath, path, pageMeta, pagesContext, lazyPagesTree = false }) => {
 	const page = pageMeta
 	const language = pagesContext.getLanguageForRoute ? pagesContext.getLanguageForRoute(routePath) : null
 	const getSiblings = pagesContext.getSiblings
-		? () => pagesContext.getSiblings(routePath, page.filePath || filePath)
+		? () => pagesContext.getSiblings(routePath, page.path || path)
 		: null
 	if (page && getSiblings && page.getSiblings !== getSiblings) {
 		page.getSiblings = getSiblings
@@ -149,7 +140,7 @@ export const buildPageContext = ({
 	const ctx = {
 		routePath,
 		routeHref: withBase(routePath),
-		filePath,
+		path,
 		page,
 		pages: pagesContext.pages || [],
 		pagesByRoute: pagesContext.pagesByRoute || new Map(),
@@ -260,11 +251,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)
@@ -288,14 +289,14 @@ const resolveMdxConfigForPage = async (frontmatter) => {
 	return mdxConfig
 }
 
-export const compileMdx = async ({ content, filePath, ctx }) => {
+export const compileMdx = async ({ content, path, ctx }) => {
 	const mdxConfig = await resolveMdxConfigForPage(ctx.page.frontmatter)
 	const runtimeFactory = mdxConfig.development ? JSXDevFactory : JSXFactory
-	const compiled = await compile({ value: content, path: filePath }, mdxConfig)
+	const compiled = await compile({ value: content, path: path }, mdxConfig)
 
 	return await run(compiled, {
 		...runtimeFactory,
-		baseUrl: pathToFileURL(filePath).href,
+		baseUrl: pathToFileURL(path).href,
 		ctx,
 		rawHTML: HTMLRenderer.rawHTML
 	})
@@ -308,14 +309,14 @@ export const compilePageMdx = async (page, pagesContext, options = {}) => {
 		ctx ||
 		buildPageContext({
 			routePath: page.routePath,
-			filePath: page.filePath,
+			path: page.path,
 			pageMeta: page,
 			pagesContext,
 			lazyPagesTree
 		})
 	const mdxModule = await compileMdx({
 		content: page.content,
-		filePath: page.filePath,
+		path: page.path,
 		ctx: activeCtx
 	})
 	page.mdxComponent = mdxModule.default
@@ -331,23 +332,17 @@ export const compilePageMdx = async (page, pagesContext, options = {}) => {
 		}
 	}
 	if (typeof pagesContext.setDerivedTitle === 'function') {
-		pagesContext.setDerivedTitle(page.filePath, shouldUseTocTitle ? page.title : null, page.toc)
+		pagesContext.setDerivedTitle(page.path, shouldUseTocTitle ? page.title : null, page.toc)
 	}
 	if (ctx && refreshPagesTree && pagesContext.getPagesTree) {
 		ctx.pagesTree = pagesContext.getPagesTree(activeCtx.routePath)
 	}
 }
 
-export const renderHtml = async ({
-	routePath,
-	filePath,
-	components,
-	pagesContext,
-	pageMeta
-}) => {
+export const renderHtml = async ({ routePath, path, components, pagesContext, pageMeta }) => {
 	const ctx = buildPageContext({
 		routePath,
-		filePath,
+		path,
 		pageMeta,
 		pagesContext
 	})

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

@@ -28,7 +28,6 @@ import { compilePageMdx } from './mdx.js'
 import { createStageLogger } from './stage-logger.js'
 
 const isPageFile = (name) => name.endsWith('.mdx') || name.endsWith('.md')
-const isInternalPage = (name) => name.startsWith('_') || name.startsWith('.')
 const isIgnoredEntry = (name) => name.startsWith('.') || name.startsWith('_')
 
 const pageMetadataCache = new Map()
@@ -107,17 +106,17 @@ const resolveLanguageForRoute = (languages = [], routePath = '/') => {
 	return best || rootLanguage
 }
 
-export const routePathFromFile = (filePath, pagesDir = state.PAGES_DIR) => {
-	if (!filePath.endsWith('.mdx') && !filePath.endsWith('.md')) {
+export const routePathFromFile = (path, pagesDir = state.PAGES_DIR) => {
+	if (!path.endsWith('.mdx') && !path.endsWith('.md')) {
 		return null
 	}
-	const relPath = relative(pagesDir, filePath)
+	const relPath = relative(pagesDir, path)
 	if (relPath.startsWith('..')) {
 		return null
 	}
 	const name = relPath.replace(/\.(mdx|md)$/, '')
 	const baseName = name.split(/[\\/]/).pop()
-	if (isInternalPage(baseName)) {
+	if (isIgnoredEntry(baseName)) {
 		return null
 	}
 	const normalized = name.replace(/\\/g, '/')
@@ -147,8 +146,8 @@ const parseFrontmatter = (raw) => {
 	}
 }
 
-const parsePageMetadata = async (filePath) => {
-	const raw = await readFile(filePath, 'utf-8')
+const parsePageMetadata = async (path) => {
+	const raw = await readFile(path, 'utf-8')
 	const { data: frontmatter, content, matter } = parseFrontmatter(raw)
 	let title = frontmatter.title
 	return {
@@ -198,13 +197,17 @@ const buildPagesTree = (pages, options = {}) => {
 		}
 		return routePath
 	}
+	const buildDirRoutePath = (dir) => {
+		const localPath = dir ? `/${dir}/` : '/'
+		if (!rootPrefix) return normalizeRoutePath(localPath)
+		return normalizeRoutePath(`${rootPrefix}${localPath}`)
+	}
 	const currentRouteWithinRoot = resolveRouteWithinRoot(currentRoutePath)
 	const isUnderRoot = (page) => {
 		if (!rootDir) return true
 		return page.routePath === rootPath || (rootPrefix && page.routePath.startsWith(`${rootPrefix}/`))
 	}
 	const treePages = pages
-		.filter((page) => !page.isInternal)
 		.filter((page) => isUnderRoot(page))
 		.map((page) => {
 			if (!rootDir) return page
@@ -267,10 +270,10 @@ const buildPagesTree = (pages, options = {}) => {
 		const dir = {
 			type: 'directory',
 			name,
-			path: `/${path}`,
+			path: resolve(state.PAGES_DIR, path),
 			children: [],
 			depth,
-			routePath: null,
+			routePath: buildDirRoutePath(path),
 			routeHref: null,
 			title: null,
 			weight: null,
@@ -291,9 +294,9 @@ const buildPagesTree = (pages, options = {}) => {
 	}
 	for (const page of treePages) {
 		if (page.hidden && !(includeHiddenRoot && page.routePath === rootPath)) {
-			const isHidden404 = page.routePath === '/404'
+			const isHiddenSpecial = page.routePath === '/404' || page.routePath === '/offline'
 			const shouldExposeHidden =
-				!isHidden404 &&
+				!isHiddenSpecial &&
 				page.hiddenByFrontmatter === true &&
 				(
 					page.routePath === currentRoutePath ||
@@ -404,7 +407,7 @@ const walkPages = async function* (dir, basePath = '') {
 		const relativePath = join(basePath, name).replace(/\\/g, '/')
 		const isIndex = name === 'index'
 		const routePath = isIndex ? (basePath ? `/${basePath}/` : '/') : `/${relativePath}`
-		yield { routePath, filePath: fullPath, isIndex }
+		yield { routePath, path: fullPath, isIndex }
 	}
 
 	for (const { entry, fullPath } of dirs) {
@@ -412,39 +415,45 @@ const walkPages = async function* (dir, basePath = '') {
 	}
 }
 
-export const buildPageEntry = async ({ filePath, pagesDir, source }) => {
-	const routePath = routePathFromFile(filePath, pagesDir)
+export const buildPageEntry = async ({ path, pagesDir, source }) => {
+	const routePath = routePathFromFile(path, pagesDir)
 	if (!routePath) return null
-	const relPath = relative(pagesDir, filePath).replace(/\\/g, '/')
+	const relPath = relative(pagesDir, path).replace(/\\/g, '/')
 	const name = relPath.replace(/\.(mdx|md)$/, '')
 	const baseName = name.split('/').pop()
 	const dir = name.split('/').slice(0, -1).join('/')
 	const dirName = dir ? dir.split('/').pop() : ''
 	const isIndex = baseName === 'index'
 	const segments = routePath.split('/').filter(Boolean)
-	const stats = await stat(filePath)
-	const cached = pageMetadataCache.get(filePath)
+	const stats = await stat(path)
+	const cached = pageMetadataCache.get(path)
 	let metadata = null
 	if (cached && cached.mtimeMs === stats.mtimeMs) {
 		metadata = cached.metadata
 	} else {
-		metadata = await parsePageMetadata(filePath)
-		pageMetadataCache.set(filePath, { mtimeMs: stats.mtimeMs, metadata })
+		metadata = await parsePageMetadata(path)
+		pageMetadataCache.set(path, { mtimeMs: stats.mtimeMs, metadata })
 	}
-	const derived = pageDerivedCache.get(filePath)
+	const derived = pageDerivedCache.get(path)
 	const exclude = Boolean(metadata.frontmatter?.exclude)
 	const frontmatterHidden = metadata.frontmatter?.hidden
 	const hiddenByFrontmatter = frontmatterHidden === true
 	const isNotFoundPage = routePath === '/404'
-	const hidden = frontmatterHidden === false
-		? false
-		: frontmatterHidden === true
-			? true
-			: isNotFoundPage || Boolean(metadata.frontmatter?.isRoot)
+	const isOfflinePage = routePath === '/offline'
+	const isSpecialPage = isNotFoundPage || isOfflinePage
+	const isSiteRoot = routePath === '/'
+	const frontmatterIsRoot = Boolean(metadata.frontmatter?.isRoot)
+	const hidden = isSpecialPage
+		? true
+		: frontmatterHidden === false
+			? false
+			: frontmatterHidden === true
+				? true
+				: frontmatterIsRoot
 	return {
 		routePath,
 		routeHref: withBase(routePath),
-		filePath,
+		path,
 		source,
 		relativePath: relPath,
 		name: baseName,
@@ -452,11 +461,10 @@ export const buildPageEntry = async ({ filePath, pagesDir, source }) => {
 		segments,
 		depth: segments.length,
 		isIndex,
-		isInternal: isInternalPage(baseName),
 		title: metadata.title || derived?.title || (baseName === 'index' ? (dirName || 'Home') : baseName),
 		weight: parseWeight(metadata.frontmatter?.weight),
 		date: parseDate(metadata.frontmatter?.date) || parseDate(stats.mtime),
-		isRoot: Boolean(metadata.frontmatter?.isRoot),
+		isRoot: isSiteRoot || frontmatterIsRoot,
 		hidden,
 		hiddenByFrontmatter,
 		exclude,
@@ -468,9 +476,7 @@ export const buildPageEntry = async ({ filePath, pagesDir, source }) => {
 			size: stats.size,
 			createdAt: stats.birthtime?.toISOString?.() || null,
 			updatedAt: stats.mtime?.toISOString?.() || null
-		},
-		createdAt: stats.birthtime?.toISOString?.() || null,
-		updatedAt: stats.mtime?.toISOString?.() || null
+		}
 	}
 }
 
@@ -481,7 +487,7 @@ const collectPagesFromDir = async (pagesDir, source) => {
 	const pages = []
 	for await (const page of walkPages(pagesDir)) {
 		const entry = await buildPageEntry({
-			filePath: page.filePath,
+			path: page.path,
 			pagesDir,
 			source
 		})
@@ -523,7 +529,12 @@ const collectPages = async () => {
 
 const buildIndexFallback = (pages, siteName) => {
 	const visiblePages = pages
-		.filter((page) => !page.isInternal && page.routePath !== '/')
+		.filter(
+			(page) =>
+				page.routePath !== '/' &&
+				page.routePath !== '/404' &&
+				page.routePath !== '/offline'
+		)
 		.sort((a, b) => a.routePath.localeCompare(b.routePath))
 
 	const lines = [
@@ -574,7 +585,7 @@ const buildNavSequence = (nodes, pagesByRoute) => {
 	const seen = new Set()
 	const addEntry = (entry) => {
 		if (!entry.routePath) return
-		const key = entry.filePath || entry.routePath
+		const key = entry.path || entry.routePath
 		if (seen.has(key)) return
 		seen.add(key)
 		result.push(entry)
@@ -616,14 +627,13 @@ export const buildPagesContext = async ({ compileAll = true } = {}) => {
 		pages.unshift({
 			routePath: '/',
 			routeHref: withBase('/'),
-			filePath: resolve(state.PAGES_DIR, 'index.md'),
+			path: 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,
@@ -648,10 +658,10 @@ export const buildPagesContext = async ({ compileAll = true } = {}) => {
 		}
 	}
 	const getPageByRoute = (routePath, options = {}) => {
-		const { filePath } = options || {}
-		if (filePath) {
+		const { path } = options || {}
+		if (path) {
 			for (const page of pages) {
-				if (page.routePath === routePath && page.filePath === filePath) {
+				if (page.routePath === routePath && page.path === path) {
 					return page
 				}
 			}
@@ -717,26 +727,26 @@ export const buildPagesContext = async ({ compileAll = true } = {}) => {
 		pagesTree,
 		getPagesTree,
 		derivedTitleCache: pageDerivedCache,
-		setDerivedTitle: (filePath, title, toc) => {
-			if (!filePath) return
-			pageDerivedCache.set(filePath, { title, toc })
+		setDerivedTitle: (path, title, toc) => {
+			if (!path) return
+			pageDerivedCache.set(path, { title, toc })
 		},
-		clearDerivedTitle: (filePath) => {
-			if (!filePath) return
-			pageDerivedCache.delete(filePath)
+		clearDerivedTitle: (path) => {
+			if (!path) return
+			pageDerivedCache.delete(path)
 		},
 		refreshPagesTree: () => {
 			pagesTreeCache.clear()
 			navSequenceCache.clear()
 			pagesContext.pagesTree = getPagesTree('/')
 		},
-		getSiblings: (routePath, filePath = null) => {
+		getSiblings: (routePath, path = null) => {
 			if (!routePath) return { prev: null, next: null }
 			const sequence = getNavSequence(routePath)
 			if (!sequence.length) return { prev: null, next: null }
 			let index = -1
-			if (filePath) {
-				index = sequence.findIndex((entry) => entry.filePath === filePath)
+			if (path) {
+				index = sequence.findIndex((entry) => entry.path === path)
 			}
 			if (index < 0) {
 				index = sequence.findIndex((entry) => entry.routePath === routePath)
@@ -748,7 +758,7 @@ export const buildPagesContext = async ({ compileAll = true } = {}) => {
 					routePath: entry.routePath,
 					routeHref: entry.routeHref,
 					title: entry.title || entry.name || entry.routePath,
-					filePath: entry.filePath || null
+					path: entry.path || null
 				}
 			}
 			return {
@@ -775,7 +785,7 @@ export const buildPagesContext = async ({ compileAll = true } = {}) => {
 		for (let i = 0; i < pages.length; i++) {
 			const page = pages[i]
 			if (logEnabled) {
-				stageLogger.update(compileToken, `Compiling MDX [${i + 1}/${totalPages}] ${page.filePath}`)
+				stageLogger.update(compileToken, `Compiling MDX [${i + 1}/${totalPages}] ${page.path}`)
 			}
 			await compilePageMdx(page, pagesContext, {
 				lazyPagesTree: true,

package/src/public-assets.js

@@ -110,7 +110,7 @@ export const preparePublicAssets = async ({ themeDir, userDir, targetDir }) => {
 	}
 }
 
-export const updateAsset = async ({ type, filePath, themeDir, userDir, targetDir, relPath }) => {
+export const updateAsset = async ({ type, path, themeDir, userDir, targetDir, relPath }) => {
 	const targetPath = resolve(targetDir, relPath)
 
 	if (type === 'unlink') {

package/src/{rewind.js → reframe.js}

@@ -58,7 +58,7 @@ export function env(parentEnv) {
 		const component = ({ children: childrenProp, ...props }, ...children) => {
 			const id = renderCount++
 			const idStr = id.toString(16)
-			const script = `$$rwnd(${JSON.stringify(key)},${id},${Object.keys(props).length ? JSON5.stringify(props) : '{}'})`
+			const script = `$$rfrm(${JSON.stringify(key)},${id},${Object.keys(props).length ? JSON5.stringify(props) : '{}'})`
 
 			return (R) => {
 				return [

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

@@ -76,8 +76,8 @@ const resolvePagesRoot = (filePath) => {
 
 export const linkResolve = () => {
 	return (tree, file) => {
-		const baseDir = file?.path ? dirname(file.path) : file?.cwd || process.cwd()
-		const pagesRoot = resolvePagesRoot(file?.path || null)
+		const baseDir = file.path ? dirname(file.path) : file.cwd || process.cwd()
+		const pagesRoot = resolvePagesRoot(file.path || null)
 		visit(tree, (node) => {
 			if (!isElement(node) || node.tagName !== 'a') {
 				return

package/src/stage-logger.js

@@ -18,7 +18,10 @@
  * under the License.
  */
 
+import { style } from './logger.js'
+
 const now = () => (typeof performance !== 'undefined' ? performance.now() : Date.now())
+const log = console.log.bind(console)
 
 export const createStageLogger = (enabled) => {
 	let lastLength = 0
@@ -26,13 +29,13 @@ export const createStageLogger = (enabled) => {
 	const writeLine = (text, newline) => {
 		if (!process.stdout || !process.stdout.write) {
 			if (newline) {
-				console.log(text)
+				log(text)
 			}
 			return
 		}
 		if (!isTty) {
 			if (newline) {
-				console.log(text)
+				log(text)
 			}
 			return
 		}
@@ -43,17 +46,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 }
 }