@tanstack/router-core 1.167.1 → 1.167.2

package/dist/cjs/load-matches.cjs

@@ -1,797 +1,650 @@
-"use strict";
-Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const invariant = require("tiny-invariant");
-const isServer = require("@tanstack/router-core/isServer");
-const batch = require("./utils/batch.cjs");
-const utils = require("./utils.cjs");
-const notFound = require("./not-found.cjs");
-const root = require("./root.cjs");
-const redirect = require("./redirect.cjs");
-const triggerOnReady = (inner) => {
-  if (!inner.rendered) {
-    inner.rendered = true;
-    return inner.onReady?.();
-  }
+const require_runtime = require("./_virtual/_rolldown/runtime.cjs");
+const require_batch = require("./utils/batch.cjs");
+const require_utils = require("./utils.cjs");
+const require_not_found = require("./not-found.cjs");
+const require_root = require("./root.cjs");
+const require_redirect = require("./redirect.cjs");
+let _tanstack_router_core_isServer = require("@tanstack/router-core/isServer");
+let tiny_invariant = require("tiny-invariant");
+tiny_invariant = require_runtime.__toESM(tiny_invariant);
+//#region src/load-matches.ts
+var triggerOnReady = (inner) => {
+	if (!inner.rendered) {
+		inner.rendered = true;
+		return inner.onReady?.();
+	}
 };
-const resolvePreload = (inner, matchId) => {
-  return !!(inner.preload && !inner.router.state.matches.some((d) => d.id === matchId));
+var resolvePreload = (inner, matchId) => {
+	return !!(inner.preload && !inner.router.state.matches.some((d) => d.id === matchId));
 };
-const buildMatchContext = (inner, index, includeCurrentMatch = true) => {
-  const context = {
-    ...inner.router.options.context ?? {}
-  };
-  const end = includeCurrentMatch ? index : index - 1;
-  for (let i = 0; i <= end; i++) {
-    const innerMatch = inner.matches[i];
-    if (!innerMatch) continue;
-    const m = inner.router.getMatch(innerMatch.id);
-    if (!m) continue;
-    Object.assign(context, m.__routeContext, m.__beforeLoadContext);
-  }
-  return context;
+/**
+* Builds the accumulated context from router options and all matches up to (and optionally including) the given index.
+* Merges __routeContext and __beforeLoadContext from each match.
+*/
+var buildMatchContext = (inner, index, includeCurrentMatch = true) => {
+	const context = { ...inner.router.options.context ?? {} };
+	const end = includeCurrentMatch ? index : index - 1;
+	for (let i = 0; i <= end; i++) {
+		const innerMatch = inner.matches[i];
+		if (!innerMatch) continue;
+		const m = inner.router.getMatch(innerMatch.id);
+		if (!m) continue;
+		Object.assign(context, m.__routeContext, m.__beforeLoadContext);
+	}
+	return context;
 };
-const getNotFoundBoundaryIndex = (inner, err) => {
-  if (!inner.matches.length) {
-    return void 0;
-  }
-  const requestedRouteId = err.routeId;
-  const matchedRootIndex = inner.matches.findIndex(
-    (m) => m.routeId === inner.router.routeTree.id
-  );
-  const rootIndex = matchedRootIndex >= 0 ? matchedRootIndex : 0;
-  let startIndex = requestedRouteId ? inner.matches.findIndex((match) => match.routeId === requestedRouteId) : inner.firstBadMatchIndex ?? inner.matches.length - 1;
-  if (startIndex < 0) {
-    startIndex = rootIndex;
-  }
-  for (let i = startIndex; i >= 0; i--) {
-    const match = inner.matches[i];
-    const route = inner.router.looseRoutesById[match.routeId];
-    if (route.options.notFoundComponent) {
-      return i;
-    }
-  }
-  return requestedRouteId ? startIndex : rootIndex;
+var getNotFoundBoundaryIndex = (inner, err) => {
+	if (!inner.matches.length) return;
+	const requestedRouteId = err.routeId;
+	const matchedRootIndex = inner.matches.findIndex((m) => m.routeId === inner.router.routeTree.id);
+	const rootIndex = matchedRootIndex >= 0 ? matchedRootIndex : 0;
+	let startIndex = requestedRouteId ? inner.matches.findIndex((match) => match.routeId === requestedRouteId) : inner.firstBadMatchIndex ?? inner.matches.length - 1;
+	if (startIndex < 0) startIndex = rootIndex;
+	for (let i = startIndex; i >= 0; i--) {
+		const match = inner.matches[i];
+		if (inner.router.looseRoutesById[match.routeId].options.notFoundComponent) return i;
+	}
+	return requestedRouteId ? startIndex : rootIndex;
 };
-const handleRedirectAndNotFound = (inner, match, err) => {
-  if (!redirect.isRedirect(err) && !notFound.isNotFound(err)) return;
-  if (redirect.isRedirect(err) && err.redirectHandled && !err.options.reloadDocument) {
-    throw err;
-  }
-  if (match) {
-    match._nonReactive.beforeLoadPromise?.resolve();
-    match._nonReactive.loaderPromise?.resolve();
-    match._nonReactive.beforeLoadPromise = void 0;
-    match._nonReactive.loaderPromise = void 0;
-    match._nonReactive.error = err;
-    inner.updateMatch(match.id, (prev) => ({
-      ...prev,
-      status: redirect.isRedirect(err) ? "redirected" : prev.status === "pending" ? "success" : prev.status,
-      context: buildMatchContext(inner, match.index),
-      isFetching: false,
-      error: err
-    }));
-    if (notFound.isNotFound(err) && !err.routeId) {
-      err.routeId = match.routeId;
-    }
-    match._nonReactive.loadPromise?.resolve();
-  }
-  if (redirect.isRedirect(err)) {
-    inner.rendered = true;
-    err.options._fromLocation = inner.location;
-    err.redirectHandled = true;
-    err = inner.router.resolveRedirect(err);
-  }
-  throw err;
+var handleRedirectAndNotFound = (inner, match, err) => {
+	if (!require_redirect.isRedirect(err) && !require_not_found.isNotFound(err)) return;
+	if (require_redirect.isRedirect(err) && err.redirectHandled && !err.options.reloadDocument) throw err;
+	if (match) {
+		match._nonReactive.beforeLoadPromise?.resolve();
+		match._nonReactive.loaderPromise?.resolve();
+		match._nonReactive.beforeLoadPromise = void 0;
+		match._nonReactive.loaderPromise = void 0;
+		match._nonReactive.error = err;
+		inner.updateMatch(match.id, (prev) => ({
+			...prev,
+			status: require_redirect.isRedirect(err) ? "redirected" : prev.status === "pending" ? "success" : prev.status,
+			context: buildMatchContext(inner, match.index),
+			isFetching: false,
+			error: err
+		}));
+		if (require_not_found.isNotFound(err) && !err.routeId) err.routeId = match.routeId;
+		match._nonReactive.loadPromise?.resolve();
+	}
+	if (require_redirect.isRedirect(err)) {
+		inner.rendered = true;
+		err.options._fromLocation = inner.location;
+		err.redirectHandled = true;
+		err = inner.router.resolveRedirect(err);
+	}
+	throw err;
 };
-const shouldSkipLoader = (inner, matchId) => {
-  const match = inner.router.getMatch(matchId);
-  if (!match) {
-    return true;
-  }
-  if (!(isServer.isServer ?? inner.router.isServer) && match._nonReactive.dehydrated) {
-    return true;
-  }
-  if ((isServer.isServer ?? inner.router.isServer) && match.ssr === false) {
-    return true;
-  }
-  return false;
+var shouldSkipLoader = (inner, matchId) => {
+	const match = inner.router.getMatch(matchId);
+	if (!match) return true;
+	if (!(_tanstack_router_core_isServer.isServer ?? inner.router.isServer) && match._nonReactive.dehydrated) return true;
+	if ((_tanstack_router_core_isServer.isServer ?? inner.router.isServer) && match.ssr === false) return true;
+	return false;
 };
-const syncMatchContext = (inner, matchId, index) => {
-  const nextContext = buildMatchContext(inner, index);
-  inner.updateMatch(matchId, (prev) => {
-    return {
-      ...prev,
-      context: nextContext
-    };
-  });
+var syncMatchContext = (inner, matchId, index) => {
+	const nextContext = buildMatchContext(inner, index);
+	inner.updateMatch(matchId, (prev) => {
+		return {
+			...prev,
+			context: nextContext
+		};
+	});
 };
-const handleSerialError = (inner, index, err, routerCode) => {
-  const { id: matchId, routeId } = inner.matches[index];
-  const route = inner.router.looseRoutesById[routeId];
-  if (err instanceof Promise) {
-    throw err;
-  }
-  err.routerCode = routerCode;
-  inner.firstBadMatchIndex ??= index;
-  handleRedirectAndNotFound(inner, inner.router.getMatch(matchId), err);
-  try {
-    route.options.onError?.(err);
-  } catch (errorHandlerErr) {
-    err = errorHandlerErr;
-    handleRedirectAndNotFound(inner, inner.router.getMatch(matchId), err);
-  }
-  inner.updateMatch(matchId, (prev) => {
-    prev._nonReactive.beforeLoadPromise?.resolve();
-    prev._nonReactive.beforeLoadPromise = void 0;
-    prev._nonReactive.loadPromise?.resolve();
-    return {
-      ...prev,
-      error: err,
-      status: "error",
-      isFetching: false,
-      updatedAt: Date.now(),
-      abortController: new AbortController()
-    };
-  });
-  if (!inner.preload && !redirect.isRedirect(err) && !notFound.isNotFound(err)) {
-    inner.serialError ??= err;
-  }
+var handleSerialError = (inner, index, err, routerCode) => {
+	const { id: matchId, routeId } = inner.matches[index];
+	const route = inner.router.looseRoutesById[routeId];
+	if (err instanceof Promise) throw err;
+	err.routerCode = routerCode;
+	inner.firstBadMatchIndex ??= index;
+	handleRedirectAndNotFound(inner, inner.router.getMatch(matchId), err);
+	try {
+		route.options.onError?.(err);
+	} catch (errorHandlerErr) {
+		err = errorHandlerErr;
+		handleRedirectAndNotFound(inner, inner.router.getMatch(matchId), err);
+	}
+	inner.updateMatch(matchId, (prev) => {
+		prev._nonReactive.beforeLoadPromise?.resolve();
+		prev._nonReactive.beforeLoadPromise = void 0;
+		prev._nonReactive.loadPromise?.resolve();
+		return {
+			...prev,
+			error: err,
+			status: "error",
+			isFetching: false,
+			updatedAt: Date.now(),
+			abortController: new AbortController()
+		};
+	});
+	if (!inner.preload && !require_redirect.isRedirect(err) && !require_not_found.isNotFound(err)) inner.serialError ??= err;
 };
-const isBeforeLoadSsr = (inner, matchId, index, route) => {
-  const existingMatch = inner.router.getMatch(matchId);
-  const parentMatchId = inner.matches[index - 1]?.id;
-  const parentMatch = parentMatchId ? inner.router.getMatch(parentMatchId) : void 0;
-  if (inner.router.isShell()) {
-    existingMatch.ssr = route.id === root.rootRouteId;
-    return;
-  }
-  if (parentMatch?.ssr === false) {
-    existingMatch.ssr = false;
-    return;
-  }
-  const parentOverride = (tempSsr2) => {
-    if (tempSsr2 === true && parentMatch?.ssr === "data-only") {
-      return "data-only";
-    }
-    return tempSsr2;
-  };
-  const defaultSsr = inner.router.options.defaultSsr ?? true;
-  if (route.options.ssr === void 0) {
-    existingMatch.ssr = parentOverride(defaultSsr);
-    return;
-  }
-  if (typeof route.options.ssr !== "function") {
-    existingMatch.ssr = parentOverride(route.options.ssr);
-    return;
-  }
-  const { search, params } = existingMatch;
-  const ssrFnContext = {
-    search: makeMaybe(search, existingMatch.searchError),
-    params: makeMaybe(params, existingMatch.paramsError),
-    location: inner.location,
-    matches: inner.matches.map((match) => ({
-      index: match.index,
-      pathname: match.pathname,
-      fullPath: match.fullPath,
-      staticData: match.staticData,
-      id: match.id,
-      routeId: match.routeId,
-      search: makeMaybe(match.search, match.searchError),
-      params: makeMaybe(match.params, match.paramsError),
-      ssr: match.ssr
-    }))
-  };
-  const tempSsr = route.options.ssr(ssrFnContext);
-  if (utils.isPromise(tempSsr)) {
-    return tempSsr.then((ssr) => {
-      existingMatch.ssr = parentOverride(ssr ?? defaultSsr);
-    });
-  }
-  existingMatch.ssr = parentOverride(tempSsr ?? defaultSsr);
-  return;
+var isBeforeLoadSsr = (inner, matchId, index, route) => {
+	const existingMatch = inner.router.getMatch(matchId);
+	const parentMatchId = inner.matches[index - 1]?.id;
+	const parentMatch = parentMatchId ? inner.router.getMatch(parentMatchId) : void 0;
+	if (inner.router.isShell()) {
+		existingMatch.ssr = route.id === require_root.rootRouteId;
+		return;
+	}
+	if (parentMatch?.ssr === false) {
+		existingMatch.ssr = false;
+		return;
+	}
+	const parentOverride = (tempSsr) => {
+		if (tempSsr === true && parentMatch?.ssr === "data-only") return "data-only";
+		return tempSsr;
+	};
+	const defaultSsr = inner.router.options.defaultSsr ?? true;
+	if (route.options.ssr === void 0) {
+		existingMatch.ssr = parentOverride(defaultSsr);
+		return;
+	}
+	if (typeof route.options.ssr !== "function") {
+		existingMatch.ssr = parentOverride(route.options.ssr);
+		return;
+	}
+	const { search, params } = existingMatch;
+	const ssrFnContext = {
+		search: makeMaybe(search, existingMatch.searchError),
+		params: makeMaybe(params, existingMatch.paramsError),
+		location: inner.location,
+		matches: inner.matches.map((match) => ({
+			index: match.index,
+			pathname: match.pathname,
+			fullPath: match.fullPath,
+			staticData: match.staticData,
+			id: match.id,
+			routeId: match.routeId,
+			search: makeMaybe(match.search, match.searchError),
+			params: makeMaybe(match.params, match.paramsError),
+			ssr: match.ssr
+		}))
+	};
+	const tempSsr = route.options.ssr(ssrFnContext);
+	if (require_utils.isPromise(tempSsr)) return tempSsr.then((ssr) => {
+		existingMatch.ssr = parentOverride(ssr ?? defaultSsr);
+	});
+	existingMatch.ssr = parentOverride(tempSsr ?? defaultSsr);
 };
-const setupPendingTimeout = (inner, matchId, route, match) => {
-  if (match._nonReactive.pendingTimeout !== void 0) return;
-  const pendingMs = route.options.pendingMs ?? inner.router.options.defaultPendingMs;
-  const shouldPending = !!(inner.onReady && !(isServer.isServer ?? inner.router.isServer) && !resolvePreload(inner, matchId) && (route.options.loader || route.options.beforeLoad || routeNeedsPreload(route)) && typeof pendingMs === "number" && pendingMs !== Infinity && (route.options.pendingComponent ?? inner.router.options?.defaultPendingComponent));
-  if (shouldPending) {
-    const pendingTimeout = setTimeout(() => {
-      triggerOnReady(inner);
-    }, pendingMs);
-    match._nonReactive.pendingTimeout = pendingTimeout;
-  }
+var setupPendingTimeout = (inner, matchId, route, match) => {
+	if (match._nonReactive.pendingTimeout !== void 0) return;
+	const pendingMs = route.options.pendingMs ?? inner.router.options.defaultPendingMs;
+	if (!!(inner.onReady && !(_tanstack_router_core_isServer.isServer ?? inner.router.isServer) && !resolvePreload(inner, matchId) && (route.options.loader || route.options.beforeLoad || routeNeedsPreload(route)) && typeof pendingMs === "number" && pendingMs !== Infinity && (route.options.pendingComponent ?? inner.router.options?.defaultPendingComponent))) {
+		const pendingTimeout = setTimeout(() => {
+			triggerOnReady(inner);
+		}, pendingMs);
+		match._nonReactive.pendingTimeout = pendingTimeout;
+	}
 };
-const preBeforeLoadSetup = (inner, matchId, route) => {
-  const existingMatch = inner.router.getMatch(matchId);
-  if (!existingMatch._nonReactive.beforeLoadPromise && !existingMatch._nonReactive.loaderPromise)
-    return;
-  setupPendingTimeout(inner, matchId, route, existingMatch);
-  const then = () => {
-    const match = inner.router.getMatch(matchId);
-    if (match.preload && (match.status === "redirected" || match.status === "notFound")) {
-      handleRedirectAndNotFound(inner, match, match.error);
-    }
-  };
-  return existingMatch._nonReactive.beforeLoadPromise ? existingMatch._nonReactive.beforeLoadPromise.then(then) : then();
+var preBeforeLoadSetup = (inner, matchId, route) => {
+	const existingMatch = inner.router.getMatch(matchId);
+	if (!existingMatch._nonReactive.beforeLoadPromise && !existingMatch._nonReactive.loaderPromise) return;
+	setupPendingTimeout(inner, matchId, route, existingMatch);
+	const then = () => {
+		const match = inner.router.getMatch(matchId);
+		if (match.preload && (match.status === "redirected" || match.status === "notFound")) handleRedirectAndNotFound(inner, match, match.error);
+	};
+	return existingMatch._nonReactive.beforeLoadPromise ? existingMatch._nonReactive.beforeLoadPromise.then(then) : then();
 };
-const executeBeforeLoad = (inner, matchId, index, route) => {
-  const match = inner.router.getMatch(matchId);
-  const prevLoadPromise = match._nonReactive.loadPromise;
-  match._nonReactive.loadPromise = utils.createControlledPromise(() => {
-    prevLoadPromise?.resolve();
-  });
-  const { paramsError, searchError } = match;
-  if (paramsError) {
-    handleSerialError(inner, index, paramsError, "PARSE_PARAMS");
-  }
-  if (searchError) {
-    handleSerialError(inner, index, searchError, "VALIDATE_SEARCH");
-  }
-  setupPendingTimeout(inner, matchId, route, match);
-  const abortController = new AbortController();
-  let isPending = false;
-  const pending = () => {
-    if (isPending) return;
-    isPending = true;
-    inner.updateMatch(matchId, (prev) => ({
-      ...prev,
-      isFetching: "beforeLoad",
-      fetchCount: prev.fetchCount + 1,
-      abortController
-      // Note: We intentionally don't update context here.
-      // Context should only be updated after beforeLoad resolves to avoid
-      // components seeing incomplete context during async beforeLoad execution.
-    }));
-  };
-  const resolve = () => {
-    match._nonReactive.beforeLoadPromise?.resolve();
-    match._nonReactive.beforeLoadPromise = void 0;
-    inner.updateMatch(matchId, (prev) => ({
-      ...prev,
-      isFetching: false
-    }));
-  };
-  if (!route.options.beforeLoad) {
-    batch.batch(() => {
-      pending();
-      resolve();
-    });
-    return;
-  }
-  match._nonReactive.beforeLoadPromise = utils.createControlledPromise();
-  const context = {
-    ...buildMatchContext(inner, index, false),
-    ...match.__routeContext
-  };
-  const { search, params, cause } = match;
-  const preload = resolvePreload(inner, matchId);
-  const beforeLoadFnContext = {
-    search,
-    abortController,
-    params,
-    preload,
-    context,
-    location: inner.location,
-    navigate: (opts) => inner.router.navigate({
-      ...opts,
-      _fromLocation: inner.location
-    }),
-    buildLocation: inner.router.buildLocation,
-    cause: preload ? "preload" : cause,
-    matches: inner.matches,
-    routeId: route.id,
-    ...inner.router.options.additionalContext
-  };
-  const updateContext = (beforeLoadContext2) => {
-    if (beforeLoadContext2 === void 0) {
-      batch.batch(() => {
-        pending();
-        resolve();
-      });
-      return;
-    }
-    if (redirect.isRedirect(beforeLoadContext2) || notFound.isNotFound(beforeLoadContext2)) {
-      pending();
-      handleSerialError(inner, index, beforeLoadContext2, "BEFORE_LOAD");
-    }
-    batch.batch(() => {
-      pending();
-      inner.updateMatch(matchId, (prev) => ({
-        ...prev,
-        __beforeLoadContext: beforeLoadContext2
-      }));
-      resolve();
-    });
-  };
-  let beforeLoadContext;
-  try {
-    beforeLoadContext = route.options.beforeLoad(beforeLoadFnContext);
-    if (utils.isPromise(beforeLoadContext)) {
-      pending();
-      return beforeLoadContext.catch((err) => {
-        handleSerialError(inner, index, err, "BEFORE_LOAD");
-      }).then(updateContext);
-    }
-  } catch (err) {
-    pending();
-    handleSerialError(inner, index, err, "BEFORE_LOAD");
-  }
-  updateContext(beforeLoadContext);
-  return;
+var executeBeforeLoad = (inner, matchId, index, route) => {
+	const match = inner.router.getMatch(matchId);
+	const prevLoadPromise = match._nonReactive.loadPromise;
+	match._nonReactive.loadPromise = require_utils.createControlledPromise(() => {
+		prevLoadPromise?.resolve();
+	});
+	const { paramsError, searchError } = match;
+	if (paramsError) handleSerialError(inner, index, paramsError, "PARSE_PARAMS");
+	if (searchError) handleSerialError(inner, index, searchError, "VALIDATE_SEARCH");
+	setupPendingTimeout(inner, matchId, route, match);
+	const abortController = new AbortController();
+	let isPending = false;
+	const pending = () => {
+		if (isPending) return;
+		isPending = true;
+		inner.updateMatch(matchId, (prev) => ({
+			...prev,
+			isFetching: "beforeLoad",
+			fetchCount: prev.fetchCount + 1,
+			abortController
+		}));
+	};
+	const resolve = () => {
+		match._nonReactive.beforeLoadPromise?.resolve();
+		match._nonReactive.beforeLoadPromise = void 0;
+		inner.updateMatch(matchId, (prev) => ({
+			...prev,
+			isFetching: false
+		}));
+	};
+	if (!route.options.beforeLoad) {
+		require_batch.batch(() => {
+			pending();
+			resolve();
+		});
+		return;
+	}
+	match._nonReactive.beforeLoadPromise = require_utils.createControlledPromise();
+	const context = {
+		...buildMatchContext(inner, index, false),
+		...match.__routeContext
+	};
+	const { search, params, cause } = match;
+	const preload = resolvePreload(inner, matchId);
+	const beforeLoadFnContext = {
+		search,
+		abortController,
+		params,
+		preload,
+		context,
+		location: inner.location,
+		navigate: (opts) => inner.router.navigate({
+			...opts,
+			_fromLocation: inner.location
+		}),
+		buildLocation: inner.router.buildLocation,
+		cause: preload ? "preload" : cause,
+		matches: inner.matches,
+		routeId: route.id,
+		...inner.router.options.additionalContext
+	};
+	const updateContext = (beforeLoadContext) => {
+		if (beforeLoadContext === void 0) {
+			require_batch.batch(() => {
+				pending();
+				resolve();
+			});
+			return;
+		}
+		if (require_redirect.isRedirect(beforeLoadContext) || require_not_found.isNotFound(beforeLoadContext)) {
+			pending();
+			handleSerialError(inner, index, beforeLoadContext, "BEFORE_LOAD");
+		}
+		require_batch.batch(() => {
+			pending();
+			inner.updateMatch(matchId, (prev) => ({
+				...prev,
+				__beforeLoadContext: beforeLoadContext
+			}));
+			resolve();
+		});
+	};
+	let beforeLoadContext;
+	try {
+		beforeLoadContext = route.options.beforeLoad(beforeLoadFnContext);
+		if (require_utils.isPromise(beforeLoadContext)) {
+			pending();
+			return beforeLoadContext.catch((err) => {
+				handleSerialError(inner, index, err, "BEFORE_LOAD");
+			}).then(updateContext);
+		}
+	} catch (err) {
+		pending();
+		handleSerialError(inner, index, err, "BEFORE_LOAD");
+	}
+	updateContext(beforeLoadContext);
 };
-const handleBeforeLoad = (inner, index) => {
-  const { id: matchId, routeId } = inner.matches[index];
-  const route = inner.router.looseRoutesById[routeId];
-  const serverSsr = () => {
-    if (isServer.isServer ?? inner.router.isServer) {
-      const maybePromise = isBeforeLoadSsr(inner, matchId, index, route);
-      if (utils.isPromise(maybePromise)) return maybePromise.then(queueExecution);
-    }
-    return queueExecution();
-  };
-  const execute = () => executeBeforeLoad(inner, matchId, index, route);
-  const queueExecution = () => {
-    if (shouldSkipLoader(inner, matchId)) return;
-    const result = preBeforeLoadSetup(inner, matchId, route);
-    return utils.isPromise(result) ? result.then(execute) : execute();
-  };
-  return serverSsr();
+var handleBeforeLoad = (inner, index) => {
+	const { id: matchId, routeId } = inner.matches[index];
+	const route = inner.router.looseRoutesById[routeId];
+	const serverSsr = () => {
+		if (_tanstack_router_core_isServer.isServer ?? inner.router.isServer) {
+			const maybePromise = isBeforeLoadSsr(inner, matchId, index, route);
+			if (require_utils.isPromise(maybePromise)) return maybePromise.then(queueExecution);
+		}
+		return queueExecution();
+	};
+	const execute = () => executeBeforeLoad(inner, matchId, index, route);
+	const queueExecution = () => {
+		if (shouldSkipLoader(inner, matchId)) return;
+		const result = preBeforeLoadSetup(inner, matchId, route);
+		return require_utils.isPromise(result) ? result.then(execute) : execute();
+	};
+	return serverSsr();
 };
-const executeHead = (inner, matchId, route) => {
-  const match = inner.router.getMatch(matchId);
-  if (!match) {
-    return;
-  }
-  if (!route.options.head && !route.options.scripts && !route.options.headers) {
-    return;
-  }
-  const assetContext = {
-    ssr: inner.router.options.ssr,
-    matches: inner.matches,
-    match,
-    params: match.params,
-    loaderData: match.loaderData
-  };
-  return Promise.all([
-    route.options.head?.(assetContext),
-    route.options.scripts?.(assetContext),
-    route.options.headers?.(assetContext)
-  ]).then(([headFnContent, scripts, headers]) => {
-    const meta = headFnContent?.meta;
-    const links = headFnContent?.links;
-    const headScripts = headFnContent?.scripts;
-    const styles = headFnContent?.styles;
-    return {
-      meta,
-      links,
-      headScripts,
-      headers,
-      scripts,
-      styles
-    };
-  });
+var executeHead = (inner, matchId, route) => {
+	const match = inner.router.getMatch(matchId);
+	if (!match) return;
+	if (!route.options.head && !route.options.scripts && !route.options.headers) return;
+	const assetContext = {
+		ssr: inner.router.options.ssr,
+		matches: inner.matches,
+		match,
+		params: match.params,
+		loaderData: match.loaderData
+	};
+	return Promise.all([
+		route.options.head?.(assetContext),
+		route.options.scripts?.(assetContext),
+		route.options.headers?.(assetContext)
+	]).then(([headFnContent, scripts, headers]) => {
+		return {
+			meta: headFnContent?.meta,
+			links: headFnContent?.links,
+			headScripts: headFnContent?.scripts,
+			headers,
+			scripts,
+			styles: headFnContent?.styles
+		};
+	});
 };
-const getLoaderContext = (inner, matchPromises, matchId, index, route) => {
-  const parentMatchPromise = matchPromises[index - 1];
-  const { params, loaderDeps, abortController, cause } = inner.router.getMatch(matchId);
-  const context = buildMatchContext(inner, index);
-  const preload = resolvePreload(inner, matchId);
-  return {
-    params,
-    deps: loaderDeps,
-    preload: !!preload,
-    parentMatchPromise,
-    abortController,
-    context,
-    location: inner.location,
-    navigate: (opts) => inner.router.navigate({
-      ...opts,
-      _fromLocation: inner.location
-    }),
-    cause: preload ? "preload" : cause,
-    route,
-    ...inner.router.options.additionalContext
-  };
+var getLoaderContext = (inner, matchPromises, matchId, index, route) => {
+	const parentMatchPromise = matchPromises[index - 1];
+	const { params, loaderDeps, abortController, cause } = inner.router.getMatch(matchId);
+	const context = buildMatchContext(inner, index);
+	const preload = resolvePreload(inner, matchId);
+	return {
+		params,
+		deps: loaderDeps,
+		preload: !!preload,
+		parentMatchPromise,
+		abortController,
+		context,
+		location: inner.location,
+		navigate: (opts) => inner.router.navigate({
+			...opts,
+			_fromLocation: inner.location
+		}),
+		cause: preload ? "preload" : cause,
+		route,
+		...inner.router.options.additionalContext
+	};
 };
-const runLoader = async (inner, matchPromises, matchId, index, route) => {
-  try {
-    const match = inner.router.getMatch(matchId);
-    try {
-      if (!(isServer.isServer ?? inner.router.isServer) || match.ssr === true) {
-        loadRouteChunk(route);
-      }
-      const routeLoader = route.options.loader;
-      const loader = typeof routeLoader === "function" ? routeLoader : routeLoader?.handler;
-      const loaderResult = loader?.(
-        getLoaderContext(inner, matchPromises, matchId, index, route)
-      );
-      const loaderResultIsPromise = !!loader && utils.isPromise(loaderResult);
-      const willLoadSomething = !!(loaderResultIsPromise || route._lazyPromise || route._componentsPromise || route.options.head || route.options.scripts || route.options.headers || match._nonReactive.minPendingPromise);
-      if (willLoadSomething) {
-        inner.updateMatch(matchId, (prev) => ({
-          ...prev,
-          isFetching: "loader"
-        }));
-      }
-      if (loader) {
-        const loaderData = loaderResultIsPromise ? await loaderResult : loaderResult;
-        handleRedirectAndNotFound(
-          inner,
-          inner.router.getMatch(matchId),
-          loaderData
-        );
-        if (loaderData !== void 0) {
-          inner.updateMatch(matchId, (prev) => ({
-            ...prev,
-            loaderData
-          }));
-        }
-      }
-      if (route._lazyPromise) await route._lazyPromise;
-      const pendingPromise = match._nonReactive.minPendingPromise;
-      if (pendingPromise) await pendingPromise;
-      if (route._componentsPromise) await route._componentsPromise;
-      inner.updateMatch(matchId, (prev) => ({
-        ...prev,
-        error: void 0,
-        context: buildMatchContext(inner, index),
-        status: "success",
-        isFetching: false,
-        updatedAt: Date.now()
-      }));
-    } catch (e) {
-      let error = e;
-      if (error?.name === "AbortError") {
-        if (match.abortController.signal.aborted) {
-          match._nonReactive.loaderPromise?.resolve();
-          match._nonReactive.loaderPromise = void 0;
-          return;
-        }
-        inner.updateMatch(matchId, (prev) => ({
-          ...prev,
-          status: prev.status === "pending" ? "success" : prev.status,
-          isFetching: false,
-          context: buildMatchContext(inner, index)
-        }));
-        return;
-      }
-      const pendingPromise = match._nonReactive.minPendingPromise;
-      if (pendingPromise) await pendingPromise;
-      if (notFound.isNotFound(e)) {
-        await route.options.notFoundComponent?.preload?.();
-      }
-      handleRedirectAndNotFound(inner, inner.router.getMatch(matchId), e);
-      try {
-        route.options.onError?.(e);
-      } catch (onErrorError) {
-        error = onErrorError;
-        handleRedirectAndNotFound(
-          inner,
-          inner.router.getMatch(matchId),
-          onErrorError
-        );
-      }
-      if (!redirect.isRedirect(error) && !notFound.isNotFound(error)) {
-        await loadRouteChunk(route, ["errorComponent"]);
-      }
-      inner.updateMatch(matchId, (prev) => ({
-        ...prev,
-        error,
-        context: buildMatchContext(inner, index),
-        status: "error",
-        isFetching: false
-      }));
-    }
-  } catch (err) {
-    const match = inner.router.getMatch(matchId);
-    if (match) {
-      match._nonReactive.loaderPromise = void 0;
-    }
-    handleRedirectAndNotFound(inner, match, err);
-  }
+var runLoader = async (inner, matchPromises, matchId, index, route) => {
+	try {
+		const match = inner.router.getMatch(matchId);
+		try {
+			if (!(_tanstack_router_core_isServer.isServer ?? inner.router.isServer) || match.ssr === true) loadRouteChunk(route);
+			const routeLoader = route.options.loader;
+			const loader = typeof routeLoader === "function" ? routeLoader : routeLoader?.handler;
+			const loaderResult = loader?.(getLoaderContext(inner, matchPromises, matchId, index, route));
+			const loaderResultIsPromise = !!loader && require_utils.isPromise(loaderResult);
+			if (!!(loaderResultIsPromise || route._lazyPromise || route._componentsPromise || route.options.head || route.options.scripts || route.options.headers || match._nonReactive.minPendingPromise)) inner.updateMatch(matchId, (prev) => ({
+				...prev,
+				isFetching: "loader"
+			}));
+			if (loader) {
+				const loaderData = loaderResultIsPromise ? await loaderResult : loaderResult;
+				handleRedirectAndNotFound(inner, inner.router.getMatch(matchId), loaderData);
+				if (loaderData !== void 0) inner.updateMatch(matchId, (prev) => ({
+					...prev,
+					loaderData
+				}));
+			}
+			if (route._lazyPromise) await route._lazyPromise;
+			const pendingPromise = match._nonReactive.minPendingPromise;
+			if (pendingPromise) await pendingPromise;
+			if (route._componentsPromise) await route._componentsPromise;
+			inner.updateMatch(matchId, (prev) => ({
+				...prev,
+				error: void 0,
+				context: buildMatchContext(inner, index),
+				status: "success",
+				isFetching: false,
+				updatedAt: Date.now()
+			}));
+		} catch (e) {
+			let error = e;
+			if (error?.name === "AbortError") {
+				if (match.abortController.signal.aborted) {
+					match._nonReactive.loaderPromise?.resolve();
+					match._nonReactive.loaderPromise = void 0;
+					return;
+				}
+				inner.updateMatch(matchId, (prev) => ({
+					...prev,
+					status: prev.status === "pending" ? "success" : prev.status,
+					isFetching: false,
+					context: buildMatchContext(inner, index)
+				}));
+				return;
+			}
+			const pendingPromise = match._nonReactive.minPendingPromise;
+			if (pendingPromise) await pendingPromise;
+			if (require_not_found.isNotFound(e)) await route.options.notFoundComponent?.preload?.();
+			handleRedirectAndNotFound(inner, inner.router.getMatch(matchId), e);
+			try {
+				route.options.onError?.(e);
+			} catch (onErrorError) {
+				error = onErrorError;
+				handleRedirectAndNotFound(inner, inner.router.getMatch(matchId), onErrorError);
+			}
+			if (!require_redirect.isRedirect(error) && !require_not_found.isNotFound(error)) await loadRouteChunk(route, ["errorComponent"]);
+			inner.updateMatch(matchId, (prev) => ({
+				...prev,
+				error,
+				context: buildMatchContext(inner, index),
+				status: "error",
+				isFetching: false
+			}));
+		}
+	} catch (err) {
+		const match = inner.router.getMatch(matchId);
+		if (match) match._nonReactive.loaderPromise = void 0;
+		handleRedirectAndNotFound(inner, match, err);
+	}
 };
-const loadRouteMatch = async (inner, matchPromises, index) => {
-  async function handleLoader(preload, prevMatch, previousRouteMatchId, match2, route2) {
-    const age = Date.now() - prevMatch.updatedAt;
-    const staleAge = preload ? route2.options.preloadStaleTime ?? inner.router.options.defaultPreloadStaleTime ?? 3e4 : route2.options.staleTime ?? inner.router.options.defaultStaleTime ?? 0;
-    const shouldReloadOption = route2.options.shouldReload;
-    const shouldReload = typeof shouldReloadOption === "function" ? shouldReloadOption(
-      getLoaderContext(inner, matchPromises, matchId, index, route2)
-    ) : shouldReloadOption;
-    const { status, invalid } = match2;
-    const staleMatchShouldReload = age > staleAge && (!!inner.forceStaleReload || match2.cause === "enter" || previousRouteMatchId !== void 0 && previousRouteMatchId !== match2.id);
-    loaderShouldRunAsync = status === "success" && (invalid || (shouldReload ?? staleMatchShouldReload));
-    if (preload && route2.options.preload === false) ;
-    else if (loaderShouldRunAsync && !inner.sync && shouldReloadInBackground) {
-      loaderIsRunningAsync = true;
-      (async () => {
-        try {
-          await runLoader(inner, matchPromises, matchId, index, route2);
-          const match3 = inner.router.getMatch(matchId);
-          match3._nonReactive.loaderPromise?.resolve();
-          match3._nonReactive.loadPromise?.resolve();
-          match3._nonReactive.loaderPromise = void 0;
-        } catch (err) {
-          if (redirect.isRedirect(err)) {
-            await inner.router.navigate(err.options);
-          }
-        }
-      })();
-    } else if (status !== "success" || loaderShouldRunAsync) {
-      await runLoader(inner, matchPromises, matchId, index, route2);
-    } else {
-      syncMatchContext(inner, matchId, index);
-    }
-  }
-  const { id: matchId, routeId } = inner.matches[index];
-  let loaderShouldRunAsync = false;
-  let loaderIsRunningAsync = false;
-  const route = inner.router.looseRoutesById[routeId];
-  const routeLoader = route.options.loader;
-  const shouldReloadInBackground = ((typeof routeLoader === "function" ? void 0 : routeLoader?.staleReloadMode) ?? inner.router.options.defaultStaleReloadMode) !== "blocking";
-  if (shouldSkipLoader(inner, matchId)) {
-    const match2 = inner.router.getMatch(matchId);
-    if (!match2) {
-      return inner.matches[index];
-    }
-    syncMatchContext(inner, matchId, index);
-    if (isServer.isServer ?? inner.router.isServer) {
-      return inner.router.getMatch(matchId);
-    }
-  } else {
-    const prevMatch = inner.router.getMatch(matchId);
-    const previousRouteMatchId = inner.router.state.matches[index]?.routeId === routeId ? inner.router.state.matches[index].id : inner.router.state.matches.find((d) => d.routeId === routeId)?.id;
-    const preload = resolvePreload(inner, matchId);
-    if (prevMatch._nonReactive.loaderPromise) {
-      if (prevMatch.status === "success" && !inner.sync && !prevMatch.preload && shouldReloadInBackground) {
-        return prevMatch;
-      }
-      await prevMatch._nonReactive.loaderPromise;
-      const match2 = inner.router.getMatch(matchId);
-      const error = match2._nonReactive.error || match2.error;
-      if (error) {
-        handleRedirectAndNotFound(inner, match2, error);
-      }
-      if (match2.status === "pending") {
-        await handleLoader(
-          preload,
-          prevMatch,
-          previousRouteMatchId,
-          match2,
-          route
-        );
-      }
-    } else {
-      const nextPreload = preload && !inner.router.state.matches.some((d) => d.id === matchId);
-      const match2 = inner.router.getMatch(matchId);
-      match2._nonReactive.loaderPromise = utils.createControlledPromise();
-      if (nextPreload !== match2.preload) {
-        inner.updateMatch(matchId, (prev) => ({
-          ...prev,
-          preload: nextPreload
-        }));
-      }
-      await handleLoader(preload, prevMatch, previousRouteMatchId, match2, route);
-    }
-  }
-  const match = inner.router.getMatch(matchId);
-  if (!loaderIsRunningAsync) {
-    match._nonReactive.loaderPromise?.resolve();
-    match._nonReactive.loadPromise?.resolve();
-  }
-  clearTimeout(match._nonReactive.pendingTimeout);
-  match._nonReactive.pendingTimeout = void 0;
-  if (!loaderIsRunningAsync) match._nonReactive.loaderPromise = void 0;
-  match._nonReactive.dehydrated = void 0;
-  const nextIsFetching = loaderIsRunningAsync ? match.isFetching : false;
-  if (nextIsFetching !== match.isFetching || match.invalid !== false) {
-    inner.updateMatch(matchId, (prev) => ({
-      ...prev,
-      isFetching: nextIsFetching,
-      invalid: false
-    }));
-    return inner.router.getMatch(matchId);
-  } else {
-    return match;
-  }
+var loadRouteMatch = async (inner, matchPromises, index) => {
+	async function handleLoader(preload, prevMatch, previousRouteMatchId, match, route) {
+		const age = Date.now() - prevMatch.updatedAt;
+		const staleAge = preload ? route.options.preloadStaleTime ?? inner.router.options.defaultPreloadStaleTime ?? 3e4 : route.options.staleTime ?? inner.router.options.defaultStaleTime ?? 0;
+		const shouldReloadOption = route.options.shouldReload;
+		const shouldReload = typeof shouldReloadOption === "function" ? shouldReloadOption(getLoaderContext(inner, matchPromises, matchId, index, route)) : shouldReloadOption;
+		const { status, invalid } = match;
+		const staleMatchShouldReload = age > staleAge && (!!inner.forceStaleReload || match.cause === "enter" || previousRouteMatchId !== void 0 && previousRouteMatchId !== match.id);
+		loaderShouldRunAsync = status === "success" && (invalid || (shouldReload ?? staleMatchShouldReload));
+		if (preload && route.options.preload === false) {} else if (loaderShouldRunAsync && !inner.sync && shouldReloadInBackground) {
+			loaderIsRunningAsync = true;
+			(async () => {
+				try {
+					await runLoader(inner, matchPromises, matchId, index, route);
+					const match = inner.router.getMatch(matchId);
+					match._nonReactive.loaderPromise?.resolve();
+					match._nonReactive.loadPromise?.resolve();
+					match._nonReactive.loaderPromise = void 0;
+				} catch (err) {
+					if (require_redirect.isRedirect(err)) await inner.router.navigate(err.options);
+				}
+			})();
+		} else if (status !== "success" || loaderShouldRunAsync) await runLoader(inner, matchPromises, matchId, index, route);
+		else syncMatchContext(inner, matchId, index);
+	}
+	const { id: matchId, routeId } = inner.matches[index];
+	let loaderShouldRunAsync = false;
+	let loaderIsRunningAsync = false;
+	const route = inner.router.looseRoutesById[routeId];
+	const routeLoader = route.options.loader;
+	const shouldReloadInBackground = ((typeof routeLoader === "function" ? void 0 : routeLoader?.staleReloadMode) ?? inner.router.options.defaultStaleReloadMode) !== "blocking";
+	if (shouldSkipLoader(inner, matchId)) {
+		if (!inner.router.getMatch(matchId)) return inner.matches[index];
+		syncMatchContext(inner, matchId, index);
+		if (_tanstack_router_core_isServer.isServer ?? inner.router.isServer) return inner.router.getMatch(matchId);
+	} else {
+		const prevMatch = inner.router.getMatch(matchId);
+		const previousRouteMatchId = inner.router.state.matches[index]?.routeId === routeId ? inner.router.state.matches[index].id : inner.router.state.matches.find((d) => d.routeId === routeId)?.id;
+		const preload = resolvePreload(inner, matchId);
+		if (prevMatch._nonReactive.loaderPromise) {
+			if (prevMatch.status === "success" && !inner.sync && !prevMatch.preload && shouldReloadInBackground) return prevMatch;
+			await prevMatch._nonReactive.loaderPromise;
+			const match = inner.router.getMatch(matchId);
+			const error = match._nonReactive.error || match.error;
+			if (error) handleRedirectAndNotFound(inner, match, error);
+			if (match.status === "pending") await handleLoader(preload, prevMatch, previousRouteMatchId, match, route);
+		} else {
+			const nextPreload = preload && !inner.router.state.matches.some((d) => d.id === matchId);
+			const match = inner.router.getMatch(matchId);
+			match._nonReactive.loaderPromise = require_utils.createControlledPromise();
+			if (nextPreload !== match.preload) inner.updateMatch(matchId, (prev) => ({
+				...prev,
+				preload: nextPreload
+			}));
+			await handleLoader(preload, prevMatch, previousRouteMatchId, match, route);
+		}
+	}
+	const match = inner.router.getMatch(matchId);
+	if (!loaderIsRunningAsync) {
+		match._nonReactive.loaderPromise?.resolve();
+		match._nonReactive.loadPromise?.resolve();
+	}
+	clearTimeout(match._nonReactive.pendingTimeout);
+	match._nonReactive.pendingTimeout = void 0;
+	if (!loaderIsRunningAsync) match._nonReactive.loaderPromise = void 0;
+	match._nonReactive.dehydrated = void 0;
+	const nextIsFetching = loaderIsRunningAsync ? match.isFetching : false;
+	if (nextIsFetching !== match.isFetching || match.invalid !== false) {
+		inner.updateMatch(matchId, (prev) => ({
+			...prev,
+			isFetching: nextIsFetching,
+			invalid: false
+		}));
+		return inner.router.getMatch(matchId);
+	} else return match;
 };
 async function loadMatches(arg) {
-  const inner = arg;
-  const matchPromises = [];
-  if (!(isServer.isServer ?? inner.router.isServer) && inner.router.state.matches.some((d) => d._forcePending)) {
-    triggerOnReady(inner);
-  }
-  let beforeLoadNotFound;
-  for (let i = 0; i < inner.matches.length; i++) {
-    try {
-      const beforeLoad = handleBeforeLoad(inner, i);
-      if (utils.isPromise(beforeLoad)) await beforeLoad;
-    } catch (err) {
-      if (redirect.isRedirect(err)) {
-        throw err;
-      }
-      if (notFound.isNotFound(err)) {
-        beforeLoadNotFound = err;
-      } else {
-        if (!inner.preload) throw err;
-      }
-      break;
-    }
-    if (inner.serialError) {
-      break;
-    }
-  }
-  const baseMaxIndexExclusive = inner.firstBadMatchIndex ?? inner.matches.length;
-  const boundaryIndex = beforeLoadNotFound && !inner.preload ? getNotFoundBoundaryIndex(inner, beforeLoadNotFound) : void 0;
-  const maxIndexExclusive = beforeLoadNotFound && inner.preload ? 0 : boundaryIndex !== void 0 ? Math.min(boundaryIndex + 1, baseMaxIndexExclusive) : baseMaxIndexExclusive;
-  let firstNotFound;
-  let firstUnhandledRejection;
-  for (let i = 0; i < maxIndexExclusive; i++) {
-    matchPromises.push(loadRouteMatch(inner, matchPromises, i));
-  }
-  try {
-    await Promise.all(matchPromises);
-  } catch {
-    const settled = await Promise.allSettled(matchPromises);
-    for (const result of settled) {
-      if (result.status !== "rejected") continue;
-      const reason = result.reason;
-      if (redirect.isRedirect(reason)) {
-        throw reason;
-      }
-      if (notFound.isNotFound(reason)) {
-        firstNotFound ??= reason;
-      } else {
-        firstUnhandledRejection ??= reason;
-      }
-    }
-    if (firstUnhandledRejection !== void 0) {
-      throw firstUnhandledRejection;
-    }
-  }
-  const notFoundToThrow = firstNotFound ?? (beforeLoadNotFound && !inner.preload ? beforeLoadNotFound : void 0);
-  let headMaxIndex = inner.serialError ? inner.firstBadMatchIndex ?? 0 : inner.matches.length - 1;
-  if (!notFoundToThrow && beforeLoadNotFound && inner.preload) {
-    return inner.matches;
-  }
-  if (notFoundToThrow) {
-    const renderedBoundaryIndex = getNotFoundBoundaryIndex(
-      inner,
-      notFoundToThrow
-    );
-    invariant(
-      renderedBoundaryIndex !== void 0,
-      "Could not find match for notFound boundary"
-    );
-    const boundaryMatch = inner.matches[renderedBoundaryIndex];
-    const boundaryRoute = inner.router.looseRoutesById[boundaryMatch.routeId];
-    const defaultNotFoundComponent = inner.router.options?.defaultNotFoundComponent;
-    if (!boundaryRoute.options.notFoundComponent && defaultNotFoundComponent) {
-      boundaryRoute.options.notFoundComponent = defaultNotFoundComponent;
-    }
-    notFoundToThrow.routeId = boundaryMatch.routeId;
-    const boundaryIsRoot = boundaryMatch.routeId === inner.router.routeTree.id;
-    inner.updateMatch(boundaryMatch.id, (prev) => ({
-      ...prev,
-      ...boundaryIsRoot ? (
-        // For root boundary, use globalNotFound so the root component's
-        // shell still renders and <Outlet> handles the not-found display,
-        // instead of replacing the entire root shell via status='notFound'.
-        { status: "success", globalNotFound: true, error: void 0 }
-      ) : (
-        // For non-root boundaries, set status:'notFound' so MatchInner
-        // renders the notFoundComponent directly.
-        { status: "notFound", error: notFoundToThrow }
-      ),
-      isFetching: false
-    }));
-    headMaxIndex = renderedBoundaryIndex;
-    await loadRouteChunk(boundaryRoute, ["notFoundComponent"]);
-  } else if (!inner.preload) {
-    const rootMatch = inner.matches[0];
-    if (!rootMatch.globalNotFound) {
-      const currentRootMatch = inner.router.getMatch(rootMatch.id);
-      if (currentRootMatch?.globalNotFound) {
-        inner.updateMatch(rootMatch.id, (prev) => ({
-          ...prev,
-          globalNotFound: false,
-          error: void 0
-        }));
-      }
-    }
-  }
-  if (inner.serialError && inner.firstBadMatchIndex !== void 0) {
-    const errorRoute = inner.router.looseRoutesById[inner.matches[inner.firstBadMatchIndex].routeId];
-    await loadRouteChunk(errorRoute, ["errorComponent"]);
-  }
-  for (let i = 0; i <= headMaxIndex; i++) {
-    const match = inner.matches[i];
-    const { id: matchId, routeId } = match;
-    const route = inner.router.looseRoutesById[routeId];
-    try {
-      const headResult = executeHead(inner, matchId, route);
-      if (headResult) {
-        const head = await headResult;
-        inner.updateMatch(matchId, (prev) => ({
-          ...prev,
-          ...head
-        }));
-      }
-    } catch (err) {
-      console.error(`Error executing head for route ${routeId}:`, err);
-    }
-  }
-  const readyPromise = triggerOnReady(inner);
-  if (utils.isPromise(readyPromise)) {
-    await readyPromise;
-  }
-  if (notFoundToThrow) {
-    throw notFoundToThrow;
-  }
-  if (inner.serialError && !inner.preload && !inner.onReady) {
-    throw inner.serialError;
-  }
-  return inner.matches;
+	const inner = arg;
+	const matchPromises = [];
+	if (!(_tanstack_router_core_isServer.isServer ?? inner.router.isServer) && inner.router.state.matches.some((d) => d._forcePending)) triggerOnReady(inner);
+	let beforeLoadNotFound;
+	for (let i = 0; i < inner.matches.length; i++) {
+		try {
+			const beforeLoad = handleBeforeLoad(inner, i);
+			if (require_utils.isPromise(beforeLoad)) await beforeLoad;
+		} catch (err) {
+			if (require_redirect.isRedirect(err)) throw err;
+			if (require_not_found.isNotFound(err)) beforeLoadNotFound = err;
+			else if (!inner.preload) throw err;
+			break;
+		}
+		if (inner.serialError) break;
+	}
+	const baseMaxIndexExclusive = inner.firstBadMatchIndex ?? inner.matches.length;
+	const boundaryIndex = beforeLoadNotFound && !inner.preload ? getNotFoundBoundaryIndex(inner, beforeLoadNotFound) : void 0;
+	const maxIndexExclusive = beforeLoadNotFound && inner.preload ? 0 : boundaryIndex !== void 0 ? Math.min(boundaryIndex + 1, baseMaxIndexExclusive) : baseMaxIndexExclusive;
+	let firstNotFound;
+	let firstUnhandledRejection;
+	for (let i = 0; i < maxIndexExclusive; i++) matchPromises.push(loadRouteMatch(inner, matchPromises, i));
+	try {
+		await Promise.all(matchPromises);
+	} catch {
+		const settled = await Promise.allSettled(matchPromises);
+		for (const result of settled) {
+			if (result.status !== "rejected") continue;
+			const reason = result.reason;
+			if (require_redirect.isRedirect(reason)) throw reason;
+			if (require_not_found.isNotFound(reason)) firstNotFound ??= reason;
+			else firstUnhandledRejection ??= reason;
+		}
+		if (firstUnhandledRejection !== void 0) throw firstUnhandledRejection;
+	}
+	const notFoundToThrow = firstNotFound ?? (beforeLoadNotFound && !inner.preload ? beforeLoadNotFound : void 0);
+	let headMaxIndex = inner.serialError ? inner.firstBadMatchIndex ?? 0 : inner.matches.length - 1;
+	if (!notFoundToThrow && beforeLoadNotFound && inner.preload) return inner.matches;
+	if (notFoundToThrow) {
+		const renderedBoundaryIndex = getNotFoundBoundaryIndex(inner, notFoundToThrow);
+		(0, tiny_invariant.default)(renderedBoundaryIndex !== void 0, "Could not find match for notFound boundary");
+		const boundaryMatch = inner.matches[renderedBoundaryIndex];
+		const boundaryRoute = inner.router.looseRoutesById[boundaryMatch.routeId];
+		const defaultNotFoundComponent = inner.router.options?.defaultNotFoundComponent;
+		if (!boundaryRoute.options.notFoundComponent && defaultNotFoundComponent) boundaryRoute.options.notFoundComponent = defaultNotFoundComponent;
+		notFoundToThrow.routeId = boundaryMatch.routeId;
+		const boundaryIsRoot = boundaryMatch.routeId === inner.router.routeTree.id;
+		inner.updateMatch(boundaryMatch.id, (prev) => ({
+			...prev,
+			...boundaryIsRoot ? {
+				status: "success",
+				globalNotFound: true,
+				error: void 0
+			} : {
+				status: "notFound",
+				error: notFoundToThrow
+			},
+			isFetching: false
+		}));
+		headMaxIndex = renderedBoundaryIndex;
+		await loadRouteChunk(boundaryRoute, ["notFoundComponent"]);
+	} else if (!inner.preload) {
+		const rootMatch = inner.matches[0];
+		if (!rootMatch.globalNotFound) {
+			if (inner.router.getMatch(rootMatch.id)?.globalNotFound) inner.updateMatch(rootMatch.id, (prev) => ({
+				...prev,
+				globalNotFound: false,
+				error: void 0
+			}));
+		}
+	}
+	if (inner.serialError && inner.firstBadMatchIndex !== void 0) {
+		const errorRoute = inner.router.looseRoutesById[inner.matches[inner.firstBadMatchIndex].routeId];
+		await loadRouteChunk(errorRoute, ["errorComponent"]);
+	}
+	for (let i = 0; i <= headMaxIndex; i++) {
+		const { id: matchId, routeId } = inner.matches[i];
+		const route = inner.router.looseRoutesById[routeId];
+		try {
+			const headResult = executeHead(inner, matchId, route);
+			if (headResult) {
+				const head = await headResult;
+				inner.updateMatch(matchId, (prev) => ({
+					...prev,
+					...head
+				}));
+			}
+		} catch (err) {
+			console.error(`Error executing head for route ${routeId}:`, err);
+		}
+	}
+	const readyPromise = triggerOnReady(inner);
+	if (require_utils.isPromise(readyPromise)) await readyPromise;
+	if (notFoundToThrow) throw notFoundToThrow;
+	if (inner.serialError && !inner.preload && !inner.onReady) throw inner.serialError;
+	return inner.matches;
 }
 function preloadRouteComponents(route, componentTypesToLoad) {
-  const preloads = componentTypesToLoad.map((type) => route.options[type]?.preload?.()).filter(Boolean);
-  if (preloads.length === 0) return void 0;
-  return Promise.all(preloads);
+	const preloads = componentTypesToLoad.map((type) => route.options[type]?.preload?.()).filter(Boolean);
+	if (preloads.length === 0) return void 0;
+	return Promise.all(preloads);
 }
 function loadRouteChunk(route, componentTypesToLoad = componentTypes) {
-  if (!route._lazyLoaded && route._lazyPromise === void 0) {
-    if (route.lazyFn) {
-      route._lazyPromise = route.lazyFn().then((lazyRoute) => {
-        const { id: _id, ...options } = lazyRoute.options;
-        Object.assign(route.options, options);
-        route._lazyLoaded = true;
-        route._lazyPromise = void 0;
-      });
-    } else {
-      route._lazyLoaded = true;
-    }
-  }
-  const runAfterLazy = () => route._componentsLoaded ? void 0 : componentTypesToLoad === componentTypes ? (() => {
-    if (route._componentsPromise === void 0) {
-      const componentsPromise = preloadRouteComponents(
-        route,
-        componentTypes
-      );
-      if (componentsPromise) {
-        route._componentsPromise = componentsPromise.then(() => {
-          route._componentsLoaded = true;
-          route._componentsPromise = void 0;
-        });
-      } else {
-        route._componentsLoaded = true;
-      }
-    }
-    return route._componentsPromise;
-  })() : preloadRouteComponents(route, componentTypesToLoad);
-  return route._lazyPromise ? route._lazyPromise.then(runAfterLazy) : runAfterLazy();
+	if (!route._lazyLoaded && route._lazyPromise === void 0) if (route.lazyFn) route._lazyPromise = route.lazyFn().then((lazyRoute) => {
+		const { id: _id, ...options } = lazyRoute.options;
+		Object.assign(route.options, options);
+		route._lazyLoaded = true;
+		route._lazyPromise = void 0;
+	});
+	else route._lazyLoaded = true;
+	const runAfterLazy = () => route._componentsLoaded ? void 0 : componentTypesToLoad === componentTypes ? (() => {
+		if (route._componentsPromise === void 0) {
+			const componentsPromise = preloadRouteComponents(route, componentTypes);
+			if (componentsPromise) route._componentsPromise = componentsPromise.then(() => {
+				route._componentsLoaded = true;
+				route._componentsPromise = void 0;
+			});
+			else route._componentsLoaded = true;
+		}
+		return route._componentsPromise;
+	})() : preloadRouteComponents(route, componentTypesToLoad);
+	return route._lazyPromise ? route._lazyPromise.then(runAfterLazy) : runAfterLazy();
 }
 function makeMaybe(value, error) {
-  if (error) {
-    return { status: "error", error };
-  }
-  return { status: "success", value };
+	if (error) return {
+		status: "error",
+		error
+	};
+	return {
+		status: "success",
+		value
+	};
 }
 function routeNeedsPreload(route) {
-  for (const componentType of componentTypes) {
-    if (route.options[componentType]?.preload) {
-      return true;
-    }
-  }
-  return false;
+	for (const componentType of componentTypes) if (route.options[componentType]?.preload) return true;
+	return false;
 }
-const componentTypes = [
-  "component",
-  "errorComponent",
-  "pendingComponent",
-  "notFoundComponent"
+var componentTypes = [
+	"component",
+	"errorComponent",
+	"pendingComponent",
+	"notFoundComponent"
 ];
-exports.componentTypes = componentTypes;
+//#endregion
 exports.loadMatches = loadMatches;
 exports.loadRouteChunk = loadRouteChunk;
 exports.routeNeedsPreload = routeNeedsPreload;
-//# sourceMappingURL=load-matches.cjs.map
+
+//# sourceMappingURL=load-matches.cjs.map