@markless/bundler 0.5.0 → 0.7.0

package/dist/vite.js

@@ -1,10 +1,10 @@
-import { c as renderMarklessDevErrorDocument, n as MARKLESS_DEV_ERROR_CLIENT_ID, r as MARKLESS_DEV_ERROR_EVENT, s as normalizeMarklessDevError, t as MARKLESS_DEV_ERROR_CLEAR_EVENT } from "./dev-error-DRvO28Fd.js";
-import { Et as executionLogActivationInjection, I as sharedReachedRenderDataRequest, at as STORAGE_FREE_RESUME_ENTRY_SPECIFIER, it as RESUME_ENTRY_SPECIFIER, j as pathname, nt as outputDefaults, t as MARKLESS_DEFERRED_PACK } from "./route-pack-groups-BpefyjrE.js";
+import { a as MARKLESS_DEV_RELOADS_ATTRIBUTE, d as renderMarklessDevErrorDocument, i as MARKLESS_DEV_PAGE_EDIT_EVENT, n as MARKLESS_DEV_ERROR_CLIENT_ID, o as MARKLESS_DEV_RELOADS_EVENT, r as MARKLESS_DEV_ERROR_EVENT, t as MARKLESS_DEV_ERROR_CLEAR_EVENT, u as normalizeMarklessDevError } from "./dev-error-BEduK_R3.js";
+import { N as pathname, R as sharedReachedRenderDataRequest, at as outputDefaults, ct as STORAGE_FREE_RESUME_ENTRY_SPECIFIER, kt as executionLogActivationInjection, st as RESUME_ENTRY_SPECIFIER, t as MARKLESS_DEFERRED_PACK } from "./route-pack-groups-BXc755qH.js";
 import { n as includeOptimizedDeps, t as excludeSourceShippedDeps } from "./optimized-deps-BfzxSm6C.js";
-import { A as inlineDeferSource, E as preflightTsrxModuleDiagnostics, O as INLINE_DEFER_LOADER_SOURCE, T as prefetchChunkParses, _ as createPreloadGraphAdder, a as collapseInitFacadeImports, d as nativePackingEnabled, f as nativePackingPlugins, h as withUndemandedReExportDoors, k as createInlineDeferTriggerSource, l as marklessRuntimeSpecifierId, m as undemandedRuntimeModules, o as unwrapAsyncImportWrappers, p as isReExportDoor, t as createMarklessRolldownPlugin, u as DEPRECATED_NATIVE_PACKING_WARNING, v as runtimeModuleIdFromOrigin } from "./rolldown-BciZw5hZ.js";
+import { A as createInlineDeferTriggerSource, D as preflightTsrxModuleDiagnostics, E as prefetchChunkParses, M as moduleIdFor, _ as createPreloadGraphAdder, a as collapseInitFacadeImports, d as nativePackingEnabled, f as nativePackingPlugins, h as withUndemandedReExportDoors, j as inlineDeferSource, k as INLINE_DEFER_LOADER_SOURCE, l as marklessRuntimeSpecifierId, m as undemandedRuntimeModules, o as unwrapAsyncImportWrappers, p as isReExportDoor, t as createMarklessRolldownPlugin, u as DEPRECATED_NATIVE_PACKING_WARNING, v as runtimeModuleIdFromOrigin } from "./rolldown-DpkfQO1h.js";
 import { n as marklessRosterPositions, r as marklessRosterRenderContext, t as marklessRosterPositionSeeds } from "./shared-seed-slot-ihIVCD2S.js";
 import { joinURL, parsePath, withQuery } from "ufo";
-import { ASYNC_PROTOCOL_VERSION, STORAGE_SLOT_SYMBOL_KEY, escapeScriptJson, serializeRuntimeAsyncSnapshots, serializeRuntimeStateCells, storageAttributeName, storageCookieName, storageSlotEntryKeyFromGraphNodeId } from "@markless/serializer";
+import { ASYNC_PROTOCOL_VERSION, PROTOCOL_CONTAINER_HOST_NODE_ID, STORAGE_SLOT_SYMBOL_KEY, escapeScriptJson, serializeRuntimeAsyncSnapshots, serializeRuntimeStateCells, storageAttributeName, storageCookieName, storageSlotEntryKeyFromGraphNodeId } from "@markless/serializer";
 import { isAbsolute, join, resolve } from "pathe";
 import { DEBUGGING_PLAYBOOK_HINT } from "@markless/compiler";
 import { mkdtemp, readFile, rm, writeFile } from "node:fs/promises";
