@qwik.dev/router 2.0.0-beta.43 → 2.0.0-beta.45

package/lib/vite/index.mjs

@@ -21,7 +21,8 @@ import { toString } from "hast-util-to-string";
 import { refractor } from "refractor";
 import tsxLang from "refractor/lang/tsx.js";
 import { optimize } from "svgo";
-/** @public */ function extendConfig(baseConfigExport, serverConfigExport) {
+/** @public */
+function extendConfig(baseConfigExport, serverConfigExport) {
 	return async (env) => {
 		let resolvedBase = await baseConfigExport;
 		if (typeof resolvedBase === "function") resolvedBase = await resolvedBase(env);
@@ -84,6 +85,11 @@ function createMenu(opts, filePath) {
 function resolveMenu(opts, menuSourceFile) {
 	return createMenu(opts, menuSourceFile.filePath);
 }
+async function transformMenu(opts, filePath, content) {
+	const parsedMenu = parseMenu(opts, filePath, content);
+	const id = createFileId(opts.routesDir, filePath);
+	return `${`const ${id} = ${JSON.stringify(parsedMenu, null, 2)};`} export default ${id}`;
+}
 function parseMenu(opts, filePath, content, checkFileExists = true) {
 	const tokens = marked.lexer(content, {});
 	let currentDepth = 0;
@@ -127,18 +133,12 @@ function parseMenu(opts, filePath, content, checkFileExists = true) {
 	if (stack.length === 0) throw new Error(`Menu must start with an h1 in the index: ${filePath}`);
 	return stack[0];
 }
-async function transformMenu(opts, filePath, content) {
-	const parsedMenu = parseMenu(opts, filePath, content);
-	const id = createFileId(opts.routesDir, filePath);
-	return `${`const ${id} = ${JSON.stringify(parsedMenu, null, 2)};`} export default ${id}`;
-}
-var PARAM_PATTERN = /^(\.\.\.)?(\w+)?$/;
-var DYNAMIC_SEGMENT = /\[(.+?)\]/;
 /**
 * Adopted from SvelteKit
 *
 * https://github.com/sveltejs/kit/blob/master/LICENSE
-*/ function parseRoutePathname(basePathname, pathname) {
+*/
+function parseRoutePathname(basePathname, pathname) {
 	if (pathname === basePathname) return {
 		pattern: new RegExp("^" + pathname.replace(/[.*+?^${}()|[\]\\]/g, "\\$&") + "$"),
 		routeName: pathname,
@@ -190,8 +190,8 @@ var DYNAMIC_SEGMENT = /\[(.+?)\]/;
 		})
 	};
 }
-var LAYOUT_NAMED_PREFIX = "layout-";
-var LAYOUT_TOP_SUFFIX = "!";
+var PARAM_PATTERN = /^(\.\.\.)?(\w+)?$/;
+var DYNAMIC_SEGMENT = /\[(.+?)\]/;
 function resolveLayout(opts, layoutSourceFile) {
 	let extlessName = layoutSourceFile.extlessName;
 	const filePath = layoutSourceFile.filePath;
@@ -202,7 +202,7 @@ function resolveLayout(opts, layoutSourceFile) {
 		layoutType = "top";
 		extlessName = extlessName.slice(0, extlessName.length - 1);
 	} else layoutType = "nested";
-	if (extlessName.startsWith(LAYOUT_NAMED_PREFIX)) layoutName = extlessName.slice(7);
+	if (extlessName.startsWith(LAYOUT_NAMED_PREFIX)) layoutName = extlessName.slice(LAYOUT_NAMED_PREFIX.length);
 	else layoutName = "";
 	return {
 		id: createFileId(opts.routesDir, filePath),
@@ -212,6 +212,8 @@ function resolveLayout(opts, layoutSourceFile) {
 		layoutName
 	};
 }
+var LAYOUT_NAMED_PREFIX = "layout-";
+var LAYOUT_TOP_SUFFIX = "!";
 function resolveRoute(opts, appLayouts, sourceFile) {
 	const filePath = sourceFile.filePath;
 	const layouts = [];
@@ -247,7 +249,8 @@ function resolveRoute(opts, appLayouts, sourceFile) {
 		...parseRoutePathname(opts.basePathname, pathname)
 	};
 }
-/** Sort routes by pathname, then by extension. Longer routes are sorted first. */ function routeSortCompare(a, b) {
+/** Sort routes by pathname, then by extension. Longer routes are sorted first. */
+function routeSortCompare(a, b) {
 	const maxSegments = Math.max(a.segments.length, b.segments.length);
 	for (let i = 0; i < maxSegments; i += 1) {
 		const sa = a.segments[i];
@@ -277,7 +280,8 @@ function resolveRoute(opts, appLayouts, sourceFile) {
 * - `[...rest]` → `{ key: '_A', paramName: 'rest' }`
 * - `pre[slug]post` → `{ key: '_W', paramName: 'slug', prefix: 'pre', suffix: 'post' }`
 * - `blog` → `{ key: 'blog' }` (lowercased)
-*/ function parseDirName(name) {
+*/
+function parseDirName(name) {
 	if (name.startsWith("(") && name.endsWith(")")) return { key: null };
 	const restMatch = /^\[\.\.\.(\w+)\]$/.exec(name);
 	if (restMatch) return {
@@ -293,49 +297,8 @@ function resolveRoute(opts, appLayouts, sourceFile) {
 	};
 	return { key: name.toLowerCase() };
 }
-async function walkRouteDir(node, dirPath) {
-	const dirItemNames = await fs.promises.readdir(dirPath);
-	await Promise.all(dirItemNames.map(async (itemName) => {
-		const itemPath = normalizePath$1(join(dirPath, itemName));
-		if ((await fs.promises.stat(itemPath)).isDirectory()) {
-			const parsed = parseDirName(itemName);
-			if (parsed.key === null) {
-				let child = node.children.get(itemName);
-				if (!child) {
-					child = {
-						_files: [],
-						children: /* @__PURE__ */ new Map()
-					};
-					node.children.set(itemName, child);
-				}
-				await walkRouteDir(child, itemPath);
-			} else {
-				let child = node.children.get(parsed.key);
-				if (!child) {
-					child = {
-						_files: [],
-						children: /* @__PURE__ */ new Map()
-					};
-					if (parsed.paramName) child._P = parsed.paramName;
-					if (parsed.prefix) child._0 = parsed.prefix;
-					if (parsed.suffix) child._9 = parsed.suffix;
-					node.children.set(parsed.key, child);
-				}
-				await walkRouteDir(child, itemPath);
-			}
-		} else {
-			const sourceFileName = getSourceFile(itemName);
-			if (sourceFileName !== null) node._files.push({
-				...sourceFileName,
-				fileName: itemName,
-				filePath: itemPath,
-				dirName: basename(dirPath),
-				dirPath: normalizePath$1(dirPath)
-			});
-		}
-	}));
-}
-/** Walk the routes directory and return a BuildTrieNode with trie keys. */ async function walkRoutes(routesDir) {
+/** Walk the routes directory and return a BuildTrieNode with trie keys. */
+async function walkRoutes(routesDir) {
 	const dirPath = normalizePath$1(routesDir);
 	const root = {
 		_files: [],
@@ -344,6 +307,48 @@ async function walkRouteDir(node, dirPath) {
 	await walkRouteDir(root, dirPath);
 	return root;
 }
+async function walkRouteDir(node, dirPath) {
+	const dirItemNames = (await fs.promises.readdir(dirPath)).sort();
+	const dirItems = await Promise.all(dirItemNames.map(async (itemName) => {
+		const itemPath = normalizePath$1(join(dirPath, itemName));
+		return {
+			itemName,
+			itemPath,
+			isDirectory: (await fs.promises.stat(itemPath)).isDirectory()
+		};
+	}));
+	const childWalks = [];
+	for (const { itemName, itemPath, isDirectory } of dirItems) {
+		if (isDirectory) {
+			childWalks.push(walkRouteDir(getOrCreateChildNode(node, itemName), itemPath));
+			continue;
+		}
+		const sourceFileName = getSourceFile(itemName);
+		if (sourceFileName !== null) node._files.push({
+			...sourceFileName,
+			fileName: itemName,
+			filePath: itemPath,
+			dirName: basename(dirPath),
+			dirPath: normalizePath$1(dirPath)
+		});
+	}
+	await Promise.all(childWalks);
+}
+function getOrCreateChildNode(node, dirName) {
+	const parsed = parseDirName(dirName);
+	const key = parsed.key ?? dirName;
+	const existing = node.children.get(key);
+	if (existing) return existing;
+	const child = {
+		_files: [],
+		children: /* @__PURE__ */ new Map()
+	};
+	if (parsed.paramName) child._P = parsed.paramName;
+	if (parsed.prefix) child._0 = parsed.prefix;
+	if (parsed.suffix) child._9 = parsed.suffix;
+	node.children.set(key, child);
+	return child;
+}
 async function walkServerPlugins(opts) {
 	const dirPath = opts.serverPluginsDir;
 	const dirItemNames = await fs.promises.readdir(dirPath);
@@ -360,30 +365,40 @@ async function walkServerPlugins(opts) {
 	}));
 	return sourceFiles.sort((a, b) => a.filePath < b.filePath ? -1 : 1);
 }
-function resolveEntry(opts, sourceFile) {
-	const pathname = getPathnameFromDirPath(opts, sourceFile.dirPath);
-	const chunkFileName = pathname.slice(opts.basePathname.length);
-	return {
-		id: createFileId(opts.routesDir, sourceFile.filePath, "Route"),
-		filePath: sourceFile.filePath,
-		chunkFileName,
-		...parseRoutePathname(opts.basePathname, pathname)
-	};
+async function parseRoutesDir(ctx) {
+	try {
+		await updateRoutingContext(ctx);
+		validateBuild(ctx);
+	} catch (e) {
+		addError(ctx, e);
+	}
+	for (const d of ctx.diagnostics) if (d.type === "error") throw new Error(d.message);
+	else console.warn(d.message);
 }
-function resolveServiceWorkerEntry(opts, sourceFile) {
-	const pathname = getPathnameFromDirPath(opts, sourceFile.dirPath) + sourceFile.extlessName + ".js";
-	const chunkFileName = pathname.slice(opts.basePathname.length);
-	return {
-		id: createFileId(opts.routesDir, sourceFile.filePath, "ServiceWorker"),
-		filePath: sourceFile.filePath,
-		chunkFileName,
-		...parseRoutePathname(opts.basePathname, pathname)
-	};
+function updateRoutingContext(ctx) {
+	ctx.activeBuild ||= _updateRoutingContext(ctx).finally(() => {
+		ctx.activeBuild = null;
+	});
+	return ctx.activeBuild;
+}
+async function _updateRoutingContext(ctx) {
+	const serverPlugins = await walkServerPlugins(ctx.opts);
+	const routeTrie = await walkRoutes(ctx.opts.routesDir);
+	if (ctx.opts.rewriteRoutes) applyRewriteRoutes(routeTrie, ctx.opts.rewriteRoutes);
+	ctx.routeTrie = routeTrie;
+	ctx.serverPlugins = serverPlugins;
+	const derived = deriveFromTrie(ctx.opts, routeTrie);
+	ctx.layouts = derived.layouts;
+	ctx.routes = rewriteRoutes(ctx, derived.routes);
+	ctx.entries = derived.entries;
+	ctx.serviceWorkers = derived.serviceWorkers;
+	ctx.menus = derived.menus;
 }
 /**
 * Walk the trie and extract flat arrays for layouts, routes, entries, menus, service workers. These
 * are needed by generate-entries, generate-menus, generate-service-worker, vite plugin, etc.
-*/ function deriveFromTrie(opts, root) {
+*/
+function deriveFromTrie(opts, root) {
 	const layouts = [];
 	const routes = [];
 	const entries = [];
@@ -434,6 +449,47 @@ function resolveServiceWorkerEntry(opts, sourceFile) {
 		menus
 	};
 }
+function resolveEntry(opts, sourceFile) {
+	const pathname = getPathnameFromDirPath(opts, sourceFile.dirPath);
+	const chunkFileName = pathname.slice(opts.basePathname.length);
+	return {
+		id: createFileId(opts.routesDir, sourceFile.filePath, "Route"),
+		filePath: sourceFile.filePath,
+		chunkFileName,
+		...parseRoutePathname(opts.basePathname, pathname)
+	};
+}
+function resolveServiceWorkerEntry(opts, sourceFile) {
+	const pathname = getPathnameFromDirPath(opts, sourceFile.dirPath) + sourceFile.extlessName + ".js";
+	const chunkFileName = pathname.slice(opts.basePathname.length);
+	return {
+		id: createFileId(opts.routesDir, sourceFile.filePath, "ServiceWorker"),
+		filePath: sourceFile.filePath,
+		chunkFileName,
+		...parseRoutePathname(opts.basePathname, pathname)
+	};
+}
+/**
+* Create rewritten route copies for each rewrite config. For backward compat: produces BuiltRoute
+* entries with translated pathnames. At runtime, codegen emits /G nodes in the trie instead.
+*/
+function rewriteRoutes(ctx, routes) {
+	if (!ctx.opts.rewriteRoutes) return routes;
+	const translatedRoutes = [];
+	let segmentsToTranslate = ctx.opts.rewriteRoutes.flatMap((rewriteConfig) => {
+		return Object.keys(rewriteConfig.paths || {});
+	});
+	segmentsToTranslate = Array.from(new Set(segmentsToTranslate));
+	routes.forEach((route) => {
+		translatedRoutes.push(route);
+		if (route.pathname.split("/").some((segment) => segmentsToTranslate.includes(segment)) || route.pathname === "/") ctx.opts.rewriteRoutes.forEach((config, configIndex) => {
+			if (route.pathname === "/" && !config.prefix) return;
+			const routeToPush = translateRoute(route, config, configIndex);
+			if (!translatedRoutes.some((item) => item.pathname === routeToPush.pathname && item.routeName === routeToPush.routeName)) translatedRoutes.push(routeToPush);
+		});
+	});
+	return translatedRoutes.sort(routeSortCompare);
+}
 function translateRoute(route, config, configIndex) {
 	const replacePath = (part) => (config.paths || {})[part] ?? part;
 	const pathnamePrefix = config.prefix ? "/" + config.prefix : "";
@@ -470,26 +526,6 @@ function translateRoute(route, config, configIndex) {
 	};
 }
 /**
-* Create rewritten route copies for each rewrite config. For backward compat: produces BuiltRoute
-* entries with translated pathnames. At runtime, codegen emits /G nodes in the trie instead.
-*/ function rewriteRoutes(ctx, routes) {
-	if (!ctx.opts.rewriteRoutes) return routes;
-	const translatedRoutes = [];
-	let segmentsToTranslate = ctx.opts.rewriteRoutes.flatMap((rewriteConfig) => {
-		return Object.keys(rewriteConfig.paths || {});
-	});
-	segmentsToTranslate = Array.from(new Set(segmentsToTranslate));
-	routes.forEach((route) => {
-		translatedRoutes.push(route);
-		if (route.pathname.split("/").some((segment) => segmentsToTranslate.includes(segment)) || route.pathname === "/") ctx.opts.rewriteRoutes.forEach((config, configIndex) => {
-			if (route.pathname === "/" && !config.prefix) return;
-			const routeToPush = translateRoute(route, config, configIndex);
-			if (!translatedRoutes.some((item) => item.pathname === routeToPush.pathname && item.routeName === routeToPush.routeName)) translatedRoutes.push(routeToPush);
-		});
-	});
-	return translatedRoutes.sort(routeSortCompare);
-}
-/**
 * Walk the trie and create _G (rewrite) nodes for each rewriteRoutes config.
 *
 * For each route in the trie, if any of its path segments are translatable (listed in a rewrite
@@ -498,7 +534,8 @@ function translateRoute(route, config, configIndex) {
 *
 * The `_G` value is a `/`-separated string of trie keys (skipping group nodes), which the runtime
 * resolver uses to walk the trie and find the target route's loaders and layouts.
-*/ function applyRewriteRoutes(root, rewriteConfigs) {
+*/
+function applyRewriteRoutes(root, rewriteConfigs) {
 	const routables = [];
 	function walk(node, steps) {
 		if (node._files.some((f) => f.type === "route" && !isErrorName(f.extlessName))) routables.push({
@@ -552,25 +589,6 @@ function translateRoute(route, config, configIndex) {
 		}
 	}
 }
-async function _updateRoutingContext(ctx) {
-	const serverPlugins = await walkServerPlugins(ctx.opts);
-	const routeTrie = await walkRoutes(ctx.opts.routesDir);
-	if (ctx.opts.rewriteRoutes) applyRewriteRoutes(routeTrie, ctx.opts.rewriteRoutes);
-	ctx.routeTrie = routeTrie;
-	ctx.serverPlugins = serverPlugins;
-	const derived = deriveFromTrie(ctx.opts, routeTrie);
-	ctx.layouts = derived.layouts;
-	ctx.routes = rewriteRoutes(ctx, derived.routes);
-	ctx.entries = derived.entries;
-	ctx.serviceWorkers = derived.serviceWorkers;
-	ctx.menus = derived.menus;
-}
-function updateRoutingContext(ctx) {
-	ctx.activeBuild ||= _updateRoutingContext(ctx).finally(() => {
-		ctx.activeBuild = null;
-	});
-	return ctx.activeBuild;
-}
 function validateBuild(ctx) {
 	const pathnames = Array.from(new Set(ctx.routes.map((r) => r.pathname))).sort();
 	for (const pathname of pathnames) {
@@ -581,15 +599,27 @@ function validateBuild(ctx) {
 		addWarning(ctx, `The "top" layout feature, which is used by "${l.filePath}" has been deprecated and will be removed from future versions. In most cases the "group" layout feature can be used in its place: https://qwik.dev/docs/advanced/routing/`);
 	});
 }
-async function parseRoutesDir(ctx) {
-	try {
-		await updateRoutingContext(ctx);
-		validateBuild(ctx);
-	} catch (e) {
-		addError(ctx, e);
-	}
-	for (const d of ctx.diagnostics) if (d.type === "error") throw new Error(d.message);
-	else console.warn(d.message);
+function createBuildContext(rootDir, viteBasePath, userOpts, target, dynamicImports) {
+	return {
+		rootDir: normalizePath$1(rootDir),
+		opts: normalizeOptions(rootDir, viteBasePath, userOpts),
+		routeTrie: {
+			_files: [],
+			children: /* @__PURE__ */ new Map()
+		},
+		routes: [],
+		serverPlugins: [],
+		layouts: [],
+		entries: [],
+		serviceWorkers: [],
+		menus: [],
+		diagnostics: [],
+		frontmatter: /* @__PURE__ */ new Map(),
+		target: target || "ssr",
+		dynamicImports: target === "client" || !!dynamicImports,
+		isDirty: true,
+		activeBuild: null
+	};
 }
 function resetBuildContext(ctx) {
 	if (ctx) {
@@ -602,6 +632,15 @@ function resetBuildContext(ctx) {
 		ctx.isDirty = true;
 	}
 }
+/**
+* Resolve the app's base pathname from plugin options and vite's `base`. Shared by option
+* normalization and the `config()`-hook `define` (which runs before the build context exists).
+*/
+function resolveBasePathname(userOpts, viteBasePath) {
+	let basePathname = typeof userOpts?.baseUrl === "string" ? userOpts.baseUrl : typeof userOpts?.basePathname === "string" ? userOpts.basePathname : viteBasePath || "/";
+	if (!basePathname.endsWith("/")) basePathname = ensureSlash(basePathname);
+	return new URL(basePathname, "https://qwik.dev/").pathname;
+}
 function normalizeOptions(rootDir, viteBasePath, userOpts) {
 	if (!(viteBasePath.startsWith("/") && viteBasePath.endsWith("/"))) {
 		console.error(`warning: vite's config.base must begin and end with /. This will be an error in v2. If you have a valid use case, please open an issue.`);
@@ -614,47 +653,13 @@ function normalizeOptions(rootDir, viteBasePath, userOpts) {
 	if (typeof opts.serverPluginsDir !== "string") opts.serverPluginsDir = opts.routesDir;
 	else if (!isAbsolute(opts.serverPluginsDir)) opts.serverPluginsDir = resolve(rootDir, opts.serverPluginsDir);
 	opts.serverPluginsDir = normalizePath$1(opts.serverPluginsDir);
-	if (typeof opts.baseUrl === "string") opts.basePathname = opts.baseUrl;
-	if (typeof opts.basePathname !== "string") opts.basePathname = viteBasePath;
-	if (!opts.basePathname.endsWith("/")) {
-		console.error(`Warning: qwik-router plugin basePathname must end with /. This will be an error in v2`);
-		opts.basePathname = ensureSlash(opts.basePathname);
-	}
-	opts.basePathname = new URL(opts.basePathname, "https://qwik.dev/").pathname;
+	if (typeof opts.baseUrl !== "string" && typeof opts.basePathname === "string" && !opts.basePathname.endsWith("/")) console.error(`Warning: qwik-router plugin basePathname must end with /. This will be an error in v2`);
+	opts.basePathname = resolveBasePathname(userOpts, viteBasePath);
 	opts.mdx = opts.mdx || {};
 	opts.platform = opts.platform || {};
 	if (opts.strictLoaders === void 0) opts.strictLoaders = true;
 	return opts;
 }
-function createBuildContext(rootDir, viteBasePath, userOpts, target, dynamicImports) {
-	return {
-		rootDir: normalizePath$1(rootDir),
-		opts: normalizeOptions(rootDir, viteBasePath, userOpts),
-		routeTrie: {
-			_files: [],
-			children: /* @__PURE__ */ new Map()
-		},
-		routes: [],
-		serverPlugins: [],
-		layouts: [],
-		entries: [],
-		serviceWorkers: [],
-		menus: [],
-		diagnostics: [],
-		frontmatter: /* @__PURE__ */ new Map(),
-		target: target || "ssr",
-		dynamicImports: target === "client" || !!dynamicImports,
-		isDirty: true,
-		activeBuild: null
-	};
-}
-function parseFrontmatterAttrs(yaml) {
-	if (typeof yaml === "string") {
-		yaml = yaml.trim();
-		if (yaml !== "") return parse(yaml);
-	}
-	return null;
-}
 function parseFrontmatter(ctx) {
 	return (mdast, vfile) => {
 		const attrs = {};
@@ -665,6 +670,13 @@ function parseFrontmatter(ctx) {
 		if (Object.keys(attrs).length > 0) ctx.frontmatter.set(normalizePath$1(vfile.path), attrs);
 	};
 }
+function parseFrontmatterAttrs(yaml) {
+	if (typeof yaml === "string") {
+		yaml = yaml.trim();
+		if (yaml !== "") return parse(yaml);
+	}
+	return null;
+}
 var metaNames = {
 	author: true,
 	creator: true,
@@ -720,17 +732,39 @@ function frontmatterAttrsToDocumentHead(attrs) {
 	}
 	return null;
 }
-function renameClassname() {
+function rehypeSlug() {
 	return (ast) => {
-		visit(ast, "element", (node) => {
-			if (node.properties) {
-				if (node.properties.className) {
-					node.properties.class = node.properties.className;
-					node.properties.className = void 0;
-				}
-			}
-		});
-	};
+		const mdast = ast;
+		const slugs = new Slugger();
+		visit(mdast, "element", (node) => {
+			if (headingRank(node) && node.properties) {
+				const text = toString(node);
+				if (!hasProperty(node, "id")) node.properties.id = slugs.slug(text);
+			}
+		});
+	};
+}
+function rehypePage(ctx) {
+	return (ast, vfile) => {
+		const mdast = ast;
+		const sourcePath = normalizePath$1(vfile.path);
+		updateContentLinks(mdast, ctx.opts, sourcePath);
+		exportFrontmatter(ctx, mdast, sourcePath);
+		exportContentHead(ctx, mdast, sourcePath);
+		exportContentHeadings(mdast);
+	};
+}
+function renameClassname() {
+	return (ast) => {
+		visit(ast, "element", (node) => {
+			if (node.properties) {
+				if (node.properties.className) {
+					node.properties.class = node.properties.className;
+					node.properties.className = void 0;
+				}
+			}
+		});
+	};
 }
 function wrapTableWithDiv() {
 	return (ast) => {
@@ -756,6 +790,30 @@ function updateContentLinks(mdast, opts, sourcePath) {
 		}
 	});
 }
+function exportFrontmatter(ctx, mdast, sourcePath) {
+	createExport(mdast, "frontmatter", ctx.frontmatter.get(sourcePath));
+}
+function exportContentHead(ctx, mdast, sourcePath) {
+	const head = frontmatterAttrsToDocumentHead(ctx.frontmatter.get(sourcePath));
+	if (head) createExport(mdast, "head", head);
+}
+function exportContentHeadings(mdast) {
+	const headings = [];
+	visit(mdast, "element", (node) => {
+		const level = headingRank(node);
+		if (level && node.properties) {
+			if (hasProperty(node, "id")) {
+				const text = toString(node);
+				headings.push({
+					text,
+					id: node.properties.id,
+					level
+				});
+			}
+		}
+	});
+	if (headings.length > 0) createExport(mdast, "headings", headings);
+}
 function createExport(mdast, identifierName, val) {
 	const mdxjsEsm = {
 		type: "mdxjsEsm",
@@ -785,69 +843,11 @@ function createExport(mdast, identifierName, val) {
 	};
 	mdast.children.unshift(mdxjsEsm);
 }
-function exportFrontmatter(ctx, mdast, sourcePath) {
-	createExport(mdast, "frontmatter", ctx.frontmatter.get(sourcePath));
-}
-function exportContentHead(ctx, mdast, sourcePath) {
-	const head = frontmatterAttrsToDocumentHead(ctx.frontmatter.get(sourcePath));
-	if (head) createExport(mdast, "head", head);
-}
 var own = {}.hasOwnProperty;
 function hasProperty(node, propName) {
 	const value = propName && node && typeof node === "object" && node.type === "element" && node.properties && own.call(node.properties, propName) && node.properties[propName];
 	return value != null && value !== false;
 }
-function rehypeSlug() {
-	return (ast) => {
-		const mdast = ast;
-		const slugs = new Slugger();
-		visit(mdast, "element", (node) => {
-			if (headingRank(node) && node.properties) {
-				const text = toString(node);
-				if (!hasProperty(node, "id")) node.properties.id = slugs.slug(text);
-			}
-		});
-	};
-}
-function exportContentHeadings(mdast) {
-	const headings = [];
-	visit(mdast, "element", (node) => {
-		const level = headingRank(node);
-		if (level && node.properties) {
-			if (hasProperty(node, "id")) {
-				const text = toString(node);
-				headings.push({
-					text,
-					id: node.properties.id,
-					level
-				});
-			}
-		}
-	});
-	if (headings.length > 0) createExport(mdast, "headings", headings);
-}
-function rehypePage(ctx) {
-	return (ast, vfile) => {
-		const mdast = ast;
-		const sourcePath = normalizePath$1(vfile.path);
-		updateContentLinks(mdast, ctx.opts, sourcePath);
-		exportFrontmatter(ctx, mdast, sourcePath);
-		exportContentHead(ctx, mdast, sourcePath);
-		exportContentHeadings(mdast);
-	};
-}
-function syntaxHighlight(node, lang) {
-	const code = toString(node);
-	const result = refractor.highlight(code, lang);
-	if (result && Array.isArray(node.children)) node.children = result.children;
-}
-function getLanguage(className) {
-	if (typeof className === "string") {
-		className = className.toLowerCase();
-		if (className.startsWith("language-")) return className.slice(9);
-	}
-	return null;
-}
 function rehypeSyntaxHighlight() {
 	refractor.register(tsxLang);
 	return async (ast) => {
@@ -865,6 +865,18 @@ function rehypeSyntaxHighlight() {
 		});
 	};
 }
+function syntaxHighlight(node, lang) {
+	const code = toString(node);
+	const result = refractor.highlight(code, lang);
+	if (result && Array.isArray(node.children)) node.children = result.children;
+}
+function getLanguage(className) {
+	if (typeof className === "string") {
+		className = className.toLowerCase();
+		if (className.startsWith("language-")) return className.slice(9);
+	}
+	return null;
+}
 async function createMdxTransformer(ctx) {
 	const { compile } = await import("@mdx-js/mdx");
 	const { default: remarkFrontmatter } = await import("remark-frontmatter");
@@ -962,118 +974,130 @@ function getImportPath(importPath) {
 	if (lowerCasePath.endsWith(".ts")) return importPath.slice(0, importPath.length - 3);
 	return importPath;
 }
-/** Check if a build trie key is a group directory name like `(common)` */ function isGroupKey(key) {
+/** Check if a build trie key is a group directory name like `(common)` */
+function isGroupKey(key) {
 	return key.charCodeAt(0) === 40;
 }
-function collectFiles(node, cb) {
-	for (const file of node._files) cb(file, node);
-	for (const child of node.children.values()) collectFiles(child, cb);
-}
 /**
-* For a named layout `index@name.tsx`, walk up ancestors to find the named layout and collect
-* default layouts above it.
+* Serialize the build trie into JS code.
 *
-* Returns the layout chain in order: [outermost default..., named layout]
-*/ function resolveNamedLayoutChain(ancestorLayouts, nodeLayouts, targetName) {
-	const allLayouts = [...ancestorLayouts, ...nodeLayouts];
-	const result = [];
-	let foundNamed = false;
-	for (let i = allLayouts.length - 1; i >= 0; i--) {
-		const layout = allLayouts[i];
-		if (!foundNamed) {
-			if (layout.layoutName === targetName) {
-				result.unshift(layout);
-				foundNamed = true;
+* Emits:
+*
+* - Layout imports and lazy loaders
+* - Route/page imports and lazy loaders
+* - Menu imports and lazy loaders
+* - The route trie object literal with _L, _I, _G, _B, _4, _E, _N, _P, _0, _9, _M
+*/
+function createRoutes(ctx, qwikPlugin, c, esmImports, isSSR, loadersByFile, serverExcludePaths, routeLoaderSourceFiles) {
+	const includeEndpoints = isSSR;
+	const dynamicImports = ctx.dynamicImports;
+	const layoutIdMap = /* @__PURE__ */ new Map();
+	const routeIdMap = /* @__PURE__ */ new Map();
+	const menuIdMap = /* @__PURE__ */ new Map();
+	let layoutCount = 0;
+	let routeCount = 0;
+	let menuCount = 0;
+	collectFiles(ctx.routeTrie, (file, _node) => {
+		if (file.type === "layout") {
+			const id = ctx.layouts.find((l) => l.filePath === file.filePath)?.id;
+			if (id) {
+				layoutIdMap.set(file.filePath, id);
+				layoutCount++;
+			}
+		} else if (file.type === "route") {
+			if (ctx.routes.find((r) => r.filePath === file.filePath)) routeCount++;
+		} else if (file.type === "menu") {
+			const id = createFileId(ctx.opts.routesDir, file.filePath);
+			menuIdMap.set(file.filePath, id);
+			menuCount++;
+		}
+	});
+	if (layoutCount > 0) {
+		c.push(`\n/** Qwik Router Layouts (${layoutCount}) */`);
+		for (const [filePath, id] of layoutIdMap) {
+			const importPath = JSON.stringify(getImportPath(filePath));
+			if (dynamicImports) c.push(`const ${id} = ()=>import(${importPath});`);
+			else {
+				esmImports.push(`import * as ${id}_ from ${importPath};`);
+				c.push(`const ${id} = ()=>${id}_;`);
 			}
-		} else if (layout.layoutName === "") {
-			result.unshift(layout);
-			if (layout.layoutType === "top") break;
 		}
 	}
-	return result;
-}
-/**
-* The `_I`/`_E`/`_4` loader expression: a bare loader (runtime prepends gathered layouts), or an
-* override chain for `!` (layout stop) / `@name` (named layout).
-*/ function buildLoaderChainExpr(extlessName, loaderExpr, ancestorLayouts, nodeLayouts) {
-	const { layoutName, layoutStop } = parseRouteIndexName(extlessName);
-	if (layoutStop) return `[ ${loaderExpr} ]`;
-	if (layoutName) return `[ ${[...resolveNamedLayoutChain(ancestorLayouts, nodeLayouts, layoutName).map((l) => l.id), loaderExpr].join(", ")} ]`;
-	return loaderExpr;
-}
-function getClientRouteBundleNames(qwikPlugin, r) {
-	const bundlesNames = [];
-	const manifest = qwikPlugin.api.getManifest();
-	if (manifest) {
-		const manifestBundleNames = Object.keys(manifest.bundles);
-		const addRouteFile = (filePath) => {
-			filePath = removeExtension(filePath);
-			for (const bundleName of manifestBundleNames) {
-				const bundle = manifest.bundles[bundleName];
-				if (bundle.origins) for (const bundleOrigin of bundle.origins) {
-					const originPath = removeExtension(bundleOrigin);
-					if (filePath.endsWith(originPath)) {
-						if (!bundlesNames.includes(bundleName)) bundlesNames.push(bundleName);
-					}
-				}
+	if (menuCount > 0) {
+		c.push(`\n/** Qwik Router Menus (${menuCount}) */`);
+		for (const [filePath, id] of menuIdMap) {
+			const importPath = JSON.stringify(getImportPath(filePath));
+			if (dynamicImports) c.push(`const ${id} = ()=>import(${importPath});`);
+			else {
+				esmImports.push(`import * as ${id}_ from ${importPath};`);
+				c.push(`const ${id} = ()=>${id}_;`);
 			}
-		};
-		for (const layout of r.layouts) addRouteFile(layout.filePath);
-		addRouteFile(r.filePath);
+		}
 	}
-	return bundlesNames;
+	c.push(`\n/** Qwik Router Routes (${routeCount}) */`);
+	for (const route of ctx.routes) if (isPageExt(route.ext)) {
+		if (serverExcludePaths?.has(route.filePath)) continue;
+		const importPath = getImportPath(route.filePath);
+		let loaderExpr;
+		if (dynamicImports) loaderExpr = `()=>import(${JSON.stringify(importPath)})`;
+		else {
+			esmImports.push(`import * as ${route.id} from ${JSON.stringify(importPath)};`);
+			loaderExpr = `()=>${route.id}`;
+		}
+		routeIdMap.set(route.filePath, loaderExpr);
+	} else if (includeEndpoints && isModuleExt(route.ext)) {
+		const importPath = getImportPath(route.filePath);
+		esmImports.push(`import * as ${route.id} from ${JSON.stringify(importPath)};`);
+		routeIdMap.set(route.filePath, `()=>${route.id}`);
+	}
+	const trieStr = serializeBuildTrie(ctx, qwikPlugin, ctx.routeTrie, layoutIdMap, routeIdMap, menuIdMap, isSSR, "", loadersByFile, routeLoaderSourceFiles);
+	const baseSegments = ctx.opts.basePathname.split("/").filter((s) => s.length > 0);
+	let routesExpr = trieStr;
+	for (let j = baseSegments.length - 1; j >= 0; j--) routesExpr = `{ ${JSON.stringify(baseSegments[j])}: ${routesExpr} }`;
+	c.push(`export const routes = ${routesExpr};`);
 }
-/**
-* Serialize a BuildTrieNode to a JS object literal string.
-*
-* The ancestor stack tracks layouts from parent nodes for layout chain resolution (needed for
-* layout stops and named layouts).
-*/ function serializeBuildTrie(ctx, qwikPlugin, node, layoutIdMap, routeIdMap, menuIdMap, ancestorLayouts, isSSR, indent, loadersByFile, routeLoaderSourceFiles) {
+function collectFiles(node, cb) {
+	for (const file of node._files) cb(file, node);
+	for (const child of node.children.values()) collectFiles(child, cb);
+}
+/** Serialize a BuildTrieNode using the resolved route layout chains. */
+function serializeBuildTrie(ctx, qwikPlugin, node, layoutIdMap, routeIdMap, menuIdMap, isSSR, indent, loadersByFile, routeLoaderSourceFiles) {
 	const lines = [];
 	const nextIndent = indent + "  ";
 	if (node._P) lines.push(`${nextIndent}_P: ${JSON.stringify(node._P)},`);
 	if (node._0) lines.push(`${nextIndent}_0: ${JSON.stringify(node._0)},`);
 	if (node._9) lines.push(`${nextIndent}_9: ${JSON.stringify(node._9)},`);
-	if (node._G != null) lines.push(`${nextIndent}_G: ${JSON.stringify(node._G)},`);
+	if (node._G != null) lines.push(`${nextIndent}_G: ${JSON.stringify(ctx.opts.basePathname + node._G)},`);
 	let layoutExpr;
 	let indexExpr;
 	let errorExpr;
 	let notFoundExpr;
 	let menuExpr;
 	let bundleRoute;
-	const nodeLayouts = [];
+	let pageLayouts;
 	for (const file of node._files) if (file.type === "menu") {
 		const menuId = menuIdMap.get(file.filePath);
 		if (menuId) menuExpr = menuId;
 	} else if (file.type === "layout") {
 		const layoutId = layoutIdMap.get(file.filePath);
 		if (layoutId) {
-			let extlessName = file.extlessName;
-			let layoutType = "nested";
-			if (extlessName.endsWith("!")) {
-				layoutType = "top";
-				extlessName = extlessName.slice(0, -1);
-			}
-			const layoutName = extlessName.startsWith("layout-") ? extlessName.slice(7) : "";
-			nodeLayouts.push({
-				id: layoutId,
-				layoutName,
-				layoutType
-			});
-			if (layoutName === "") layoutExpr = layoutId;
+			if (file.extlessName === "layout" || file.extlessName === "layout!") layoutExpr = layoutId;
 		}
 	}
 	for (const file of node._files) {
 		if (file.type !== "route") continue;
 		const loaderExpr = routeIdMap.get(file.filePath);
 		if (!loaderExpr) continue;
-		const expr = buildLoaderChainExpr(file.extlessName, loaderExpr, ancestorLayouts, nodeLayouts);
+		const route = ctx.routes.find((route) => route.filePath === file.filePath);
+		const expr = buildLoaderChainExpr(file.extlessName, loaderExpr, route?.layouts ?? []);
 		const boundary = errorBoundaryName(file.extlessName);
 		if (boundary === "404") notFoundExpr = expr;
 		else if (boundary === "error") errorExpr = expr;
 		else {
 			indexExpr = expr;
-			bundleRoute = ctx.routes.find((r) => r.filePath === file.filePath);
+			const { layoutName, layoutStop } = parseRouteIndexName(file.extlessName);
+			pageLayouts = layoutStop || layoutName ? route?.layouts ?? [] : void 0;
+			bundleRoute = route;
 		}
 	}
 	if (layoutExpr) lines.push(`${nextIndent}_L: ${layoutExpr},`);
@@ -1084,29 +1108,25 @@ function getClientRouteBundleNames(qwikPlugin, r) {
 			if (bundleNames.length > 0) lines.push(`${nextIndent}_B: ${JSON.stringify(bundleNames)},`);
 		}
 	}
-	{
-		const routeFiles = [];
-		for (const file of node._files.filter((f) => f.type === "layout" || f.type === "route" && routeIdMap.has(f.filePath))) routeFiles.push(file.filePath, ...routeLoaderSourceFiles?.get(file.filePath) ?? []);
-		if (node === ctx.routeTrie) for (const plugin of ctx.serverPlugins) routeFiles.push(plugin.filePath, ...routeLoaderSourceFiles?.get(plugin.filePath) ?? []);
-		const routeLoaderFiles = [...new Set(routeFiles)];
-		if (routeLoaderFiles.length > 0) {
-			if (loadersByFile) {
-				const nodeLoaderHashes = [];
-				for (const filePath of routeLoaderFiles) {
-					const hashes = loadersByFile.get(normalizePathKey(filePath));
-					if (hashes) nodeLoaderHashes.push(...hashes);
-				}
-				if (nodeLoaderHashes.length > 0) lines.push(`${nextIndent}_R: ${JSON.stringify(nodeLoaderHashes)},`);
-			} else {
-				const placeholder = `__LOADERS:${routeLoaderFiles.join("|")}__`;
-				lines.push(`${nextIndent}_R: ${JSON.stringify(placeholder)},`);
-			}
+	const pluginFiles = ctx.serverPlugins.map((plugin) => plugin.filePath);
+	const layoutFiles = node._files.filter((file) => file.type === "layout" && !file.extlessName.startsWith("layout-")).map((file) => file.filePath);
+	if (node === ctx.routeTrie) layoutFiles.push(...pluginFiles);
+	const pageFiles = bundleRoute ? [bundleRoute.filePath] : [];
+	if (pageLayouts) pageFiles.push(...pageLayouts.map((layout) => layout.filePath), ...pluginFiles);
+	for (const [field, routeFiles] of [["_R", layoutFiles], ["_D", pageFiles]]) {
+		const routeLoaderFiles = [...new Set(routeFiles.flatMap((path) => [path, ...routeLoaderSourceFiles?.get(path) ?? []]))];
+		if (routeLoaderFiles.length === 0) continue;
+		if (loadersByFile) {
+			const hashes = routeLoaderFiles.flatMap((filePath) => loadersByFile.get(normalizePathKey(filePath)) ?? []);
+			if (hashes.length > 0) lines.push(`${nextIndent}${field}: ${JSON.stringify(hashes)},`);
+		} else {
+			const placeholder = `__LOADERS:${routeLoaderFiles.join("|")}__`;
+			lines.push(`${nextIndent}${field}: ${JSON.stringify(placeholder)},`);
 		}
 	}
 	if (errorExpr) lines.push(`${nextIndent}_E: ${errorExpr},`);
 	if (notFoundExpr) lines.push(`${nextIndent}_4: ${notFoundExpr},`);
 	if (menuExpr) lines.push(`${nextIndent}_N: ${menuExpr},`);
-	const childAncestors = [...ancestorLayouts, ...nodeLayouts];
 	const groupChildren = [];
 	const regularChildren = [];
 	for (const [key, child] of node.children) if (isGroupKey(key)) groupChildren.push([key, child]);
@@ -1115,13 +1135,13 @@ function getClientRouteBundleNames(qwikPlugin, r) {
 		groupChildren.sort((a, b) => a[0].localeCompare(b[0]));
 		const groupStrs = [];
 		for (const [_key, child] of groupChildren) {
-			const childStr = serializeBuildTrie(ctx, qwikPlugin, child, layoutIdMap, routeIdMap, menuIdMap, childAncestors, isSSR, nextIndent, loadersByFile, routeLoaderSourceFiles);
+			const childStr = serializeBuildTrie(ctx, qwikPlugin, child, layoutIdMap, routeIdMap, menuIdMap, isSSR, nextIndent, loadersByFile, routeLoaderSourceFiles);
 			if (childStr !== "{}") groupStrs.push(childStr);
 		}
 		if (groupStrs.length > 0) lines.push(`${nextIndent}_M: [${groupStrs.join(", ")}],`);
 	}
 	for (const [key, child] of regularChildren) {
-		const childStr = serializeBuildTrie(ctx, qwikPlugin, child, layoutIdMap, routeIdMap, menuIdMap, childAncestors, isSSR, nextIndent, loadersByFile, routeLoaderSourceFiles);
+		const childStr = serializeBuildTrie(ctx, qwikPlugin, child, layoutIdMap, routeIdMap, menuIdMap, isSSR, nextIndent, loadersByFile, routeLoaderSourceFiles);
 		if (childStr !== "{}") {
 			const keyStr = JSON.stringify(key);
 			lines.push(`${nextIndent}${keyStr}: ${childStr},`);
@@ -1131,81 +1151,35 @@ function getClientRouteBundleNames(qwikPlugin, r) {
 	return `{\n${lines.join("\n")}\n${indent}}`;
 }
 /**
-* Serialize the build trie into JS code.
-*
-* Emits:
-*
-* - Layout imports and lazy loaders
-* - Route/page imports and lazy loaders
-* - Menu imports and lazy loaders
-* - The route trie object literal with _L, _I, _G, _B, _4, _E, _N, _P, _0, _9, _M
-*/ function createRoutes(ctx, qwikPlugin, c, esmImports, isSSR, loadersByFile, serverExcludePaths, routeLoaderSourceFiles) {
-	const includeEndpoints = isSSR;
-	const dynamicImports = ctx.dynamicImports;
-	const layoutIdMap = /* @__PURE__ */ new Map();
-	const routeIdMap = /* @__PURE__ */ new Map();
-	const menuIdMap = /* @__PURE__ */ new Map();
-	let layoutCount = 0;
-	let routeCount = 0;
-	let menuCount = 0;
-	collectFiles(ctx.routeTrie, (file, _node) => {
-		if (file.type === "layout") {
-			const id = ctx.layouts.find((l) => l.filePath === file.filePath)?.id;
-			if (id) {
-				layoutIdMap.set(file.filePath, id);
-				layoutCount++;
-			}
-		} else if (file.type === "route") {
-			if (ctx.routes.find((r) => r.filePath === file.filePath)) routeCount++;
-		} else if (file.type === "menu") {
-			const id = createFileId(ctx.opts.routesDir, file.filePath);
-			menuIdMap.set(file.filePath, id);
-			menuCount++;
-		}
-	});
-	if (layoutCount > 0) {
-		c.push(`\n/** Qwik Router Layouts (${layoutCount}) */`);
-		for (const [filePath, id] of layoutIdMap) {
-			const importPath = JSON.stringify(getImportPath(filePath));
-			if (dynamicImports) c.push(`const ${id} = ()=>import(${importPath});`);
-			else {
-				esmImports.push(`import * as ${id}_ from ${importPath};`);
-				c.push(`const ${id} = ()=>${id}_;`);
-			}
-		}
-	}
-	if (menuCount > 0) {
-		c.push(`\n/** Qwik Router Menus (${menuCount}) */`);
-		for (const [filePath, id] of menuIdMap) {
-			const importPath = JSON.stringify(getImportPath(filePath));
-			if (dynamicImports) c.push(`const ${id} = ()=>import(${importPath});`);
-			else {
-				esmImports.push(`import * as ${id}_ from ${importPath};`);
-				c.push(`const ${id} = ()=>${id}_;`);
+* The `_I`/`_E`/`_4` loader expression: a bare loader (runtime prepends gathered layouts), or an
+* override chain for `!` (layout stop) / `@name` (named layout).
+*/
+function buildLoaderChainExpr(extlessName, loaderExpr, layouts) {
+	const { layoutName, layoutStop } = parseRouteIndexName(extlessName);
+	if (layoutStop || layoutName) return `[ ${[...layouts.map((layout) => layout.id), loaderExpr].join(", ")} ]`;
+	return loaderExpr;
+}
+function getClientRouteBundleNames(qwikPlugin, r) {
+	const bundlesNames = [];
+	const manifest = qwikPlugin.api.getManifest();
+	if (manifest) {
+		const manifestBundleNames = Object.keys(manifest.bundles);
+		const addRouteFile = (filePath) => {
+			filePath = removeExtension(filePath);
+			for (const bundleName of manifestBundleNames) {
+				const bundle = manifest.bundles[bundleName];
+				if (bundle.origins) for (const bundleOrigin of bundle.origins) {
+					const originPath = removeExtension(bundleOrigin);
+					if (filePath.endsWith(originPath)) {
+						if (!bundlesNames.includes(bundleName)) bundlesNames.push(bundleName);
+					}
+				}
 			}
-		}
-	}
-	c.push(`\n/** Qwik Router Routes (${routeCount}) */`);
-	for (const route of ctx.routes) if (isPageExt(route.ext)) {
-		if (serverExcludePaths?.has(route.filePath)) continue;
-		const importPath = getImportPath(route.filePath);
-		let loaderExpr;
-		if (dynamicImports) loaderExpr = `()=>import(${JSON.stringify(importPath)})`;
-		else {
-			esmImports.push(`import * as ${route.id} from ${JSON.stringify(importPath)};`);
-			loaderExpr = `()=>${route.id}`;
-		}
-		routeIdMap.set(route.filePath, loaderExpr);
-	} else if (includeEndpoints && isModuleExt(route.ext)) {
-		const importPath = getImportPath(route.filePath);
-		esmImports.push(`import * as ${route.id} from ${JSON.stringify(importPath)};`);
-		routeIdMap.set(route.filePath, `()=>${route.id}`);
+		};
+		for (const layout of r.layouts) addRouteFile(layout.filePath);
+		addRouteFile(r.filePath);
 	}
-	const trieStr = serializeBuildTrie(ctx, qwikPlugin, ctx.routeTrie, layoutIdMap, routeIdMap, menuIdMap, [], isSSR, "", loadersByFile, routeLoaderSourceFiles);
-	const baseSegments = ctx.opts.basePathname.split("/").filter((s) => s.length > 0);
-	let routesExpr = trieStr;
-	for (let j = baseSegments.length - 1; j >= 0; j--) routesExpr = `{ ${JSON.stringify(baseSegments[j])}: ${routesExpr} }`;
-	c.push(`export const routes = ${routesExpr};`);
+	return bundlesNames;
 }
 function createServerPlugins(ctx, _qwikPlugin, c, esmImports, isSSR) {
 	c.push(`\n/** Qwik Router ServerPlugins (${ctx.serverPlugins.length}) */`);
@@ -1219,24 +1193,23 @@ function createServerPlugins(ctx, _qwikPlugin, c, esmImports, isSSR) {
 	}
 	c.push(`];`);
 }
-/** Generates the Qwik Router Config runtime code */ function generateQwikRouterConfig(ctx, qwikPlugin, isSSR, loadersByFile, serverExcludePaths, routeLoaderSourceFiles) {
+/** Generates the Qwik Router Config runtime code */
+function generateQwikRouterConfig(ctx, qwikPlugin, isSSR, loadersByFile, serverExcludePaths, routeLoaderSourceFiles) {
 	const esmImports = [];
 	const c = [];
 	c.push(`\n/** Qwik Router Config */`);
 	c.push(`\nimport { isDev } from '@qwik.dev/core/build';`);
-	if (isSSR) esmImports.push(`import 'virtual:qwik-router-server-fns';`);
+	if (isSSR) esmImports.push(`import { importEagerModules } from 'virtual:qwik-router-server-fns';`, `export { importEagerModules } from 'virtual:qwik-router-server-fns';`);
 	createServerPlugins(ctx, qwikPlugin, c, esmImports, isSSR);
 	createRoutes(ctx, qwikPlugin, c, esmImports, isSSR, loadersByFile, serverExcludePaths, routeLoaderSourceFiles);
 	createEntries(ctx, c);
 	c.push(`export const trailingSlash = ${JSON.stringify(!globalThis.__NO_TRAILING_SLASH__)};`);
 	c.push(`export const basePathname = ${JSON.stringify(ctx.opts.basePathname)};`);
 	c.push(`export const cacheModules = !isDev;`);
-	c.push(`export default { routes, serverPlugins, trailingSlash, basePathname, cacheModules };`);
+	if (isSSR) c.push(`export default { routes, serverPlugins, trailingSlash, basePathname, cacheModules, importEagerModules };`);
+	else c.push(`export default { routes, serverPlugins, trailingSlash, basePathname, cacheModules };`);
 	return esmImports.join("\n") + c.join("\n");
 }
-var SW_UNREGISTER = `
-"serviceWorker"in navigator&&navigator.serviceWorker.getRegistrations().then(r=>{for(const e of r){const c='__url'.split("/").pop();e.active?.scriptURL.endsWith(c||"service-worker.js")&&e.unregister().catch(console.error)}}),"caches"in window&&caches.keys().then(r=>{const e=r.find(c=>c.startsWith("QwikBuild"));e&&caches.delete(e).catch(console.error)}).catch(console.error)
-`;
 function generateServiceWorkerRegister(ctx, swRegister) {
 	let swReg;
 	let swUrl = "/service-worker.js";
@@ -1249,10 +1222,14 @@ function generateServiceWorkerRegister(ctx, swRegister) {
 	swReg = swReg.replace("__url", swUrl);
 	return `export default ${JSON.stringify(swReg)};`;
 }
+var SW_UNREGISTER = `
+"serviceWorker"in navigator&&navigator.serviceWorker.getRegistrations().then(r=>{for(const e of r){const c='__url'.split("/").pop();e.active?.scriptURL.endsWith(c||"service-worker.js")&&e.unregister().catch(console.error)}}),"caches"in window&&caches.keys().then(r=>{const e=r.find(c=>c.startsWith("QwikBuild"));e&&caches.delete(e).catch(console.error)}).catch(console.error)
+`;
 /**
 * Non-GET RouteModule handlers keep a route server-side (onGet is served statically). Typed against
 * keyof RouteModule so a renamed/added handler fails to compile until classified.
-*/ var NON_GET_HANDLERS = /* @__PURE__ */ new Set([
+*/
+var NON_GET_HANDLERS = /* @__PURE__ */ new Set([
 	"onRequest",
 	"onPost",
 	"onPut",
@@ -1266,11 +1243,13 @@ var ROUTER_MODULE = "@qwik.dev/router";
 * Imports tying a route to the server — loaders, actions, and server$ (which POSTs to the route's
 * own URL). Matched on the import statement (the optimizer's ctxName isn't available
 * pre-transform); fail-safe, so a stray match only keeps a route.
-*/ var SERVER_QRL = /\b(?:routeLoader|routeAction|globalAction|server)(?:\$|Qrl)/;
+*/
+var SERVER_QRL = /\b(?:routeLoader|routeAction|globalAction|server)(?:\$|Qrl)/;
 /**
 * True when the module exports no non-GET handler and imports no loader/action/server$ from the
 * router. Pure (no I/O) for direct unit testing.
-*/ function isServerFreeSource(code) {
+*/
+function isServerFreeSource(code) {
 	for (const e of findExports(code)) {
 		if (e.specifier) return false;
 		if ([...e.name ? [e.name] : [], ...e.names ?? []].some((n) => NON_GET_HANDLERS.has(n))) return false;
@@ -1279,28 +1258,13 @@ var ROUTER_MODULE = "@qwik.dev/router";
 	return true;
 }
 /**
-* Read + lex a module once, memoized by path. Returns the cached in-flight promise (not async) so
-* concurrent callers share one read; read/parse failure keeps the route.
-*/ function isFileServerFree(filePath, cache) {
-	let pending = cache.get(filePath);
-	if (!pending) {
-		pending = readFile(filePath, "utf-8").then(isServerFreeSource).catch(() => false);
-		cache.set(filePath, pending);
-	}
-	return pending;
-}
-/** The route's own module and every layout wrapping it must be free of server code. */ async function isRouteServerFree(route, cache) {
-	if (!isMarkdownExt(route.ext) && !await isFileServerFree(route.filePath, cache)) return false;
-	for (const layout of route.layouts) if (!await isFileServerFree(layout.filePath, cache)) return false;
-	return true;
-}
-/**
 * Route file paths to drop from the production server route plan — prerendered, static, server-free
 * pages (own module and every layout) — so they tree-shake out of size-capped edge bundles.
 * Candidates come from the SSG include/exclude; server surfaces are detected in route/layout source
 * only. Fail-safe: dynamic routes, re-exports, and read errors keep the route. A loader/action
 * route stays whole — stripping just its dead component needs optimizer segment data.
-*/ async function getServerExcludedRoutes(ctx, ssg) {
+*/
+async function getServerExcludedRoutes(ctx, ssg) {
 	const excluded = /* @__PURE__ */ new Set();
 	if (!ssg?.include?.length) return excluded;
 	const isPrerendered = createRouteTester(ctx.opts.basePathname, ssg.include, ssg.exclude);
@@ -1311,12 +1275,23 @@ var ROUTER_MODULE = "@qwik.dev/router";
 	}));
 	return excluded;
 }
-function isBundlePartOfRoute(bundle, routeAndLayoutPaths) {
-	if (!bundle.origins) return false;
-	return bundle.origins.some((bundleOrigin) => {
-		const originPath = removeExtension(bundleOrigin);
-		return routeAndLayoutPaths.some((path) => path.endsWith(originPath));
-	});
+/** The route's own module and every layout wrapping it must be free of server code. */
+async function isRouteServerFree(route, cache) {
+	if (!isMarkdownExt(route.ext) && !await isFileServerFree(route.filePath, cache)) return false;
+	for (const layout of route.layouts) if (!await isFileServerFree(layout.filePath, cache)) return false;
+	return true;
+}
+/**
+* Read + lex a module once, memoized by path. Returns the cached in-flight promise (not async) so
+* concurrent callers share one read; read/parse failure keeps the route.
+*/
+function isFileServerFree(filePath, cache) {
+	let pending = cache.get(filePath);
+	if (!pending) {
+		pending = readFile(filePath, "utf-8").then(isServerFreeSource).catch(() => false);
+		cache.set(filePath, pending);
+	}
+	return pending;
 }
 function getRouteImports(routes, manifest) {
 	const result = {};
@@ -1338,13 +1313,13 @@ function getRouteImports(routes, manifest) {
 	}
 	return result;
 }
-var safeParseInt = (nu) => {
-	try {
-		return parseInt(nu, 10);
-	} catch {
-		return;
-	}
-};
+function isBundlePartOfRoute(bundle, routeAndLayoutPaths) {
+	if (!bundle.origins) return false;
+	return bundle.origins.some((bundleOrigin) => {
+		const originPath = removeExtension(bundleOrigin);
+		return routeAndLayoutPaths.some((path) => path.endsWith(originPath));
+	});
+}
 var findLocation = (e) => {
 	const stack = e.stack;
 	if (typeof stack === "string") {
@@ -1382,6 +1357,13 @@ var findLocation = (e) => {
 		}
 	}
 };
+var safeParseInt = (nu) => {
+	try {
+		return parseInt(nu, 10);
+	} catch {
+		return;
+	}
+};
 var splitRE = /\r?\n/;
 var range = 2;
 function posToNumber(source, pos) {
@@ -1508,60 +1490,9 @@ function createImageJsxModule(pathId, params, userOpts) {
 function createSvgJsxModule(attrs) {
 	return `export default p => <svg {...p} {...${JSON.stringify(attrs)}} />`;
 }
-function optimizeSvg({ code, path }, userOpts) {
-	const svgAttributes = {};
-	const prefixIdsConfiguration = userOpts?.imageOptimization?.svgo?.prefixIds;
-	const maybePrefixIdsPlugin = prefixIdsConfiguration !== false ? [{
-		name: "prefixIds",
-		params: prefixIdsConfiguration
-	}] : [];
-	const userPlugins = userOpts?.imageOptimization?.svgo?.plugins?.filter((plugin) => {
-		if (plugin === "preset-default" || typeof plugin === "object" && plugin.name === "preset-default") {
-			console.warn(`You are trying to use the preset-default SVGO plugin. This plugin is already included by default, you can customize it through the defaultPresetOverrides option.`);
-			return false;
-		}
-		if (plugin === "prefixIds" || typeof plugin === "object" && plugin.name === "prefixIds") {
-			console.warn(`You are trying to use the prefixIds SVGO plugin. This plugin is already included by default, you can customize it through the prefixIds option.`);
-			return false;
-		}
-		return true;
-	}) || [];
-	const data = optimize(code, {
-		floatPrecision: userOpts?.imageOptimization?.svgo?.floatPrecision,
-		multipass: userOpts?.imageOptimization?.svgo?.multipass,
-		path,
-		plugins: [
-			{
-				name: "preset-default",
-				params: { overrides: {
-					removeViewBox: false,
-					...userOpts?.imageOptimization?.svgo?.defaultPresetOverrides
-				} }
-			},
-			{
-				name: "customPluginName",
-				fn: () => {
-					return { element: { exit: (node) => {
-						if (node.name === "svg") {
-							node.name = "g";
-							Object.assign(svgAttributes, node.attributes);
-							node.attributes = {};
-						}
-					} } };
-				}
-			},
-			...maybePrefixIdsPlugin,
-			...userPlugins
-		]
-	}).data;
-	svgAttributes.dangerouslySetInnerHTML = data.slice(3, -4);
-	return {
-		data,
-		svgAttributes
-	};
-}
-/** @public */ function imagePlugin(userOpts) {
-	return [import("vite-imagetools").then((_rawProps) => _rawProps.imagetools({
+/** @public */
+function imagePlugin(userOpts) {
+	return [import("vite-imagetools").then(({ imagetools }) => imagetools({
 		exclude: [],
 		extendOutputFormats(builtins) {
 			const jsx = () => (metadatas) => {
@@ -1654,6 +1585,58 @@ function optimizeSvg({ code, path }, userOpts) {
 		}
 	}];
 }
+function optimizeSvg({ code, path }, userOpts) {
+	const svgAttributes = {};
+	const prefixIdsConfiguration = userOpts?.imageOptimization?.svgo?.prefixIds;
+	const maybePrefixIdsPlugin = prefixIdsConfiguration !== false ? [{
+		name: "prefixIds",
+		params: prefixIdsConfiguration
+	}] : [];
+	const userPlugins = userOpts?.imageOptimization?.svgo?.plugins?.filter((plugin) => {
+		if (plugin === "preset-default" || typeof plugin === "object" && plugin.name === "preset-default") {
+			console.warn(`You are trying to use the preset-default SVGO plugin. This plugin is already included by default, you can customize it through the defaultPresetOverrides option.`);
+			return false;
+		}
+		if (plugin === "prefixIds" || typeof plugin === "object" && plugin.name === "prefixIds") {
+			console.warn(`You are trying to use the prefixIds SVGO plugin. This plugin is already included by default, you can customize it through the prefixIds option.`);
+			return false;
+		}
+		return true;
+	}) || [];
+	const data = optimize(code, {
+		floatPrecision: userOpts?.imageOptimization?.svgo?.floatPrecision,
+		multipass: userOpts?.imageOptimization?.svgo?.multipass,
+		path,
+		plugins: [
+			{
+				name: "preset-default",
+				params: { overrides: {
+					removeViewBox: false,
+					...userOpts?.imageOptimization?.svgo?.defaultPresetOverrides
+				} }
+			},
+			{
+				name: "customPluginName",
+				fn: () => {
+					return { element: { exit: (node) => {
+						if (node.name === "svg") {
+							node.name = "g";
+							Object.assign(svgAttributes, node.attributes);
+							node.attributes = {};
+						}
+					} } };
+				}
+			},
+			...maybePrefixIdsPlugin,
+			...userPlugins
+		]
+	}).data;
+	svgAttributes.dangerouslySetInnerHTML = data.slice(3, -4);
+	return {
+		data,
+		svgAttributes
+	};
+}
 async function collectServerFnModuleIds(routingContext, resolvedVirtualId, pluginContext) {
 	const serverFnModules = /* @__PURE__ */ new Set();
 	const queuedModuleIds = /* @__PURE__ */ new Set();
@@ -1725,11 +1708,23 @@ function formatError(e) {
 	}
 	return e;
 }
+var State = /* @__PURE__ */ function(State) {
+	/** Collecting content until <body> is found */
+	State[State["BUFFERING"] = 0] = "BUFFERING";
+	/** Transforming the head portion */
+	State[State["PROCESSING_HEAD"] = 1] = "PROCESSING_HEAD";
+	/** Streaming transformed content until </body> */
+	State[State["STREAMING_BODY"] = 2] = "STREAMING_BODY";
+	/** Passing through content unchanged */
+	State[State["PASSTHROUGH"] = 3] = "PASSTHROUGH";
+	return State;
+}(State || {});
 /**
 * Patches a response object to intercept HTML streams and transform them using Vite's
 * transformIndexHtml.
-*/ var HtmlTransformPatcher = class {
-	state = 0;
+*/
+var HtmlTransformPatcher = class {
+	state = State.BUFFERING;
 	buffer = "";
 	headInnerIndex = -1;
 	bodyInnerIndex = -1;
@@ -1782,7 +1777,7 @@ function formatError(e) {
 		};
 	}
 	handleWrite(chunk, encoding, callback) {
-		if (!this.isHtmlResponse || this.state === 3) return this.origWrite(chunk, encoding, callback);
+		if (!this.isHtmlResponse || this.state === State.PASSTHROUGH) return this.origWrite(chunk, encoding, callback);
 		if (typeof encoding === "function") {
 			callback = encoding;
 			encoding = void 0;
@@ -1794,7 +1789,7 @@ function formatError(e) {
 		else data = chunk?.toString() || "";
 		this.buffer += data;
 		switch (this.state) {
-			case 0:
+			case State.BUFFERING:
 				if (this.headInnerIndex === -1) {
 					const headMatch = this.buffer.match(/<head[^>]*>/i);
 					if (headMatch) {
@@ -1805,15 +1800,15 @@ function formatError(e) {
 				if (this.headInnerIndex !== -1) {
 					const bodyMatch = this.buffer.slice(this.headInnerIndex).match(/<body[^>]*>/i);
 					if (bodyMatch) {
-						this.state = 1;
+						this.state = State.PROCESSING_HEAD;
 						const bodyOuterIndex = this.buffer.indexOf(bodyMatch[0]);
 						this.bodyInnerIndex = bodyOuterIndex + bodyMatch[0].length;
 						this.processingPromise = this.processHead();
 					}
 				}
 				break;
-			case 1: break;
-			case 2:
+			case State.PROCESSING_HEAD: break;
+			case State.STREAMING_BODY:
 				this.handleStreamingBodyState();
 				break;
 			default: throw new Error(`Invalid state: ${this.state}`);
@@ -1840,7 +1835,7 @@ function formatError(e) {
 			if (headCloseIndex === -1) throw new Error("Buffered HTML does not contain </head>");
 			this.buffer = this.buffer.slice(0, this.headInnerIndex) + headPreContent + this.buffer.slice(this.headInnerIndex, headCloseIndex) + headPostContent + this.buffer.slice(headCloseIndex, this.bodyInnerIndex) + bodyPreContent + this.buffer.slice(this.bodyInnerIndex);
 			if (this.bodyPostContent.length > 0) {
-				this.state = 2;
+				this.state = State.STREAMING_BODY;
 				this.handleStreamingBodyState();
 				return;
 			}
@@ -1863,7 +1858,7 @@ function formatError(e) {
 		this.flushBuffer(6);
 	}
 	transitionToPassthrough() {
-		this.state = 3;
+		this.state = State.PASSTHROUGH;
 		this.flushBuffer();
 	}
 	flushBuffer(keep = 0) {
@@ -1892,7 +1887,8 @@ function formatError(e) {
 		this.origEnd(callback);
 	}
 };
-/** Patches a response to enable HTML transformation using Vite's transformIndexHtml */ function wrapResponseForHtmlTransform(request, response, server) {
+/** Patches a response to enable HTML transformation using Vite's transformIndexHtml */
+function wrapResponseForHtmlTransform(request, response, server) {
 	new HtmlTransformPatcher(request, response, server);
 	return response;
 }
@@ -1901,43 +1897,6 @@ var ROUTE_PATH_HEADER = "X-Qwik-route-path";
 function getDevMiddlewareRequestPath(req) {
 	return req.originalUrl || req.url;
 }
-async function loadSsrModule(server, filePath) {
-	return server.ssrLoadModule(getImportPath(normalizePath$1(filePath)));
-}
-function matchesLoaderId(loader, loaderId) {
-	return loader.__id === loaderId || loader.__qrl.getHash() === loaderId;
-}
-function isLoaderInternal(value) {
-	return typeof value === "function" && value.__brand === "server_loader";
-}
-function findMatchingLoader(mod, loaderId) {
-	for (const value of Object.values(mod)) if (isLoaderInternal(value) && matchesLoaderId(value, loaderId)) return value;
-}
-async function preloadQLoaderRouteLoader(server, ctx, req) {
-	const requestPath = getDevMiddlewareRequestPath(req);
-	if (!requestPath) return;
-	let requestUrl;
-	try {
-		requestUrl = new URL(requestPath, "http://qwik.dev");
-	} catch {
-		return;
-	}
-	const recognized = recognizeRequest(requestUrl.pathname);
-	if (recognized?.type !== "@isQLoader" || !recognized.data?.loaderId) return;
-	const loaderId = recognized.data.loaderId;
-	const headerValue = req.headers[FULLPATH_HEADER.toLowerCase()] ?? req.headers[ROUTE_PATH_HEADER.toLowerCase()];
-	const fullPathHeader = Array.isArray(headerValue) ? headerValue[0] : headerValue ?? null;
-	const loaderPathname = trimRecognizedInternalPathname(requestUrl.pathname, recognized);
-	const pathname = resolveValidInternalFullPathname(loaderPathname, fullPathHeader) ?? loaderPathname;
-	const route = ctx.routes.filter((route) => isPageExt(route.ext)).slice().sort(routeSortCompare).find((route) => route.pattern.test(pathname));
-	if (!route) return;
-	const routeRootFiles = [...route.layouts.map((layout) => layout.filePath), route.filePath];
-	const modules = await Promise.all([...ctx.serverPlugins.map((plugin) => loadSsrModule(server, plugin.filePath)), ...routeRootFiles.map((filePath) => loadSsrModule(server, filePath))]);
-	for (const mod of modules) {
-		const loader = findMatchingLoader(mod, loaderId);
-		if (loader) return loader;
-	}
-}
 var makeRouterDevMiddleware = (server, ctx) => async (req, res, next) => {
 	let mod;
 	try {
@@ -1977,9 +1936,9 @@ var makeRouterDevMiddleware = (server, ctx) => async (req, res, next) => {
 	globalThis.__qwik = void 0;
 	const { createQwikRouter } = await server.ssrLoadModule("@qwik.dev/router/middleware/node");
 	try {
-		const render = async (opts) => {
+		const render = (async (opts) => {
 			return await renderer(opts);
-		};
+		});
 		const { router, staticFile } = createQwikRouter({
 			render,
 			platform: ctx.opts.platform
@@ -1997,6 +1956,43 @@ var makeRouterDevMiddleware = (server, ctx) => async (req, res, next) => {
 		return;
 	}
 };
+async function preloadQLoaderRouteLoader(server, ctx, req) {
+	const requestPath = getDevMiddlewareRequestPath(req);
+	if (!requestPath) return;
+	let requestUrl;
+	try {
+		requestUrl = new URL(requestPath, "http://qwik.dev");
+	} catch {
+		return;
+	}
+	const recognized = recognizeRequest(requestUrl.pathname);
+	if (recognized?.type !== "@isQLoader" || !recognized.data?.loaderId) return;
+	const loaderId = recognized.data.loaderId;
+	const headerValue = req.headers[FULLPATH_HEADER.toLowerCase()] ?? req.headers[ROUTE_PATH_HEADER.toLowerCase()];
+	const fullPathHeader = Array.isArray(headerValue) ? headerValue[0] : headerValue ?? null;
+	const loaderPathname = trimRecognizedInternalPathname(requestUrl.pathname, recognized);
+	const pathname = resolveValidInternalFullPathname(loaderPathname, fullPathHeader) ?? loaderPathname;
+	const route = ctx.routes.filter((route) => isPageExt(route.ext)).slice().sort(routeSortCompare).find((route) => route.pattern.test(pathname));
+	if (!route) return;
+	const routeRootFiles = [...route.layouts.map((layout) => layout.filePath), route.filePath];
+	const modules = await Promise.all([...ctx.serverPlugins.map((plugin) => loadSsrModule(server, plugin.filePath)), ...routeRootFiles.map((filePath) => loadSsrModule(server, filePath))]);
+	for (const mod of modules) {
+		const loader = findMatchingLoader(mod, loaderId);
+		if (loader) return loader;
+	}
+}
+async function loadSsrModule(server, filePath) {
+	return server.ssrLoadModule(getImportPath(normalizePath$1(filePath)));
+}
+function findMatchingLoader(mod, loaderId) {
+	for (const value of Object.values(mod)) if (isLoaderInternal(value) && matchesLoaderId(value, loaderId)) return value;
+}
+function matchesLoaderId(loader, loaderId) {
+	return loader.__id === loaderId || loader.__qrl.getHash() === loaderId;
+}
+function isLoaderInternal(value) {
+	return typeof value === "function" && value.__brand === "server_loader";
+}
 var CSS_EXTENSIONS = [
 	".css",
 	".scss",
@@ -2014,7 +2010,8 @@ var isCssPath = (url) => CSS_EXTENSIONS.some((ext) => url.endsWith(ext));
 * We check both the client and SSR module graphs because on the first page request only the SSR
 * graph has been populated (via ssrLoadModule). The client graph is empty until the browser
 * actually fetches modules through Vite's dev server.
-*/ var getCssUrls = (server) => {
+*/
+var getCssUrls = (server) => {
 	const clientGraph = server.environments.client.moduleGraph;
 	const ssrGraph = server.environments.ssr.moduleGraph;
 	const cssModules = /* @__PURE__ */ new Set();
@@ -2053,7 +2050,8 @@ var getRouterIndexTags = (server) => {
 /**
 * Live-reload route CSS that Qwik injects as `<link>` tags; it only lives in the SSR graph, so Vite
 * skips HMR. Emit a `css-update` to swap the `<link>` in place. Returns `true` when handled.
-*/ var sendRouterCssHotUpdate = (server, file, timestamp) => {
+*/
+var sendRouterCssHotUpdate = (server, file, timestamp) => {
 	const { client, ssr } = server.environments;
 	if (!isCssPath(file) || client.moduleGraph.getModulesByFile(file)?.size) return false;
 	const paths = /* @__PURE__ */ new Set();
@@ -2077,19 +2075,37 @@ var QWIK_ROUTER_CONFIG_ID = "@qwik-router-config";
 /**
 * This virtual module is used to generate dynamic entries for user route files, which are added as
 * dynamic imports to the qwik-router-config as a way to create new entry points for the build.
-*/ var QWIK_ROUTER_ENTRIES_ID = "@qwik-router-entries";
+*/
+var QWIK_ROUTER_ENTRIES_ID = "@qwik-router-entries";
 var QWIK_ROUTER = "@qwik.dev/router";
 var QWIK_ROUTER_SW_REGISTER = "@qwik-router-sw-register";
 var VIRTUAL_SERVER_FNS = "virtual:qwik-router-server-fns";
-/** Replace or strip `_R: "__LOADERS:path1|path2__"` placeholders in a bundle chunk. */ function replaceLoaderPlaceholders(code, loadersByFile) {
-	return code.replace(/_R\s*:\s*(["'`])__LOADERS:([^"'`]+)__\1\s*,?/g, (_match, _q, paths) => {
+/**
+* @deprecated Use `qwikRouter` instead. Will be removed in V3
+* @public
+*/
+function qwikCity(userOpts) {
+	return qwikRouter(userOpts);
+}
+/** @public */
+function qwikRouter(userOpts) {
+	const buildContextRef = { current: null };
+	return [
+		qwikRouterPlugin(userOpts, buildContextRef),
+		serverFnsPlugin(buildContextRef),
+		...imagePlugin(userOpts)
+	];
+}
+/** Replace or strip loader placeholders in a bundle chunk. */
+function replaceLoaderPlaceholders(code, loadersByFile) {
+	return code.replace(/(_R|_D)\s*:\s*(["'`])__LOADERS:([^"'`]+)__\2\s*,?/g, (_match, field, _q, paths) => {
 		const filePaths = JSON.parse(`"${paths}"`).split("|");
 		const hashes = [];
 		for (const filePath of filePaths) {
 			const fileHashes = loadersByFile.get(normalizePathKey(filePath));
 			if (fileHashes) hashes.push(...fileHashes);
 		}
-		if (hashes.length > 0) return `_R: ${JSON.stringify(hashes)},`;
+		if (hashes.length > 0) return `${field}: ${JSON.stringify(hashes)},`;
 		return "";
 	});
 }
@@ -2127,6 +2143,14 @@ function isDiscoveredRouteLoaderSource(filePath, sourceFiles) {
 	for (const files of sourceFiles.values()) if (files.includes(normalizedPath)) return true;
 	return false;
 }
+async function findRouteLoaderSourceFiles(ctx, resolveSource) {
+	const sources = /* @__PURE__ */ new Map();
+	const owners = /* @__PURE__ */ new Set();
+	collectRouteLoaderOwners(ctx.routeTrie, owners);
+	for (const plugin of ctx.serverPlugins) owners.add(plugin.filePath);
+	await Promise.all([...owners].map((owner) => collectRouteLoaderSources(owner, owner, resolveSource, sources)));
+	return sources;
+}
 function collectRouteLoaderOwners(node, owners) {
 	for (const file of node._files) if (file.type === "layout" || file.type === "route") owners.add(file.filePath);
 	for (const child of node.children.values()) collectRouteLoaderOwners(child, owners);
@@ -2166,14 +2190,6 @@ async function collectRouteLoaderSources(owner, filePath, resolveSource, sources
 		}
 	}
 }
-async function findRouteLoaderSourceFiles(ctx, resolveSource) {
-	const sources = /* @__PURE__ */ new Map();
-	const owners = /* @__PURE__ */ new Set();
-	collectRouteLoaderOwners(ctx.routeTrie, owners);
-	for (const plugin of ctx.serverPlugins) owners.add(plugin.filePath);
-	await Promise.all([...owners].map((owner) => collectRouteLoaderSources(owner, owner, resolveSource, sources)));
-	return sources;
-}
 function invalidateRouterConfigModules(server) {
 	const modules = [];
 	const moduleGraphs = /* @__PURE__ */ new Set();
@@ -2192,21 +2208,6 @@ function invalidateRouterConfigModules(server) {
 	}
 	return modules;
 }
-async function generateServerPackageJson(outDir) {
-	await fs.promises.mkdir(outDir, { recursive: true });
-	const serverPackageJsonPath = join(outDir, "package.json");
-	let packageJson = {};
-	if (fs.existsSync(serverPackageJsonPath)) {
-		const content = await fs.promises.readFile(serverPackageJsonPath, "utf-8");
-		packageJson = { ...JSON.parse(content) };
-	}
-	packageJson = {
-		...packageJson,
-		type: "module"
-	};
-	const serverPackageJsonCode = JSON.stringify(packageJson, null, 2);
-	await fs.promises.writeFile(serverPackageJsonPath, serverPackageJsonCode);
-}
 function qwikRouterPlugin(userOpts, buildContextRef) {
 	let ctx = null;
 	let mdxTransform = null;
@@ -2218,9 +2219,11 @@ function qwikRouterPlugin(userOpts, buildContextRef) {
 	let devSsrServer = userOpts?.devSsrServer;
 	const routesDir = userOpts?.routesDir ?? "src/routes";
 	const serverPluginsDir = userOpts?.serverPluginsDir ?? routesDir;
-	/** Map from source file path to array of routeLoader$ hashes found in that file */ const loadersByFile = /* @__PURE__ */ new Map();
+	/** Map from source file path to array of routeLoader$ hashes found in that file */
+	const loadersByFile = /* @__PURE__ */ new Map();
 	let reExportedRouteLoaderSources;
-	/** SSG include/exclude from the adapter (see `_setSsgRoutes`); drives the server-route prune. */ let ssgRoutePatterns;
+	/** SSG include/exclude from the adapter (see `_setSsgRoutes`); drives the server-route prune. */
+	let ssgRoutePatterns;
 	return {
 		name: "vite-plugin-qwik-router",
 		enforce: "pre",
@@ -2245,6 +2248,7 @@ function qwikRouterPlugin(userOpts, buildContextRef) {
 				define: {
 					"globalThis.__DEFAULT_LOADERS_SERIALIZATION_STRATEGY__": JSON.stringify(userOpts?.defaultLoadersSerializationStrategy || "never"),
 					"globalThis.__NO_TRAILING_SLASH__": JSON.stringify(userOpts?.trailingSlash === false),
+					"globalThis.__QWIK_ROUTER_BASE_PATHNAME__": JSON.stringify(resolveBasePathname(userOpts, _viteConfig.base || "/")),
 					"globalThis.__SSR_CACHE_SIZE__": JSON.stringify(viteEnv.command === "serve" ? 0 : userOpts?.ssrCacheSize ?? 50),
 					"globalThis.__STRICT_LOADERS__": JSON.stringify(userOpts?.strictLoaders !== false)
 				},
@@ -2372,6 +2376,10 @@ function qwikRouterPlugin(userOpts, buildContextRef) {
 		},
 		buildStart() {
 			resetBuildContext(ctx);
+			if (this.environment.mode === "build" && this.environment.config.consumer === "client") this.emitFile({
+				type: "chunk",
+				id: QWIK_ROUTER_CONFIG_ID
+			});
 		},
 		resolveId(id) {
 			if (id === "@qwik-router-config" || id === QWIK_ROUTER_ENTRIES_ID) return {
@@ -2472,11 +2480,27 @@ function qwikRouterPlugin(userOpts, buildContextRef) {
 		}
 	};
 }
+async function generateServerPackageJson(outDir) {
+	await fs.promises.mkdir(outDir, { recursive: true });
+	const serverPackageJsonPath = join(outDir, "package.json");
+	let packageJson = {};
+	if (fs.existsSync(serverPackageJsonPath)) {
+		const content = await fs.promises.readFile(serverPackageJsonPath, "utf-8");
+		packageJson = { ...JSON.parse(content) };
+	}
+	packageJson = {
+		...packageJson,
+		type: "module"
+	};
+	const serverPackageJsonCode = JSON.stringify(packageJson, null, 2);
+	await fs.promises.writeFile(serverPackageJsonPath, serverPackageJsonCode);
+}
 /**
 * Separate plugin that tracks modules containing server$ functions during SSR builds and generates
 * `virtual:qwik-router-server-fns` — a virtual module that statically imports all such modules so
 * their `_regSymbol` side effects run before any RPC request arrives.
-*/ function serverFnsPlugin(buildContextRef) {
+*/
+function serverFnsPlugin(buildContextRef) {
 	const RESOLVED_ID = "\0virtual:qwik-router-server-fns";
 	const serverFnModules = /* @__PURE__ */ new Set();
 	let serverFnsReady = null;
@@ -2515,26 +2539,12 @@ function qwikRouterPlugin(userOpts, buildContextRef) {
 				const isServerBuild = this.environment.config.consumer === "server" && this.environment.mode === "build";
 				if (id === RESOLVED_ID) {
 					if (isServerBuild) await collectServerFnModules.call(this);
-					if (!isServerBuild || serverFnModules.size === 0) return "// No server$ functions";
-					return [...serverFnModules].map((mod, index) => `import * as serverFnModule${index} from ${JSON.stringify(mod)};\nObject.values(serverFnModule${index});`).join("\n");
+					if (!isServerBuild || serverFnModules.size === 0) return "export const importEagerModules = () => Promise.resolve();\n";
+					return "export const importEagerModules = () =>\n  Promise.all([\n" + [...serverFnModules].map((mod) => `    import(${JSON.stringify(mod)}),`).join("\n") + "\n  ]);\n";
 				}
 				return null;
 			}
 		}
 	};
 }
-/** @public */ function qwikRouter(userOpts) {
-	const buildContextRef = { current: null };
-	return [
-		qwikRouterPlugin(userOpts, buildContextRef),
-		serverFnsPlugin(buildContextRef),
-		...imagePlugin(userOpts)
-	];
-}
-/**
-* @deprecated Use `qwikRouter` instead. Will be removed in V3
-* @public
-*/ function qwikCity(userOpts) {
-	return qwikRouter(userOpts);
-}
 export { extendConfig, qwikCity, qwikRouter };