@tanstack/solid-router 2.0.0-alpha.5 → 2.0.0-alpha.7

package/dist/cjs/Transitioner.cjs

@@ -1,30 +1,44 @@
 const require_runtime = require("./_virtual/_rolldown/runtime.cjs");
 const require_useRouter = require("./useRouter.cjs");
-const require_useRouterState = require("./useRouterState.cjs");
-const require_utils = require("./utils.cjs");
 let _tanstack_router_core = require("@tanstack/router-core");
 let solid_js = require("solid-js");
 solid_js = require_runtime.__toESM(solid_js);
 //#region src/Transitioner.tsx
+/**
+* Inline version of handleHashScroll that accepts a pre-captured location
+* to avoid reading router.stores.location.state inside an effect callback
+* (which would trigger a Solid v2 reactive warning).
+*/
+function handleHashScrollWithLocation(_router, location) {
+	if (typeof document !== "undefined" && document.querySelector) {
+		const hashScrollIntoViewOptions = location.state.__hashScrollIntoViewOptions ?? true;
+		if (hashScrollIntoViewOptions && location.hash !== "") {
+			const el = document.getElementById(location.hash);
+			if (el) el.scrollIntoView(hashScrollIntoViewOptions);
+		}
+	}
+}
 function Transitioner() {
 	const router = require_useRouter.useRouter();
 	let mountLoadForRouter = {
 		router,
 		mounted: false
 	};
-	const isLoading = require_useRouterState.useRouterState({ select: ({ isLoading }) => isLoading });
+	const isLoading = solid_js.createMemo(() => router.stores.isLoading.state);
 	const [isSolidTransitioning] = [() => false];
-	const hasPendingMatches = require_useRouterState.useRouterState({ select: (s) => s.matches.some((d) => d.status === "pending") });
-	const previousIsLoading = require_utils.usePrevious(isLoading);
-	const isAnyPending = () => isLoading() || isSolidTransitioning() || hasPendingMatches();
-	const previousIsAnyPending = require_utils.usePrevious(isAnyPending);
-	const isPagePending = () => isLoading() || hasPendingMatches();
-	const previousIsPagePending = require_utils.usePrevious(isPagePending);
+	const hasPendingMatches = solid_js.createMemo(() => router.stores.hasPendingMatches.state);
+	const isAnyPending = solid_js.createMemo(() => isLoading() || isSolidTransitioning() || hasPendingMatches());
+	const isPagePending = solid_js.createMemo(() => isLoading() || hasPendingMatches());
 	router.startTransition = (fn) => {
 		solid_js.runWithOwner(null, fn);
+		try {
+			solid_js.flush();
+		} catch {}
 	};
 	solid_js.onSettled(() => {
-		const unsub = router.history.subscribe(router.load);
+		const unsub = router.history.subscribe(() => {
+			queueMicrotask(() => router.load());
+		});
 		router.updateLatestLocation();
 		const nextLocation = router.buildLocation({
 			to: router.latestLocation.pathname,
@@ -38,17 +52,17 @@ function Transitioner() {
 			...nextLocation,
 			replace: true
 		});
-		solid_js.onCleanup(() => {
+		return () => {
 			unsub();
-		});
+		};
 	});
-	solid_js.createTrackedEffect(() => {
-		solid_js.untrack(() => {
-			if (typeof window !== "undefined" && router.ssr || mountLoadForRouter.router === router && mountLoadForRouter.mounted) return;
-			mountLoadForRouter = {
-				router,
-				mounted: true
-			};
+	solid_js.onSettled(() => {
+		if (typeof window !== "undefined" && router.ssr || mountLoadForRouter.router === router && mountLoadForRouter.mounted) return;
+		mountLoadForRouter = {
+			router,
+			mounted: true
+		};
+		queueMicrotask(() => {
 			const tryLoad = async () => {
 				try {
 					await router.load();
@@ -59,31 +73,38 @@ function Transitioner() {
 			tryLoad();
 		});
 	});
-	solid_js.createEffect(() => [previousIsLoading(), isLoading()], ([previousIsLoading, isLoading]) => {
-		if (previousIsLoading.previous && !isLoading) router.emit({
+	solid_js.createRenderEffect(() => [
+		isLoading(),
+		isPagePending(),
+		isAnyPending(),
+		router.stores.location.state,
+		router.stores.resolvedLocation.state
+	], ([currentIsLoading, currentIsPagePending, currentIsAnyPending, loc, resolvedLoc], prev) => {
+		if (!loc) return;
+		const previousIsLoading = prev?.[0];
+		const previousIsPagePending = prev?.[1];
+		const previousIsAnyPending = prev?.[2];
+		if (previousIsLoading && !currentIsLoading) router.emit({
 			type: "onLoad",
-			...(0, _tanstack_router_core.getLocationChangeInfo)(router.state)
+			...(0, _tanstack_router_core.getLocationChangeInfo)(loc, resolvedLoc)
 		});
-	});
-	solid_js.createEffect(() => [isPagePending(), previousIsPagePending()], ([isPagePending, previousIsPagePending]) => {
-		if (previousIsPagePending.previous && !isPagePending) router.emit({
+		if (previousIsPagePending && !currentIsPagePending) router.emit({
 			type: "onBeforeRouteMount",
-			...(0, _tanstack_router_core.getLocationChangeInfo)(router.state)
+			...(0, _tanstack_router_core.getLocationChangeInfo)(loc, resolvedLoc)
 		});
-	});
-	solid_js.createEffect(() => [isAnyPending(), previousIsAnyPending()], ([isAnyPending, previousIsAnyPending]) => {
-		if (previousIsAnyPending.previous && !isAnyPending) {
-			const changeInfo = (0, _tanstack_router_core.getLocationChangeInfo)(router.state);
+		if (previousIsAnyPending && !currentIsAnyPending) {
+			const changeInfo = (0, _tanstack_router_core.getLocationChangeInfo)(loc, resolvedLoc);
 			router.emit({
 				type: "onResolved",
 				...changeInfo
 			});
-			router.__store.setState((s) => ({
-				...s,
-				status: "idle",
-				resolvedLocation: s.location
-			}));
-			if (changeInfo.hrefChanged) (0, _tanstack_router_core.handleHashScroll)(router);
+			solid_js.runWithOwner(null, () => {
+				router.batch(() => {
+					router.stores.status.setState(() => "idle");
+					router.stores.resolvedLocation.setState(() => loc);
+				});
+			});
+			if (changeInfo.hrefChanged) handleHashScrollWithLocation(router, loc);
 		}
 	});
 	return null;

package/dist/cjs/Transitioner.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"Transitioner.cjs","names":["Solid","getLocationChangeInfo","handleHashScroll","trimPathRight","useRouter","useRouterState","usePrevious","Transitioner","router","mountLoadForRouter","mounted","isLoading","select","isSolidTransitioning","hasPendingMatches","s","matches","some","d","status","previousIsLoading","isAnyPending","previousIsAnyPending","isPagePending","previousIsPagePending","startTransition","fn","Promise","runWithOwner","onSettled","unsub","history","subscribe","load","updateLatestLocation","nextLocation","buildLocation","to","latestLocation","pathname","search","params","hash","state","_includeValidateSearch","publicHref","commitLocation","replace","onCleanup","createTrackedEffect","untrack","window","ssr","tryLoad","err","console","error","createEffect","const","previous","emit","type","changeInfo","__store","setState","resolvedLocation","location","hrefChanged"],"sources":["../../src/Transitioner.tsx"],"sourcesContent":["import * as Solid from 'solid-js'\nimport {\n  getLocationChangeInfo,\n  handleHashScroll,\n  trimPathRight,\n} from '@tanstack/router-core'\nimport { useRouter } from './useRouter'\nimport { useRouterState } from './useRouterState'\nimport { usePrevious } from './utils'\n\nexport function Transitioner() {\n  const router = useRouter()\n  let mountLoadForRouter = { router, mounted: false }\n  const isLoading = useRouterState({\n    select: ({ isLoading }) => isLoading,\n  })\n\n  const [isSolidTransitioning] = [() => false]\n\n  // Track pending state changes\n  const hasPendingMatches = useRouterState({\n    select: (s) => s.matches.some((d) => d.status === 'pending'),\n  })\n\n  const previousIsLoading = usePrevious(isLoading)\n\n  const isAnyPending = () =>\n    isLoading() || isSolidTransitioning() || hasPendingMatches()\n  const previousIsAnyPending = usePrevious(isAnyPending)\n\n  const isPagePending = () => isLoading() || hasPendingMatches()\n  const previousIsPagePending = usePrevious(isPagePending)\n\n  router.startTransition = (fn: () => void | Promise<void>) => {\n    Solid.runWithOwner(null, fn)\n  }\n\n  // Subscribe to location changes\n  // and try to load the new location\n  Solid.onSettled(() => {\n    const unsub = router.history.subscribe(router.load)\n\n    // Refresh latestLocation from the current browser URL before comparing.\n    // The URL may have been changed synchronously (e.g. via replaceState) after\n    // render() but before this effect ran, so we must not use the stale\n    // render-time location here.\n    router.updateLatestLocation()\n\n    const nextLocation = router.buildLocation({\n      to: router.latestLocation.pathname,\n      search: true,\n      params: true,\n      hash: true,\n      state: true,\n      _includeValidateSearch: true,\n    })\n\n    // Check if the current URL matches the canonical form.\n    // Compare publicHref (browser-facing URL) for consistency with\n    // the server-side redirect check in router.beforeLoad.\n    if (\n      trimPathRight(router.latestLocation.publicHref) !==\n      trimPathRight(nextLocation.publicHref)\n    ) {\n      router.commitLocation({ ...nextLocation, replace: true })\n    }\n\n    Solid.onCleanup(() => {\n      unsub()\n    })\n  })\n\n  // Try to load the initial location\n  Solid.createTrackedEffect(() => {\n    Solid.untrack(() => {\n      if (\n        // if we are hydrating from SSR, loading is triggered in ssr-client\n        (typeof window !== 'undefined' && router.ssr) ||\n        (mountLoadForRouter.router === router && mountLoadForRouter.mounted)\n      ) {\n        return\n      }\n      mountLoadForRouter = { router, mounted: true }\n      const tryLoad = async () => {\n        try {\n          await router.load()\n        } catch (err) {\n          console.error(err)\n        }\n      }\n      tryLoad()\n    })\n  })\n\n  Solid.createEffect(\n    () => [previousIsLoading(), isLoading()] as const,\n    ([previousIsLoading, isLoading]) => {\n      if (previousIsLoading.previous && !isLoading) {\n        router.emit({\n          type: 'onLoad',\n          ...getLocationChangeInfo(router.state),\n        })\n      }\n    },\n  )\n\n  Solid.createEffect(\n    () => [isPagePending(), previousIsPagePending()] as const,\n    ([isPagePending, previousIsPagePending]) => {\n      // emit onBeforeRouteMount\n      if (previousIsPagePending.previous && !isPagePending) {\n        router.emit({\n          type: 'onBeforeRouteMount',\n          ...getLocationChangeInfo(router.state),\n        })\n      }\n    },\n  )\n\n  Solid.createEffect(\n    () => [isAnyPending(), previousIsAnyPending()] as const,\n    ([isAnyPending, previousIsAnyPending]) => {\n      if (previousIsAnyPending.previous && !isAnyPending) {\n        const changeInfo = getLocationChangeInfo(router.state)\n        router.emit({\n          type: 'onResolved',\n          ...changeInfo,\n        })\n\n        router.__store.setState((s) => ({\n          ...s,\n          status: 'idle',\n          resolvedLocation: s.location,\n        }))\n\n        if (changeInfo.hrefChanged) {\n          handleHashScroll(router)\n        }\n      }\n    },\n  )\n\n  return null\n}\n"],"mappings":"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"}
+{"version":3,"file":"Transitioner.cjs","names":["Solid","getLocationChangeInfo","trimPathRight","useRouter","ParsedLocation","handleHashScrollWithLocation","_router","location","document","querySelector","hashScrollIntoViewOptions","state","__hashScrollIntoViewOptions","hash","el","getElementById","scrollIntoView","Transitioner","router","mountLoadForRouter","mounted","isLoading","createMemo","stores","isSolidTransitioning","hasPendingMatches","isAnyPending","isPagePending","startTransition","fn","Promise","runWithOwner","flush","onSettled","unsub","history","subscribe","queueMicrotask","load","updateLatestLocation","nextLocation","buildLocation","to","latestLocation","pathname","search","params","_includeValidateSearch","publicHref","commitLocation","replace","window","ssr","tryLoad","err","console","error","createRenderEffect","resolvedLocation","const","currentIsLoading","currentIsPagePending","currentIsAnyPending","loc","resolvedLoc","prev","previousIsLoading","previousIsPagePending","previousIsAnyPending","emit","type","changeInfo","batch","status","setState","hrefChanged"],"sources":["../../src/Transitioner.tsx"],"sourcesContent":["import * as Solid from 'solid-js'\nimport { getLocationChangeInfo, trimPathRight } from '@tanstack/router-core'\nimport { useRouter } from './useRouter'\nimport type { ParsedLocation } from '@tanstack/router-core'\n\n/**\n * Inline version of handleHashScroll that accepts a pre-captured location\n * to avoid reading router.stores.location.state inside an effect callback\n * (which would trigger a Solid v2 reactive warning).\n */\nfunction handleHashScrollWithLocation(_router: any, location: ParsedLocation) {\n  if (typeof document !== 'undefined' && (document as any).querySelector) {\n    const hashScrollIntoViewOptions =\n      location.state.__hashScrollIntoViewOptions ?? true\n\n    if (hashScrollIntoViewOptions && location.hash !== '') {\n      const el = document.getElementById(location.hash)\n      if (el) {\n        el.scrollIntoView(hashScrollIntoViewOptions)\n      }\n    }\n  }\n}\n\nexport function Transitioner() {\n  const router = useRouter()\n  let mountLoadForRouter = { router, mounted: false }\n  const isLoading = Solid.createMemo(() => router.stores.isLoading.state)\n\n  const [isSolidTransitioning] = [() => false]\n\n  // Track pending state changes\n  const hasPendingMatches = Solid.createMemo(\n    () => router.stores.hasPendingMatches.state,\n  )\n\n  const isAnyPending = Solid.createMemo(\n    () => isLoading() || isSolidTransitioning() || hasPendingMatches(),\n  )\n\n  const isPagePending = Solid.createMemo(\n    () => isLoading() || hasPendingMatches(),\n  )\n\n  router.startTransition = (fn: () => void | Promise<void>) => {\n    Solid.runWithOwner(null, fn)\n    try {\n      Solid.flush()\n    } catch {\n      // flush() throws inside reactive contexts — Solid auto-flushes there\n    }\n  }\n\n  // Subscribe to location changes\n  // and try to load the new location\n  Solid.onSettled(() => {\n    const unsub = router.history.subscribe(() => {\n      queueMicrotask(() => router.load())\n    })\n\n    // Refresh latestLocation from the current browser URL before comparing.\n    // The URL may have been changed synchronously (e.g. via replaceState) after\n    // render() but before this effect ran, so we must not use the stale\n    // render-time location here.\n    router.updateLatestLocation()\n\n    const nextLocation = router.buildLocation({\n      to: router.latestLocation.pathname,\n      search: true,\n      params: true,\n      hash: true,\n      state: true,\n      _includeValidateSearch: true,\n    })\n\n    // Check if the current URL matches the canonical form.\n    // Compare publicHref (browser-facing URL) for consistency with\n    // the server-side redirect check in router.beforeLoad.\n    if (\n      trimPathRight(router.latestLocation.publicHref) !==\n      trimPathRight(nextLocation.publicHref)\n    ) {\n      router.commitLocation({ ...nextLocation, replace: true })\n    }\n\n    return () => {\n      unsub()\n    }\n  })\n\n  // Try to load the initial location\n  // In Solid v2, signal updates inside onSettled cannot be flushed\n  // synchronously (flush() throws). router.load() sets signals via batch(),\n  // and the code that runs immediately after needs those values committed.\n  // By deferring to queueMicrotask, the load runs outside the reactive\n  // scheduling frame so flush() works correctly.\n  Solid.onSettled(() => {\n    if (\n      // if we are hydrating from SSR, loading is triggered in ssr-client\n      (typeof window !== 'undefined' && router.ssr) ||\n      (mountLoadForRouter.router === router && mountLoadForRouter.mounted)\n    ) {\n      return\n    }\n    mountLoadForRouter = { router, mounted: true }\n    queueMicrotask(() => {\n      const tryLoad = async () => {\n        try {\n          await router.load()\n        } catch (err) {\n          console.error(err)\n        }\n      }\n      tryLoad()\n    })\n  })\n  Solid.createRenderEffect(\n    () =>\n      [\n        isLoading(),\n        isPagePending(),\n        isAnyPending(),\n        router.stores.location.state,\n        router.stores.resolvedLocation.state,\n      ] as const,\n    (\n      [\n        currentIsLoading,\n        currentIsPagePending,\n        currentIsAnyPending,\n        loc,\n        resolvedLoc,\n      ],\n      prev,\n    ) => {\n      // Guard: if location state isn't available yet, skip all event emissions\n      if (!loc) return\n\n      const previousIsLoading = prev?.[0]\n      const previousIsPagePending = prev?.[1]\n      const previousIsAnyPending = prev?.[2]\n\n      // onLoad: when the router finishes loading\n      if (previousIsLoading && !currentIsLoading) {\n        router.emit({\n          type: 'onLoad',\n          ...getLocationChangeInfo(loc, resolvedLoc),\n        })\n      }\n\n      // onBeforeRouteMount: must fire before onResolved\n      if (previousIsPagePending && !currentIsPagePending) {\n        router.emit({\n          type: 'onBeforeRouteMount',\n          ...getLocationChangeInfo(loc, resolvedLoc),\n        })\n      }\n\n      // onResolved: fires after onBeforeRouteMount\n      if (previousIsAnyPending && !currentIsAnyPending) {\n        const changeInfo = getLocationChangeInfo(loc, resolvedLoc)\n        router.emit({\n          type: 'onResolved',\n          ...changeInfo,\n        })\n\n        Solid.runWithOwner(null, () => {\n          router.batch(() => {\n            router.stores.status.setState(() => 'idle')\n            // Use `loc` from the source tuple to avoid reading\n            // router.stores.location.state inside the effect callback\n            router.stores.resolvedLocation.setState(() => loc)\n          })\n        })\n\n        if (changeInfo.hrefChanged) {\n          // Pass the already-captured location to avoid a reactive read\n          // inside the effect callback (handleHashScroll would otherwise\n          // read router.stores.location.state which triggers a warning)\n          handleHashScrollWithLocation(router, loc)\n        }\n      }\n    },\n  )\n\n  return null\n}\n"],"mappings":"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"}

package/dist/cjs/headContentUtils.cjs

@@ -1,6 +1,5 @@
 const require_runtime = require("./_virtual/_rolldown/runtime.cjs");
 const require_useRouter = require("./useRouter.cjs");
-const require_useRouterState = require("./useRouterState.cjs");
 let _tanstack_router_core = require("@tanstack/router-core");
 let solid_js = require("solid-js");
 solid_js = require_runtime.__toESM(solid_js);
@@ -12,9 +11,9 @@ solid_js = require_runtime.__toESM(solid_js);
 var useTags = () => {
 	const router = require_useRouter.useRouter();
 	const nonce = router.options.ssr?.nonce;
-	const routeMeta = require_useRouterState.useRouterState({ select: (state) => {
-		return state.matches.map((match) => match.meta).filter(Boolean);
-	} });
+	const getTagKey = (tag) => JSON.stringify(tag);
+	const activeMatches = solid_js.createMemo(() => router.stores.activeMatchesSnapshot.state);
+	const routeMeta = solid_js.createMemo(() => activeMatches().map((match) => match.meta).filter(Boolean));
 	const meta = solid_js.createMemo(() => {
 		const resultMeta = [];
 		const metaByAttribute = {};
@@ -63,8 +62,9 @@ var useTags = () => {
 		resultMeta.reverse();
 		return resultMeta;
 	});
-	const links = require_useRouterState.useRouterState({ select: (state) => {
-		const constructed = state.matches.map((match) => match.links).filter(Boolean).flat(1).map((link) => ({
+	const links = solid_js.createMemo(() => {
+		const matches = activeMatches();
+		const constructed = matches.map((match) => match.links).filter(Boolean).flat(1).map((link) => ({
 			tag: "link",
 			attrs: {
 				...link,
@@ -72,7 +72,7 @@ var useTags = () => {
 			}
 		}));
 		const manifest = router.ssr?.manifest;
-		const assets = state.matches.map((match) => manifest?.routes[match.routeId]?.assets ?? []).filter(Boolean).flat(1).filter((asset) => asset.tag === "link").map((asset) => ({
+		const assets = matches.map((match) => manifest?.routes[match.routeId]?.assets ?? []).filter(Boolean).flat(1).filter((asset) => asset.tag === "link").map((asset) => ({
 			tag: "link",
 			attrs: {
 				...asset.attrs,
@@ -80,10 +80,11 @@ var useTags = () => {
 			}
 		}));
 		return [...constructed, ...assets];
-	} });
-	const preloadLinks = require_useRouterState.useRouterState({ select: (state) => {
+	});
+	const preloadLinks = solid_js.createMemo(() => {
+		const matches = activeMatches();
 		const preloadLinks = [];
-		state.matches.map((match) => router.looseRoutesById[match.routeId]).forEach((route) => router.ssr?.manifest?.routes[route.id]?.preloads?.filter(Boolean).forEach((preload) => {
+		matches.map((match) => router.looseRoutesById[match.routeId]).forEach((route) => router.ssr?.manifest?.routes[route.id]?.preloads?.filter(Boolean).forEach((preload) => {
 			preloadLinks.push({
 				tag: "link",
 				attrs: {
@@ -94,31 +95,33 @@ var useTags = () => {
 			});
 		}));
 		return preloadLinks;
-	} });
-	const styles = require_useRouterState.useRouterState({ select: (state) => state.matches.map((match) => match.styles).flat(1).filter(Boolean).map(({ children, ...style }) => ({
+	});
+	const styles = solid_js.createMemo(() => activeMatches().map((match) => match.styles).flat(1).filter(Boolean).map(({ children, ...style }) => ({
 		tag: "style",
 		attrs: {
 			...style,
 			nonce
 		},
 		children
-	})) });
-	const headScripts = require_useRouterState.useRouterState({ select: (state) => state.matches.map((match) => match.headScripts).flat(1).filter(Boolean).map(({ children, ...script }) => ({
+	})));
+	const headScripts = solid_js.createMemo(() => activeMatches().map((match) => match.headScripts).flat(1).filter(Boolean).map(({ children, ...script }) => ({
 		tag: "script",
 		attrs: {
 			...script,
 			nonce
 		},
 		children
-	})) });
-	return () => uniqBy([
-		...meta(),
-		...preloadLinks(),
-		...links(),
-		...styles(),
-		...headScripts()
-	], (d) => {
-		return JSON.stringify(d);
+	})));
+	return solid_js.createMemo((prev) => {
+		const next = uniqBy([
+			...meta(),
+			...preloadLinks(),
+			...links(),
+			...styles(),
+			...headScripts()
+		], getTagKey);
+		if (prev && prev.length === next.length && prev.every((tag, index) => getTagKey(tag) === getTagKey(next[index]))) return prev;
+		return next;
 	});
 };
 function uniqBy(arr, fn) {

package/dist/cjs/headContentUtils.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"headContentUtils.cjs","names":["Solid","escapeHtml","useRouter","useRouterState","RouterManagedTag","useTags","router","nonce","options","ssr","routeMeta","select","state","matches","map","match","meta","filter","Boolean","Accessor","Array","createMemo","resultMeta","metaByAttribute","Record","title","routeMetasArray","i","length","metas","j","m","tag","children","json","JSON","stringify","push","attrs","type","attribute","name","property","content","reverse","links","constructed","flat","link","manifest","assets","routes","routeId","asset","preloadLinks","looseRoutesById","forEach","route","id","preloads","preload","rel","href","styles","style","headScripts","script","uniqBy","d","arr","T","fn","item","seen","Set","key","has","add"],"sources":["../../src/headContentUtils.tsx"],"sourcesContent":["import * as Solid from 'solid-js'\nimport { escapeHtml } from '@tanstack/router-core'\nimport { useRouter } from './useRouter'\nimport { useRouterState } from './useRouterState'\nimport type { RouterManagedTag } from '@tanstack/router-core'\n\n/**\n * Build the list of head/link/meta/script tags to render for active matches.\n * Used internally by `HeadContent`.\n */\nexport const useTags = () => {\n  const router = useRouter()\n  const nonce = router.options.ssr?.nonce\n  const routeMeta = useRouterState({\n    select: (state) => {\n      return state.matches.map((match) => match.meta!).filter(Boolean)\n    },\n  })\n\n  const meta: Solid.Accessor<Array<RouterManagedTag>> = Solid.createMemo(() => {\n    const resultMeta: Array<RouterManagedTag> = []\n    const metaByAttribute: Record<string, true> = {}\n    let title: RouterManagedTag | undefined\n    const routeMetasArray = routeMeta()\n    for (let i = routeMetasArray.length - 1; i >= 0; i--) {\n      const metas = routeMetasArray[i]!\n      for (let j = metas.length - 1; j >= 0; j--) {\n        const m = metas[j]\n        if (!m) continue\n\n        if (m.title) {\n          if (!title) {\n            title = {\n              tag: 'title',\n              children: m.title,\n            }\n          }\n        } else if ('script:ld+json' in m) {\n          // Handle JSON-LD structured data\n          // Content is HTML-escaped to prevent XSS when injected via innerHTML\n          try {\n            const json = JSON.stringify(m['script:ld+json'])\n            resultMeta.push({\n              tag: 'script',\n              attrs: {\n                type: 'application/ld+json',\n              },\n              children: escapeHtml(json),\n            })\n          } catch {\n            // Skip invalid JSON-LD objects\n          }\n        } else {\n          const attribute = m.name ?? m.property\n          if (attribute) {\n            if (metaByAttribute[attribute]) {\n              continue\n            } else {\n              metaByAttribute[attribute] = true\n            }\n          }\n\n          resultMeta.push({\n            tag: 'meta',\n            attrs: {\n              ...m,\n              nonce,\n            },\n          })\n        }\n      }\n    }\n\n    if (title) {\n      resultMeta.push(title)\n    }\n\n    if (router.options.ssr?.nonce) {\n      resultMeta.push({\n        tag: 'meta',\n        attrs: {\n          property: 'csp-nonce',\n          content: router.options.ssr.nonce,\n        },\n      })\n    }\n    resultMeta.reverse()\n\n    return resultMeta\n  })\n\n  const links = useRouterState({\n    select: (state) => {\n      const constructed = state.matches\n        .map((match) => match.links!)\n        .filter(Boolean)\n        .flat(1)\n        .map((link) => ({\n          tag: 'link',\n          attrs: {\n            ...link,\n            nonce,\n          },\n        })) satisfies Array<RouterManagedTag>\n\n      const manifest = router.ssr?.manifest\n\n      const assets = state.matches\n        .map((match) => manifest?.routes[match.routeId]?.assets ?? [])\n        .filter(Boolean)\n        .flat(1)\n        .filter((asset) => asset.tag === 'link')\n        .map(\n          (asset) =>\n            ({\n              tag: 'link',\n              attrs: { ...asset.attrs, nonce },\n            }) satisfies RouterManagedTag,\n        )\n\n      return [...constructed, ...assets]\n    },\n  })\n\n  const preloadLinks = useRouterState({\n    select: (state) => {\n      const preloadLinks: Array<RouterManagedTag> = []\n\n      state.matches\n        .map((match) => router.looseRoutesById[match.routeId]!)\n        .forEach((route) =>\n          router.ssr?.manifest?.routes[route.id]?.preloads\n            ?.filter(Boolean)\n            .forEach((preload) => {\n              preloadLinks.push({\n                tag: 'link',\n                attrs: {\n                  rel: 'modulepreload',\n                  href: preload,\n                  nonce,\n                },\n              })\n            }),\n        )\n\n      return preloadLinks\n    },\n  })\n\n  const styles = useRouterState({\n    select: (state) =>\n      (\n        state.matches\n          .map((match) => match.styles!)\n          .flat(1)\n          .filter(Boolean) as Array<RouterManagedTag>\n      ).map(({ children, ...style }) => ({\n        tag: 'style',\n        attrs: {\n          ...style,\n          nonce,\n        },\n        children,\n      })),\n  })\n\n  const headScripts = useRouterState({\n    select: (state) =>\n      (\n        state.matches\n          .map((match) => match.headScripts!)\n          .flat(1)\n          .filter(Boolean) as Array<RouterManagedTag>\n      ).map(({ children, ...script }) => ({\n        tag: 'script',\n        attrs: {\n          ...script,\n          nonce,\n        },\n        children,\n      })),\n  })\n\n  return () =>\n    uniqBy(\n      [\n        ...meta(),\n        ...preloadLinks(),\n        ...links(),\n        ...styles(),\n        ...headScripts(),\n      ] as Array<RouterManagedTag>,\n      (d) => {\n        return JSON.stringify(d)\n      },\n    )\n}\n\nexport function uniqBy<T>(arr: Array<T>, fn: (item: T) => string) {\n  const seen = new Set<string>()\n  return arr.filter((item) => {\n    const key = fn(item)\n    if (seen.has(key)) {\n      return false\n    }\n    seen.add(key)\n    return true\n  })\n}\n"],"mappings":"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"}
+{"version":3,"file":"headContentUtils.cjs","names":["Solid","escapeHtml","useRouter","RouterManagedTag","useTags","router","nonce","options","ssr","getTagKey","tag","JSON","stringify","activeMatches","createMemo","stores","activeMatchesSnapshot","state","routeMeta","map","match","meta","filter","Boolean","Accessor","Array","resultMeta","metaByAttribute","Record","title","routeMetasArray","i","length","metas","j","m","children","json","push","attrs","type","attribute","name","property","content","reverse","links","matches","constructed","flat","link","manifest","assets","routes","routeId","asset","preloadLinks","looseRoutesById","forEach","route","id","preloads","preload","rel","href","styles","style","headScripts","script","prev","next","uniqBy","every","index","arr","T","fn","item","seen","Set","key","has","add"],"sources":["../../src/headContentUtils.tsx"],"sourcesContent":["import * as Solid from 'solid-js'\nimport { escapeHtml } from '@tanstack/router-core'\nimport { useRouter } from './useRouter'\nimport type { RouterManagedTag } from '@tanstack/router-core'\n\n/**\n * Build the list of head/link/meta/script tags to render for active matches.\n * Used internally by `HeadContent`.\n */\nexport const useTags = () => {\n  const router = useRouter()\n  const nonce = router.options.ssr?.nonce\n  const getTagKey = (tag: RouterManagedTag) => JSON.stringify(tag)\n  const activeMatches = Solid.createMemo(\n    () => router.stores.activeMatchesSnapshot.state,\n  )\n  const routeMeta = Solid.createMemo(() =>\n    activeMatches()\n      .map((match) => match.meta!)\n      .filter(Boolean),\n  )\n\n  const meta: Solid.Accessor<Array<RouterManagedTag>> = Solid.createMemo(() => {\n    const resultMeta: Array<RouterManagedTag> = []\n    const metaByAttribute: Record<string, true> = {}\n    let title: RouterManagedTag | undefined\n    const routeMetasArray = routeMeta()\n    for (let i = routeMetasArray.length - 1; i >= 0; i--) {\n      const metas = routeMetasArray[i]!\n      for (let j = metas.length - 1; j >= 0; j--) {\n        const m = metas[j]\n        if (!m) continue\n\n        if (m.title) {\n          if (!title) {\n            title = {\n              tag: 'title',\n              children: m.title,\n            }\n          }\n        } else if ('script:ld+json' in m) {\n          // Handle JSON-LD structured data\n          // Content is HTML-escaped to prevent XSS when injected via innerHTML\n          try {\n            const json = JSON.stringify(m['script:ld+json'])\n            resultMeta.push({\n              tag: 'script',\n              attrs: {\n                type: 'application/ld+json',\n              },\n              children: escapeHtml(json),\n            })\n          } catch {\n            // Skip invalid JSON-LD objects\n          }\n        } else {\n          const attribute = m.name ?? m.property\n          if (attribute) {\n            if (metaByAttribute[attribute]) {\n              continue\n            } else {\n              metaByAttribute[attribute] = true\n            }\n          }\n\n          resultMeta.push({\n            tag: 'meta',\n            attrs: {\n              ...m,\n              nonce,\n            },\n          })\n        }\n      }\n    }\n\n    if (title) {\n      resultMeta.push(title)\n    }\n\n    if (router.options.ssr?.nonce) {\n      resultMeta.push({\n        tag: 'meta',\n        attrs: {\n          property: 'csp-nonce',\n          content: router.options.ssr.nonce,\n        },\n      })\n    }\n    resultMeta.reverse()\n\n    return resultMeta\n  })\n\n  const links = Solid.createMemo(() => {\n    const matches = activeMatches()\n    const constructed = matches\n      .map((match) => match.links!)\n      .filter(Boolean)\n      .flat(1)\n      .map((link) => ({\n        tag: 'link',\n        attrs: {\n          ...link,\n          nonce,\n        },\n      })) satisfies Array<RouterManagedTag>\n\n    const manifest = router.ssr?.manifest\n\n    const assets = matches\n      .map((match) => manifest?.routes[match.routeId]?.assets ?? [])\n      .filter(Boolean)\n      .flat(1)\n      .filter((asset) => asset.tag === 'link')\n      .map(\n        (asset) =>\n          ({\n            tag: 'link',\n            attrs: { ...asset.attrs, nonce },\n          }) satisfies RouterManagedTag,\n      )\n\n    return [...constructed, ...assets]\n  })\n\n  const preloadLinks = Solid.createMemo(() => {\n    const matches = activeMatches()\n    const preloadLinks: Array<RouterManagedTag> = []\n\n    matches\n      .map((match) => router.looseRoutesById[match.routeId]!)\n      .forEach((route) =>\n        router.ssr?.manifest?.routes[route.id]?.preloads\n          ?.filter(Boolean)\n          .forEach((preload) => {\n            preloadLinks.push({\n              tag: 'link',\n              attrs: {\n                rel: 'modulepreload',\n                href: preload,\n                nonce,\n              },\n            })\n          }),\n      )\n\n    return preloadLinks\n  })\n\n  const styles = Solid.createMemo(() =>\n    (\n      activeMatches()\n        .map((match) => match.styles!)\n        .flat(1)\n        .filter(Boolean) as Array<RouterManagedTag>\n    ).map(({ children, ...style }) => ({\n      tag: 'style',\n      attrs: {\n        ...style,\n        nonce,\n      },\n      children,\n    })),\n  )\n\n  const headScripts = Solid.createMemo(() =>\n    (\n      activeMatches()\n        .map((match) => match.headScripts!)\n        .flat(1)\n        .filter(Boolean) as Array<RouterManagedTag>\n    ).map(({ children, ...script }) => ({\n      tag: 'script',\n      attrs: {\n        ...script,\n        nonce,\n      },\n      children,\n    })),\n  )\n\n  return Solid.createMemo((prev: Array<RouterManagedTag> | undefined) => {\n    const next = uniqBy(\n      [\n        ...meta(),\n        ...preloadLinks(),\n        ...links(),\n        ...styles(),\n        ...headScripts(),\n      ] as Array<RouterManagedTag>,\n      getTagKey,\n    )\n\n    if (\n      prev &&\n      prev.length === next.length &&\n      prev.every((tag, index) => getTagKey(tag) === getTagKey(next[index]!))\n    ) {\n      return prev\n    }\n\n    return next\n  })\n}\n\nexport function uniqBy<T>(arr: Array<T>, fn: (item: T) => string) {\n  const seen = new Set<string>()\n  return arr.filter((item) => {\n    const key = fn(item)\n    if (seen.has(key)) {\n      return false\n    }\n    seen.add(key)\n    return true\n  })\n}\n"],"mappings":"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"}

package/dist/cjs/headContentUtils.d.cts

@@ -1,7 +1,8 @@
 import { RouterManagedTag } from '@tanstack/router-core';
+import * as Solid from 'solid-js';
 /**
  * Build the list of head/link/meta/script tags to render for active matches.
  * Used internally by `HeadContent`.
  */
-export declare const useTags: () => () => RouterManagedTag[];
+export declare const useTags: () => Solid.Accessor<RouterManagedTag[]>;
 export declare function uniqBy<T>(arr: Array<T>, fn: (item: T) => string): T[];

package/dist/cjs/index.cjs

@@ -4,7 +4,6 @@ const require_awaited = require("./awaited.cjs");
 const require_CatchBoundary = require("./CatchBoundary.cjs");
 const require_ClientOnly = require("./ClientOnly.cjs");
 const require_useRouter = require("./useRouter.cjs");
-const require_useRouterState = require("./useRouterState.cjs");
 const require_link = require("./link.cjs");
 const require_useMatch = require("./useMatch.cjs");
 const require_useLoaderData = require("./useLoaderData.cjs");
@@ -24,6 +23,7 @@ const require_router = require("./router.cjs");
 const require_RouterProvider = require("./RouterProvider.cjs");
 const require_ScrollRestoration = require("./ScrollRestoration.cjs");
 const require_useBlocker = require("./useBlocker.cjs");
+const require_useRouterState = require("./useRouterState.cjs");
 const require_useLocation = require("./useLocation.cjs");
 const require_useCanGoBack = require("./useCanGoBack.cjs");
 const require_Asset = require("./Asset.cjs");

package/dist/cjs/index.dev.cjs

@@ -4,7 +4,6 @@ const require_awaited = require("./awaited.cjs");
 const require_CatchBoundary = require("./CatchBoundary.cjs");
 const require_ClientOnly = require("./ClientOnly.cjs");
 const require_useRouter = require("./useRouter.cjs");
-const require_useRouterState = require("./useRouterState.cjs");
 const require_link = require("./link.cjs");
 const require_useMatch = require("./useMatch.cjs");
 const require_useLoaderData = require("./useLoaderData.cjs");
@@ -24,6 +23,7 @@ const require_router = require("./router.cjs");
 const require_RouterProvider = require("./RouterProvider.cjs");
 const require_ScrollRestoration = require("./ScrollRestoration.cjs");
 const require_useBlocker = require("./useBlocker.cjs");
+const require_useRouterState = require("./useRouterState.cjs");
 const require_useLocation = require("./useLocation.cjs");
 const require_useCanGoBack = require("./useCanGoBack.cjs");
 const require_Asset = require("./Asset.cjs");