@tanstack/router-core 1.171.13 → 1.171.15

package/dist/cjs/router.cjs

@@ -49,7 +49,6 @@ function getLocationChangeInfo(location, resolvedLocation) {
 		hashChanged: fromLocation?.hash !== toLocation.hash
 	};
 }
-const locationHistoryActions = /* @__PURE__ */ new WeakMap();
 /**
 * Core, framework-agnostic router engine that powers TanStack Router.
 *
@@ -70,6 +69,7 @@ var RouterCore = class {
 		this.isViewTransitionTypesSupported = void 0;
 		this.subscribers = /* @__PURE__ */ new Set();
 		this.routeBranchCache = /* @__PURE__ */ new WeakMap();
+		this.lightweightCache = /* @__PURE__ */ new WeakMap();
 		this.startTransition = (fn) => fn();
 		this.update = (newOptions) => {
 			if (process.env.NODE_ENV !== "production") {
@@ -451,7 +451,7 @@ var RouterCore = class {
 				hashScrollIntoView,
 				ignoreBlocker
 			});
-			Promise.resolve().then(() => {
+			queueMicrotask(() => {
 				if (this.pendingBuiltLocation === location) this.pendingBuiltLocation = void 0;
 			});
 			return commitPromise;
@@ -475,7 +475,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?.() ?? [];
@@ -484,12 +484,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,
@@ -540,8 +540,7 @@ var RouterCore = class {
 				this.startTransition(async () => {
 					try {
 						this.beforeLoad();
-						if (historyAction) locationHistoryActions.set(this.latestLocation, historyAction);
-						else locationHistoryActions.delete(this.latestLocation);
+						if (historyAction) this._scroll.hash = historyAction === "PUSH" || historyAction === "REPLACE";
 						const next = this.latestLocation;
 						const locationChangeInfo = getLocationChangeInfo(next, this.stores.resolvedLocation.get());
 						if (!this.stores.redirect.get()) this.emit({
@@ -1007,13 +1006,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;
@@ -1025,12 +1026,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. */
@@ -1189,7 +1192,6 @@ exports.getInitialRouterState = getInitialRouterState;
 exports.getLocationChangeInfo = getLocationChangeInfo;
 exports.getMatchedRoutes = getMatchedRoutes;
 exports.lazyFn = lazyFn;
-exports.locationHistoryActions = locationHistoryActions;
 exports.trailingSlashOptions = trailingSlashOptions;
 
 //# sourceMappingURL=router.cjs.map