methanol 0.0.16 → 0.0.18

package/package.json

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

package/src/client/sw.js

@@ -139,7 +139,6 @@ self.addEventListener('install', (event) => {
 			const assetCache = await openCache(ASSETS_CACHE)
 			const manifestEntries = getManifestEntries()
 			const manifestMap = buildManifestMap(manifestEntries)
-			const previousMap = await loadStoredManifestMap()
 			const manifestUrls = manifestEntries.map((entry) => entry.url)
 			const [prioritized] = prioritizeManifestUrls(manifestUrls)
 			const { failedIndex } = await runConcurrentQueue(prioritized, {
@@ -150,11 +149,9 @@ self.addEventListener('install', (event) => {
 					const cached = await matchCache(cacheName, url)
 					const key = manifestKey(url)
 					const currentRevision = manifestMap.get(key) ?? null
-					const previousRevision = previousMap.get(key) ?? null
 					const shouldFetch = shouldFetchWithRevision({
 						cached,
-						currentRevision,
-						previousRevision
+						currentRevision
 					})
 					if (!shouldFetch) return true
 					const cache = isHtml ? pageCache : assetCache
@@ -272,11 +269,12 @@ async function runConcurrentQueue(list, { concurrency, handler, stopOnError = tr
 	return { ok: failedIndex === null, failedIndex }
 }
 
-function shouldFetchWithRevision({ cached, currentRevision, previousRevision }) {
+function shouldFetchWithRevision({ cached, currentRevision }) {
 	if (!cached) return true
 	if (currentRevision == null) return false
-	if (previousRevision == null) return true
-	return currentRevision !== previousRevision
+	const cachedRevision = cached.headers?.get?.(REVISION_HEADER)
+	if (cachedRevision == null) return true
+	return cachedRevision !== String(currentRevision)
 }
 
 function shouldRevalidateCached(cached, currentRevision) {
@@ -550,7 +548,6 @@ const DB_STORE = 'kv'
 const KEY_INDEX = 'warmIndex'
 const KEY_LEASE = 'warmLease'
 const KEY_FORCE = 'warmForce'
-const KEY_MANIFEST = 'warmManifest'
 
 function idbOpen() {
 	return new Promise((resolve, reject) => {
@@ -611,12 +608,6 @@ function buildManifestMap(entries) {
 	return map
 }
 
-async function loadStoredManifestMap() {
-	const stored = await idbGet(KEY_MANIFEST)
-	if (!stored) return new Map()
-	if (Array.isArray(stored)) return buildManifestMap(stored)
-	return new Map()
-}
 
 async function tryAcquireLease(leaseMs) {
 	const leaseId = randomId()
@@ -667,7 +658,6 @@ async function warmManifestResumable({ force = false } = {}) {
 	try {
 		const manifestEntries = getManifestEntries()
 		const manifestMap = buildManifestMap(manifestEntries)
-		const previousMap = await loadStoredManifestMap()
 		const [, urls] = prioritizeManifestUrls(manifestEntries.map((entry) => entry.url))
 		if (!urls.length) return
 		if (index >= urls.length) {
@@ -685,14 +675,12 @@ async function warmManifestResumable({ force = false } = {}) {
 				const isHtml = abs.endsWith('.html')
 				const key = manifestKey(abs)
 				const currentRevision = manifestMap.get(key) ?? null
-				const previousRevision = previousMap.get(key) ?? null
 
 				if (isHtml) {
 					const cached = await matchCache(PAGES_CACHE, abs)
 					const shouldFetch = shouldFetchWithRevision({
 						cached,
-						currentRevision,
-						previousRevision
+						currentRevision
 					})
 					if (!shouldFetch) return true
 
@@ -709,8 +697,7 @@ async function warmManifestResumable({ force = false } = {}) {
 					const cached = await matchCache(ASSETS_CACHE, abs)
 					const shouldFetch = shouldFetchWithRevision({
 						cached,
-						currentRevision,
-						previousRevision
+						currentRevision
 					})
 					if (!shouldFetch) return true
 
@@ -738,7 +725,6 @@ async function warmManifestResumable({ force = false } = {}) {
 		completed = true
 	} finally {
 		if (completed) {
-			await idbSet(KEY_MANIFEST, getManifestEntries())
 			await idbSet(KEY_FORCE, 0)
 		}
 		await releaseLease(lease)

package/src/components.js

@@ -51,6 +51,7 @@ export const reframeEnv = env()
 export const register = reframeEnv.register
 export const invalidateRegistryEntry = reframeEnv.invalidate
 export const genRegistryScript = reframeEnv.genRegistryScript
+export const resetReframeRenderCount = () => reframeEnv.resetRenderCount()
 
 const resolveComponentExport = (componentPath, exportName, ext) => {
 	const staticCandidate = `${componentPath}.static${ext}`
@@ -75,7 +76,9 @@ const resolveComponentExport = (componentPath, exportName, ext) => {
 	}
 
 	if (ret.staticPath) {
-		ret.staticImportURL = `${pathToFileURL(ret.staticPath).href}?t=${componentImportNonce}`
+		const baseUrl = pathToFileURL(ret.staticPath).href
+		ret.staticImportURL =
+			state.CURRENT_MODE === 'production' ? baseUrl : `${baseUrl}?t=${componentImportNonce}`
 	}
 
 	return ret

package/src/mdx.js

@@ -38,6 +38,7 @@ import { resolveUserMdxConfig, withBase } from './config.js'
 import { methanolCtx } from './rehype-plugins/methanol-ctx.js'
 import { linkResolve } from './rehype-plugins/link-resolve.js'
 import { cached } from './utils.js'
+import { resetReframeRenderCount } from './components.js'
 
 // Workaround for Vite: it doesn't support resolving module/virtual modules in script src in dev mode
 const resolveRewindInject = cached(() =>
@@ -585,6 +586,7 @@ export const compilePageMdx = async (page, pagesContext, options = {}) => {
 }
 
 export const renderHtml = async ({ routePath, path, components, pagesContext, pageMeta }) => {
+	resetReframeRenderCount()
 	const ctx = buildPageContext({
 		routePath,
 		path,

package/src/reframe.js

@@ -61,10 +61,10 @@ export function env(parentEnv) {
 		} while (keyPathRegistry[key] && keyPathRegistry[key] !== clientPath)
 
 		const component = async ({ children: childrenProp, ...props }, ...children) => {
-			const staticComponent = (await import(staticImportURL)).default
-
 			const id = renderCount++
 			const idStr = id.toString(16)
+
+			const staticComponent = (await import(staticImportURL)).default
 			const script = `$$rfrm(${JSON.stringify(key)},${id},${Object.keys(props).length ? JSON5.stringify(props).replace(/<\/script/ig, '<\\/script') : '{}'})`
 
 			return (R) => {
@@ -101,6 +101,11 @@ export function env(parentEnv) {
 		parent = nextParent || null
 	}
 
+	function resetRenderCount() {
+		renderCount = 0
+		parent?.resetRenderCount()
+	}
+
 	function getMergedRegistry() {
 		return Object.assign({}, parent?.registry, registry)
 	}
@@ -117,6 +122,7 @@ export function env(parentEnv) {
 		invalidate,
 		genRegistryScript,
 		setParent,
+		resetRenderCount,
 		get registry() {
 			return getMergedRegistry()
 		}

package/themes/default/sources/theme-prepare.js

@@ -29,7 +29,7 @@
 	if (savedAccent && savedAccent !== 'default') {
 		document.documentElement.classList.add('accent-' + savedAccent)
 	}
-})
+})()
 ;(function initPrefetch() {
 	const prefetched = new Set()
 	const canPrefetch = (anchor) => {
@@ -58,4 +58,4 @@
 		document.head.appendChild(link)
 	}
 	document.addEventListener('pointerover', onHover, { capture: true, passive: true })
-})
+})()