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

package/lib/chunks/url.mjs

@@ -39,6 +39,7 @@
 	tiff: "image/tiff",
 	ts: "video/mp2t",
 	txt: "text/plain",
+	wasm: "application/wasm",
 	wbmp: "image/vnd.wap.wbmp",
 	webm: "video/webm",
 	webp: "image/webp",

package/lib/chunks/user-response.mjs

@@ -225,6 +225,7 @@ var RequestEvSharedNonce = "@nonce";
 var RequestEvIsRewrite = "@rewrite";
 var RequestEvShareServerTiming = "@serverTiming";
 var RequestEvETagCacheKey = "@eTagCacheKey";
+var RequestEvErrorBoundaryCaught = "@errorBoundaryCaught";
 var RequestEvHttpStatusMessage = "@httpStatusMessage";
 function getRequestRoute(requestEv) {
 	return requestEv[RequestEvRoute];
@@ -851,7 +852,27 @@ async function runValidators(requestEv, validators, data, devMode) {
 		requestEv.send(requestEv.status(), serialized);
 	};
 }
-var staticPaths = /* @__PURE__ */ new Set(["__QWIK_ROUTER_STATIC_PATHS_ARRAY__"]);
+/**
+* A set of static paths generated by the SSG, including loader json. Routes always have a trailing
+* slash, short for `.../index.html`
+*/ var staticPaths = /* @__PURE__ */ new Set(["__QWIK_ROUTER_STATIC_PATHS_ARRAY__"]);
+/**
+* Check if the current pathname needs a redirect due to trailing slash mismatch. If we're not sure,
+* we fall through.
+*
+* Note that we ignore build/ and assets/, those never need trailing slash redirects.
+*
+* @returns The canonical path with the correct trailing slash if a redirect is needed, otherwise
+*   `undefined`.
+*/ function getStaticPathRedirect(method, url) {
+	const { pathname, search } = url;
+	if (method.toUpperCase() !== "GET" || pathname === "/" || !pathname.startsWith("/") || pathname.startsWith("//")) return;
+	const hasTrailingSlash = pathname.endsWith("/");
+	const routesHaveTrailingSlash = !globalThis.__NO_TRAILING_SLASH__;
+	if (hasTrailingSlash === routesHaveTrailingSlash) return;
+	const canonicalPathname = hasTrailingSlash ? pathname.slice(0, -1) : pathname + "/";
+	if (staticPaths.has(canonicalPathname) || !routesHaveTrailingSlash && staticPaths.has(pathname)) return canonicalPathname + search;
+}
 /**
 * Decide whether a given request path is a static path, for optimizing file access.
 *
@@ -862,6 +883,7 @@ var staticPaths = /* @__PURE__ */ new Set(["__QWIK_ROUTER_STATIC_PATHS_ARRAY__"]
 	const p = url.pathname;
 	if (p.startsWith("/" + (globalThis.__QWIK_BUILD_DIR__ || "build") + "/")) return true;
 	if (p.startsWith("/" + (globalThis.__QWIK_ASSETS_DIR__ || "assets") + "/")) return true;
+	if (globalThis.__NO_TRAILING_SLASH__ && p !== "/") return !p.endsWith("/") && (staticPaths.has(p) || staticPaths.has(p + "/"));
 	return staticPaths.has(p);
 }
 /**
@@ -1380,6 +1402,7 @@ function createResolveRequestHandlers() {
 				if (accept && !accept.includes("text/html")) throw e;
 				const status = e.status;
 				requestEv.status(status);
+				requestEv.headers.set("Cache-Control", "no-store");
 				const errorLoader = route.$errorLoader$;
 				route.$mods$ = errorLoader ? await Promise.all(errorLoader.map((load) => load())) : [await loadHttpError()];
 				requestEv.sharedMap.set(RequestEvHttpStatusMessage, typeof e.data === "string" ? e.data : "Server Error");
@@ -1393,6 +1416,7 @@ function createResolveRequestHandlers() {
 		requestEv.sharedMap.delete(RequestEvSharedActionId);
 		requestEv.sharedMap.delete(RequestEvSharedActionFormData);
 		requestEv.sharedMap.delete("@actionResult");
+		requestEv.sharedMap.delete(RequestEvETagCacheKey);
 	}
 	async function runValidators(requestEv, validators, data) {
 		let lastResult = {
@@ -1517,7 +1541,11 @@ The request origin "${inputOrigin}" does not match the server origin "${origin}"
 			if (!responseHeaders.has("Content-Type")) responseHeaders.set("Content-Type", "text/html; charset=utf-8");
 			const cachePlan = requestEv.sharedMap.get(RequestEvETagCacheKey);
 			const { readable, writable } = new TextEncoderStream();
-			const writableStream = requestEv.getWritableStream();
+			let responseWriter;
+			const lazyResponseSink = new WritableStream({ write(chunk) {
+				responseWriter ||= requestEv.getWritableStream().getWriter();
+				return responseWriter.write(chunk);
+			} });
 			let cacheChunks;
 			let pipeSource = readable;
 			if (cachePlan) {
@@ -1529,7 +1557,10 @@ The request origin "${inputOrigin}" does not match the server origin "${origin}"
 				pipeSource = readable.pipeThrough(capture);
 			}
 			let pipeError;
-			const pipe = pipeSource.pipeTo(writableStream, { preventClose: true }).catch((error) => {
+			let boundaryErrored = false;
+			let noStoreSent = false;
+			let overrodeCacheControl = false;
+			const pipe = pipeSource.pipeTo(lazyResponseSink, { preventClose: true }).catch((error) => {
 				pipeError = error;
 			});
 			const stream = writable.getWriter();
@@ -1544,16 +1575,31 @@ The request origin "${inputOrigin}" does not match the server origin "${origin}"
 					containerAttributes: {
 						["q:render"]: isStatic ? "static" : "",
 						...serverData.containerAttributes
+					},
+					onBeforeFirstFlush: (info) => {
+						if (info.errorBoundaryCaught) {
+							boundaryErrored = true;
+							noStoreSent = true;
+							overrodeCacheControl = responseHeaders.has("Cache-Control");
+							responseHeaders.set("Cache-Control", "no-store");
+						}
 					}
 				});
 				if (typeof result.html === "string") await stream.write(result.html);
+				boundaryErrored ||= result.errorBoundaryCaught === true;
+				if (boundaryErrored) requestEv.sharedMap.set(RequestEvErrorBoundaryCaught, true);
 			} finally {
-				await stream.ready;
-				await stream.close();
-				await pipe;
+				try {
+					await stream.ready;
+					await stream.close();
+				} finally {
+					await pipe;
+					responseWriter?.releaseLock();
+				}
 			}
 			if (pipeError) throw pipeError;
-			if (cachePlan && cacheChunks && cacheChunks.length > 0) {
+			if (boundaryErrored && (noStoreSent ? cachePlan || overrodeCacheControl : !!cachePlan)) console.warn(`An <ErrorBoundary> caught during SSR of ${requestEv.url.pathname} — configured caching disabled: ` + (noStoreSent ? "the response was sent with Cache-Control: no-store." : "the SSR cache was skipped (response headers were already sent)."));
+			if (cachePlan && cacheChunks && cacheChunks.length > 0 && !boundaryErrored) {
 				const totalLength = cacheChunks.reduce((sum, chunk) => sum + chunk.length, 0);
 				const combined = new Uint8Array(totalLength);
 				let offset = 0;
@@ -1568,7 +1614,7 @@ The request origin "${inputOrigin}" does not match the server origin "${origin}"
 					body: html
 				});
 			}
-			await writableStream.close();
+			if (responseWriter) await requestEv.getWritableStream().close();
 		};
 	}
 	function now() {
@@ -1727,4 +1773,4 @@ function runQwikRouter(serverRequestEv, loadedRoute, requestHandlers, rebuildRou
 		};
 	}
 }
-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 };
+export { getStaticPathRedirect as a, clearSsrCache as c, mergeHeadersCookies as d, resolveRequestHandlers as i, RequestEvErrorBoundaryCaught as l, getErrorHtml as n, isStaticPath as o, renderQwikMiddleware as r, clearLoaderCache as s, runQwikRouter as t, RewriteMessage as u };

package/lib/chunks/worker-thread.mjs

@@ -155,8 +155,16 @@ async function workerRender(sys, opts, staticRoute, pendingPromises, callback, d
 			}
 		}, opts, deps).then((rsp) => {
 			if (rsp != null) return rsp.completion.then((r) => {
-				if (routeWriter) return closePromise.then(() => r);
-				return r;
+				const failRouteOnCaughtBoundary = (completion) => {
+					if (completion === void 0 && rsp.requestEv.sharedMap.get("@errorBoundaryCaught")) {
+						result.ok = false;
+						result.filePath = null;
+						return /* @__PURE__ */ new Error(`An <ErrorBoundary> caught an error while rendering ${staticRoute.pathname}`);
+					}
+					return completion;
+				};
+				if (routeWriter) return closePromise.then(() => failRouteOnCaughtBoundary(r));
+				return failRouteOnCaughtBoundary(r);
 			});
 		}).then((e) => {
 			if (e !== void 0) {

package/lib/index.d.ts

@@ -391,14 +391,6 @@ declare interface EndpointResponse {
     loaderHashes?: string[];
 }
 
-/** @public */
-export declare const ErrorBoundary: Component<ErrorBoundaryProps>;
-
-/** @public */
-declare interface ErrorBoundaryProps {
-    fallback$?: QRL<(error: any) => any>;
-}
-
 /**
  * Drops control-flow signals (`ev.redirect()`, `ev.error()`, etc.) from a loader/action return
  * type: those are thrown, not surfaced as data. `ev.fail()` is plain data and is kept.

package/lib/index.qwik.mjs

@@ -1,24 +1,15 @@
 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, 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 { 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, useServerData, useSignal, useStore, useTaskQrl, useVisibleTaskQrl, withLocale } from "@qwik.dev/core";
 import * as qwikRouterConfig from "@qwik-router-config";
 import { p } from "@qwik.dev/core/preloader";
 import { _deserialize, _getContextContainer, _getContextHostElement, _hasStoreEffects, _serialize, _waitUntilRendered, forceStoreEffects } from "@qwik.dev/core/internal";
+import { Fragment } from "@qwik.dev/core/jsx-runtime";
 import * as v from "valibot";
 import * as z$1 from "zod";
 import { z } from "zod";
 import swRegister from "@qwik-router-sw-register";
 import { renderToStream } from "@qwik.dev/core/server";
-/** @public */ var ErrorBoundary = /*#__PURE__*/ componentQrl(/*#__PURE__*/ inlinedQrl((props) => {
-	const store = useErrorBoundary();
-	useOnWindow("qerror", /*#__PURE__*/ inlinedQrl((e) => {
-		const store = _captures[0];
-		store.error = e.detail.error;
-	}, "ErrorBoundary_component_useOnWindow_G0jFRpoNY0M", [store]));
-	if (store.error && props.fallback$) return /*#__PURE__*/ _jsxSorted(Fragment, null, null, props.fallback$(store.error), 1, "bA_0");
-	return /*#__PURE__*/ _jsxSorted(Slot, null, null, null, 3, "bA_1");
-}, "ErrorBoundary_component_pOa6vjtC7ik"));
 /**
 * Prefetch a route's loader data in parallel (fire-and-forget). The per-nav fetch map dedupes
 * repeat hovers and shares the promise with the navigation's own fetch; the browser HTTP cache
@@ -838,7 +829,7 @@ function initializeSPA(goto, scroller) {
 			scroll,
 			historyUpdated
 		};
-		if (isBrowser) prefetchRoute(dest, true, .8, manifestHash);
+		if (isBrowser) prefetchRoute(dest, false, .8, manifestHash, true);
 		navResolver.p = new Promise((resolve) => {
 			navResolver.r = () => {
 				navResolver.r = void 0;
@@ -933,8 +924,8 @@ function initializeSPA(goto, scroller) {
 		const contentModules = $mods$;
 		if (!isServer) routeLoaderCtx.goto = noSerialize(goto);
 		updateRouteLoaderPaths(routeLoaderCtx, loadedRoute.$loaderPaths$, trackUrl);
-		const routeLoaders = ensureRouteLoaderSignals(contentModules, loaderState, routeLoaderCtx);
 		if (!isServer) invalidateNavRouteLoaders(loaderState);
+		const routeLoaders = ensureRouteLoaderSignals(contentModules, loaderState, routeLoaderCtx);
 		if (shouldInvalidateActionLoaders) {
 			if (actionLoaderHashes !== void 0) for (const hash of actionLoaderHashes) loaderState[hash]?.invalidate(true);
 			else for (const loader of routeLoaders) loaderState[loader.__id].invalidate(true);
@@ -1692,4 +1683,4 @@ var GetForm = /*#__PURE__*/ componentQrl(/*#__PURE__*/ inlinedQrl((_rawProps) =>
 		})
 	], 1, "r5_3");
 }, "DocumentHeadTags_component_9CrWYOoCpgY"));
