@tanstack/router-core 1.171.3 → 1.171.5

package/dist/cjs/index.cjs

@@ -18,7 +18,6 @@ const require_Matches = require("./Matches.cjs");
 const require_route = require("./route.cjs");
 const require_config = require("./config.cjs");
 const require_searchMiddleware = require("./searchMiddleware.cjs");
-const require_hash_scroll = require("./hash-scroll.cjs");
 const require_transformer = require("./ssr/serializer/transformer.cjs");
 const require_RawStream = require("./ssr/serializer/RawStream.cjs");
 const require_seroval_plugins = require("./ssr/serializer/seroval-plugins.cjs");
@@ -61,7 +60,6 @@ exports.getInitialRouterState = require_router.getInitialRouterState;
 exports.getLocationChangeInfo = require_router.getLocationChangeInfo;
 exports.getMatchedRoutes = require_router.getMatchedRoutes;
 exports.getStylesheetHref = require_manifest.getStylesheetHref;
-exports.handleHashScroll = require_hash_scroll.handleHashScroll;
 exports.hasKeys = require_utils.hasKeys;
 exports.interpolatePath = require_path.interpolatePath;
 exports.invariant = require_invariant.invariant;
@@ -89,7 +87,6 @@ exports.resolveManifestAssetLink = require_manifest.resolveManifestAssetLink;
 exports.resolvePath = require_path.resolvePath;
 exports.retainSearchParams = require_searchMiddleware.retainSearchParams;
 exports.rootRouteId = require_root.rootRouteId;
-exports.scrollRestorationCache = require_scroll_restoration.scrollRestorationCache;
 exports.setupScrollRestoration = require_scroll_restoration.setupScrollRestoration;
 exports.storageKey = require_scroll_restoration.storageKey;
 exports.stringifySearchWith = require_searchParams.stringifySearchWith;

package/dist/cjs/index.d.cts

