methanol 0.0.9 → 0.0.11

package/src/{assets.js → client/virtual-module/assets.js}

@@ -21,10 +21,14 @@
 import { readFileSync } from 'fs'
 import { fileURLToPath } from 'url'
 import { dirname, resolve } from 'path'
+import { cached } from '../../utils.js'
 
 const __filename = fileURLToPath(import.meta.url)
 const __dirname = dirname(__filename)
 
-export const INJECT_SCRIPT = readFileSync(resolve(__dirname, './virtual-module/inject.js'), 'utf-8')
-export const LOADER_SCRIPT = readFileSync(resolve(__dirname, './virtual-module/loader.js'), 'utf-8')
-export const PAGEFIND_LOADER_SCRIPT = readFileSync(resolve(__dirname, './virtual-module/pagefind-loader.js'), 'utf-8')
+const readStatic = (filePath) => cached(() => readFileSync(resolve(__dirname, filePath), 'utf-8'))
+
+export const INJECT_SCRIPT = readStatic('./inject.js')
+export const LOADER_SCRIPT = readStatic('./loader.js')
+export const PAGEFIND_LOADER_SCRIPT = readStatic('./pagefind-loader.js')
+export const PWA_INJECT_SCRIPT = readStatic('./pwa-inject.js')

package/src/{virtual-module → client/virtual-module}/inject.js

@@ -23,6 +23,7 @@ import { defaults } from 'refui/browser'
 import { lazy } from 'refui'
 import { init } from 'methanol:loader'
 import { registry } from 'methanol:registry'
+import 'methanol:pwa-inject'
 
 const R = createDOMRenderer(defaults)
 

package/src/{virtual-module → client/virtual-module}/loader.js

