methanol 0.0.10 → 0.0.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "methanol",
-  "version": "0.0.10",
+  "version": "0.0.11",
   "description": "Static site generator powered by rEFui and MDX",
   "main": "./index.js",
   "type": "module",

package/src/build-system.js

@@ -107,7 +107,10 @@ export const buildHtmlEntries = async () => {
 	for (let i = 0; i < pagesContext.pages.length; i++) {
 		const page = pagesContext.pages[i]
 		if (logEnabled) {
-			stageLogger.update(renderToken, `Rendering pages [${i + 1}/${totalPages}] ${page.path}`)
+			stageLogger.update(
+				renderToken,
+				`Rendering pages [${i + 1}/${totalPages}] ${page.routePath || page.path}`
+			)
 		}
 		const html = await renderHtml({
 			routePath: page.routePath,

package/src/pages.js

@@ -202,6 +202,10 @@ const buildPagesTree = (pages, options = {}) => {
 		if (!rootPrefix) return normalizeRoutePath(localPath)
 		return normalizeRoutePath(`${rootPrefix}${localPath}`)
 	}
+	const resolveDirFsPath = (dir) => {
+		if (!rootDir) return resolve(state.PAGES_DIR, dir)
+		return resolve(state.PAGES_DIR, join(rootDir, dir))
+	}
 	const currentRouteWithinRoot = resolveRouteWithinRoot(currentRoutePath)
 	const isUnderRoot = (page) => {
 		if (!rootDir) return true
@@ -270,7 +274,7 @@ const buildPagesTree = (pages, options = {}) => {
 		const dir = {
 			type: 'directory',
 			name,
-			path: resolve(state.PAGES_DIR, path),
+			path: resolveDirFsPath(path),
 			children: [],
 			depth,
 			routePath: buildDirRoutePath(path),
@@ -785,7 +789,10 @@ 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.path}`)
+				stageLogger.update(
+					compileToken,
+					`Compiling MDX [${i + 1}/${totalPages}] ${page.routePath || page.path}`
+				)
 			}
 			await compilePageMdx(page, pagesContext, {
 				lazyPagesTree: true,

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

@@ -30,10 +30,10 @@ const matchCurrentPath = onCondition(currentPath)
 const toSignal = (i) => {
 	const clone = Object.assign(new NullProtoObj(), i)
 
-	let sig = navEntryMap.get(clone.path)
+	let sig = navEntryMap.get(clone.routePath)
 	if (!sig) {
 		sig = signal(clone)
-		navEntryMap.set(clone.path, sig)
+		navEntryMap.set(clone.routePath, sig)
 	} else {
 		sig.value = clone
 	}