@@ -12,26 +12,30 @@ import { isAbsolute as isAbsolute$1 } from "node:path";
 import { pathToFileURL } from "node:url";
 import { createServerModuleRunner, isRunnableDevEnvironment } from "vite";
 import { tmpdir } from "node:os";
-import { PROTOCOL_EVENT_ACTION_KIND as PROTOCOL_EVENT_ACTION_KIND$1, PROTOCOL_IDLE_EVENT_NAME as PROTOCOL_IDLE_EVENT_NAME$1, PROTOCOL_LOCATOR_PATHS_ATTRIBUTE, PROTOCOL_VISIBLE_EVENT_NAME, protocolEventDispatchesMarkless } from "@markless/serializer/protocol";
+import { PROTOCOL_CONTAINER_END_COMMENT, PROTOCOL_CONTAINER_START_COMMENT, PROTOCOL_EVENT_ACTION_KIND as PROTOCOL_EVENT_ACTION_KIND$1, PROTOCOL_IDLE_EVENT_NAME as PROTOCOL_IDLE_EVENT_NAME$1, PROTOCOL_LOCATOR_PATHS_ATTRIBUTE, PROTOCOL_VISIBLE_EVENT_NAME, protocolEventDispatchesMarkless } from "@markless/serializer/protocol";
 import "@markless/serializer/resume-record-delta";
 //#region ../web/src/inline/served-census.ts
 /**
-* Pins the container's elements in DOM order as its census and returns them.
-* When the count differs from the one the server measured, a script outside
-* Markless changed the page first: the root is flagged for the resume module
-* to renumber the census, and no elements are returned, so nothing is matched
-* by a shifted index.
+* Pins the container's elements in DOM order as its census and returns them,
+* between the page start and end markers an author's element carries. When the
+* count differs from the one the server measured, a script outside Markless
+* changed the page first: the root is flagged for the resume module to renumber
+* the census, and no elements are returned, so nothing is matched by a shifted index.
 */
 function marklessServedCensus(root, attribute) {
 	const live = [root];
-	const walker = document.createTreeWalker(root, 1);
-	for (let next = walker.nextNode(); next; next = walker.nextNode()) live.push(next);
+	const walker = document.createTreeWalker(root, 129);
+	for (let next = walker.nextNode(); next; next = walker.nextNode()) if (next.nodeType !== 8) live.push(next);
+	else if (next.data === __MARKLESS_PAGE_START__) live.length = 1;
+	else if (next.data === __MARKLESS_PAGE_END__) break;
 	root.__marklessCensus ||= live;
 	const value = root.getAttribute?.(attribute);
 	return value && parseInt(value) !== live.length ? (root.__marklessShifted = 1, []) : live;
 }
 //#endregion
 //#region ../web/src/inline/resumer.ts