@@ -21,7 +21,7 @@
 export function init(registry, R) {
 	if (!registry) return
 
-	async function $$rwnd(key, id, props, target = document.currentScript) {
+	async function $$rfrm(key, id, props, target = document.currentScript) {
 		const loader = registry[key]
 
 		if (!loader) {
@@ -103,14 +103,14 @@ export function init(registry, R) {
 	}
 
 	let loaded = []
-	if (window.$$rwnd) {
-		loaded = window.$$rwnd.$$loaded
+	if (window.$$rfrm) {
+		loaded = window.$$rfrm.$$loaded
 	}
-	window.$$rwnd = $$rwnd
+	window.$$rfrm = $$rfrm
 
 	if (loaded) {
 		for (let i = 0; i < loaded.length; i++) {
-			$$rwnd.apply(null, loaded[i])
+			$$rfrm.apply(null, loaded[i])
 		}
 	}
 }

package/src/{virtual-module → client/virtual-module}/pagefind-loader.js

@@ -52,7 +52,7 @@ const dynamicImport = (path) => {
 	}
 }
 
-export const loadPagefind = async () => {
+export const loadPagefind = () => {
 	if (pagefindInit) return pagefindInit
 	pagefindInit = new Promise((resolve) => {
 		if (typeof window === 'undefined') {

package/src/client/virtual-module/pwa-inject.js

@@ -0,0 +1,25 @@
+/* Copyright Yukino Song, SudoMaker Ltd.
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * 	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+if (typeof navigator !== 'undefined' && 'serviceWorker' in navigator) {
+	navigator.serviceWorker.ready.then((reg) => {
+		reg.active?.postMessage({ type: 'METHANOL_WARM_MANIFEST' });
+	});
+}

package/src/components.js

@@ -22,7 +22,7 @@ import { readdir, stat } from 'fs/promises'
 import { existsSync } from 'fs'
 import { join, extname, basename } from 'path'
 import { pathToFileURL } from 'url'
-import { env } from './rewind.js'
+import { env } from './reframe.js'
 import { state } from './state.js'
 
 const normalizeComponentName = (value) => basename(value)
@@ -47,10 +47,10 @@ export const bumpComponentImportNonce = () => {
 	return componentImportNonce
 }
 
-export const rewindEnv = env()
-export const client = rewindEnv.client
-export const invalidateRegistryEntry = rewindEnv.invalidate
-export const genRegistryScript = rewindEnv.genRegistryScript
+export const reframeEnv = env()
+export const client = reframeEnv.client
+export const invalidateRegistryEntry = reframeEnv.invalidate
+export const genRegistryScript = reframeEnv.genRegistryScript
 
 const resolveComponentExport = (componentPath, ext) => {
 	const staticCandidate = `${componentPath}.static${ext}`

package/src/config.js

@@ -26,8 +26,8 @@ import { mergeConfig } from 'vite'
 import { cli, state } from './state.js'
 import { logger } from './logger.js'
 import { HTMLRenderer } from './renderer.js'
-import { rewindEnv } from './components.js'
-import { env as createEnv } from './rewind.js'
+import { reframeEnv } from './components.js'
+import { env as createEnv } from './reframe.js'
 import { cached, cachedStr } from './utils.js'
 import defaultTheme from '../themes/default/index.js'
 
@@ -324,7 +324,7 @@ export const applyConfig = async (config, mode) => {
 	}
 	const themeEnv = state.USER_THEME.env || createEnv()
 	state.THEME_ENV = themeEnv
-	rewindEnv.setParent(themeEnv)
+	reframeEnv.setParent(themeEnv)
 	const themeRoot = state.USER_THEME.root || root
 	const themeComponentDirValue = hasOwn(state.USER_THEME, 'componentsDir')
 		? state.USER_THEME.componentsDir
@@ -383,8 +383,27 @@ export const applyConfig = async (config, mode) => {
 	state.RESOLVED_MDX_CONFIG = undefined
 	state.RESOLVED_VITE_CONFIG = undefined
 	state.PAGEFIND_ENABLED = resolvePagefindEnabled(config)
+	if (cli.CLI_SEARCH !== undefined) {
+		state.PAGEFIND_ENABLED = cli.CLI_SEARCH
+	}
 	state.PAGEFIND_OPTIONS = resolvePagefindOptions(config)
 	state.PAGEFIND_BUILD = resolvePagefindBuild(config)
+	
+	if (hasOwn(config, 'pwa')) {
+		if (config.pwa === true) {
+			state.PWA_ENABLED = true
+			state.PWA_OPTIONS = null
+		} else if (typeof config.pwa === 'object' && config.pwa !== null) {
+			state.PWA_ENABLED = true
+			state.PWA_OPTIONS = config.pwa
+		} else {
+			state.PWA_ENABLED = false
+			state.PWA_OPTIONS = null
+		}
+	}
+	if (cli.CLI_PWA !== undefined) {
+		state.PWA_ENABLED = cli.CLI_PWA
+	}
 	state.USER_PRE_BUILD_HOOKS = normalizeHooks(config.preBuild)
 	state.USER_POST_BUILD_HOOKS = normalizeHooks(config.postBuild)
 	state.USER_PRE_BUNDLE_HOOKS = normalizeHooks(config.preBundle)

package/src/dev-server.js

@@ -104,12 +104,12 @@ export const runViteDev = async () => {
 		const assetWatcher = chokidar.watch(state.USER_ASSETS_DIR, {
 			ignoreInitial: true
 		})
-		const handleAssetUpdate = (type, filePath) => {
-			const relPath = relative(state.USER_ASSETS_DIR, filePath)
+		const handleAssetUpdate = (type, path) => {
+			const relPath = relative(state.USER_ASSETS_DIR, path)
 			enqueue(async () => {
 				await updateAsset({
 					type,
-					filePath,
+					path,
 					relPath,
 					themeDir: state.THEME_ASSETS_DIR,
 					userDir: state.USER_ASSETS_DIR,
@@ -117,9 +117,9 @@ export const runViteDev = async () => {
 				})
 			})
 		}
-		assetWatcher.on('add', (filePath) => handleAssetUpdate('add', filePath))
-		assetWatcher.on('change', (filePath) => handleAssetUpdate('change', filePath))
-		assetWatcher.on('unlink', (filePath) => handleAssetUpdate('unlink', filePath))
+		assetWatcher.on('add', (path) => handleAssetUpdate('add', path))
+		assetWatcher.on('change', (path) => handleAssetUpdate('change', path))
+		assetWatcher.on('unlink', (path) => handleAssetUpdate('unlink', path))
 	}
 
 	const themeComponentsDir = state.THEME_COMPONENTS_DIR
@@ -289,8 +289,8 @@ export const runViteDev = async () => {
 		}
 		const notFoundPage = pagesContext.pagesByRoute.get('/404')
 		let pageMeta = pagesContext.pagesByRoute.get(requestedPath)
-		let filePath = pageMeta?.filePath || resolvePageFile(requestedPath)
-		const hasMdx = Boolean(pageMeta) || existsSync(filePath)
+		let path = pageMeta?.path || resolvePageFile(requestedPath)
+		const hasMdx = Boolean(pageMeta) || existsSync(path)
 		let status = 200
 		let renderRoutePath = requestedPath
 
@@ -326,19 +326,15 @@ export const runViteDev = async () => {
 
 		if (isExcludedPath()) {
 			if (notFoundPage) {
-				filePath = notFoundPage.filePath
+				path = notFoundPage.path
 				renderRoutePath = '/404'
 				status = 404
 			} else {
 				return next()
 			}
-		} else if (requestedPath === '/404' && notFoundPage) {
-			filePath = notFoundPage.filePath
-			renderRoutePath = '/404'
-			status = 404
-		} else if (!pageMeta && !existsSync(filePath)) {
+		} else if (!pageMeta && !existsSync(path)) {
 			if (notFoundPage) {
-				filePath = notFoundPage.filePath
+				path = notFoundPage.path
 				renderRoutePath = '/404'
 				status = 404
 			} else {
@@ -351,18 +347,18 @@ export const runViteDev = async () => {
 		try {
 			const renderEpoch = htmlCacheEpoch
 			const cacheEntry = htmlCache.get(renderRoutePath)
-			if (cacheEntry && cacheEntry.filePath === filePath && cacheEntry.epoch === htmlCacheEpoch) {
+			if (cacheEntry && cacheEntry.path === path && cacheEntry.epoch === htmlCacheEpoch) {
 				res.statusCode = status
 				res.setHeader('Content-Type', 'text/html')
 				res.end(cacheEntry.html)
 				return
 			}
 
-			pageMeta ??= pagesContext.getPageByRoute(renderRoutePath, { filePath })
+			pageMeta ??= pagesContext.getPageByRoute(renderRoutePath, { path })
 
 			const html = await renderHtml({
 				routePath: renderRoutePath,
-				filePath,
+				path,
 				components: {
 					...themeComponents,
 					...components
@@ -373,7 +369,7 @@ export const runViteDev = async () => {
 			if (renderEpoch === htmlCacheEpoch) {
 				htmlCache.set(renderRoutePath, {
 					html,
-					filePath,
+					path,
 					epoch: renderEpoch
 				})
 			}
@@ -429,7 +425,7 @@ export const runViteDev = async () => {
 		reload()
 	}
 
-	const getExportName = (filePath) => basename(filePath).split('.')[0]
+	const getExportName = (path) => basename(path).split('.')[0]
 
 	const findComponentExt = (dir, exportName) => {
 		for (const ext of COMPONENT_EXTENSIONS) {
@@ -444,11 +440,11 @@ export const runViteDev = async () => {
 		return null
 	}
 
-	const updateComponentEntry = async (filePath, { fallback = false } = {}) => {
+	const updateComponentEntry = async (path, { fallback = false } = {}) => {
 		bumpComponentImportNonce()
-		const exportName = getExportName(filePath)
-		const dir = dirname(filePath)
-		let ext = extname(filePath)
+		const exportName = getExportName(path)
+		const dir = dirname(path)
+		let ext = extname(path)
 		let { component, hasClient, staticPath } = await buildComponentEntry({
 			dir,
 			exportName,
@@ -488,28 +484,28 @@ export const runViteDev = async () => {
 	const PAGE_UPDATE_DEBOUNCE_MS = 30
 	const pageUpdateTimers = new Map()
 
-	const schedulePageUpdate = (filePath, kind) => {
-		const existing = pageUpdateTimers.get(filePath)
+	const schedulePageUpdate = (path, kind) => {
+		const existing = pageUpdateTimers.get(path)
 		if (existing?.timer) {
 			clearTimeout(existing.timer)
 		}
 		const entry = {
 			kind,
 			timer: setTimeout(() => {
-				pageUpdateTimers.delete(filePath)
-				enqueue(() => handlePageUpdate(filePath, kind))
+				pageUpdateTimers.delete(path)
+				enqueue(() => handlePageUpdate(path, kind))
 			}, PAGE_UPDATE_DEBOUNCE_MS)
 		}
-		pageUpdateTimers.set(filePath, entry)
+		pageUpdateTimers.set(path, entry)
 	}
 
-	const resolveWatchedSource = (filePath) => {
-		const inUserPages = routePathFromFile(filePath, state.PAGES_DIR)
+	const resolveWatchedSource = (path) => {
+		const inUserPages = routePathFromFile(path, state.PAGES_DIR)
 		if (inUserPages) {
 			return { pagesDir: state.PAGES_DIR, source: 'user', routePath: inUserPages }
 		}
 		if (state.THEME_PAGES_DIR) {
-			const inThemePages = routePathFromFile(filePath, state.THEME_PAGES_DIR)
+			const inThemePages = routePathFromFile(path, state.THEME_PAGES_DIR)
 			if (inThemePages) {
 				return { pagesDir: state.THEME_PAGES_DIR, source: 'theme', routePath: inThemePages }
 			}
@@ -517,16 +513,16 @@ export const runViteDev = async () => {
 		return null
 	}
 
-	const updatePageEntry = async (filePath, resolved) => {
+	const updatePageEntry = async (path, resolved) => {
 		if (!pagesContext || !resolved) return false
-		pagesContext.clearDerivedTitle?.(filePath)
+		pagesContext.clearDerivedTitle?.(path)
 		const nextEntry = await buildPageEntry({
-			filePath,
+			path,
 			pagesDir: resolved.pagesDir,
 			source: resolved.source
 		})
 		if (!nextEntry) return false
-		const prevEntry = pagesContext.pages?.find?.((page) => page.filePath === filePath) || null
+		const prevEntry = pagesContext.pages?.find?.((page) => page.path === path) || null
 		if (!prevEntry) return false
 		if (prevEntry.exclude !== nextEntry.exclude) return false
 		if (prevEntry.isIndex !== nextEntry.isIndex || prevEntry.dir !== nextEntry.dir) return false
@@ -546,22 +542,22 @@ export const runViteDev = async () => {
 		return true
 	}
 
-	const isUserHeadAsset = (filePath) => {
-		const name = basename(filePath)
+	const isUserHeadAsset = (path) => {
+		const name = basename(path)
 		if (name !== 'style.css' && name !== 'index.js' && name !== 'index.ts') {
 			return false
 		}
 		const root = resolve(state.PAGES_DIR || '')
-		return root && resolve(dirname(filePath)) === root
+		return root && resolve(dirname(path)) === root
 	}
 
-	const handlePageUpdate = async (filePath, kind) => {
-		if (isUserHeadAsset(filePath)) {
+	const handlePageUpdate = async (path, kind) => {
+		if (isUserHeadAsset(path)) {
 			invalidateHtmlCache()
 			reload()
 			return
 		}
-		const resolved = resolveWatchedSource(filePath)
+		const resolved = resolveWatchedSource(path)
 		if (kind === 'unlink') {
 			if (resolved?.routePath) {
 				htmlCache.delete(resolved.routePath)
@@ -571,7 +567,7 @@ export const runViteDev = async () => {
 			await refreshPages()
 			return
 		}
-		const updated = await updatePageEntry(filePath, resolved)
+		const updated = await updatePageEntry(path, resolved)
 		if (updated) {
 			invalidateHtmlCache()
 			reload()
@@ -583,15 +579,15 @@ export const runViteDev = async () => {
 		await refreshPages()
 	}
 
-	pageWatcher.on('change', (filePath) => {
-		schedulePageUpdate(filePath, 'change')
+	pageWatcher.on('change', (path) => {
+		schedulePageUpdate(path, 'change')
 	})
 
-	pageWatcher.on('add', (filePath) => {
-		schedulePageUpdate(filePath, 'add')
+	pageWatcher.on('add', (path) => {
+		schedulePageUpdate(path, 'add')
 	})
-	pageWatcher.on('unlink', (filePath) => {
-		schedulePageUpdate(filePath, 'unlink')
+	pageWatcher.on('unlink', (path) => {
+		schedulePageUpdate(path, 'unlink')
 	})
 	pageWatcher.on('addDir', () => {
 		enqueue(refreshPages)
@@ -605,13 +601,13 @@ export const runViteDev = async () => {
 		ignoreInitial: true
 	})
 
-	componentWatcher.on('add', (filePath) => {
-		if (!isComponentFile(filePath)) {
+	componentWatcher.on('add', (path) => {
+		if (!isComponentFile(path)) {
 			return
 		}
-		if (isClientComponent(filePath)) {
+		if (isClientComponent(path)) {
 			enqueue(async () => {
-				const { hasClient } = await updateComponentEntry(filePath)
+				const { hasClient } = await updateComponentEntry(path)
 				if (hasClient) {
 					invalidateRewindInject()
 				}
@@ -621,7 +617,7 @@ export const runViteDev = async () => {
 			return
 		}
 		enqueue(async () => {
-			const { hasClient } = await updateComponentEntry(filePath)
+			const { hasClient } = await updateComponentEntry(path)
 			invalidateHtmlCache()
 			if (hasClient) {
 				invalidateRewindInject()
@@ -630,19 +626,19 @@ export const runViteDev = async () => {
 		})
 	})
 
-	componentWatcher.on('change', (filePath) => {
-		if (!isComponentFile(filePath)) {
+	componentWatcher.on('change', (path) => {
+		if (!isComponentFile(path)) {
 			return
 		}
-		if (isClientComponent(filePath)) {
+		if (isClientComponent(path)) {
 			enqueue(async () => {
-				await updateComponentEntry(filePath)
+				await updateComponentEntry(path)
 				invalidateHtmlCache()
 			})
 			return
 		}
 		enqueue(async () => {
-			const { hasClient } = await updateComponentEntry(filePath)
+			const { hasClient } = await updateComponentEntry(path)
 			invalidateHtmlCache()
 			if (hasClient) {
 				invalidateRewindInject()
@@ -651,24 +647,24 @@ export const runViteDev = async () => {
 		})
 	})
 
-	componentWatcher.on('unlink', (filePath) => {
-		if (!isComponentFile(filePath)) return
-		if (isClientComponent(filePath)) {
+	componentWatcher.on('unlink', (path) => {
+		if (!isComponentFile(path)) return
+		if (isClientComponent(path)) {
 			enqueue(async () => {
-				await updateComponentEntry(filePath, { fallback: true })
+				await updateComponentEntry(path, { fallback: true })
 				invalidateRewindInject()
 				invalidateHtmlCache()
 				reload()
 			})
 			return
 		}
-		const exportName = getExportName(filePath)
+		const exportName = getExportName(path)
 		const currentSource = componentSources.get(exportName)
-		if (currentSource && currentSource !== filePath && existsSync(currentSource)) {
+		if (currentSource && currentSource !== path && existsSync(currentSource)) {
 			return
 		}
 		enqueue(async () => {
-			const { hasClient } = await updateComponentEntry(filePath, {
+			const { hasClient } = await updateComponentEntry(path, {
 				fallback: true
 			})
 			invalidateHtmlCache()

package/src/logger.js

@@ -71,10 +71,14 @@ export const style = {
 	bgWhite: formatter('\x1b[47m', '\x1b[49m')
 }
 
+const log = console.log.bind(console)
+const warn = console.warn.bind(console)
+const error = console.error.bind(console)
+
 export const logger = {
-	info: (msg) => console.log(`${style.blue('ℹ')}  ${msg}`),
-	success: (msg) => console.log(`${style.green('✔')}  ${msg}`),
-	warn: (msg) => console.log(`${style.yellow('⚠')}  ${msg}`),
-	error: (msg) => console.log(`${style.red('✖')}  ${msg}`),
-	dim: (msg) => console.log(style.dim(msg))
+	info: (msg) => log(`${style.blue('ℹ')}  ${msg}`),
+	success: (msg) => log(`${style.green('✔')}  ${msg}`),
+	warn: (msg) => warn(`${style.yellow('⚠')}  ${msg}`),
+	error: (msg) => error(`${style.red('✖')}  ${msg}`),
+	dim: (msg) => log(style.dim(msg))
 }

package/src/main.js

@@ -134,8 +134,12 @@ const main = async () => {
 		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 completed in ${style.bold(timeString)}.`)
+		logger.success(
+			`Build complete! Processed ${style.bold(totalPages)} ${pageLabel} in ${style.bold(timeString)}.`
+		)
 		return
 	}
 	cli.showHelp()

package/src/mdx.js

@@ -41,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>`
 
@@ -74,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)) {
@@ -132,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
@@ -150,7 +140,7 @@ export const buildPageContext = ({
 	const ctx = {
 		routePath,
 		routeHref: withBase(routePath),
-		filePath,
+		path,
 		page,
 		pages: pagesContext.pages || [],
 		pagesByRoute: pagesContext.pagesByRoute || new Map(),
@@ -299,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
 	})
@@ -319,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
@@ -342,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
 	})