@markless/router 0.7.0 → 0.8.0

package/dist/{create-server-entry-yboa-2m6.js → create-server-entry-BsYTWdxi.js}

@@ -1,5 +1,5 @@
 import { a as ROUTE_SCRIPT_TYPE, c as servedHtmlAttributesScript, d as REPLACE_ATTRIBUTE, f as SCROLL_ATTRIBUTE, i as HTML_ATTRIBUTES_SLOT, l as LINK_ATTRIBUTE, n as requestLocals, o as SERVED_HTML_ATTRIBUTES_PROPERTY, r as takeMiddlewareHeaders, u as PREFETCH_ATTRIBUTE } from "./request-locals-BDAhNpEa.js";
-import { i as matchRouteManifest, n as buildRouteManifestFromFileIds, o as normalizeRouteFileId } from "./route-manifest-DMizh42B.js";
+import { i as matchRouteManifest, n as buildRouteManifestFromFileIds, o as normalizeRouteFileId } from "./route-manifest-DmoxXanW.js";
 import { n as __marklessDebugBootstrapSource } from "./debug-channel-Di6SppZv.js";
 import { CONTAINER_ATTRIBUTE, PROTOCOL_CONTAINER_END_COMMENT, PROTOCOL_CONTAINER_START_COMMENT, PROTOCOL_LOCATOR_PATHS_ATTRIBUTE } from "@markless/web/fns/container-region";
 import { CONTAINER_RETIRE_PROPERTY, renderToString, splitSsrContainer } from "@markless/web/render-to-string";
@@ -49,6 +49,11 @@ function appendModulePreloads(document, items) {
 	return appended;
 }
 //#endregion
