methanol 0.0.20 → 0.0.22

package/src/workers/build-worker.js

@@ -18,9 +18,11 @@
  * under the License.
  */
 
-import '../register-loader.js'
 import { parentPort, workerData } from 'worker_threads'
+import { mkdir, writeFile, readFile, copyFile } from 'fs/promises'
+import { resolve, join, dirname } from 'path'
 import { style } from '../logger.js'
+import { scanRenderedHtml, rewriteHtmlContent, resolveManifestEntry } from '../html/worker-html.js'
 
 const { mode = 'production', configPath = null, command = 'build', cli: cliOverrides = null } =
 	workerData || {}
@@ -29,6 +31,7 @@ let pages = []
 let pagesContext = null
 let components = null
 let mdxPageIds = new Set()
+const parsedHtmlCache = new Map()
 
 const ensureInit = async () => {
 	if (initPromise) return initPromise
@@ -117,6 +120,11 @@ const handleSetPages = async (message) => {
 	await rebuildPagesContext(new Set(excludedRoutes), new Set(excludedDirs))
 }
 
+const handleSetPagesLite = async (message) => {
+	const { pages: nextPages } = message || {}
+	pages = Array.isArray(nextPages) ? nextPages : []
+}
+
 const handleSyncUpdates = async (message) => {
 	const { updates = [], excludedRoutes = null, excludedDirs = null } = message || {}
 	for (const update of updates) {
@@ -168,9 +176,17 @@ const handleCompile = async (message) => {
 	return updates
 }
 
+const MAX_PENDING_WRITES = 32
+
 const handleRender = async (message) => {
-	const { ids = [], stage } = message || {}
-	const { renderHtml } = await import('../mdx.js')
+	const { ids = [], stage, feedIds = [], htmlStageDir = null, writeConcurrency = null } = message || {}
+	const { renderHtml, renderPageContent } = await import('../mdx.js')
+	const feedSet = new Set(Array.isArray(feedIds) ? feedIds : [])
+	const writeLimit =
+		typeof writeConcurrency === 'number' && Number.isFinite(writeConcurrency)
+			? Math.max(1, Math.floor(writeConcurrency))
+			: MAX_PENDING_WRITES
+	const pendingWrites = []
 	let completed = 0
 	for (const id of ids) {
 		const page = pages[id]
@@ -187,7 +203,57 @@ const handleRender = async (message) => {
 				pagesContext,
 				pageMeta: page
 			})
-			parentPort?.postMessage({ type: 'result', stage, result: { id, html } })
+			let outputHtml = html
+			let scan = null
+			let feedContent = null
+			if (feedSet.has(id)) {
+				feedContent = await renderPageContent({
+					routePath: page.routePath,
+					path: page.path,
+					components,
+					pagesContext,
+					pageMeta: page
+				})
+			}
+			let stagePath = null
+			if (htmlStageDir) {
+				const scanned = await scanRenderedHtml(outputHtml, page.routePath)
+				outputHtml = scanned.html
+				scan = scanned.scan
+				const hasResources =
+					scan.scripts.length > 0 || scan.styles.length > 0 || scan.assets.length > 0
+				if (hasResources) {
+					parsedHtmlCache.set(id, scanned.plan)
+				}
+				const name = resolveOutputName(page)
+				stagePath = resolve(htmlStageDir, `${name}.html`)
+				pendingWrites.push(
+					(async () => {
+						await mkdir(dirname(stagePath), { recursive: true })
+						await writeFile(stagePath, outputHtml)
+					})()
+				)
+				if (pendingWrites.length >= writeLimit) {
+					const results = await Promise.allSettled(pendingWrites)
+					pendingWrites.length = 0
+					const failed = results.find((result) => result.status === 'rejected')
+					if (failed) {
+						throw failed.reason
+					}
+				}
+			}
+			page.mdxComponent = null
+			parentPort?.postMessage({
+				type: 'result',
+				stage,
+				result: {
+					id,
+					html: htmlStageDir ? null : outputHtml,
+					stagePath,
+					feedContent,
+					scan
+				}
+			})
 		} catch (error) {
 			logPageError('MDX render', page, error)
 			throw error
@@ -195,11 +261,55 @@ const handleRender = async (message) => {
 		completed += 1
 		parentPort?.postMessage({ type: 'progress', stage, completed })
 	}
+	if (pendingWrites.length) {
+		const results = await Promise.allSettled(pendingWrites)
+		const failed = results.find((result) => result.status === 'rejected')
+		if (failed) {
+			throw failed.reason
+		}
+	}
 }
 
-const handleRss = async (message) => {
-	const { ids = [], stage } = message || {}
-	const { renderPageContent } = await import('../mdx.js')
+const resolveOutputName = (page) => {
+	if (!page) return 'index'
+	if (page.routePath === '/') return 'index'
+	if (page.isIndex && page.dir) {
+		return join(page.dir, 'index').replace(/\\/g, '/')
+	}
+	return page.routePath.slice(1)
+}
+
+const handleRewrite = async (message) => {
+	const {
+		ids = [],
+		stage,
+		htmlStageDir,
+		manifest,
+		entryModules = [],
+		commonScripts = [],
+		commonEntry = null,
+		scans = {}
+	} = message || {}
+	const { state } = await import('../state.js')
+	const { resolveBasePrefix } = await import('../config.js')
+	const basePrefix = resolveBasePrefix()
+	const scriptMap = new Map()
+	const styleMap = new Map()
+	for (const entry of entryModules) {
+		if (!entry?.publicPath || !entry?.manifestKey) continue
+		const manifestEntry = resolveManifestEntry(manifest, entry.manifestKey)
+		if (!manifestEntry?.file) continue
+		if (entry.kind === 'script') {
+			scriptMap.set(entry.publicPath, { file: manifestEntry.file, css: manifestEntry.css || null })
+		}
+		if (entry.kind === 'style') {
+			const cssFile = manifestEntry.css?.[0] || (manifestEntry.file.endsWith('.css') ? manifestEntry.file : null)
+			if (cssFile) {
+				styleMap.set(entry.publicPath, { file: cssFile, css: manifestEntry.css || null })
+			}
+		}
+	}
+	const commonSet = new Set(commonScripts || [])
 	let completed = 0
 	for (const id of ids) {
 		const page = pages[id]
@@ -209,16 +319,40 @@ const handleRss = async (message) => {
 			continue
 		}
 		try {
-			const content = await renderPageContent({
-				routePath: page.routePath,
-				path: page.path,
-				components,
-				pagesContext,
-				pageMeta: page
-			})
-			parentPort?.postMessage({ type: 'result', stage, result: { id, content } })
+			const name = resolveOutputName(page)
+			const stagePath = htmlStageDir ? resolve(htmlStageDir, `${name}.html`) : null
+			const distPath = resolve(state.DIST_DIR, `${name}.html`)
+			await mkdir(dirname(distPath), { recursive: true })
+			const scan = scans?.[id] || null
+			if (scan && Array.isArray(scan.scripts) && Array.isArray(scan.styles) && Array.isArray(scan.assets)) {
+				if (scan.scripts.length === 0 && scan.styles.length === 0 && scan.assets.length === 0) {
+					await copyFile(stagePath, distPath)
+					completed += 1
+					parentPort?.postMessage({ type: 'progress', stage, completed })
+					continue
+				}
+			}
+			const plan = parsedHtmlCache.get(id)
+			const html = await readFile(stagePath, 'utf-8')
+			if (html == null) {
+				throw new Error('HTML content not available for rewrite')
+			}
+			const output = rewriteHtmlContent(
+				html,
+				plan,
+				page.routePath,
+				basePrefix,
+				manifest,
+				scriptMap,
+				styleMap,
+				commonSet,
+				commonEntry
+			)
+			parsedHtmlCache.delete(id)
+			await writeFile(distPath, output)
+			parentPort?.postMessage({ type: 'result', stage, result: { id } })
 		} catch (error) {
-			logPageError('RSS render', page, error)
+			logPageError('HTML rewrite', page, error)
 			throw error
 		}
 		completed += 1
@@ -235,6 +369,11 @@ parentPort?.on('message', async (message) => {
 			parentPort?.postMessage({ type: 'done', stage: 'setPages' })
 			return
 		}
+		if (type === 'setPagesLite') {
+			await handleSetPagesLite(message)
+			parentPort?.postMessage({ type: 'done', stage: 'setPagesLite' })
+			return
+		}
 		if (type === 'sync') {
 			await handleSyncUpdates(message)
 			parentPort?.postMessage({ type: 'done', stage: 'sync' })
@@ -250,8 +389,8 @@ parentPort?.on('message', async (message) => {
 			parentPort?.postMessage({ type: 'done', stage })
 			return
 		}
-		if (type === 'rss') {
-			await handleRss(message)
+		if (type === 'rewrite') {
+			await handleRewrite(message)
 			parentPort?.postMessage({ type: 'done', stage })
 			return
 		}

package/src/workers/entry-build-worker.js

@@ -0,0 +1,22 @@
+/* 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.
+ */
+
+import '../register-loader.js'
+import('./build-worker.js')

package/src/workers/entry-mdx-compile-worker.js

@@ -0,0 +1,22 @@
+/* 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.
+ */
+
+import '../register-loader.js'
+import('./mdx-compile-worker.js')

package/src/workers/mdx-compile-worker.js

@@ -18,7 +18,6 @@
  * under the License.
  */
 
-import '../register-loader.js'
 import { parentPort, workerData } from 'worker_threads'
 
 const { mode = 'production', configPath = null, cli: cliOverrides = null } = workerData || {}

package/themes/benchmark/README.md

@@ -0,0 +1,5 @@
+# Benchmark Theme
+
+Some frameworks cheat at benchmark, so can we.
+
+This theme does nothing but rendering the bodies of markdown files.

package/themes/benchmark/index.js

@@ -0,0 +1,33 @@
+/* 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.
+ */
+
+import { fileURLToPath } from 'url'
+import { dirname } from 'path'
+import PAGE_TEMPLATE from './src/page.jsx'
+
+const __filename = fileURLToPath(import.meta.url)
+const __dirname = dirname(__filename)
+
+export default () => {
+	return {
+		root: __dirname,
+		template: PAGE_TEMPLATE
+	}
+}

package/themes/benchmark/src/page.jsx

@@ -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.
+ */
+
+const PAGE_TEMPLATE = ({ PageContent }) => {
+	return <PageContent />
+}
+
+export default PAGE_TEMPLATE

package/themes/blog/src/page.jsx

@@ -128,7 +128,6 @@ const PAGE_TEMPLATE = ({ PageContent, ExtraHead, components, ctx, withBase }) =>
 	const pagefindOptions = ctx.site.pagefind?.options || null
 	const feedInfo = ctx.site.feed
 	const rssHref = feedInfo?.enabled ? feedInfo.href : null
-	const feedType = feedInfo?.atom ? 'application/atom+xml' : 'application/rss+xml'
 	const feedLabel = feedInfo?.atom ? 'Atom' : 'RSS'
 
 	return (
@@ -142,7 +141,6 @@ const PAGE_TEMPLATE = ({ PageContent, ExtraHead, components, ctx, withBase }) =>
 						{title} | {siteName}
 					</title>
 					<link rel="stylesheet" href="/.methanol_theme_blog/style.css" />
-					{rssHref ? <link rel="alternate" type={feedType} title={`${siteName} ${feedLabel}`} href={rssHref} /> : null}
 					<ExtraHead />
 				</head>
 				<body>

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

@@ -118,11 +118,12 @@ const NavTree = ({ nodes, depth }) => {
 	)
 }
 
-const rootNodes = signal()
+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) => {
 	currentPath.value = path
-	rootNodes.value = nodes.map(toSignal)
+	_rootNodes.value = nodes
 	return rootTree
 }

package/themes/default/src/page.jsx

@@ -63,7 +63,6 @@ const PAGE_TEMPLATE = ({ PageContent, ExtraHead, components, ctx }) => {
 	const pagefindOptions = ctx.site.pagefind?.options || null
 	const feedInfo = ctx.site.feed
 	const rssHref = feedInfo?.enabled ? feedInfo.href : null
-	const feedType = feedInfo?.atom ? 'application/atom+xml' : 'application/rss+xml'
 	const feedLabel = feedInfo?.atom ? 'Atom' : 'RSS'
 	const repoBase = ctx.site.repoBase
 	const sourceUrl = pageFrontmatter.sourceURL
@@ -128,7 +127,6 @@ const PAGE_TEMPLATE = ({ PageContent, ExtraHead, components, ctx }) => {
 					{twitterTitle ? <meta name="twitter:title" content={twitterTitle} /> : null}
 					{twitterDescription ? <meta name="twitter:description" content={twitterDescription} /> : null}
 					{twitterImage ? <meta name="twitter:image" content={twitterImage} /> : null}
-					{rssHref ? <link rel="alternate" type={feedType} title={`${siteName} ${feedLabel}`} href={rssHref} /> : null}
 					<link
 						rel="preload stylesheet"
 						as="style"