@tanstack/router-core 1.171.12 → 1.171.14

package/dist/cjs/router.cjs

@@ -65,13 +65,12 @@ var RouterCore = class {
 	*/
 	constructor(options, getStoreConfig) {
 		this.tempLocationKey = `${Math.round(Math.random() * 1e7)}`;
-		this.resetNextScroll = true;
+		this._scroll = { next: true };
 		this.shouldViewTransition = void 0;
 		this.isViewTransitionTypesSupported = void 0;
 		this.subscribers = /* @__PURE__ */ new Set();
-		this.isScrollRestoring = false;
-		this.isScrollRestorationSetup = false;
 		this.routeBranchCache = /* @__PURE__ */ new WeakMap();
+		this.lightweightCache = /* @__PURE__ */ new WeakMap();
 		this.startTransition = (fn) => fn();
 		this.update = (newOptions) => {
 			if (process.env.NODE_ENV !== "production") {
@@ -427,7 +426,7 @@ var RouterCore = class {
 				historyAction = next.replace ? "REPLACE" : "PUSH";
 				this.history[historyAction === "REPLACE" ? "replace" : "push"](nextHistory.publicHref, nextHistory.state, { ignoreBlocker });
 			}
-			this.resetNextScroll = next.resetScroll ?? true;
+			this._scroll.next = next.resetScroll ?? true;
 			if (!this.history.subscribers.size) this.load(historyAction ? { action: { type: historyAction } } : void 0);
 			return this.commitLocationPromise;
 		};
@@ -453,7 +452,7 @@ var RouterCore = class {
 				hashScrollIntoView,
 				ignoreBlocker
 			});
-			Promise.resolve().then(() => {
+			queueMicrotask(() => {
 				if (this.pendingBuiltLocation === location) this.pendingBuiltLocation = void 0;
 			});
 			return commitPromise;
@@ -477,7 +476,7 @@ var RouterCore = class {
 				const reloadHref = !hrefIsUrl && publicHref ? publicHref : href;
 				if (require_utils.isDangerousProtocol(reloadHref, this.protocolAllowlist)) {
 					if (process.env.NODE_ENV !== "production") console.warn(`Blocked navigation to dangerous protocol: ${reloadHref}`);
-					return Promise.resolve();
+					return;
 				}
 				if (!rest.ignoreBlocker) {
 					const blockers = this.history.getBlockers?.() ?? [];
@@ -486,12 +485,12 @@ var RouterCore = class {
 							currentLocation: this.latestLocation,
 							nextLocation: this.latestLocation,
 							action: "PUSH"
-						})) return Promise.resolve();
+						})) return;
 					}
 				}
 				if (rest.replace) window.location.replace(reloadHref);
 				else window.location.href = reloadHref;
-				return Promise.resolve();
+				return;
 			}
 			return this.buildAndCommitLocation({
 				...rest,
@@ -1009,13 +1008,15 @@ var RouterCore = class {
 	* operations like AbortController, ControlledPromise, loaderDeps, and full match objects.
 	*/
 	matchRoutesLightweight(location) {
+		const lastStateMatchId = require_utils.last(this.stores.matchesId.get());
+		const cached = this.lightweightCache.get(location);
+		if (cached && cached[0] === lastStateMatchId) return cached[1];
 		const { matchedRoutes, routeParams } = this.getMatchedRoutes(location.pathname);
 		const lastRoute = require_utils.last(matchedRoutes);
 		const accumulatedSearch = { ...location.search };
 		for (const route of matchedRoutes) try {
 			Object.assign(accumulatedSearch, validateSearch(route.options.validateSearch, accumulatedSearch));
 		} catch {}
-		const lastStateMatchId = require_utils.last(this.stores.matchesId.get());
 		const lastStateMatch = lastStateMatchId && this.stores.matchStores.get(lastStateMatchId)?.get();
 		const canReuseParams = lastStateMatch && lastStateMatch.routeId === lastRoute.id && lastStateMatch.pathname === location.pathname;
 		let params;
@@ -1027,12 +1028,14 @@ var RouterCore = class {
 			} catch {}
 			params = strictParams;
 		}
-		return {
+		const result = {
 			matchedRoutes,
 			fullPath: lastRoute.fullPath,
 			search: accumulatedSearch,
 			params
 		};
+		this.lightweightCache.set(location, [lastStateMatchId, result]);
+		return result;
 	}
 };
 /** Error thrown when search parameter validation fails. */