+//#region src/vite/runtime/document-handlers.ts
+function documentHandlersMessage(what) {
+	return `MARKLESS_ROUTER_DOCUMENT_HANDLERS_UNSUPPORTED: ${what}, but the router serves only the document's HTML and never wires it in the browser, so the handler would never run. Put the handler on an element a page renders, for example in a layout component each page wraps its content in.`;
+}
+//#endregion
 //#region src/vite/fragment-navigation.ts
 function startFragmentNavigation(d, linkAttributeOf, routes, importModule, loadRun, intentOf) {
 	const w = d.defaultView;
@@ -192,7 +197,14 @@ function runFragmentNavigation(d, config, routes, importModule, scrolled, arrivi
 			if (endpoint && !under) return false;
 			const rest = page.indexOf("**");
 			if (rest === -1 ? page.length !== parts.length : parts.length <= rest) return false;
-			return page.every((segment, index) => segment === "**" || segment === ":" || segment === parts[index]);
+			return page.every((segment, index) => {
+				if (segment === "**" || segment === ":") return true;
+				try {
+					return segment === decodeURIComponent(parts[index]);
+				} catch {
+					return segment === parts[index];
+				}
+			});
 		});
 	};
 	const eligible = (anchor, forClick = false) => {
@@ -836,7 +848,7 @@ function createServerEntry(options) {
 		const renderSsr = baseArtifact?.renderSsr ?? pageModule.marklessRenderSsr;
 		if (!renderSsr) {
 			const shell = await renderDocumentShell(documentModule, pageProps, "");
-			const message = `Page module must export an Markless compiled artifact: ${escapeHtml(file)}`;
+			const message = `Page module must export a Markless compiled artifact: ${escapeHtml(file)}`;
 			return new Response(fillDocumentChildren(shell, message), http.commit(status, headers));
 		}
 		const documentLoads = options.documentNavigation === "document";
@@ -864,7 +876,7 @@ function createServerEntry(options) {
 			resumeModuleUrl: options.resumeEntryPath ?? baseArtifact?.resumeModuleUrl,
 			modulePreloads: (html, resumes) => landingModulePreloads(resumes ? options.routeSsrModulePreloads?.[file] : void 0, linkBridges?.[html.includes("href=\"#/") ? 1 : 0])
 		};
-		const headStart = (documentLoads && fragmentNavigation && !fragment ? servedHtmlAttributesScript() : "") + (options.importMap ?? "");
+		const headStart = (documentLoads && fragmentNavigation && !fragment ? servedHtmlAttributesScript() : "") + (fragment ? "" : options.importMap ?? "");
 		if (options.render === "blocking") {
 			const pageHtml = splitPageHtml(await renderToString(routedArtifact, renderOptions));
 			privateToVisitor();
@@ -1104,8 +1116,15 @@ function wholeDocument(shell, page, fragment, documentLoads) {
 async function renderDocumentModule(documentModule, props, htmlAttributes) {
 	const output = await documentModule?.default?.renderSsr?.(props, { [HTML_ATTRIBUTES_SLOT]: htmlAttributes });
 	assertDocumentStorageFree(output);
+	assertDocumentHandlerFree(output);
 	return output?.html;
 }
+function assertDocumentHandlerFree(output) {
+	const view = output?.view;
+	const names = [...new Set((view?.events ?? []).map((event) => event.eventName))];
+	if (names.length === 0) return;
+	throw new Error(documentHandlersMessage(`the document renders ${names.join(", ")} handlers`));
+}
 function assertDocumentStorageFree(output) {
 	const storage = documentStorageRecords(output?.state);
 	if (storage.length === 0) return;
@@ -1330,4 +1349,4 @@ function insertImportMap(html, importMap) {
 	return `${html.slice(0, at)}${importMap}${html.slice(at)}`;
 }
 //#endregion
-export { runFragmentNavigation as a, FRAGMENT_PATH_PREFIX as i, routerLinkBridgeModules as n, startFragmentNavigation as o, LINK_BRIDGE_DIR as r, listenForLinkIntent as s, createServerEntry as t };
+export { runFragmentNavigation as a, listenForLinkIntent as c, FRAGMENT_PATH_PREFIX as i, routerLinkBridgeModules as n, startFragmentNavigation as o, LINK_BRIDGE_DIR as r, documentHandlersMessage as s, createServerEntry as t };

package/dist/debug-channel-dB6CJyHa.js

@@ -0,0 +1 @@
+export { t as __marklessDebugActivateContainer, n as __marklessDebugBootstrapSource, r as __marklessDebugChannelForTest, i as __marklessDebugDisposeContainer, a as __marklessDebugInvalidateElement, o as __marklessDebugRecordInteraction, s as __marklessDebugRecordViolation, c as __marklessDebugRegisterDelegatedEvents, l as __marklessDebugRegisterRouter, u as __marklessDebugResetForTest, d as __marklessDebugSetBoundaries, f as __marklessDebugStartContainer } from "./debug-channel-Di6SppZv.js";

package/dist/index.js

@@ -1,5 +1,5 @@
 import { d as REPLACE_ATTRIBUTE, f as SCROLL_ATTRIBUTE, i as HTML_ATTRIBUTES_SLOT, l as LINK_ATTRIBUTE, s as routeMountTarget, t as rememberRequestLocals, u as PREFETCH_ATTRIBUTE } from "./request-locals-BDAhNpEa.js";
-import { a as normalizeRequestPathname, c as parseRequestFile, i as matchRouteManifest, l as transformRequestFileSource, n as buildRouteManifestFromFileIds, o as normalizeRouteFileId, s as normalizeRequestFileId } from "./route-manifest-DMizh42B.js";
+import { a as normalizeRequestPathname, c as parseRequestFile, i as matchRouteManifest, l as transformRequestFileSource, n as buildRouteManifestFromFileIds, o as normalizeRouteFileId, s as normalizeRequestFileId } from "./route-manifest-DmoxXanW.js";
 import { createExternalDelegateStructureTokens, createExternalDelegateView } from "@markless/web/fns/external-delegate";
 import { render } from "@markless/web/render";
 import { MARKLESS_PENDING_MIN_VISIBLE_MS as MARKLESS_NAV_PENDING_MIN_MS, settleOrPendingDeadline } from "@markless/web/fns/pending-timing";
@@ -152,8 +152,8 @@ async function __marklessRouterStartSpaNavigation(options) {
 	navigation.addEventListener("navigate", (event) => {
 		handleNavigateEvent(event, context);
 	});
-	if (typeof __MARKLESS_DEBUG_ENABLED__ !== "undefined" && __MARKLESS_DEBUG_ENABLED__) await import("./debug-channel-CewnC9fH.js").then((debug) => debug.__marklessDebugRegisterRouter(void 0, "spa-click-listener")).catch(() => {});
-	if (typeof __MARKLESS_DEBUG_ENABLED__ !== "undefined" && __MARKLESS_DEBUG_ENABLED__) await import("./debug-channel-CewnC9fH.js").then((debug) => debug.__marklessDebugRegisterRouter(void 0, "navigation-event")).catch(() => {});
+	if (typeof __MARKLESS_DEBUG_ENABLED__ !== "undefined" && __MARKLESS_DEBUG_ENABLED__) await import("./debug-channel-dB6CJyHa.js").then((debug) => debug.__marklessDebugRegisterRouter(void 0, "spa-click-listener")).catch(() => {});
+	if (typeof __MARKLESS_DEBUG_ENABLED__ !== "undefined" && __MARKLESS_DEBUG_ENABLED__) await import("./debug-channel-dB6CJyHa.js").then((debug) => debug.__marklessDebugRegisterRouter(void 0, "navigation-event")).catch(() => {});
 	{
 		const bootUrl = parseSameOriginUrl(runtimeWindow.location.href, runtimeWindow.location.href);
 		const bootHashPath = bootUrl ? hashRoutePath(bootUrl) : void 0;

package/dist/{route-manifest-DMizh42B.js → route-manifest-DmoxXanW.js}

@@ -1,5 +1,5 @@
 import { basename, extname, join, normalize, relative } from "pathe";
-import { joinURL, withLeadingSlash, withoutLeadingSlash, withoutTrailingSlash } from "ufo";
+import { decode, joinURL, withLeadingSlash, withoutLeadingSlash, withoutTrailingSlash } from "ufo";
 const MIDDLEWARE_DIR = "middleware";
 const HTTP_METHODS = /* @__PURE__ */ new Set([
 	"connect",
@@ -432,7 +432,7 @@ function matchRoutePathname(route, requestPathname) {
 			params[routeSegment.slice(1)] = requestSegment;
 			continue;
 		}
-		if (routeSegment !== requestSegment) return;
+		if (routeSegment !== decode(requestSegment)) return;
 	}
 	return params;
 }

package/dist/vite/route-href.js

@@ -1,2 +1 @@
-import { t as __marklessRouteHref } from "../route-href-CGooO_g6.js";
-export { __marklessRouteHref };
+export { t as __marklessRouteHref } from "../route-href-CGooO_g6.js";

package/dist/vite/runtime/create-route-discovery.js

@@ -1,4 +1,4 @@
-import { o as normalizeRouteFileId } from "../../route-manifest-DMizh42B.js";
+import { o as normalizeRouteFileId } from "../../route-manifest-DmoxXanW.js";
 //#region src/vite/runtime/create-route-discovery.ts
 function createRouteDiscovery(discoveredPageModuleLoaders) {
 	const pageModuleLoaders = Object.fromEntries(Object.entries(discoveredPageModuleLoaders).map(([file, loader]) => [normalizeRouteFileId(file), loader]));

package/dist/vite/runtime/create-server-entry.js

@@ -1,2 +1 @@
-import { n as routerLinkBridgeModules, t as createServerEntry } from "../../create-server-entry-yboa-2m6.js";
-export { createServerEntry, routerLinkBridgeModules };
+export { t as createServerEntry, n as routerLinkBridgeModules } from "../../create-server-entry-BsYTWdxi.js";

package/dist/vite/runtime/mdx-route.d.ts

@@ -1186,4 +1186,5 @@ export declare function renderMdxChild(children: MdxChild[], component: MdxCompo
 export declare function composeMdxState(children: readonly MdxChild[]): MdxStatePayload | undefined;
 export declare function composeMdxView(parts: readonly MdxRoutePart[], children: readonly MdxChild[], initialElementOffset: number, initialCommentOffset?: number): MdxViewPayload | undefined;
 export declare function loadMdxSymbol(symbolId: string, children: readonly MdxChild[], loaders: readonly MdxSymbolLoader[]): unknown;
-//#endregion
+//#endregion
+export {};

package/dist/vite.js

@@ -1,8 +1,8 @@
 import { d as REPLACE_ATTRIBUTE, f as SCROLL_ATTRIBUTE, l as LINK_ATTRIBUTE, u as PREFETCH_ATTRIBUTE } from "./request-locals-BDAhNpEa.js";
-import { i as matchRouteManifest, l as transformRequestFileSource, n as buildRouteManifestFromFileIds, o as normalizeRouteFileId, r as isPageModuleFile, t as assertNoEndpointConflicts } from "./route-manifest-DMizh42B.js";
+import { i as matchRouteManifest, l as transformRequestFileSource, n as buildRouteManifestFromFileIds, o as normalizeRouteFileId, r as isPageModuleFile, t as assertNoEndpointConflicts } from "./route-manifest-DmoxXanW.js";
 import { t as __marklessRouteHref } from "./route-href-CGooO_g6.js";
 import { r as protocolIslandSegment } from "./protocol-constants-B4WxrZAS.js";
-import { a as runFragmentNavigation, i as FRAGMENT_PATH_PREFIX, n as routerLinkBridgeModules, o as startFragmentNavigation, s as listenForLinkIntent } from "./create-server-entry-yboa-2m6.js";
+import { a as runFragmentNavigation, c as listenForLinkIntent, i as FRAGMENT_PATH_PREFIX, n as routerLinkBridgeModules, o as startFragmentNavigation, s as documentHandlersMessage } from "./create-server-entry-BsYTWdxi.js";
 import { dirname, extname, isAbsolute, join, normalize, relative, resolve } from "pathe";
 import { decodePath, joinURL, parsePath, parseQuery, parseURL, stringifyQuery, withLeadingSlash, withQuery, withoutBase, withoutLeadingSlash } from "ufo";
 import { existsSync, readdirSync } from "node:fs";
@@ -11,10 +11,20 @@ import { nitro } from "nitro/vite";
 import { minifySync, sortUserPlugins } from "vite";
 import { isClientPrimarySourceRequest, isExecutionLogChunk, isMarklessNavigationPack, isRenderDataSourceRequest, isResumeSourceRequest, isRouteNavigationSourceRequest, isSymbolOnlySourceRequest, lazyStartupPackName, marklessDeferredChunkFileNames, optimizedDepsToInclude, plannedLandingFiles, resolverVirtualModuleSourceFile, startupPackOfLazy, symbolVirtualModuleSourceFile, warmEvaluatedImports } from "@markless/bundler/preload";
 import { MARKLESS_BUILD_PREFIX, MARKLESS_CHUNK_SPECIFIER_PREFIX, MARKLESS_IMPORT_MAP_ASSET, MARKLESS_PUBLIC_BUILD_METADATA_FILES, importMapScript, marklessBuildManifestDir } from "@markless/bundler/rolldown";
-import { parseModule } from "@tsrx/yuku";
+import { parse } from "@tsrx/yuku";
 import { toHtml } from "hast-util-to-html";
 import { HastReader, createMdxHastHandle, defineHastPlugin, dropHandle, materializeHastTree, resolveHastSubscriptions, serializeHandle, visitHastHandle } from "satteri";
 import "@markless/web/render-to-string";
+import { isEventAttribute } from "@markless/compiler";
+//#region src/vite/tsrx-ast.ts
+/** A `.tsrx` module's tree; throws a `SyntaxError` naming the first error, as a module that does not parse has no tree to read. */
+function parseTsrxModule(source) {
+	const { program, diagnostics } = parse(source, { preserveParens: true });
+	const error = diagnostics.find((diagnostic) => diagnostic.severity === "error");
+	if (error) throw new SyntaxError(`${error.message} (${error.start}:${error.end})`);
+	return program;
+}
+//#endregion
 //#region src/route-types.ts
 const routeTypesEnvPath = "markless-router-env.d.ts";
 const routeTypesOutputPath = ".output/markless/router/types/routes.d.ts";
@@ -300,7 +310,7 @@ function lowerRouterLinks(code, ast) {
 	return applyEdits(code, edits);
 }
 function parseTransformAst(code, id, parse) {
-	if (id.includes(".tsrx")) return parseModule(code, id);
+	if (id.includes(".tsrx")) return parseTsrxModule(code);
 	return parse(code, {
 		astType: "ts",
 		lang: id.includes(".jsx") ? "jsx" : "tsx",
@@ -825,6 +835,8 @@ function scalarPlanSourceReference(source) {
 		[MARKLESS_SCALAR_PLAN_SOURCE_QUERY]: null
 	});
 }
+//#endregion
+//#region ../bundler/src/source-module.ts
 /**
 * The same one line for the live roster, gated on the same fact the reconcile
 * plane is gated on: a payload with no computed nodes can hold no roster
@@ -844,6 +856,7 @@ function emitQueuedResumeContainerEvent(source, { censusRepair = true } = {}) {
 		implementation,
 		"export function resumeContainerEvent(input) {",
 		"	const root = input.root;",
+		"	if (input.eventIndex >= 0) input = { ...input, eventRecord: (root.__mE ||= JSON.parse(root.querySelector('script[type=\"markless/view\"]').textContent).events)[input.eventIndex] };",
 		censusRepair ? "	if (root.__marklessShifted) return import('@markless/web/fns/served-census-repair').then((census) => (census.marklessRepairCensus(root), resumeContainerEvent(input)));" : "",
 		"	if (!root.__marklessDispatch) {",
 		"		let handler = marklessResumeContainerEvent, tail = Promise.resolve(), done = tail, lastEvent = null, lastEventTime = undefined, seen = new WeakMap();",
@@ -1389,11 +1402,11 @@ const NAVIGATION_POLYFILL_MODULE = "@virtualstate/navigation";
 //#endregion
 //#region src/vite/document-navigation.ts
 const ROUTE_INVARIANT_DOCUMENT_PROPS = /* @__PURE__ */ new Set(["children"]);
-function documentNavigationFor(source, id) {
+function documentNavigationFor(source) {
 	if (source === void 0) return "client";
 	let program;
 	try {
-		program = parseModule(source, id);
+		program = parseTsrxModule(source);
 	} catch {
 		return "document";
 	}
@@ -1403,6 +1416,43 @@ function documentNavigationFor(source, id) {
 	if (!component) return "document";
 	return readsOnlyRouteInvariantProps(nodes(component.params)) ? "client" : "document";
 }
+function documentHandlerError(source, id) {
+	if (source === void 0) return void 0;
+	let program;
+	try {
+		program = parseTsrxModule(source);
+	} catch {
+		return;
+	}
+	const found = firstHandlerAttribute(program);
+	if (!found) return void 0;
+	return documentHandlersMessage(`${id} sets ${found.attribute} on <${found.tag}>`);
+}
+function firstHandlerAttribute(value, tag = "") {
+	if (Array.isArray(value)) {
+		for (const item of value) {
+			const found = firstHandlerAttribute(item, tag);
+			if (found) return found;
+		}
+		return;
+	}
+	const current = node(value);
+	if (!current) return void 0;
+	if (current.type === "JSXAttribute") {
+		const name = node(current.name)?.name;
+		return typeof name === "string" && (isEventAttribute(name) || name === "attach") ? {
+			attribute: name,
+			tag
+		} : void 0;
+	}
+	const elementName = node(node(current.openingElement)?.name)?.name;
+	const nextTag = typeof elementName === "string" ? elementName : tag;
+	for (const [key, child] of Object.entries(current)) {
+		if (key === "loc" || key === "range" || key === "metadata") continue;
+		const found = firstHandlerAttribute(child, nextTag);
+		if (found) return found;
+	}
+}
 function readsOnlyRouteInvariantProps(params) {
 	if (params.length === 0) return true;
 	if (params.length > 1) return false;
@@ -2048,9 +2098,11 @@ function virtualModulesPlugin(resumeEntry = resumeEntryState(), prerenderWakeEnt
 }
 async function routerOptionsSource(options, documentFile) {
 	const documentSource = await readFile(documentFile, "utf8").catch(() => void 0);
+	const handlerError = documentHandlerError(documentSource, documentFile);
+	if (handlerError) throw new Error(handlerError);
 	return [
 		"export const routerMode = \"path\";",
-		`export const documentNavigation = ${JSON.stringify(documentNavigationFor(documentSource, documentFile))};`,
+		`export const documentNavigation = ${JSON.stringify(documentNavigationFor(documentSource))};`,
 		linkIntentEnabled(options) ? `export const startLinkIntentPreloading = (root, preload) => (${listenForLinkIntent.toString()})(root, ${JSON.stringify(LINK_ATTRIBUTE)}, preload, ${JSON.stringify(PREFETCH_ATTRIBUTE)});` : "export const startLinkIntentPreloading = () => () => {};"
 	].join("\n");
 }
@@ -2098,7 +2150,7 @@ function linkBridgeFilesPlugin(navigationEntry, fragmentEntry, options) {
 					fragmentNavigationSource: minifiedFragmentNavigationSource(),
 					fragmentNavigationRunSource: minifiedFragmentNavigationSource(runFragmentNavigation),
 					prefetch: options.prefetch,
-					documentNavigation: documentNavigationFor(documentSource, documentFile),
+					documentNavigation: documentNavigationFor(documentSource),
 					routeFileIds: bundledPageFileIds(chunks, root),
 					debug
 				});
@@ -2132,13 +2184,13 @@ function serverEntrySource(root, options) {
 	const query = rootScopeQuery(root);
 	return [
 		`import { createServerEntry } from '@markless/router/vite/runtime/create-server-entry';`,
-		`import { resumeEntryPath } from '${RESUME_ENTRY_PATH_ID}${query}';`,
-		`import { prerenderWakeEntryPath } from '${PRERENDER_WAKE_ENTRY_PATH_ID}${query}';`,
-		`import { navigationEntryPath } from '${NAVIGATION_ENTRY_PATH_ID}${query}';`,
-		`import { fragmentEntryPath } from '${FRAGMENT_ENTRY_PATH_ID}${query}';`,
-		`import { documentStylesheets, routeModulePreloads, routeSsrModulePreloads, routeStylesheets, documentImportMap } from '${ROUTE_PRELOADS_ID}${query}';`,
-		`import { pageModuleLoaders, routeFileIds } from '${ROUTE_DISCOVERY_ID}${query}';`,
-		`import { documentNavigation } from '${ROUTER_OPTIONS_ID}${query}';`,
+		`import { resumeEntryPath } from ${JSON.stringify(`${RESUME_ENTRY_PATH_ID}${query}`)};`,
+		`import { prerenderWakeEntryPath } from ${JSON.stringify(`${PRERENDER_WAKE_ENTRY_PATH_ID}${query}`)};`,
+		`import { navigationEntryPath } from ${JSON.stringify(`${NAVIGATION_ENTRY_PATH_ID}${query}`)};`,
+		`import { fragmentEntryPath } from ${JSON.stringify(`${FRAGMENT_ENTRY_PATH_ID}${query}`)};`,
+		`import { documentStylesheets, routeModulePreloads, routeSsrModulePreloads, routeStylesheets, documentImportMap } from ${JSON.stringify(`${ROUTE_PRELOADS_ID}${query}`)};`,
+		`import { pageModuleLoaders, routeFileIds } from ${JSON.stringify(`${ROUTE_DISCOVERY_ID}${query}`)};`,
+		`import { documentNavigation } from ${JSON.stringify(`${ROUTER_OPTIONS_ID}${query}`)};`,
 		`const documentModuleLoaders = import.meta.glob(['/document.tsrx']);`,
 		`const linkBridgePathsJson = globalThis.__marklessRouterLinkBridgePathsJson ?? ${JSON.stringify(LINK_BRIDGE_PATHS_PLACEHOLDER)};`,
 		`const entry = createServerEntry({`,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@markless/router",
-  "version": "0.7.0",
+  "version": "0.8.0",
   "description": "Markless router: client-side navigation with SSR streaming and build-time preload maps.",
   "license": "MIT",
   "repository": {
@@ -57,22 +57,23 @@
     "provenance": true
   },
   "dependencies": {
-    "@tsrx/yuku": "0.2.0",
+    "@tsrx/yuku": "0.8.0",
     "@virtualstate/navigation": "1.0.1-alpha.212",
     "hast-util-to-html": "^9.0.5",
-    "nitro": "3.0.260429-beta",
+    "nitro": "3.0.260903-beta",
     "pathe": "^2.0.3",
     "satteri": "0.6.3",
     "ufo": "^1.6.4",
-    "@markless/web": "0.7.0",
-    "@markless/bundler": "0.7.0"
+    "@markless/bundler": "0.8.0",
+    "@markless/web": "0.8.0",
+    "@markless/compiler": "0.8.0"
   },
   "devDependencies": {
-    "@markless/analyzer": "0.7.0"
+    "@markless/analyzer": "0.8.0"
   },
   "peerDependencies": {
     "typescript": "^5.9.3",
-    "vite": "8.2.2"
+    "vite": "8.3.4"
   },
   "peerDependenciesMeta": {
     "vite": {

package/src/vite/entries/fragment-entry.ts

@@ -401,7 +401,7 @@ async function mergeHead(d: Document, next: Document) {
 		const rel = element.localName === 'link' ? (element as HTMLLinkElement).rel : '';
 		if (rel === 'modulepreload' || rel === 'preload') continue;
 		if (rel === 'stylesheet' || element.localName === 'style') stale.push(element);
-		else element.remove();
+		else if ((element as HTMLScriptElement).type !== 'importmap') element.remove();
 	}
 	await loaded(d.defaultView!, stylesheets);
 	return { stale, scripts };
@@ -621,6 +621,53 @@ async function streamAppends(
 	return signal.aborted ? undefined : all;
 }
 
+// Inserting a big page whole lays it out in one long frame; the HTML parser yields while it streams a document, and the swap does the same.
+const FRAME_ELEMENTS = 800;
+
+type HeldPage = [parent: Node, before: Node | null, nodes: ChildNode[]][];
+
+function holdPage(parent: Element, after: Node | undefined, before: Node | null): HeldPage {
+	const nodes: ChildNode[] = [];
+	for (let node = after ? after.nextSibling : parent.firstChild; node && node !== before; ) {
+		const next: ChildNode | null = node.nextSibling;
+		nodes.push(node);
+		node.remove();
+		node = next;
+	}
+	return [[parent, before, nodes]];
+}
+
+const elementsIn = (node: Node) =>
+	node.nodeType === 1 ? (node as Element).getElementsByTagName('*').length + 1 : 0;
+
+// Places a frame's worth synchronously, so the first paint shows the top of the page; true when everything is in.
+function fillPage(
+	w: Window,
+	held: HeldPage,
+	budget: number,
+	current: () => boolean,
+): true | Promise<boolean> {
+	let used = 0;
+	while (held.length) {
+		const [parent, before, nodes] = held[0]!;
+		const node = nodes.shift()!;
+		if (!nodes.length) held.shift();
+		const size = elementsIn(node);
+		if (used + size > budget && node.firstChild) {
+			const children = [...node.childNodes];
+			(node as Element).replaceChildren();
+			held.unshift([node, null, children]);
+			used += 1;
+		} else used += size;
+		parent.insertBefore(node, before);
+		if (used >= budget && held.length)
+			return new Promise<void>((resolve) =>
+				w.requestAnimationFrame(() => w.setTimeout(resolve, 0)),
+			).then(() => current() && fillPage(w, held, budget, current));
+	}
+	return true;
+}
+
 export async function navigate(
 	d: Document,
 	url: URL,
@@ -647,13 +694,16 @@ export async function navigate(
 		return;
 	}
 	if (id !== session.navigation) return taken.abort();
+	// A prefetch is shared by every link to the page, so the address takes the clicked link's #fragment.
+	const landed = new URL(fetched.url);
+	landed.hash = url.hash;
 	const next = fetched.doc;
 	const documentLoads = state.config.documentLoads;
 	const incoming = documentLoads ? next.body : regionOf(state, next);
 	const outgoing = documentLoads ? d.body : regionOf(state, d);
 	const scope = documentLoads && !isContainer(d.body) ? d.body : outgoing?.parentElement;
 	if (!incoming || !outgoing || !scope) {
-		fallback(fetched.url);
+		fallback(landed.href);
 		return;
 	}
 	// The destination shows once its own code has arrived, so its first interaction never waits on a fetch.
@@ -686,8 +736,8 @@ export async function navigate(
 		w.history.scrollRestoration = 'manual';
 		session.current = entryId();
 		const entry = { __marklessFragment: { id: session.current, x: 0, y: 0 } };
-		if (mode === 'push') w.history.pushState(entry, '', fetched.url);
-		else w.history.replaceState(entry, '', fetched.url);
+		if (mode === 'push') w.history.pushState(entry, '', landed.href);
+		else w.history.replaceState(entry, '', landed.href);
 	}
 	const offsets: ScrolledBox[] = [];
 	for (const element of state.scrolled) {
@@ -709,7 +759,9 @@ export async function navigate(
 	if (documentLoads) syncHtmlAttributes(d, next, state.config.servedHtmlAttributesProperty);
 	let region: Element;
 	let end: Comment;
+	let start: Comment | undefined;
 	let scripts: Element[];
+	let held: HeldPage | undefined;
 	if (documentLoads && !isContainer(d.body)) {
 		const fresh: Element[] = [];
 		region = d.body;
@@ -731,7 +783,7 @@ export async function navigate(
 			const fresh: Element[] = [];
 			if (documentLoads) morphChildren(d, kept, arriving, fresh);
 			const leavingStart = pageStart(outgoing, state.config.pageStartComment);
-			let start = pageStart(region, state.config.pageStartComment);
+			start = pageStart(region, state.config.pageStartComment);
 			if (leavingStart || start) {
 				start ??= region.insertBefore(
 					d.createComment(state.config.pageStartComment),
@@ -746,16 +798,25 @@ export async function navigate(
 			}
 			scripts = [...scriptsIn(region), ...fresh.flatMap(scriptsIn)];
 			region.append(kept);
+			held = holdPage(region, start, end);
 			outgoing.replaceWith(region);
 			// The document's own nodes moved to the new element; focus inside them stays put.
 			if (focused && focused !== d.activeElement && region.contains(focused))
 				focused.focus({ preventScroll: true });
 		} else {
 			scripts = scriptsIn(region);
+			held = holdPage(region, undefined, null);
 			outgoing.replaceWith(region);
 			region.after((end = d.createComment('')));
 		}
 	}
+	// A scroll target or a restored position needs the whole page in place before it is applied.
+	const progressive = restore === 'reset' && !url.hash && d.visibilityState !== 'hidden';
+	const filled = held && fillPage(w, held, progressive ? FRAME_ELEMENTS : Infinity, () => id === session.navigation);
+	if (filled instanceof Promise) {
+		w.scrollTo({ top: 0, left: 0, behavior: 'instant' });
+		if (!(await filled)) return;
+	}
 	// 'instant': a `scroll-behavior: smooth` page would otherwise animate every landing.
 	for (const box of offsets)
 		sameBox(scope, box)?.scrollTo({ top: box.top, left: box.left, behavior: 'instant' });
@@ -773,7 +834,7 @@ export async function navigate(
 	if (restore === 'reset') {
 		const target = url.hash ? d.getElementById(decodeURIComponent(url.hash.slice(1))) : null;
 		if (target) target.scrollIntoView({ behavior: 'instant' });
-		else w.scrollTo({ top: 0, left: 0, behavior: 'instant' });
+		else if (!(filled instanceof Promise)) w.scrollTo({ top: 0, left: 0, behavior: 'instant' });
 	} else if (restore !== 'manual')
 		w.scrollTo({ top: restore.y, left: restore.x, behavior: 'instant' });
 	d.dispatchEvent(new CustomEvent('marklessrouterrendered'));

package/dist/debug-channel-CewnC9fH.js

@@ -1,2 +0,0 @@
-import { a as __marklessDebugInvalidateElement, c as __marklessDebugRegisterDelegatedEvents, d as __marklessDebugSetBoundaries, f as __marklessDebugStartContainer, i as __marklessDebugDisposeContainer, l as __marklessDebugRegisterRouter, n as __marklessDebugBootstrapSource, o as __marklessDebugRecordInteraction, r as __marklessDebugChannelForTest, s as __marklessDebugRecordViolation, t as __marklessDebugActivateContainer, u as __marklessDebugResetForTest } from "./debug-channel-Di6SppZv.js";
-export { __marklessDebugActivateContainer, __marklessDebugBootstrapSource, __marklessDebugChannelForTest, __marklessDebugDisposeContainer, __marklessDebugInvalidateElement, __marklessDebugRecordInteraction, __marklessDebugRecordViolation, __marklessDebugRegisterDelegatedEvents, __marklessDebugRegisterRouter, __marklessDebugResetForTest, __marklessDebugSetBoundaries, __marklessDebugStartContainer };