-export { DocumentHeadTags, ErrorBoundary, Form, Link, QWIK_CITY_SCROLLER, QWIK_ROUTER_SCROLLER, QwikCityMockProvider, QwikCityProvider, QwikRouterMockProvider, QwikRouterProvider, RouterOutlet, ServiceWorkerRegister, createRenderer, getRequestEvent, globalAction$, globalActionQrl, omitProps, routeAction$, routeActionQrl, routeLoader$, routeLoaderQrl, server$, serverQrl, untypedAppUrl, useContent, useDocumentHead, useHttpStatus, useLocation, useNavigate, usePreventNavigate$, usePreventNavigateQrl, useQwikRouter, valibot$, valibotQrl, validator$, validatorQrl, z, zod$, zodQrl };
+export { DocumentHeadTags, Form, Link, QWIK_CITY_SCROLLER, QWIK_ROUTER_SCROLLER, QwikCityMockProvider, QwikCityProvider, QwikRouterMockProvider, QwikRouterProvider, RouterOutlet, ServiceWorkerRegister, createRenderer, getRequestEvent, globalAction$, globalActionQrl, omitProps, routeAction$, routeActionQrl, routeLoader$, routeLoaderQrl, server$, serverQrl, untypedAppUrl, useContent, useDocumentHead, useHttpStatus, useLocation, useNavigate, usePreventNavigate$, usePreventNavigateQrl, useQwikRouter, valibot$, valibotQrl, validator$, validatorQrl, z, zod$, zodQrl };

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 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 { a as getStaticPathRedirect, c as clearSsrCache, d as mergeHeadersCookies, i as resolveRequestHandlers, n as getErrorHtml, o as isStaticPath, r as renderQwikMiddleware, s as clearLoaderCache, t as runQwikRouter, u as RewriteMessage } from "../../chunks/user-response.mjs";
 import { isDev } from "@qwik.dev/core";
 var qwikRouterConfig;
 async function getConfig() {
@@ -38,12 +38,20 @@ async function loadRequestHandlers(qwikRouterConfig, pathname, method, checkOrig
 	const config = await getConfig();
 	const pathname = getRequestHandlerPathname(serverRequestEv);
 	if (pathname === "/.well-known" || pathname.startsWith("/.well-known/")) return null;
-	const { loadedRoute, requestHandlers } = await loadRequestHandlers(config, pathname, serverRequestEv.request.method, checkOrigin ?? true, render, serverRequestEv);
-	if (config.fallthrough && loadedRoute.$notFound$) return null;
+	const staticPathRedirect = getStaticPathRedirect(serverRequestEv.request.method, serverRequestEv.url);
 	const rebuildRouteInfo = async (url) => {
 		const cleanPathname = trimInternalPathname(url.pathname);
 		return loadRequestHandlers(config, cleanPathname, serverRequestEv.request.method, checkOrigin ?? true, render, serverRequestEv);
 	};
+	if (staticPathRedirect) return runQwikRouter(serverRequestEv, {
+		$routeName$: pathname,
+		$params$: {},
+		$mods$: []
+	}, [(event) => {
+		throw event.redirect(301, staticPathRedirect);
+	}], rebuildRouteInfo, config.basePathname);
+	const { loadedRoute, requestHandlers } = await loadRequestHandlers(config, pathname, serverRequestEv.request.method, checkOrigin ?? true, render, serverRequestEv);
+	if (config.fallthrough && loadedRoute.$notFound$) return null;
 	return runQwikRouter(serverRequestEv, loadedRoute, requestHandlers, rebuildRouteInfo, config.basePathname);
 }
 /**

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@qwik.dev/router",
   "description": "The router for Qwik.",
-  "version": "2.0.0-beta.41",
+  "version": "2.0.0-beta.43",
   "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.41"
+    "@qwik.dev/core": "2.0.0-beta.43"
   },
   "engines": {
     "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
@@ -166,7 +166,7 @@
   "main": "./lib/index.qwik.mjs",
   "peerDependencies": {
     "vite": ">=8 <9",
-    "@qwik.dev/core": "2.0.0-beta.41"
+    "@qwik.dev/core": "2.0.0-beta.43"
   },
   "publishConfig": {
     "access": "public"