@@ -40,8 +40,7 @@ export type { Redirect, RedirectOptions, RedirectOptionsRoute, RedirectFnRoute,
 export { redirect, isRedirect, isResolvedRedirect, parseRedirect, } from './redirect.cjs';
 export type { NotFoundError } from './not-found.cjs';
 export { isNotFound, notFound } from './not-found.cjs';
-export { defaultGetScrollRestorationKey, getElementScrollRestorationEntry, storageKey, scrollRestorationCache, setupScrollRestoration, } from './scroll-restoration.cjs';
-export { handleHashScroll } from './hash-scroll.cjs';
+export { defaultGetScrollRestorationKey, getElementScrollRestorationEntry, storageKey, setupScrollRestoration, } from './scroll-restoration.cjs';
 export type { ScrollRestorationOptions, ScrollRestorationEntry, } from './scroll-restoration.cjs';
 export type { ValidateFromPath, ValidateToPath, ValidateSearch, ValidateParams, InferFrom, InferTo, InferMaskTo, InferMaskFrom, ValidateNavigateOptions, ValidateNavigateOptionsArray, ValidateRedirectOptions, ValidateRedirectOptionsArray, ValidateId, InferStrict, InferShouldThrow, InferSelected, ValidateUseSearchResult, ValidateUseParamsResult, } from './typePrimitives.cjs';
 export type { AnySerializationAdapter, SerializationAdapter, ValidateSerializableInput, SerializerExtensions, ValidateSerializable, RegisteredSerializableInput, SerializableExtensions, DefaultSerializable, Serializable, TSR_SERIALIZABLE, TsrSerializable, SerializationError, } from './ssr/serializer/transformer.cjs';

package/dist/cjs/rewrite.cjs

@@ -1,7 +1,6 @@
 const require_path = require("./path.cjs");
 //#region src/rewrite.ts
 /** Compose multiple rewrite pairs into a single in/out rewrite. */
-/** Compose multiple rewrite pairs into a single in/out rewrite. */
 function composeRewrites(rewrites) {
 	return {
 		input: ({ url }) => {
@@ -15,13 +14,11 @@ function composeRewrites(rewrites) {
 	};
 }
 /** Create a rewrite pair that strips/adds a basepath on input/output. */
-/** Create a rewrite pair that strips/adds a basepath on input/output. */
 function rewriteBasepath(opts) {
 	const trimmedBasepath = require_path.trimPath(opts.basepath);
 	const normalizedBasepath = `/${trimmedBasepath}`;
-	const normalizedBasepathWithSlash = `${normalizedBasepath}/`;
 	const checkBasepath = opts.caseSensitive ? normalizedBasepath : normalizedBasepath.toLowerCase();
-	const checkBasepathWithSlash = opts.caseSensitive ? normalizedBasepathWithSlash : normalizedBasepathWithSlash.toLowerCase();
+	const checkBasepathWithSlash = `${checkBasepath}/`;
 	return {
 		input: ({ url }) => {
 			const pathname = opts.caseSensitive ? url.pathname : url.pathname.toLowerCase();
@@ -40,7 +37,6 @@ function rewriteBasepath(opts) {
 	};
 }
 /** Execute a location input rewrite if provided. */
-/** Execute a location input rewrite if provided. */
 function executeRewriteInput(rewrite, url) {
 	const res = rewrite?.input?.({ url });
 	if (res) {
@@ -50,7 +46,6 @@ function executeRewriteInput(rewrite, url) {
 	return url;
 }
 /** Execute a location output rewrite if provided. */
-/** Execute a location output rewrite if provided. */
 function executeRewriteOutput(rewrite, url) {
 	const res = rewrite?.output?.({ url });
 	if (res) {

package/dist/cjs/rewrite.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"rewrite.cjs","names":[],"sources":["../../src/rewrite.ts"],"sourcesContent":["import { joinPaths, trimPath } from './path'\nimport type { LocationRewrite } from './router'\n\n/** Compose multiple rewrite pairs into a single in/out rewrite. */\n/** Compose multiple rewrite pairs into a single in/out rewrite. */\nexport function composeRewrites(rewrites: Array<LocationRewrite>) {\n  return {\n    input: ({ url }) => {\n      for (const rewrite of rewrites) {\n        url = executeRewriteInput(rewrite, url)\n      }\n      return url\n    },\n    output: ({ url }) => {\n      for (let i = rewrites.length - 1; i >= 0; i--) {\n        url = executeRewriteOutput(rewrites[i], url)\n      }\n      return url\n    },\n  } satisfies LocationRewrite\n}\n\n/** Create a rewrite pair that strips/adds a basepath on input/output. */\n/** Create a rewrite pair that strips/adds a basepath on input/output. */\nexport function rewriteBasepath(opts: {\n  basepath: string\n  caseSensitive?: boolean\n}) {\n  const trimmedBasepath = trimPath(opts.basepath)\n  const normalizedBasepath = `/${trimmedBasepath}`\n  const normalizedBasepathWithSlash = `${normalizedBasepath}/`\n  const checkBasepath = opts.caseSensitive\n    ? normalizedBasepath\n    : normalizedBasepath.toLowerCase()\n  const checkBasepathWithSlash = opts.caseSensitive\n    ? normalizedBasepathWithSlash\n    : normalizedBasepathWithSlash.toLowerCase()\n\n  return {\n    input: ({ url }) => {\n      const pathname = opts.caseSensitive\n        ? url.pathname\n        : url.pathname.toLowerCase()\n\n      // Handle exact basepath match (e.g., /my-app -> /)\n      if (pathname === checkBasepath) {\n        url.pathname = '/'\n      } else if (pathname.startsWith(checkBasepathWithSlash)) {\n        // Handle basepath with trailing content (e.g., /my-app/users -> /users)\n        url.pathname = url.pathname.slice(normalizedBasepath.length)\n      }\n      return url\n    },\n    output: ({ url }) => {\n      url.pathname = joinPaths(['/', trimmedBasepath, url.pathname])\n      return url\n    },\n  } satisfies LocationRewrite\n}\n\n/** Execute a location input rewrite if provided. */\n/** Execute a location input rewrite if provided. */\nexport function executeRewriteInput(\n  rewrite: LocationRewrite | undefined,\n  url: URL,\n): URL {\n  const res = rewrite?.input?.({ url })\n  if (res) {\n    if (typeof res === 'string') {\n      return new URL(res)\n    } else if (res instanceof URL) {\n      return res\n    }\n  }\n  return url\n}\n\n/** Execute a location output rewrite if provided. */\n/** Execute a location output rewrite if provided. */\nexport function executeRewriteOutput(\n  rewrite: LocationRewrite | undefined,\n  url: URL,\n): URL {\n  const res = rewrite?.output?.({ url })\n  if (res) {\n    if (typeof res === 'string') {\n      return new URL(res)\n    } else if (res instanceof URL) {\n      return res\n    }\n  }\n  return url\n}\n"],"mappings":";;;;AAKA,SAAgB,gBAAgB,UAAkC;AAChE,QAAO;EACL,QAAQ,EAAE,UAAU;AAClB,QAAK,MAAM,WAAW,SACpB,OAAM,oBAAoB,SAAS,IAAI;AAEzC,UAAO;;EAET,SAAS,EAAE,UAAU;AACnB,QAAK,IAAI,IAAI,SAAS,SAAS,GAAG,KAAK,GAAG,IACxC,OAAM,qBAAqB,SAAS,IAAI,IAAI;AAE9C,UAAO;;EAEV;;;;AAKH,SAAgB,gBAAgB,MAG7B;CACD,MAAM,kBAAkB,aAAA,SAAS,KAAK,SAAS;CAC/C,MAAM,qBAAqB,IAAI;CAC/B,MAAM,8BAA8B,GAAG,mBAAmB;CAC1D,MAAM,gBAAgB,KAAK,gBACvB,qBACA,mBAAmB,aAAa;CACpC,MAAM,yBAAyB,KAAK,gBAChC,8BACA,4BAA4B,aAAa;AAE7C,QAAO;EACL,QAAQ,EAAE,UAAU;GAClB,MAAM,WAAW,KAAK,gBAClB,IAAI,WACJ,IAAI,SAAS,aAAa;AAG9B,OAAI,aAAa,cACf,KAAI,WAAW;YACN,SAAS,WAAW,uBAAuB,CAEpD,KAAI,WAAW,IAAI,SAAS,MAAM,mBAAmB,OAAO;AAE9D,UAAO;;EAET,SAAS,EAAE,UAAU;AACnB,OAAI,WAAW,aAAA,UAAU;IAAC;IAAK;IAAiB,IAAI;IAAS,CAAC;AAC9D,UAAO;;EAEV;;;;AAKH,SAAgB,oBACd,SACA,KACK;CACL,MAAM,MAAM,SAAS,QAAQ,EAAE,KAAK,CAAC;AACrC,KAAI;MACE,OAAO,QAAQ,SACjB,QAAO,IAAI,IAAI,IAAI;WACV,eAAe,IACxB,QAAO;;AAGX,QAAO;;;;AAKT,SAAgB,qBACd,SACA,KACK;CACL,MAAM,MAAM,SAAS,SAAS,EAAE,KAAK,CAAC;AACtC,KAAI;MACE,OAAO,QAAQ,SACjB,QAAO,IAAI,IAAI,IAAI;WACV,eAAe,IACxB,QAAO;;AAGX,QAAO"}
+{"version":3,"file":"rewrite.cjs","names":[],"sources":["../../src/rewrite.ts"],"sourcesContent":["import { joinPaths, trimPath } from './path'\nimport type { LocationRewrite } from './router'\n\n/** Compose multiple rewrite pairs into a single in/out rewrite. */\nexport function composeRewrites(rewrites: Array<LocationRewrite>) {\n  return {\n    input: ({ url }) => {\n      for (const rewrite of rewrites) {\n        url = executeRewriteInput(rewrite, url)\n      }\n      return url\n    },\n    output: ({ url }) => {\n      for (let i = rewrites.length - 1; i >= 0; i--) {\n        url = executeRewriteOutput(rewrites[i], url)\n      }\n      return url\n    },\n  } satisfies LocationRewrite\n}\n\n/** Create a rewrite pair that strips/adds a basepath on input/output. */\nexport function rewriteBasepath(opts: {\n  basepath: string\n  caseSensitive?: boolean\n}) {\n  const trimmedBasepath = trimPath(opts.basepath)\n  const normalizedBasepath = `/${trimmedBasepath}`\n  const checkBasepath = opts.caseSensitive\n    ? normalizedBasepath\n    : normalizedBasepath.toLowerCase()\n  const checkBasepathWithSlash = `${checkBasepath}/`\n\n  return {\n    input: ({ url }) => {\n      const pathname = opts.caseSensitive\n        ? url.pathname\n        : url.pathname.toLowerCase()\n\n      // Handle exact basepath match (e.g., /my-app -> /)\n      if (pathname === checkBasepath) {\n        url.pathname = '/'\n      } else if (pathname.startsWith(checkBasepathWithSlash)) {\n        // Handle basepath with trailing content (e.g., /my-app/users -> /users)\n        url.pathname = url.pathname.slice(normalizedBasepath.length)\n      }\n      return url\n    },\n    output: ({ url }) => {\n      url.pathname = joinPaths(['/', trimmedBasepath, url.pathname])\n      return url\n    },\n  } satisfies LocationRewrite\n}\n\n/** Execute a location input rewrite if provided. */\nexport function executeRewriteInput(\n  rewrite: LocationRewrite | undefined,\n  url: URL,\n): URL {\n  const res = rewrite?.input?.({ url })\n  if (res) {\n    if (typeof res === 'string') {\n      return new URL(res)\n    } else if (res instanceof URL) {\n      return res\n    }\n  }\n  return url\n}\n\n/** Execute a location output rewrite if provided. */\nexport function executeRewriteOutput(\n  rewrite: LocationRewrite | undefined,\n  url: URL,\n): URL {\n  const res = rewrite?.output?.({ url })\n  if (res) {\n    if (typeof res === 'string') {\n      return new URL(res)\n    } else if (res instanceof URL) {\n      return res\n    }\n  }\n  return url\n}\n"],"mappings":";;;AAIA,SAAgB,gBAAgB,UAAkC;AAChE,QAAO;EACL,QAAQ,EAAE,UAAU;AAClB,QAAK,MAAM,WAAW,SACpB,OAAM,oBAAoB,SAAS,IAAI;AAEzC,UAAO;;EAET,SAAS,EAAE,UAAU;AACnB,QAAK,IAAI,IAAI,SAAS,SAAS,GAAG,KAAK,GAAG,IACxC,OAAM,qBAAqB,SAAS,IAAI,IAAI;AAE9C,UAAO;;EAEV;;;AAIH,SAAgB,gBAAgB,MAG7B;CACD,MAAM,kBAAkB,aAAA,SAAS,KAAK,SAAS;CAC/C,MAAM,qBAAqB,IAAI;CAC/B,MAAM,gBAAgB,KAAK,gBACvB,qBACA,mBAAmB,aAAa;CACpC,MAAM,yBAAyB,GAAG,cAAc;AAEhD,QAAO;EACL,QAAQ,EAAE,UAAU;GAClB,MAAM,WAAW,KAAK,gBAClB,IAAI,WACJ,IAAI,SAAS,aAAa;AAG9B,OAAI,aAAa,cACf,KAAI,WAAW;YACN,SAAS,WAAW,uBAAuB,CAEpD,KAAI,WAAW,IAAI,SAAS,MAAM,mBAAmB,OAAO;AAE9D,UAAO;;EAET,SAAS,EAAE,UAAU;AACnB,OAAI,WAAW,aAAA,UAAU;IAAC;IAAK;IAAiB,IAAI;IAAS,CAAC;AAC9D,UAAO;;EAEV;;;AAIH,SAAgB,oBACd,SACA,KACK;CACL,MAAM,MAAM,SAAS,QAAQ,EAAE,KAAK,CAAC;AACrC,KAAI;MACE,OAAO,QAAQ,SACjB,QAAO,IAAI,IAAI,IAAI;WACV,eAAe,IACxB,QAAO;;AAGX,QAAO;;;AAIT,SAAgB,qBACd,SACA,KACK;CACL,MAAM,MAAM,SAAS,SAAS,EAAE,KAAK,CAAC;AACtC,KAAI;MACE,OAAO,QAAQ,SACjB,QAAO,IAAI,IAAI,IAAI;WACV,eAAe,IACxB,QAAO;;AAGX,QAAO"}

package/dist/cjs/rewrite.d.cts

@@ -1,6 +1,5 @@
 import { LocationRewrite } from './router.cjs';
 /** Compose multiple rewrite pairs into a single in/out rewrite. */
-/** Compose multiple rewrite pairs into a single in/out rewrite. */
 export declare function composeRewrites(rewrites: Array<LocationRewrite>): {
     input: ({ url }: {
         url: URL;
@@ -10,7 +9,6 @@ export declare function composeRewrites(rewrites: Array<LocationRewrite>): {
     }) => URL;
 };
 /** Create a rewrite pair that strips/adds a basepath on input/output. */
-/** Create a rewrite pair that strips/adds a basepath on input/output. */
 export declare function rewriteBasepath(opts: {
     basepath: string;
     caseSensitive?: boolean;
@@ -23,8 +21,6 @@ export declare function rewriteBasepath(opts: {
     }) => URL;
 };
 /** Execute a location input rewrite if provided. */
-/** Execute a location input rewrite if provided. */
 export declare function executeRewriteInput(rewrite: LocationRewrite | undefined, url: URL): URL;
 /** Execute a location output rewrite if provided. */
-/** Execute a location output rewrite if provided. */
 export declare function executeRewriteOutput(rewrite: LocationRewrite | undefined, url: URL): URL;

package/dist/cjs/router.cjs

@@ -49,6 +49,7 @@ function getLocationChangeInfo(location, resolvedLocation) {
 		hashChanged: fromLocation?.hash !== toLocation.hash
 	};
 }
+const locationHistoryActions = /* @__PURE__ */ new WeakMap();
 /**
 * Core, framework-agnostic router engine that powers TanStack Router.
 *
@@ -374,6 +375,7 @@ var RouterCore = class {
 			return buildWithMatches(opts);
 		};
 		this.commitLocation = async ({ viewTransition, ignoreBlocker, ...next }) => {
+			let historyAction;
 			const isSameState = () => {
 				const ignoredProps = [
 					"key",
@@ -422,10 +424,11 @@ var RouterCore = class {
 				}
 				nextHistory.state.__hashScrollIntoViewOptions = hashScrollIntoView ?? this.options.defaultHashScrollIntoView ?? true;
 				this.shouldViewTransition = viewTransition;
-				this.history[next.replace ? "replace" : "push"](nextHistory.publicHref, nextHistory.state, { ignoreBlocker });
+				historyAction = next.replace ? "REPLACE" : "PUSH";
+				this.history[historyAction === "REPLACE" ? "replace" : "push"](nextHistory.publicHref, nextHistory.state, { ignoreBlocker });
 			}
 			this.resetNextScroll = next.resetScroll ?? true;
-			if (!this.history.subscribers.size) this.load();
+			if (!this.history.subscribers.size) this.load(historyAction ? { action: { type: historyAction } } : void 0);
 			return this.commitLocationPromise;
 		};
 		this.buildAndCommitLocation = ({ replace, resetScroll, hashScrollIntoView, viewTransition, ignoreBlocker, href, ...rest } = {}) => {
@@ -530,6 +533,7 @@ var RouterCore = class {
 			});
 		};
 		this.load = async (opts) => {
+			const historyAction = opts?.action?.type;
 			let redirect;
 			let notFound;
 			let loadPromise;
@@ -538,6 +542,8 @@ var RouterCore = class {
 				this.startTransition(async () => {
 					try {
 						this.beforeLoad();
+						if (historyAction) locationHistoryActions.set(this.latestLocation, historyAction);
+						else locationHistoryActions.delete(this.latestLocation);
 						const next = this.latestLocation;
 						const locationChangeInfo = getLocationChangeInfo(next, this.stores.resolvedLocation.get());
 						if (!this.stores.redirect.get()) this.emit({
@@ -1180,6 +1186,7 @@ exports.getInitialRouterState = getInitialRouterState;
 exports.getLocationChangeInfo = getLocationChangeInfo;
 exports.getMatchedRoutes = getMatchedRoutes;
 exports.lazyFn = lazyFn;
+exports.locationHistoryActions = locationHistoryActions;
 exports.trailingSlashOptions = trailingSlashOptions;
 
 //# sourceMappingURL=router.cjs.map