methanol 0.0.2 → 0.0.3

package/package.json

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

package/src/config.js

@@ -308,8 +308,12 @@ export const applyConfig = async (config, mode) => {
 	state.PAGEFIND_BUILD = resolvePagefindBuild(config)
 	state.USER_PRE_BUILD_HOOKS = normalizeHooks(config.preBuild)
 	state.USER_POST_BUILD_HOOKS = normalizeHooks(config.postBuild)
+	state.USER_PRE_BUNDLE_HOOKS = normalizeHooks(config.preBundle)
+	state.USER_POST_BUNDLE_HOOKS = normalizeHooks(config.postBundle)
 	state.THEME_PRE_BUILD_HOOKS = normalizeHooks(state.USER_THEME?.preBuild)
 	state.THEME_POST_BUILD_HOOKS = normalizeHooks(state.USER_THEME?.postBuild)
+	state.THEME_PRE_BUNDLE_HOOKS = normalizeHooks(state.USER_THEME?.preBundle)
+	state.THEME_POST_BUNDLE_HOOKS = normalizeHooks(state.USER_THEME?.postBundle)
 	const starryNight = resolveStarryNightConfig(config.starryNight)
 	const cliCodeHighlighting = cli.CLI_CODE_HIGHLIGHTING
 	if (cliCodeHighlighting != null) {

package/src/main.js

@@ -106,11 +106,7 @@ const main = async () => {
 		await runHooks(state.USER_PRE_BUILD_HOOKS)
 		await runHooks(state.THEME_PRE_BUILD_HOOKS)
 		const { entry, htmlCache, pagesContext } = await buildHtmlEntries()
-		await runViteBuild(entry, htmlCache)
-		if (state.PAGEFIND_ENABLED) {
-			await runPagefind()
-		}
-		const postBuildContext = pagesContext
+		const buildContext = pagesContext
 			? {
 					pagesContext,
 					pages: pagesContext.pages,
@@ -119,8 +115,16 @@ const main = async () => {
 					site: pagesContext.site
 				}
 			: null
-		await runHooks(state.THEME_POST_BUILD_HOOKS, postBuildContext)
-		await runHooks(state.USER_POST_BUILD_HOOKS, postBuildContext)
+		await runHooks(state.USER_PRE_BUNDLE_HOOKS, buildContext)
+		await runHooks(state.THEME_PRE_BUNDLE_HOOKS, buildContext)
+		await runViteBuild(entry, htmlCache)
+		await runHooks(state.THEME_POST_BUNDLE_HOOKS, buildContext)
+		await runHooks(state.USER_POST_BUNDLE_HOOKS, buildContext)
+		if (state.PAGEFIND_ENABLED) {
+			await runPagefind()
+		}
+		await runHooks(state.THEME_POST_BUILD_HOOKS, buildContext)
+		await runHooks(state.USER_POST_BUILD_HOOKS, buildContext)
 		return
 	}
 	cli.showHelp()

package/src/pages.js

@@ -111,7 +111,13 @@ export const routePathFromFile = (filePath, pagesDir = state.PAGES_DIR) => {
 
 const parseFrontmatter = (raw) => {
 	const parsed = matter(raw)
-	const data = parsed.data || {}
+	const data = { ...(parsed.data || {}) }
+	if (data.excerpt == null && data.description != null) {
+		data.excerpt = data.description
+	}
+	if (data.description == null && data.excerpt != null) {
+		data.description = data.excerpt
+	}
 	const content = parsed.content ?? ''
 	return {
 		data,

package/src/register-loader.js

@@ -18,12 +18,7 @@
  * under the License.
  */
 
-import { fileURLToPath } from 'node:url'
-import { dirname, resolve } from 'node:path'
 import { register } from 'node:module'
 
-const __filename = fileURLToPath(import.meta.url)
-const __dirname = dirname(__filename)
-const loaderPath = resolve(__dirname, '../src/node-loader.js')
-
-register(loaderPath, import.meta.url)
+const loaderUrl = new URL('./node-loader.js', import.meta.url)
+register(loaderUrl.href, import.meta.url)

package/src/state.js

@@ -169,8 +169,12 @@ export const state = {
 	PAGEFIND_BUILD: null,
 	USER_PRE_BUILD_HOOKS: [],
 	USER_POST_BUILD_HOOKS: [],
+	USER_PRE_BUNDLE_HOOKS: [],
+	USER_POST_BUNDLE_HOOKS: [],
 	THEME_PRE_BUILD_HOOKS: [],
 	THEME_POST_BUILD_HOOKS: [],
+	THEME_PRE_BUNDLE_HOOKS: [],
+	THEME_POST_BUNDLE_HOOKS: [],
 	STARRY_NIGHT_ENABLED: false,
 	STARRY_NIGHT_OPTIONS: null,
 	CURRENT_MODE: 'production',