@qwik.dev/router 2.0.0-beta.40 → 2.0.0-beta.41

package/lib/adapters/cloudflare-pages/vite/index.mjs

@@ -1,6 +1,6 @@
 import { t as ensureSlash } from "../../../chunks/pathname.mjs";
 import { viteAdapter } from "../../shared/vite/index.mjs";
-import { v as normalizePathSlash } from "../../../chunks/fs.mjs";
+import { y as normalizePathSlash } from "../../../chunks/fs.mjs";
 import fs from "node:fs";
 import { join, relative } from "node:path";
 /** @public */ function cloudflarePagesAdapter(opts = {}) {

package/lib/adapters/shared/vite/index.mjs

@@ -31,21 +31,27 @@ var injectStatics = async (staticPathsCode, outDir) => {
 	await walk(outDir);
 	await Promise.all(promises);
 };
-/** Cleans the client output SSG results if needed and injects the SSG metadata into the build output */ async function postBuild(clientOutDir, serverOutDir, pathName, userStaticPaths, cleanStatic) {
+/** Cleans the client output SSG results if needed and injects the SSG metadata into the build output */ async function postBuild(clientOutDir, serverOutDir, pathName, userStaticPaths, cleanStatic, noTrailingSlash) {
 	if (pathName && !pathName.endsWith("/")) pathName = ensureSlash(pathName);
 	const pathNameBase = pathName || "/";
 	const ignorePathnames = /* @__PURE__ */ new Set([pathNameBase + (globalThis.__QWIK_BUILD_DIR__ || "build") + "/", pathNameBase + (globalThis.__QWIK_ASSETS_DIR__ || "assets") + "/"]);
-	const staticPaths = new Set(userStaticPaths.map(ensureSlash));
+	const getStaticPathname = (pathname) => {
+		pathname = ensureSlash(pathname);
+		if (noTrailingSlash && pathname !== pathNameBase) return pathname.slice(0, -1);
+		return pathname;
+	};
+	const staticPaths = new Set(userStaticPaths.map(getStaticPathname));
 	const loadItem = async (fsDir, fsName, pathname) => {
 		pathname = ensureSlash(pathname);
 		if (ignorePathnames.has(pathname)) return;
 		const fsPath = join(fsDir, fsName);
 		if (fsName === "index.html") {
-			if (!staticPaths.has(pathname) && cleanStatic) await fs.promises.unlink(fsPath);
+			if (!staticPaths.has(getStaticPathname(pathname)) && cleanStatic) await fs.promises.unlink(fsPath);
 			return;
 		}
 		if (LOADER_REGEX.test("/" + fsName)) {
-			if (staticPaths.has(pathname)) staticPaths.add(pathname + fsName);
+			const staticPathname = getStaticPathname(pathname);
+			if (staticPaths.has(staticPathname)) staticPaths.add(ensureSlash(staticPathname) + fsName);
 			else if (cleanStatic) await fs.promises.unlink(fsPath);
 			return;
 		}
@@ -217,6 +223,7 @@ var QWIK_SSG_WORKER_ENTRY_RESOLVED = "\0@qwik-ssg-worker-entry";
 			const basePathname = qwikRouterPlugin.api.getBasePathname();
 			const clientOutDir = qwikVitePlugin.api.getClientOutDir();
 			const clientPublicOutDir = qwikVitePlugin.api.getClientPublicOutDir();
+			const noTrailingSlash = builder.config.define?.["globalThis.__NO_TRAILING_SLASH__"] === "true";
 			const ssgEnv = builder.environments.ssg;
 			const ssgOutDir = ssgOutDirFor(builder.config.root);
 			if (ssgEnv && clientOutDir && clientPublicOutDir) {
@@ -248,7 +255,7 @@ var QWIK_SSG_WORKER_ENTRY_RESOLVED = "\0@qwik-ssg-worker-entry";
 					force: true
 				});
 			}
-			await postBuild(clientPublicOutDir, serverOutDir, basePathname, staticPaths, !!opts.cleanStaticGenerated);
+			await postBuild(clientPublicOutDir, serverOutDir, basePathname, staticPaths, !!opts.cleanStaticGenerated, noTrailingSlash);
 			if (typeof opts.generate === "function") await opts.generate({
 				outputEntries,
 				serverOutDir,

package/lib/chunks/fs.mjs

@@ -51,6 +51,13 @@ function getMenuPathname(opts, filePath) {
 	const result = normalizePathname(pathname, opts.basePathname);
 	return ensureSlash(result);
 }
+/** Normalize equivalent filesystem paths for string-key comparisons. */ function normalizePathKey(path) {
+	if (path.startsWith("\\\\?\\UNC\\")) path = `\\\\${path.slice(8)}`;
+	else if (path.startsWith("\\\\?\\")) path = path.slice(4);
+	else if (path.startsWith("//?/UNC/")) path = `//${path.slice(8)}`;
+	else if (path.startsWith("//?/")) path = path.slice(4);
+	return normalizePath(path).replace(/\\/g, "/");
+}
 /**
 * Creates an id for the module, based on its path.
 *
@@ -130,4 +137,4 @@ function getPathnameFromDirPath(opts, dirPath) {
 	if (pathname === "") return "/";
 	return pathname;
 }
-export { normalizePath as _, getPathnameFromDirPath as a, removeExtension as b, isIndexModule as c, isMenuFileName as d, isModuleExt as f, isServiceWorkerName as g, isPluginModule as h, getMenuPathname as i, isLayoutModule as l, isPageModuleExt as m, errorBoundaryName as n, isEntryName as o, isPageExt as p, getExtension as r, isErrorName as s, createFileId as t, isMarkdownExt as u, normalizePathSlash as v, parseRouteIndexName as y };
+export { normalizePath as _, getPathnameFromDirPath as a, parseRouteIndexName as b, isIndexModule as c, isMenuFileName as d, isModuleExt as f, isServiceWorkerName as g, isPluginModule as h, getMenuPathname as i, isLayoutModule as l, isPageModuleExt as m, errorBoundaryName as n, isEntryName as o, isPageExt as p, getExtension as r, isErrorName as s, createFileId as t, isMarkdownExt as u, normalizePathKey as v, removeExtension as x, normalizePathSlash as y };

package/lib/chunks/head.qwik.mjs

@@ -208,24 +208,12 @@ function getRouteLoaderCtx(requestEv) {
 	}
 	return ctx;
 }
-/**
-* Update the loader paths store on client-side navigation.
-*
-* Only adds/updates entries for loaders present on the new route. Entries for loaders that are NOT
-* on the new route are left untouched — their ComputedSignals keep their prior values, and no
-* track() fires to invalidate them. If the user navigates back to a route where the loader IS
-* present, the path updates and the signal re-fetches. This is the "stale is fine by default"
-* contract: readers see old data until new data arrives.
-*/ var updateRouteLoaderPaths = (ctx, loaderPaths, pageUrl) => {
+/** Update route loader matching state on navigation. */ var updateRouteLoaderPaths = (ctx, loaderPaths, pageUrl) => {
 	if (!isServer) {
 		ctx.pagePathname = pageUrl.pathname;
 		ctx.pageSearch = pageUrl.search;
-		if (isDev) ctx.devRouteLoaderPaths = {};
-	}
-	if (loaderPaths) for (const key in loaderPaths) {
-		ctx.loaderPaths[key] = loaderPaths[key];
-		if (!isServer && isDev) ctx.devRouteLoaderPaths[key] = true;
-	}
+		ctx.routeLoaderCandidates = loaderPaths;
+	} else if (loaderPaths) for (const key in loaderPaths) ctx.loaderPaths[key] = loaderPaths[key];
 };
 var getModuleRouteLoaders = (mods) => {
 	const routeLoaders = [];
@@ -262,6 +250,11 @@ var isImmutableLoader = (loaderId) => immutableLoaderIds.has(loaderId);
 */ var invalidateNavRouteLoaders = (state) => {
 	for (const id in state) if (!id.startsWith(ROUTE_LOADER_VALUE_PREFIX) && !immutableLoaderIds.has(id)) state[id].invalidate();
 };
+var applyClientRouteLoaderPath = (loaderId, ctx) => {
+	const currentPath = ctx.routeLoaderCandidates?.[loaderId];
+	if (currentPath) ctx.loaderPaths[loaderId] = currentPath;
+	else if (isDev && ctx.pagePathname) ctx.loaderPaths[loaderId] = ctx.pagePathname;
+};
 /**
 * Inject a pre-loaded value into a ComputedSignal while preserving subscriptions. Delegates to the
 * core helper which calls `invalidate({__v})` + `$computeIfNeeded$()` so the compute function runs
@@ -304,7 +297,7 @@ var resolveRouteLoaderByHash = (routeLoaders, loaderId) => {
 				enumerable: true
 			},
 			params: {
-				value: {},
+				value: rootRequestEv.params,
 				enumerable: true
 			},
 			pathname: {
@@ -518,20 +511,14 @@ var createRouteLoaderSignal = (loader, routeLoaderCtx, state) => {
 	return signal;
 };
 var ensureRouteLoaderSignal = (loader, state, routeLoaderCtx) => {
+	if (!isServer && routeLoaderCtx.pagePathname) applyClientRouteLoaderPath(loader.__id, routeLoaderCtx);
 	if (loader.__cacheControl === "immutable") immutableLoaderIds.add(loader.__id);
 	if (isServer && loader.__serializationStrategy === "never") state[getRouteLoaderValueStateKey(loader.__id)] = _UNINITIALIZED;
 	return state[loader.__id] ||= createRouteLoaderSignal(loader, routeLoaderCtx, state);
 };
 var ensureRouteLoaderSignals = (mods, state, routeLoaderCtx) => {
 	const loaders = getModuleRouteLoaders(mods);
-	for (let i = 0; i < loaders.length; i++) {
-		const loader = loaders[i];
-		if (isDev && !isServer) {
-			const devCtx = routeLoaderCtx;
-			if (devCtx.pagePathname && !devCtx.devRouteLoaderPaths?.[loader.__id]) devCtx.loaderPaths[loader.__id] = devCtx.pagePathname;
-		}
-		ensureRouteLoaderSignal(loader, state, routeLoaderCtx);
-	}
+	for (let i = 0; i < loaders.length; i++) ensureRouteLoaderSignal(loaders[i], state, routeLoaderCtx);
 	return loaders;
 };
 var loadRouteLoader = (loader, requestEv) => {
@@ -554,9 +541,7 @@ var loadRouteLoader = (loader, requestEv) => {
 /** @internal */ var routeLoaderQrl = (loaderQrl, ...rest) => {
 	const { id, validators, serializationStrategy, cacheControl, eTag, cacheKey, search, blockSSR } = getLoaderOptions(rest);
 	function loader() {
-		const state = _resolveContextWithoutSequentialScope(RouteStateContext);
-		let signal = state[loader.__id];
-		if (!signal) signal = ensureRouteLoaderSignal(loader, state, _resolveContextWithoutSequentialScope(RouteLoaderCtxContext));
+		const signal = ensureRouteLoaderSignal(loader, _resolveContextWithoutSequentialScope(RouteStateContext), _resolveContextWithoutSequentialScope(RouteLoaderCtxContext));
 		signal.promise();
 		return signal;
 	}

package/lib/chunks/user-response.mjs

@@ -851,6 +851,19 @@ async function runValidators(requestEv, validators, data, devMode) {
 		requestEv.send(requestEv.status(), serialized);
 	};
 }
+var staticPaths = /* @__PURE__ */ new Set(["__QWIK_ROUTER_STATIC_PATHS_ARRAY__"]);
+/**
+* Decide whether a given request path is a static path, for optimizing file access.
+*
+* @internal
+*/ function isStaticPath(method, url) {
+	method = method.toUpperCase();
+	if (method !== "GET" && method !== "HEAD") return false;
+	const p = url.pathname;
+	if (p.startsWith("/" + (globalThis.__QWIK_BUILD_DIR__ || "build") + "/")) return true;
+	if (p.startsWith("/" + (globalThis.__QWIK_ASSETS_DIR__ || "assets") + "/")) return true;
+	return staticPaths.has(p);
+}
 /**
 * Hypertext Transfer Protocol (HTTP) response status codes.
 *
@@ -1167,7 +1180,7 @@ function createResolveRequestHandlers() {
 		if (isPageRoute) {
 			requestHandlers.push(loaderHandler(routeLoaders, route.$loaderPaths$));
 			requestHandlers.push(actionHandler(routeActions));
-			if (!route.$notFound$) requestHandlers.push(fixTrailingSlash);
+			requestHandlers.push(route.$notFound$ ? fixStaticTrailingSlash : fixTrailingSlash);
 		}
 		if (isPageRoute) {
 			requestHandlers.push((ev) => {
@@ -1449,6 +1462,15 @@ function createResolveRequestHandlers() {
 			} else if (pathname.endsWith("/")) throw ev.redirect(HttpStatus.MovedPermanently, pathname.slice(0, pathname.length - 1) + search);
 		}
 	}
+	/**
+	* Prerendered pages are pruned from the production server route plan, so a request missing the
+	* canonical trailing slash lands here as not found. Redirect it when the canonical path was
+	* prerendered, and leave a genuine 404 alone.
+	*/ function fixStaticTrailingSlash(ev) {
+		const canonicalUrl = new URL(ev.originalUrl);
+		canonicalUrl.pathname = globalThis.__NO_TRAILING_SLASH__ ? canonicalUrl.pathname.replace(/\/$/, "") : ensureSlash(canonicalUrl.pathname);
+		if (isStaticPath(ev.request.method, canonicalUrl)) fixTrailingSlash(ev);
+	}
 	function verifySerializable(data, qrl) {
 		try {
 			_verifySerializable(data, void 0);
@@ -1567,6 +1589,7 @@ The request origin "${inputOrigin}" does not match the server origin "${origin}"
 		actionsMiddleware,
 		checkBrand,
 		checkCSRF,
+		fixStaticTrailingSlash,
 		fixTrailingSlash,
 		getPathname,
 		isLastModulePageRoute,
@@ -1579,7 +1602,7 @@ The request origin "${inputOrigin}" does not match the server origin "${origin}"
 		verifySerializable
 	};
 }
-var { actionsMiddleware, checkBrand, checkCSRF, fixTrailingSlash, getPathname, isLastModulePageRoute, isQrl, loadersMiddleware, measure, renderQwikMiddleware, resolveRequestHandlers, streamServerFunctionResult, verifySerializable } = createResolveRequestHandlers();
+var { actionsMiddleware, checkBrand, checkCSRF, fixStaticTrailingSlash, fixTrailingSlash, getPathname, isLastModulePageRoute, isQrl, loadersMiddleware, measure, renderQwikMiddleware, resolveRequestHandlers, streamServerFunctionResult, verifySerializable } = createResolveRequestHandlers();
 /** @public */ var ESCAPE_HTML = /[&<>]/g;
 var escapeHtml = (s) => {
 	return s.replace(ESCAPE_HTML, (c) => {
@@ -1704,4 +1727,4 @@ function runQwikRouter(serverRequestEv, loadedRoute, requestHandlers, rebuildRou
 		};
 	}
 }
-export { clearLoaderCache as a, mergeHeadersCookies as c, resolveRequestHandlers as i, getErrorHtml as n, clearSsrCache as o, renderQwikMiddleware as r, RewriteMessage as s, runQwikRouter as t };
+export { isStaticPath as a, RewriteMessage as c, resolveRequestHandlers as i, mergeHeadersCookies as l, getErrorHtml as n, clearLoaderCache as o, renderQwikMiddleware as r, clearSsrCache as s, runQwikRouter as t };

package/lib/index.d.ts

@@ -1062,6 +1062,7 @@ declare type RouteLoaderCtx = {
     goto?: NoSerialize<RouteNavigate>;
     /** Client manifest hash for q-loader fetch URLs. */
     manifestHash?: string;
+    routeLoaderCandidates?: Record<string, string>;
 };
 
 /* Excluded from this release type: routeLoaderQrl */
@@ -1316,16 +1317,16 @@ export declare const zod$: ZodConstructor;
 export declare type ZodConstructor = {
     <T extends z_2.ZodRawShape>(schema: T): ZodDataValidator<z_2.ZodObject<T>>;
     <T extends z_2.ZodRawShape>(schema: (zod: typeof z_2.z, ev: RequestEvent) => T): ZodDataValidator<z_2.ZodObject<T>>;
-    <T extends z_2.Schema>(schema: T): ZodDataValidator<T>;
-    <T extends z_2.Schema>(schema: (zod: typeof z_2.z, ev: RequestEvent) => T): ZodDataValidator<T>;
+    <T extends z_2.ZodType>(schema: T): ZodDataValidator<T>;
+    <T extends z_2.ZodType>(schema: (zod: typeof z_2.z, ev: RequestEvent) => T): ZodDataValidator<T>;
 };
 
 /** @public */
 declare type ZodConstructorQRL = {
     <T extends z_2.ZodRawShape>(schema: QRL<T>): ZodDataValidator<z_2.ZodObject<T>>;
     <T extends z_2.ZodRawShape>(schema: QRL<(zod: typeof z_2.z, ev: RequestEvent) => T>): ZodDataValidator<z_2.ZodObject<T>>;
-    <T extends z_2.Schema>(schema: QRL<T>): ZodDataValidator<T>;
-    <T extends z_2.Schema>(schema: QRL<(zod: typeof z_2.z, ev: RequestEvent) => T>): ZodDataValidator<T>;
+    <T extends z_2.ZodType>(schema: QRL<T>): ZodDataValidator<T>;
+    <T extends z_2.ZodType>(schema: QRL<(zod: typeof z_2.z, ev: RequestEvent) => T>): ZodDataValidator<T>;
 };
 
 /** @public */

package/lib/index.qwik.mjs

@@ -1,5 +1,5 @@
 import { t as ensureSlash } from "./chunks/pathname.mjs";
-import { A as routeLoader$, B as RouteLoaderCtxContext, E as isImmutableLoader, F as ContentContext, G as QACTION_KEY, H as RouteNavigateContext, I as ContentInternalContext, J as Q_ROUTE, K as QDATA_KEY, L as DocumentHeadContext, M as setLoaderSignalValue, P as updateRouteLoaderPaths, R as HttpStatusContext, T as invalidateNavRouteLoaders, U as RoutePreventNavigateContext, V as RouteLocationContext, W as RouteStateContext, _ as fetchRouteLoaderData, b as getRequestEvent, c as shouldPreload, d as loadRoute, g as ensureRouteLoaderSignals, i as getClientNavPath, j as routeLoaderQrl, l as toPath, m as clearNavFetchCache, n as resolveHead, o as isSameOrigin, q as QFN_KEY, s as isSamePath, t as createDocumentHead, u as toUrl, y as getModuleRouteLoaders, z as RouteActionContext } from "./chunks/head.qwik.mjs";
+import { A as routeLoader$, B as RouteLoaderCtxContext, E as isImmutableLoader, F as ContentContext, G as QACTION_KEY, H as RouteNavigateContext, I as ContentInternalContext, J as Q_ROUTE, K as QDATA_KEY, L as DocumentHeadContext, M as setLoaderSignalValue, P as updateRouteLoaderPaths, R as HttpStatusContext, T as invalidateNavRouteLoaders, U as RoutePreventNavigateContext, V as RouteLocationContext, W as RouteStateContext, _ as fetchRouteLoaderData, a as isPromise, b as getRequestEvent, c as shouldPreload, d as loadRoute, g as ensureRouteLoaderSignals, i as getClientNavPath, j as routeLoaderQrl, l as toPath, m as clearNavFetchCache, n as resolveHead, o as isSameOrigin, q as QFN_KEY, s as isSamePath, t as createDocumentHead, u as toUrl, y as getModuleRouteLoaders, z as RouteActionContext } from "./chunks/head.qwik.mjs";
 import { SkipRender, Slot, _captures, _fnSignal, _getConstProps, _getVarProps, _jsxSorted, _jsxSplit, _qrlSync, _restProps, _wrapProp, componentQrl, createComputedQrl, createElement, eventQrl, getLocale, implicit$FirstArg, inlinedQrl, isBrowser, isDev, isServer, noSerialize, untrack, useContext, useContextProvider, useErrorBoundary, useOnWindow, useServerData, useSignal, useStore, useTaskQrl, useVisibleTaskQrl, withLocale } from "@qwik.dev/core";
 import { Fragment } from "@qwik.dev/core/jsx-runtime";
 import * as qwikRouterConfig from "@qwik-router-config";
@@ -1026,7 +1026,14 @@ function initializeSPA(goto, scroller) {
 		const contentModules = track(contentInternal);
 		if (!contentModules) return;
 		const actionData = track(actionDataSignal);
-		const head = track(() => resolveHead(actionData, loaderState, routeLocation, contentModules, getLocale(""), serverHead));
+		let head;
+		try {
+			head = track(() => resolveHead(actionData, loaderState, routeLocation, contentModules, getLocale(""), serverHead));
+		} catch (error) {
+			if (isServer || isPromise(error)) throw error;
+			console.error(error);
+			return;
+		}
 		documentHead.links = head.links;
 		documentHead.meta = head.meta;
 		documentHead.styles = head.styles;
@@ -1220,7 +1227,7 @@ var flattenZodIssues = (issues) => {
 		async validate(ev, inputData) {
 			const schema = await qrl.resolve().then((obj) => {
 				if (typeof obj === "function") obj = obj(z$1, ev);
-				if (obj instanceof z$1.Schema) return obj;
+				if (obj instanceof z$1.ZodType) return obj;
 				else return z$1.object(obj);
 			});
 			const data = inputData ?? await ev.parseBody();

package/lib/middleware/cloudflare-pages/index.mjs

@@ -28,11 +28,16 @@ import { _TextEncoderStream_polyfill, getErrorHtml, isStaticPath, mergeHeadersCo
 					return env[key];
 				} },
 				getWritableStream: (status, headers, cookies, resolve) => {
-					const { readable, writable } = new TransformStream();
-					resolve(new Response(readable, {
+					const responseInit = {
 						status,
 						headers: mergeHeadersCookies(headers, cookies)
-					}));
+					};
+					if (status === 204 || status === 205 || status === 304) {
+						resolve(new Response(null, responseInit));
+						return new WritableStream();
+					}
+					const { readable, writable } = new TransformStream();
+					resolve(new Response(readable, responseInit));
 					return writable;
 				},
 				getClientConn: () => {

package/lib/middleware/request-handler/index.mjs

@@ -2,7 +2,7 @@ import { Y as _asyncRequestStore, d as loadRoute } from "../../chunks/head.qwik.
 import { c as resolveValidInternalFullPathname, l as trimInternalPathname, s as recognizeRequest, u as trimRecognizedInternalPathname } from "../../chunks/request-path.mjs";
 import { i as RedirectMessage, r as AbortMessage, t as ServerError } from "../../chunks/server-error.mjs";
 import { t as devPreloadedRouteLoaders } from "../../chunks/dev-preloaded-route-loader.mjs";
-import { a as clearLoaderCache, c as mergeHeadersCookies, i as resolveRequestHandlers, n as getErrorHtml, o as clearSsrCache, r as renderQwikMiddleware, s as RewriteMessage, t as runQwikRouter } from "../../chunks/user-response.mjs";
+import { a as isStaticPath, c as RewriteMessage, i as resolveRequestHandlers, l as mergeHeadersCookies, n as getErrorHtml, o as clearLoaderCache, r as renderQwikMiddleware, s as clearSsrCache, t as runQwikRouter } from "../../chunks/user-response.mjs";
 import { isDev } from "@qwik.dev/core";
 var qwikRouterConfig;
 async function getConfig() {
@@ -46,18 +46,6 @@ async function loadRequestHandlers(qwikRouterConfig, pathname, method, checkOrig
 	};
 	return runQwikRouter(serverRequestEv, loadedRoute, requestHandlers, rebuildRouteInfo, config.basePathname);
 }
-var staticPaths = /* @__PURE__ */ new Set(["__QWIK_ROUTER_STATIC_PATHS_ARRAY__"]);
-/**
-* Decide whether a given request path is a static path, for optimizing file access.
-*
-* @internal
-*/ function isStaticPath(method, url) {
-	if (method.toUpperCase() !== "GET") return false;
-	const p = url.pathname;
-	if (p.startsWith("/" + (globalThis.__QWIK_BUILD_DIR__ || "build") + "/")) return true;
-	if (p.startsWith("/" + (globalThis.__QWIK_ASSETS_DIR__ || "assets") + "/")) return true;
-	return staticPaths.has(p);
-}
 /**
 * TextEncoderStream polyfill based on Node.js' implementation
 * https://github.com/nodejs/node/blob/3f3226c8e363a5f06c1e6a37abd59b6b8c1923f1/lib/internal/webstreams/encoding.js#L38-L119

package/lib/vite/index.mjs

@@ -1,14 +1,14 @@
 import { r as isSameOriginUrl, t as ensureSlash } from "../chunks/pathname.mjs";
 import { c as resolveValidInternalFullPathname, s as recognizeRequest, u as trimRecognizedInternalPathname } from "../chunks/request-path.mjs";
 import { n as addWarning, t as addError } from "../chunks/format.mjs";
-import { _ as normalizePath$1, a as getPathnameFromDirPath, b as removeExtension, c as isIndexModule, d as isMenuFileName, f as isModuleExt, g as isServiceWorkerName, h as isPluginModule, i as getMenuPathname, l as isLayoutModule, m as isPageModuleExt, n as errorBoundaryName, o as isEntryName, p as isPageExt, r as getExtension, s as isErrorName, t as createFileId, u as isMarkdownExt, y as parseRouteIndexName } from "../chunks/fs.mjs";
+import { _ as normalizePath$1, a as getPathnameFromDirPath, b as parseRouteIndexName, c as isIndexModule, d as isMenuFileName, f as isModuleExt, g as isServiceWorkerName, h as isPluginModule, i as getMenuPathname, l as isLayoutModule, m as isPageModuleExt, n as errorBoundaryName, o as isEntryName, p as isPageExt, r as getExtension, s as isErrorName, t as createFileId, u as isMarkdownExt, v as normalizePathKey, x as removeExtension } from "../chunks/fs.mjs";
 import { t as devPreloadedRouteLoaders } from "../chunks/dev-preloaded-route-loader.mjs";
 import { t as createRouteTester } from "../chunks/routes.mjs";
 import fs, { existsSync } from "node:fs";
 import path, { basename, dirname, extname, isAbsolute, join, resolve } from "node:path";
 import { readFile } from "node:fs/promises";
 import { loadEnv, mergeConfig, normalizePath } from "vite";
-import { findExports, findStaticImports } from "mlly";
+import { findExports, findStaticImports, parseStaticImport } from "mlly";
 import { marked } from "marked";
 import { createHash } from "node:crypto";
 import { SourceMapGenerator } from "source-map";
@@ -1093,7 +1093,7 @@ function getClientRouteBundleNames(qwikPlugin, r) {
 			if (loadersByFile) {
 				const nodeLoaderHashes = [];
 				for (const filePath of routeLoaderFiles) {
-					const hashes = loadersByFile.get(filePath);
+					const hashes = loadersByFile.get(normalizePathKey(filePath));
 					if (hashes) nodeLoaderHashes.push(...hashes);
 				}
 				if (nodeLoaderHashes.length > 0) lines.push(`${nextIndent}_R: ${JSON.stringify(nodeLoaderHashes)},`);
@@ -2083,10 +2083,10 @@ 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) => {
-		const filePaths = paths.split("|");
+		const filePaths = JSON.parse(`"${paths}"`).split("|");
 		const hashes = [];
 		for (const filePath of filePaths) {
-			const fileHashes = loadersByFile.get(filePath);
+			const fileHashes = loadersByFile.get(normalizePathKey(filePath));
 			if (fileHashes) hashes.push(...fileHashes);
 		}
 		if (hashes.length > 0) return `_R: ${JSON.stringify(hashes)},`;
@@ -2094,7 +2094,7 @@ var VIRTUAL_SERVER_FNS = "virtual:qwik-router-server-fns";
 	});
 }
 function addRouteLoaderHash(loadersByFile, filePath, hash) {
-	const normalizedPath = normalizePath$1(filePath);
+	const normalizedPath = normalizePathKey(filePath).split(/[?#]/, 1)[0];
 	const existing = loadersByFile.get(normalizedPath);
 	if (!existing) {
 		loadersByFile.set(normalizedPath, [hash]);
@@ -2107,7 +2107,7 @@ function addRouteLoaderHash(loadersByFile, filePath, hash) {
 	return false;
 }
 function clearRouteLoaderHashes(loadersByFile, filePath) {
-	return loadersByFile.delete(normalizePath$1(filePath));
+	return loadersByFile.delete(normalizePathKey(filePath).split(/[?#]/, 1)[0]);
 }
 function isRouterSourceFilePath(filePath) {
 	const fileName = basename(filePath);
@@ -2131,7 +2131,7 @@ 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);
 }
-async function collectReExportSources(owner, filePath, resolveSource, sources, seen = /* @__PURE__ */ new Set([owner])) {
+async function collectRouteLoaderSources(owner, filePath, resolveSource, sources, seen = /* @__PURE__ */ new Set([owner])) {
 	let code, exportEntries;
 	try {
 		code = await readFile(filePath, "utf-8");
@@ -2140,26 +2140,38 @@ async function collectReExportSources(owner, filePath, resolveSource, sources, s
 	} catch {
 		return;
 	}
-	await Promise.all(exportEntries.map(async (exp) => {
-		if (!exp.specifier) return;
-		const resolved = await resolveSource(exp.specifier, filePath);
-		if (!resolved || resolved.charCodeAt(0) === 0) return;
+	const importedFactories = /* @__PURE__ */ new Map();
+	for (const entry of findStaticImports(code)) {
+		const parsed = parseStaticImport(entry);
+		if (parsed.defaultImport) importedFactories.set(parsed.defaultImport, entry.specifier);
+		if (parsed.namedImports) for (const localName of Object.values(parsed.namedImports)) importedFactories.set(localName, entry.specifier);
+	}
+	const specifiers = /* @__PURE__ */ new Set();
+	for (const exp of exportEntries) if (exp.specifier) specifiers.add(exp.specifier);
+	else if (/^export\s+(?:const|let|var)\s*{/.test(exp.code)) {
+		const factoryName = code.slice(exp.end).match(/^\s*([\w$]+)(?:\s*<[^;()]*>)?\s*\(/)?.[1];
+		const specifier = factoryName && importedFactories.get(factoryName);
+		if (specifier) specifiers.add(specifier);
+	}
+	for (const specifier of specifiers) {
+		const resolved = await resolveSource(specifier, filePath);
+		if (!resolved || resolved.charCodeAt(0) === 0) continue;
 		const resolvedPath = normalizePath$1(resolved.split(/[?#]/, 1)[0]);
 		let ownerSources = sources.get(owner);
 		if (!ownerSources) sources.set(owner, ownerSources = []);
 		if (!ownerSources.includes(resolvedPath)) ownerSources.push(resolvedPath);
 		if (!seen.has(resolvedPath)) {
 			seen.add(resolvedPath);
-			await collectReExportSources(owner, resolvedPath, resolveSource, sources, seen);
+			await collectRouteLoaderSources(owner, resolvedPath, resolveSource, sources, seen);
 		}
-	}));
+	}
 }
 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) => collectReExportSources(owner, owner, resolveSource, sources)));
+	await Promise.all([...owners].map((owner) => collectRouteLoaderSources(owner, owner, resolveSource, sources)));
 	return sources;
 }
 function invalidateRouterConfigModules(server) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@qwik.dev/router",
   "description": "The router for Qwik.",
-  "version": "2.0.0-beta.40",
+  "version": "2.0.0-beta.41",
   "bugs": "https://github.com/QwikDev/qwik/issues",
   "dependencies": {
     "@azure/functions": "3.5.1",
@@ -41,7 +41,7 @@
     "typescript": "5.9.3",
     "uvu": "0.5.6",
     "vite": "8.2.1",
-    "@qwik.dev/core": "2.0.0-beta.40"
+    "@qwik.dev/core": "2.0.0-beta.41"
   },
   "engines": {
     "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
@@ -147,10 +147,6 @@
       "types": "./lib/vite/index.d.ts",
       "import": "./lib/vite/index.mjs"
     },
-    "./service-worker": {
-      "types": "./service-worker.d.ts",
-      "import": "./lib/service-worker.mjs"
-    },
     "./package.json": "./package.json"
   },
   "files": [
@@ -170,7 +166,7 @@
   "main": "./lib/index.qwik.mjs",
   "peerDependencies": {
     "vite": ">=8 <9",
-    "@qwik.dev/core": "^2.0.0-beta.40"
+    "@qwik.dev/core": "2.0.0-beta.41"
   },
   "publishConfig": {
     "access": "public"