+const withPageMarkers = (source) => source.replaceAll("__MARKLESS_PAGE_START__", JSON.stringify(PROTOCOL_CONTAINER_START_COMMENT)).replaceAll("__MARKLESS_PAGE_END__", JSON.stringify(PROTOCOL_CONTAINER_END_COMMENT));
+const servedCensusSource = () => withPageMarkers(marklessServedCensus.toString());
 PROTOCOL_EVENT_ACTION_KIND$1.event, PROTOCOL_EVENT_ACTION_KIND$1.externalDelegate;
 const INLINE_MODULE_LOADER_SOURCE = INLINE_DEFER_LOADER_SOURCE;
 function createInlineResumerSelfWakeSource(resumeModuleUrl) {
@@ -54,14 +58,14 @@ function runInlineResumerStorageWake(slotSymbolKey, rendered, wake) {
 * with no mark ships a byte-identical resumer.
 */
 function createInlineResumerOverlayPrimerSource(resumeModuleUrl) {
-	return `;(${runInlineResumerOverlayPrimer.toString()})(${JSON.stringify(resumeModuleUrl)},${INLINE_MODULE_LOADER_SOURCE});`;
+	return `;(${withPageMarkers(runInlineResumerOverlayPrimer.toString())})(${JSON.stringify(resumeModuleUrl)},${INLINE_MODULE_LOADER_SOURCE});`;
 }
 const PRERENDER_INLINE_EVENT_NAMES_TOKEN = "__MARKLESS_PRERENDER_EVENT_NAMES__";
 function renderPrerenderInlineResumerSource(compiled, eventNames) {
 	return compiled.replace(PRERENDER_INLINE_EVENT_NAMES_TOKEN, JSON.stringify(eventNames));
 }
 function createPrerenderInlineResumerSource(eventNames, resumeModuleUrl, options) {
-	const plain = `(${runPrerenderInlineResumer.toString()})(${JSON.stringify(eventNames)},${JSON.stringify(resumeModuleUrl)},u=>import(u),${marklessServedCensus.toString()},${JSON.stringify(PROTOCOL_LOCATOR_PATHS_ATTRIBUTE)});`;
+	const plain = `(${runPrerenderInlineResumer.toString()})(${JSON.stringify(eventNames)},${JSON.stringify(resumeModuleUrl)},u=>import(u),${servedCensusSource()},${JSON.stringify(PROTOCOL_LOCATOR_PATHS_ATTRIBUTE)});`;
 	const logging = options?.executionLog !== void 0 && options.executionLog !== "never";
 	if (!options?.debug && !logging) return plain;
 	return `{
@@ -174,7 +178,7 @@ function runInlineResumerSelfWake(fallbackResumeModuleUrl, loadModule, defer) {
 	defer.idle(root, async () => {
 		if (root.__asyncResumeRuntimeStarted) return;
 		root.__marklessDelegatedDispatch = true;
-		await (await loadModule(resumeModuleUrl)).resumeContainerEvent({
+		await (await (root.__mResume ||= loadModule(resumeModuleUrl))).resumeContainerEvent({
 			root,
 			event: 0
 		});
@@ -196,8 +200,10 @@ function runInlineResumerOverlayPrimer(fallbackResumeModuleUrl, loadModule) {
 		if (root.__marklessDelegatedDispatch === true) return;
 		if (!root.__marklessCensus) {
 			const census = [root];
-			const all = root.getElementsByTagName?.("*") ?? [];
-			for (let index = 0; index < all.length; index++) census.push(all[index]);
+			const walker = document.createTreeWalker(root, 129);
+			for (let next = walker.nextNode(); next; next = walker.nextNode()) if (next.nodeType !== 8) census.push(next);
+			else if (next.data === __MARKLESS_PAGE_START__) census.length = 1;
+			else if (next.data === __MARKLESS_PAGE_END__) break;
 			root.__marklessCensus = census;
 		}
 		setTimeout(() => {
@@ -232,12 +238,19 @@ async function prepareSsrResumeRecords(output) {
 	};
 }
 function containerScopedView(view) {
+	const locators = view.locators.map((locator) => ({
+		...locator,
+		index: locator.index + 1
+	}));
+	if (view.keyedRepeats?.some((repeat) => repeat.parentHostNodeId === PROTOCOL_CONTAINER_HOST_NODE_ID)) locators.unshift({
+		hostNodeId: PROTOCOL_CONTAINER_HOST_NODE_ID,
+		strategy: "dom-order",
+		index: 0,
+		tagName: "*"
+	});
 	return {
 		...view,
-		locators: view.locators.map((locator) => ({
-			...locator,
-			index: locator.index + 1
-		}))
+		locators
 	};
 }
 function emptyStatePayload() {
@@ -259,6 +272,9 @@ function emptyViewPayload() {
 	};
 }
 //#endregion
+//#region ../web/src/fns/container-region.ts
+const CONTAINER_ATTRIBUTE = "data-async-container";
+//#endregion
 //#region ../web/src/fns/roster-position.ts
 /**
 * The server render context with the roster channels on it. One counter per
@@ -485,7 +501,7 @@ async function assemblePrerenderPageParts(component, output, options) {
 	const { state, view } = await prepareSsrResumeRecords(output);
 	const browserTriggers = hasBrowserTriggers(view, state);
 	const resumeModuleUrl = options.prerenderWakeModuleUrl ?? options.resumeModuleUrl ?? artifactPrerenderWakeModuleUrl(component) ?? artifactResumeModuleUrl(component);
-	const modulePreloads = (typeof options.modulePreloads === "function" ? options.modulePreloads(output.html) : options.modulePreloads) ?? (browserTriggers ? artifactModulePreloads(component) : void 0);
+	const modulePreloads = (typeof options.modulePreloads === "function" ? options.modulePreloads(output.html, browserTriggers && resumeModuleUrl !== void 0) : options.modulePreloads) ?? (browserTriggers ? artifactModulePreloads(component) : void 0);
 	const eventNames = browserEventNames(view);
 	const selfWake = hasUnsettledAsyncBoundaryRunner(view, state);
 	const boot = artifactPrerenderBoot(component);
@@ -656,25 +672,34 @@ function eventHostIndexes(view, eventName) {
 function deferredTriggerSource(view) {
 	const visible = eventHostIndexes(view, PROTOCOL_VISIBLE_EVENT_NAME);
 	const idle = eventHostIndexes(view, PROTOCOL_IDLE_EVENT_NAME$1);
-	if (browserEventNames({
+	const nested = deferredEventNames({
 		...view,
 		events: []
-	}).includes(PROTOCOL_IDLE_EVENT_NAME$1)) idle.push(0);
+	});
+	if (nested.includes(PROTOCOL_VISIBLE_EVENT_NAME)) visible.push(0);
+	if (nested.includes(PROTOCOL_IDLE_EVENT_NAME$1)) idle.push(0);
 	return (visible.length > 0 ? createInlineDeferTriggerSource("visible", visible) : "") + (idle.length > 0 ? createInlineDeferTriggerSource("idle", idle) : "");
 }
 function browserEventNames(view) {
+	return deferredEventNames(view).filter((eventName) => eventName !== PROTOCOL_VISIBLE_EVENT_NAME);
+}
+function deferredEventNames(view) {
 	return [.../* @__PURE__ */ new Set([
 		...view.events.filter(protocolEventDispatchesMarkless).map((event) => event.eventName),
 		...(view.keyedRepeats ?? []).flatMap((repeat) => repeat.rowEvents.map((event) => event.eventName)),
 		...(view.branches ?? []).flatMap((branch) => [...(branch.armRecords ?? []).flatMap((arm) => arm.events.filter(protocolEventDispatchesMarkless).map((event) => event.eventName)), ...branchServedArmEventNames(branch)]),
 		...view.asyncBoundaries.flatMap(boundaryArmEventNames)
-	])].filter((eventName) => eventName !== PROTOCOL_VISIBLE_EVENT_NAME);
+	])];
 }
 function renderContainer(containerId, parts, locators) {
 	const inner = parts.filter(Boolean).join("");
 	const paths = servedLocatorPaths(inner, locators);
-	return `<div data-async-container${containerId ? `="${escapeAttribute(containerId)}"` : ""}${paths ? ` ${PROTOCOL_LOCATOR_PATHS_ATTRIBUTE}="${paths}"` : ""}>${inner}</div>`;
+	const id = containerId ? `="${escapeAttribute(containerId)}"` : "";
+	const located = paths ? ` ${PROTOCOL_LOCATOR_PATHS_ATTRIBUTE}="${paths}"` : "";
+	return `${CONTAINER_OPEN}${id}${located}>${inner}${CONTAINER_CLOSE}`;
 }
+const CONTAINER_OPEN = `<div ${CONTAINER_ATTRIBUTE}`;
+const CONTAINER_CLOSE = "</div>";
 function renderInlineResumerScript(source, nonce, resumeModuleUrl, selfWake, settleModuleUrl, appendSelfWakeSource = true, overlayPrimer = false, appendedSource = "", deferFactory) {
 	const nonceAttribute = nonce ? ` nonce="${escapeAttribute(nonce)}"` : "";
 	const resumeModuleAttribute = resumeModuleUrl ? ` data-markless-resume-module="${escapeAttribute(resumeModuleUrl)}"` : "";
@@ -1327,6 +1352,9 @@ function createDevErrorClientAsset(viteClientUrl) {
 const hot = createHotContext(${JSON.stringify(MARKLESS_DEV_ERROR_CLIENT_ID)});
 const ERROR_EVENT = ${JSON.stringify(MARKLESS_DEV_ERROR_EVENT)};
 const CLEAR_EVENT = ${JSON.stringify(MARKLESS_DEV_ERROR_CLEAR_EVENT)};
+const RELOADS_EVENT = ${JSON.stringify(MARKLESS_DEV_RELOADS_EVENT)};
+const RELOADS_ATTRIBUTE = ${JSON.stringify(MARKLESS_DEV_RELOADS_ATTRIBUTE)};
+const PAGE_EDIT_EVENT = ${JSON.stringify(MARKLESS_DEV_PAGE_EDIT_EVENT)};
 const ELEMENT = 'markless-dev-error-overlay';
 const SUPPRESSION = 'data-markless-vite-overlay-suppression';
 const OPEN_IN_EDITOR = ${JSON.stringify(`${base}/__open-in-editor`)};
@@ -1400,6 +1428,10 @@ hot.on(CLEAR_EVENT, ({ id }) => { if (currentPayload?.id === id) reset(); });
 hot.on('vite:beforeFullReload', reset);
 addEventListener('keydown', (event) => { if (event.key === 'Escape') document.querySelector(ELEMENT)?.remove(); });
 if (window.__MARKLESS_DEV_ERROR__) show(window.__MARKLESS_DEV_ERROR__);
+const servedAfter = document.querySelector('script[' + RELOADS_ATTRIBUTE + ']')?.getAttribute(RELOADS_ATTRIBUTE);
+const report = (edit) => hot.send(RELOADS_EVENT, { reloads: servedAfter != null ? Number(servedAfter) : edit, href: location.href });
+if (servedAfter != null) report();
+hot.on(PAGE_EDIT_EVENT, ({ edit }) => report(edit));
 `;
 }
 //#endregion
@@ -1464,6 +1496,20 @@ function createViteHmr(options) {
 	let recheckingInvalidSources = false;
 	const preflightByFile = /* @__PURE__ */ new Map();
 	const unreportedInvalidations = /* @__PURE__ */ new Map();
+	const edits = [];
+	let lastReloadedEdit;
+	function recordEdit(edit, pages) {
+		if (edit === lastReloadedEdit) return void 0;
+		lastReloadedEdit = edit;
+		return edits.push(pages) - 1;
+	}
+	function servedPageIsStale(data) {
+		const since = typeof data?.reloads === "number" ? data.reloads : edits.length;
+		const later = edits.slice(Math.max(0, since));
+		if (later.length === 0) return false;
+		const page = typeof data?.href === "string" && options.pageForUrl ? options.pageForUrl(data.href) : void 0;
+		return later.some((pages) => pages === "all" || page === void 0 || pages.has(page));
+	}
 	let hotUpdatePasses = 0;
 	let hotUpdateCycle;
 	function beginHotUpdatePass() {
@@ -1587,7 +1633,10 @@ function createViteHmr(options) {
 				sendClear(id);
 				recovered = true;
 			}
-			if (recovered) server?.environments?.[options.clientEnvironment]?.hot?.send?.({ type: "full-reload" });
+			if (recovered) {
+				recordEdit(`recovered\0${Date.now()}`, "all");
+				server?.environments?.[options.clientEnvironment]?.hot?.send?.({ type: "full-reload" });
+			}
 		} finally {
 			recheckingInvalidSources = false;
 			stopInvalidSourceRecheckIfIdle();
@@ -1612,7 +1661,15 @@ function createViteHmr(options) {
 			installServerRenderBarrier(nextServer);
 			nextServer.httpServer?.once("close", cleanup);
 			nextServer.watcher?.once?.("close", cleanup);
-			if (options.enabled) installFetchViteClient(nextServer, options);
+			if (options.enabled) {
+				installFetchViteClient(nextServer, options, async () => {
+					await settledHotUpdate();
+					return edits.length;
+				});
+				nextServer.environments?.[options.clientEnvironment]?.hot?.on?.(MARKLESS_DEV_RELOADS_EVENT, (data, client) => {
+					if (servedPageIsStale(data)) client.send({ type: "full-reload" });
+				});
+			}
 		},
 		transformIndexHtml() {},
 		resolveId(id) {
@@ -1641,6 +1698,49 @@ function createViteHmr(options) {
 			}
 		}
 	};
+	function loadedOrInvalid(environments, file) {
+		const path = parsePath(file).pathname;
+		if (invalidSources.has(path)) return true;
+		let answered = false;
+		for (const environment of environments) {
+			if (typeof environment.moduleGraph?.getModulesByFile !== "function") continue;
+			answered = true;
+			if (environment.moduleGraph.getModulesByFile(path)?.size) return true;
+		}
+		return !answered;
+	}
+	function editedPages(targets, file) {
+		const isPage = options.isPage;
+		const root = server?.config?.root;
+		if (!isPage || !options.pageForUrl || !root) return "all";
+		const pageOf = (module) => {
+			const id = module.file ? moduleIdFor(module.file, root) : void 0;
+			return id !== void 0 && isPage(id) ? id : void 0;
+		};
+		const pending = [];
+		for (const [target, scope] of targets) {
+			if (scope !== "server") continue;
+			pending.push(...target.moduleGraph?.getModulesByFile?.(parsePath(file).pathname) ?? []);
+		}
+		if (pending.length === 0) return "all";
+		const pages = /* @__PURE__ */ new Set();
+		const seen = /* @__PURE__ */ new Set();
+		while (pending.length > 0) {
+			const module = pending.pop();
+			if (seen.has(module)) continue;
+			seen.add(module);
+			const page = pageOf(module);
+			const importers = [...module.importers ?? []];
+			if (page) {
+				pages.add(page);
+				pending.push(...importers.filter((importer) => pageOf(importer)));
+				continue;
+			}
+			if (importers.length === 0) return "all";
+			pending.push(...importers);
+		}
+		return pages;
+	}
 	async function runHotUpdate(environment, ctx) {
 		if (!environment) return;
 		const env = marklessEnvironment(environment);
@@ -1659,6 +1759,22 @@ function createViteHmr(options) {
 		}
 		const modules = new Set(ctx.modules ?? []);
 		if (ctx.file) for (const target of targets.keys()) for (const module of target.moduleGraph?.getModulesByFile?.(ctx.file) ?? []) modules.add(module);
+		const listingModules = /* @__PURE__ */ new Map();
+		if (ctx.type !== "update") {
+			listingModules.set(environment, new Set(ctx.modules ?? []));
+			for (const target of targets.keys()) for (const module of await globImporters(target, ctx)) {
+				const listed = listingModules.get(target) ?? /* @__PURE__ */ new Set();
+				listed.add(module);
+				listingModules.set(target, listed);
+				modules.add(module);
+			}
+		}
+		if (modules.size === 0 && ctx.file && !loadedOrInvalid(targets.keys(), ctx.file)) return [];
+		for (const [target, listed] of listingModules) for (const module of listed) {
+			const invalidated = /* @__PURE__ */ new Set();
+			target.moduleGraph?.invalidateModule?.(module, invalidated, ctx.timestamp, true);
+			recordUnreportedInvalidation(target, invalidated);
+		}
 		const files = changedFiles([...modules]);
 		const root = server?.config?.root;
 		if (ctx.file && SOURCE_FILE_EXTENSION.test(ctx.file)) {
@@ -1722,14 +1838,31 @@ function createViteHmr(options) {
 			recordUnreportedInvalidation(targetEnvironment, invalidated);
 		}
 		reloadModuleRunner();
-		hot.send({
+		const pages = ctx.type === "update" && ctx.file ? editedPages(targets, ctx.file) : "all";
+		const edit = recordEdit(`${ctx.file}\0${ctx.timestamp}`, pages);
+		if (pages === "all") hot.send({
 			type: "full-reload",
 			path: firstChangedFile(files),
 			triggeredBy: ctx.file
 		});
+		else if (edit !== void 0) hot.send({
+			type: "custom",
+			event: MARKLESS_DEV_PAGE_EDIT_EVENT,
+			data: { edit }
+		});
 		return [];
 	}
 }
+async function globImporters(environment, ctx) {
+	const hook = (environment.plugins?.find((candidate) => candidate.name === "vite:import-glob"))?.hotUpdate;
+	const handler = typeof hook === "function" ? hook : hook?.handler;
+	if (!handler) return [];
+	const modules = await handler.call({ environment }, {
+		...ctx,
+		modules: []
+	});
+	return Array.isArray(modules) ? modules : [];
+}
 async function fetchedModuleNode(environment, id) {
 	const resolved = id.startsWith(VITE_ID_PREFIX) ? id.slice(5).replace(VITE_NULL_BYTE, "\0") : id;
 	return environment.moduleGraph.getModuleById(resolved) ?? await environment.moduleGraph.getModuleByUrl(id).catch(() => void 0);
@@ -1737,16 +1870,17 @@ async function fetchedModuleNode(environment, id) {
 function hasErrorCode(error, code) {
 	return typeof error === "object" && error !== null && "code" in error && error.code === code;
 }
-function installFetchViteClient(server, options) {
+function installFetchViteClient(server, options, servedAfterReloads) {
 	for (const environment of Object.values(server.environments)) {
 		const fetchEnv = fetchableDevEnvironment(environment);
 		if (!fetchEnv) continue;
 		const dispatchFetch = fetchEnv.dispatchFetch.bind(fetchEnv);
 		fetchEnv.dispatchFetch = async (request) => {
+			const reloads = await servedAfterReloads();
 			const response = await dispatchFetch(request);
 			if (!response.headers.get("content-type")?.includes("text/html")) return response;
 			const html = await response.text();
-			const nextHtml = injectDevClients(html, options.base);
+			const nextHtml = injectDevClients(html, options.base, reloads);
 			const headers = new Headers(response.headers);
 			if (nextHtml !== html) headers.delete("content-length");
 			return new Response(nextHtml, {
@@ -1757,9 +1891,9 @@ function installFetchViteClient(server, options) {
 		};
 	}
 }
-function injectDevClients(html, base) {
+function injectDevClients(html, base, reloads) {
 	if (!html) return html;
-	const tags = [...html.includes("/@vite/client") ? [] : [`<script type="module" src="${joinURL(base, "/@vite/client")}"><\/script>`], ...html.includes("virtual:markless:dev-error-client") ? [] : [`<script type="module" src="${joinURL(base, `/@id/__x00__${MARKLESS_DEV_ERROR_CLIENT_ID}`)}"><\/script>`]].join("");
+	const tags = [...html.includes("/@vite/client") ? [] : [`<script type="module" src="${joinURL(base, "/@vite/client")}"><\/script>`], ...html.includes("virtual:markless:dev-error-client") ? [] : [`<script type="module" src="${joinURL(base, `/@id/__x00__${MARKLESS_DEV_ERROR_CLIENT_ID}`)}"${reloads === void 0 ? "" : ` ${MARKLESS_DEV_RELOADS_ATTRIBUTE}="${reloads}"`}><\/script>`]].join("");
 	if (!tags) return html;
 	if (html.includes("</head>")) return html.replace("</head>", `${tags}</head>`);
 	if (html.includes("<head>")) return html.replace("<head>", `<head>${tags}`);
@@ -1957,7 +2091,9 @@ function markless(options = {}) {
 		clientEnvironment: viteEnvironmentName("client", options),
 		enabled: false,
 		invalidateGeneratedModules: (parent, environment, nextSource) => marklessPlugin.api.invalidateGeneratedModules(parent, environment, nextSource),
-		invalidatePrerenderSnapshots: void 0
+		invalidatePrerenderSnapshots: void 0,
+		isPage: void 0,
+		pageForUrl: void 0
 	};
 	let devPrerender;
 	const devTags = createDevTags();
@@ -1975,6 +2111,13 @@ function markless(options = {}) {
 		sharedDuringBuild: true,
 		api: {
 			...basePlugin.api,
+			declareRouteModules: (isRoute) => {
+				basePlugin.api.declareRouteModules(isRoute);
+				hmrOptions.isPage = isRoute;
+			},
+			declarePageForUrl: (pageForUrl) => {
+				hmrOptions.pageForUrl = pageForUrl;
+			},
 			registerBundleGraphAdder: (adder) => bundleGraphAdders.add(adder),
 			registerDevInjection: (injection) => devTags.register(injection),
 			registerPreloadGraphEntries: (adder) => bundleGraphAdders.add(createPreloadGraphAdder(adder))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@markless/bundler",
-  "version": "0.5.0",
+  "version": "0.7.0",
   "description": "Markless build plugins for Rolldown and Vite.",
   "license": "MIT",
   "repository": {
@@ -39,12 +39,12 @@
     "@thi.ng/dgraph": "^2.1.205",
     "pathe": "^2.0.3",
     "ufo": "^1.6.4",
-    "@markless/serializer": "0.5.0",
-    "@markless/compiler": "0.5.0",
-    "@markless/web": "0.5.0"
+    "@markless/compiler": "0.7.0",
+    "@markless/web": "0.7.0",
+    "@markless/serializer": "0.7.0"
   },
   "devDependencies": {
-    "@markless/analyzer": "0.5.0"
+    "@markless/analyzer": "0.7.0"
   },
   "peerDependencies": {
     "rolldown": "1.2.7",