@tanstack/solid-router - npm Package Compare versions

Comparing version 1.170.24 to 1.170.25

dist/cjs/nonRouteComponentContext.cjs

+const require_runtime = require("./_virtual/_rolldown/runtime.cjs");
+let solid_js_web = require("solid-js/web");
+let solid_js = require("solid-js");
+solid_js = require_runtime.__toESM(solid_js, 1);
+//#region src/nonRouteComponentContext.tsx
+var nonRouteComponentContext = process.env.NODE_ENV !== "production" ? /* @__PURE__ */ solid_js.createContext() : void 0;
+function renderInNonRouteComponentContext(render, component) {
+	return (0, solid_js_web.createComponent)(nonRouteComponentContext.Provider, {
+		value: component,
+		get children() {
+			return render();
+		}
+	});
+}
+//#endregion
+exports.nonRouteComponentContext = nonRouteComponentContext;
+exports.renderInNonRouteComponentContext = renderInNonRouteComponentContext;
+
+//# sourceMappingURL=nonRouteComponentContext.cjs.map

dist/cjs/nonRouteComponentContext.cjs.map

+{"version":3,"file":"nonRouteComponentContext.cjs","names":["Solid","NonRouteComponent","nonRouteComponentContext","process","env","NODE_ENV","createContext","undefined","renderInNonRouteComponentContext","render","JSX","Element","component","Context","_$createComponent","Provider","value","children"],"sources":["../../src/nonRouteComponentContext.tsx"],"sourcesContent":["import * as Solid from 'solid-js'\n\nexport type NonRouteComponent =\n  | 'pendingComponent'\n  | 'errorComponent'\n  | 'notFoundComponent'\n\nexport const nonRouteComponentContext =\n  process.env.NODE_ENV !== 'production'\n    ? /* @__PURE__ */ Solid.createContext<NonRouteComponent>()\n    : undefined\n\nexport function renderInNonRouteComponentContext(\n  render: () => Solid.JSX.Element,\n  component: NonRouteComponent,\n) {\n  const Context = nonRouteComponentContext!\n  return <Context.Provider value={component}>{render()}</Context.Provider>\n}\n"],"mappings":";;;;;AAOA,IAAaE,2BAAAA,QAAAA,IAAAA,aACc,eACLF,yBAAMM,cAAiC,IACvDC,KAAAA;AAEN,SAAgBC,iCACdC,QACAG,WACA;CAEA,QAAA,GAAA,aAAA,iBAAQC,yBAAQE,UAAQ;EAACC,OAAOJ;EAAS,IAAAK,WAAA;GAAA,OAAGR,OAAO;EAAC;CAAA,CAAA;AACtD"}

dist/cjs/nonRouteComponentContext.d.cts

+import * as Solid from 'solid-js';
+export type NonRouteComponent = 'pendingComponent' | 'errorComponent' | 'notFoundComponent';
+export declare const nonRouteComponentContext: Solid.Context<NonRouteComponent | undefined> | undefined;
+export declare function renderInNonRouteComponentContext(render: () => Solid.JSX.Element, component: NonRouteComponent): Solid.JSX.Element;

dist/esm/nonRouteComponentContext.d.ts

+import * as Solid from 'solid-js';
+export type NonRouteComponent = 'pendingComponent' | 'errorComponent' | 'notFoundComponent';
+export declare const nonRouteComponentContext: Solid.Context<NonRouteComponent | undefined> | undefined;
+export declare function renderInNonRouteComponentContext(render: () => Solid.JSX.Element, component: NonRouteComponent): Solid.JSX.Element;

dist/esm/nonRouteComponentContext.js

+import { createComponent } from "solid-js/web";
+import * as Solid from "solid-js";
+//#region src/nonRouteComponentContext.tsx
+var nonRouteComponentContext = process.env.NODE_ENV !== "production" ? /* @__PURE__ */ Solid.createContext() : void 0;
+function renderInNonRouteComponentContext(render, component) {
+	return createComponent(nonRouteComponentContext.Provider, {
+		value: component,
+		get children() {
+			return render();
+		}
+	});
+}
+//#endregion
+export { nonRouteComponentContext, renderInNonRouteComponentContext };
+
+//# sourceMappingURL=nonRouteComponentContext.js.map

dist/esm/nonRouteComponentContext.js.map

+{"version":3,"file":"nonRouteComponentContext.js","names":["Solid","NonRouteComponent","nonRouteComponentContext","process","env","NODE_ENV","createContext","undefined","renderInNonRouteComponentContext","render","JSX","Element","component","Context","_$createComponent","Provider","value","children"],"sources":["../../src/nonRouteComponentContext.tsx"],"sourcesContent":["import * as Solid from 'solid-js'\n\nexport type NonRouteComponent =\n  | 'pendingComponent'\n  | 'errorComponent'\n  | 'notFoundComponent'\n\nexport const nonRouteComponentContext =\n  process.env.NODE_ENV !== 'production'\n    ? /* @__PURE__ */ Solid.createContext<NonRouteComponent>()\n    : undefined\n\nexport function renderInNonRouteComponentContext(\n  render: () => Solid.JSX.Element,\n  component: NonRouteComponent,\n) {\n  const Context = nonRouteComponentContext!\n  return <Context.Provider value={component}>{render()}</Context.Provider>\n}\n"],"mappings":";;;AAOA,IAAaE,2BAAAA,QAAAA,IAAAA,aACc,eACLF,sBAAMM,cAAiC,IACvDC,KAAAA;AAEN,SAAgBC,iCACdC,QACAG,WACA;CAEA,OAAAE,gBAAQD,yBAAQE,UAAQ;EAACC,OAAOJ;EAAS,IAAAK,WAAA;GAAA,OAAGR,OAAO;EAAC;CAAA,CAAA;AACtD"}

dist/source/nonRouteComponentContext.d.ts

+import * as Solid from 'solid-js';
+export type NonRouteComponent = 'pendingComponent' | 'errorComponent' | 'notFoundComponent';
+export declare const nonRouteComponentContext: Solid.Context<NonRouteComponent | undefined> | undefined;
+export declare function renderInNonRouteComponentContext(render: () => Solid.JSX.Element, component: NonRouteComponent): Solid.JSX.Element;

dist/source/nonRouteComponentContext.jsx

+import * as Solid from 'solid-js';
+export const nonRouteComponentContext = process.env.NODE_ENV !== 'production'
+    ? /* @__PURE__ */ Solid.createContext()
+    : undefined;
+export function renderInNonRouteComponentContext(render, component) {
+    const Context = nonRouteComponentContext;
+    return <Context.Provider value={component}>{render()}</Context.Provider>;
+}
+//# sourceMappingURL=nonRouteComponentContext.jsx.map

dist/source/nonRouteComponentContext.jsx.map

+{"version":3,"file":"nonRouteComponentContext.jsx","sourceRoot":"","sources":["../../src/nonRouteComponentContext.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,UAAU,CAAA;AAOjC,MAAM,CAAC,MAAM,wBAAwB,GACnC,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,YAAY;IACnC,CAAC,CAAC,eAAe,CAAC,KAAK,CAAC,aAAa,EAAqB;IAC1D,CAAC,CAAC,SAAS,CAAA;AAEf,MAAM,UAAU,gCAAgC,CAC9C,MAA+B,EAC/B,SAA4B;IAE5B,MAAM,OAAO,GAAG,wBAAyB,CAAA;IACzC,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAA;AAC1E,CAAC"}

src/nonRouteComponentContext.tsx

+import * as Solid from 'solid-js'
+
+export type NonRouteComponent =
+  | 'pendingComponent'
+  | 'errorComponent'
+  | 'notFoundComponent'
+
+export const nonRouteComponentContext =
+  process.env.NODE_ENV !== 'production'
+    ? /* @__PURE__ */ Solid.createContext<NonRouteComponent>()
+    : undefined
+
+export function renderInNonRouteComponentContext(
+  render: () => Solid.JSX.Element,
+  component: NonRouteComponent,
+) {
+  const Context = nonRouteComponentContext!
+  return <Context.Provider value={component}>{render()}</Context.Provider>
+}

dist/cjs/CatchBoundary.cjs

 const require_runtime = require("./_virtual/_rolldown/runtime.cjs");
+const require_nonRouteComponentContext = require("./nonRouteComponentContext.cjs");
 let solid_js_web = require("solid-js/web");
@@ -12,3 +13,3 @@ let solid_js = require("solid-js");
 			solid_js.createEffect(solid_js.on(props.getResetKey, () => reset(), { defer: true }));
-			return (0, solid_js_web.createComponent)(solid_js_web.Dynamic, {
+			return process.env.NODE_ENV !== "production" ? require_nonRouteComponentContext.renderInNonRouteComponentContext(() => (0, solid_js_web.createComponent)(solid_js_web.Dynamic, {
 				get component() {
@@ -19,2 +20,8 @@ return props.errorComponent ?? ErrorComponent;
 				reset
+			}), "errorComponent") : (0, solid_js_web.createComponent)(solid_js_web.Dynamic, {
+				get component() {
+					return props.errorComponent ?? ErrorComponent;
+				},
+				error,
+				reset
 			});
@@ -21,0 +28,0 @@ },

dist/cjs/CatchBoundary.cjs.map

@@ -1,1 +0,1 @@
-{"version":3,"file":"CatchBoundary.cjs","names":["Solid","Dynamic","ErrorRouteComponent","CatchBoundary","props","getResetKey","children","JSX","Element","errorComponent","onCatch","error","Error","ParentProps","_$createComponent","ErrorBoundary","fallback","reset","createEffect","on","defer","component","ErrorComponent","show","setShow","createSignal","process","env","NODE_ENV","_el$","_tmpl$","_el$2","firstChild","_el$3","_el$4","nextSibling","_el$5","$$click","d","_$insert","_c$","_$memo","_el$6","_tmpl$2","_el$7","_c$2","message","_el$8","_tmpl$3","_$delegateEvents"],"sources":["../../src/CatchBoundary.tsx"],"sourcesContent":["import * as Solid from 'solid-js'\nimport { Dynamic } from 'solid-js/web'\nimport type { ErrorRouteComponent } from './route'\n\nexport function CatchBoundary(\n  props: {\n    getResetKey: () => unknown\n    children: Solid.JSX.Element\n    errorComponent?: ErrorRouteComponent\n    onCatch?: (error: Error) => void\n  } & Solid.ParentProps,\n) {\n  return (\n    <Solid.ErrorBoundary\n      fallback={(error, reset) => {\n        props.onCatch?.(error)\n\n        Solid.createEffect(\n          Solid.on(props.getResetKey, () => reset(), { defer: true }),\n        )\n\n        return (\n          <Dynamic\n            component={props.errorComponent ?? ErrorComponent}\n            error={error}\n            reset={reset}\n          />\n        )\n      }}\n    >\n      {props.children}\n    </Solid.ErrorBoundary>\n  )\n}\n\nexport function ErrorComponent({ error }: { error: any }) {\n  const [show, setShow] = Solid.createSignal(\n    process.env.NODE_ENV !== 'production',\n  )\n\n  return (\n    <div style={{ padding: '.5rem', 'max-width': '100%' }}>\n      <div style={{ display: 'flex', 'align-items': 'center', gap: '.5rem' }}>\n        <strong style={{ 'font-size': '1rem' }}>Something went wrong!</strong>\n        <button\n          style={{\n            appearance: 'none',\n            'font-size': '.6em',\n            border: '1px solid currentColor',\n            padding: '.1rem .2rem',\n            'font-weight': 'bold',\n            'border-radius': '.25rem',\n          }}\n          onClick={() => setShow((d) => !d)}\n        >\n          {show() ? 'Hide Error' : 'Show Error'}\n        </button>\n      </div>\n      <div style={{ height: '.25rem' }} />\n      {show() ? (\n        <div>\n          <pre\n            style={{\n              'font-size': '.7em',\n              border: '1px solid red',\n              'border-radius': '.25rem',\n              padding: '.3rem',\n              color: 'red',\n              overflow: 'auto',\n            }}\n          >\n            {error.message ? <code>{error.message}</code> : null}\n          </pre>\n        </div>\n      ) : null}\n    </div>\n  )\n}\n"],"mappings":";;;;;;AAIA,SAAgBG,cACdC,OAMA;CACA,QAAA,GAAA,aAAA,iBACGJ,SAAMe,eAAa;EAClBC,WAAWL,OAAOM,UAAU;GAC1Bb,MAAMM,UAAUC,KAAK;GAErBX,SAAMkB,aACJlB,SAAMmB,GAAGf,MAAMC,mBAAmBY,MAAM,GAAG,EAAEG,OAAO,KAAK,CAAC,CAC5D;GAEA,QAAA,GAAA,aAAA,iBACGnB,aAAAA,SAAO;IAAA,IACNoB,YAAS;KAAA,OAAEjB,MAAMK,kBAAkBa;IAAc;IAC1CX;IACAM;GAAK,CAAA;EAGlB;EAAC,IAAAX,WAAA;GAAA,OAEAF,MAAME;EAAQ;CAAA,CAAA;AAGrB;AAEA,SAAgBgB,eAAe,EAAEX,SAAyB;CACxD,MAAM,CAACY,MAAMC,WAAWxB,SAAMyB,aAAAA,QAAAA,IAAAA,aACH,YAC3B;CAEA,cAAA;EAAA,IAAAI,OAAAC,OAAA,GAAAC,QAAAF,KAAAG,YAAAE,QAAAH,MAAAC,WAAAG;EAAAJ,MAAAI;EAAAD,MAAAG,gBAauBb,SAASc,MAAM,CAACA,CAAC;EAACC,CAAAA,GAAAA,aAAAA,QAAAL,aAEhCX,KAAK,IAAI,eAAe,YAAY;EAAAgB,CAAAA,GAAAA,aAAAA,QAAAV,aAAA;GAAA,IAAAW,OAAAA,GAAAA,aAAAA,YAAA,CAAA,CAIxCjB,KAAK,CAAC;GAAA,aAANiB,IAAA,WAAA;IAAA,IAAAE,QAAAC,QAAA,GAAAC,QAAAF,MAAAV;IAAAO,CAAAA,GAAAA,aAAAA,QAAAK,cAAA;KAAA,IAAAC,QAAAA,GAAAA,aAAAA,YAAA,CAAA,CAYMlC,MAAMmC,OAAO;KAAA,aAAbD,KAAA,WAAA;MAAA,IAAAE,QAAAC,QAAA;MAAAT,CAAAA,GAAAA,aAAAA,QAAAQ,aAAuBpC,MAAMmC,OAAO;MAAA,OAAAC;KAAA,GAAA,IAAW;IAAI,GAAA,CAAA;IAAA,OAAAL;GAAA,GAAA,IAGtD;EAAI,GAAA,GAAA,IAAA;EAAA,OAAAb;CAAA,GAAA;AAGd;iCAAC,CAAA,OAAA,CAAA"}
+{"version":3,"file":"CatchBoundary.cjs","names":["Solid","Dynamic","renderInNonRouteComponentContext","ErrorRouteComponent","CatchBoundary","props","getResetKey","children","JSX","Element","errorComponent","onCatch","error","Error","ParentProps","_$createComponent","ErrorBoundary","fallback","reset","createEffect","on","defer","process","env","NODE_ENV","component","ErrorComponent","show","setShow","createSignal","_el$","_tmpl$","_el$2","firstChild","_el$3","_el$4","nextSibling","_el$5","$$click","d","_$insert","_c$","_$memo","_el$6","_tmpl$2","_el$7","_c$2","message","_el$8","_tmpl$3","_$delegateEvents"],"sources":["../../src/CatchBoundary.tsx"],"sourcesContent":["import * as Solid from 'solid-js'\nimport { Dynamic } from 'solid-js/web'\nimport { renderInNonRouteComponentContext } from './nonRouteComponentContext'\nimport type { ErrorRouteComponent } from './route'\n\nexport function CatchBoundary(\n  props: {\n    getResetKey: () => unknown\n    children: Solid.JSX.Element\n    errorComponent?: ErrorRouteComponent\n    onCatch?: (error: Error) => void\n  } & Solid.ParentProps,\n) {\n  return (\n    <Solid.ErrorBoundary\n      fallback={(error, reset) => {\n        props.onCatch?.(error)\n\n        Solid.createEffect(\n          Solid.on(props.getResetKey, () => reset(), { defer: true }),\n        )\n\n        return process.env.NODE_ENV !== 'production' ? (\n          renderInNonRouteComponentContext(\n            () => (\n              <Dynamic\n                component={props.errorComponent ?? ErrorComponent}\n                error={error}\n                reset={reset}\n              />\n            ),\n            'errorComponent',\n          )\n        ) : (\n          <Dynamic\n            component={props.errorComponent ?? ErrorComponent}\n            error={error}\n            reset={reset}\n          />\n        )\n      }}\n    >\n      {props.children}\n    </Solid.ErrorBoundary>\n  )\n}\n\nexport function ErrorComponent({ error }: { error: any }) {\n  const [show, setShow] = Solid.createSignal(\n    process.env.NODE_ENV !== 'production',\n  )\n\n  return (\n    <div style={{ padding: '.5rem', 'max-width': '100%' }}>\n      <div style={{ display: 'flex', 'align-items': 'center', gap: '.5rem' }}>\n        <strong style={{ 'font-size': '1rem' }}>Something went wrong!</strong>\n        <button\n          style={{\n            appearance: 'none',\n            'font-size': '.6em',\n            border: '1px solid currentColor',\n            padding: '.1rem .2rem',\n            'font-weight': 'bold',\n            'border-radius': '.25rem',\n          }}\n          onClick={() => setShow((d) => !d)}\n        >\n          {show() ? 'Hide Error' : 'Show Error'}\n        </button>\n      </div>\n      <div style={{ height: '.25rem' }} />\n      {show() ? (\n        <div>\n          <pre\n            style={{\n              'font-size': '.7em',\n              border: '1px solid red',\n              'border-radius': '.25rem',\n              padding: '.3rem',\n              color: 'red',\n              overflow: 'auto',\n            }}\n          >\n            {error.message ? <code>{error.message}</code> : null}\n          </pre>\n        </div>\n      ) : null}\n    </div>\n  )\n}\n"],"mappings":";;;;;;;AAKA,SAAgBI,cACdC,OAMA;CACA,QAAA,GAAA,aAAA,iBACGL,SAAMgB,eAAa;EAClBC,WAAWL,OAAOM,UAAU;GAC1Bb,MAAMM,UAAUC,KAAK;GAErBZ,SAAMmB,aACJnB,SAAMoB,GAAGf,MAAMC,mBAAmBY,MAAM,GAAG,EAAEG,OAAO,KAAK,CAAC,CAC5D;GAEA,OAAA,QAAA,IAAA,aAAgC,eAC9BnB,iCAAAA,wCAAAA,GAAAA,aAAAA,iBAEKD,aAAAA,SAAO;IAAA,IACNwB,YAAS;KAAA,OAAEpB,MAAMK,kBAAkBgB;IAAc;IAC1Cd;IACAM;GAAK,CAAA,GAGhB,gBACF,KAAA,GAAA,aAAA,iBAECjB,aAAAA,SAAO;IAAA,IACNwB,YAAS;KAAA,OAAEpB,MAAMK,kBAAkBgB;IAAc;IAC1Cd;IACAM;GAAK,CAAA;EAGlB;EAAC,IAAAX,WAAA;GAAA,OAEAF,MAAME;EAAQ;CAAA,CAAA;AAGrB;AAEA,SAAgBmB,eAAe,EAAEd,SAAyB;CACxD,MAAM,CAACe,MAAMC,WAAW5B,SAAM6B,aAAAA,QAAAA,IAAAA,aACH,YAC3B;CAEA,cAAA;EAAA,IAAAC,OAAAC,OAAA,GAAAC,QAAAF,KAAAG,YAAAE,QAAAH,MAAAC,WAAAG;EAAAJ,MAAAI;EAAAD,MAAAG,gBAauBV,SAASW,MAAM,CAACA,CAAC;EAACC,CAAAA,GAAAA,aAAAA,QAAAL,aAEhCR,KAAK,IAAI,eAAe,YAAY;EAAAa,CAAAA,GAAAA,aAAAA,QAAAV,aAAA;GAAA,IAAAW,OAAAA,GAAAA,aAAAA,YAAA,CAAA,CAIxCd,KAAK,CAAC;GAAA,aAANc,IAAA,WAAA;IAAA,IAAAE,QAAAC,QAAA,GAAAC,QAAAF,MAAAV;IAAAO,CAAAA,GAAAA,aAAAA,QAAAK,cAAA;KAAA,IAAAC,QAAAA,GAAAA,aAAAA,YAAA,CAAA,CAYMlC,MAAMmC,OAAO;KAAA,aAAbD,KAAA,WAAA;MAAA,IAAAE,QAAAC,QAAA;MAAAT,CAAAA,GAAAA,aAAAA,QAAAQ,aAAuBpC,MAAMmC,OAAO;MAAA,OAAAC;KAAA,GAAA,IAAW;IAAI,GAAA,CAAA;IAAA,OAAAL;GAAA,GAAA,IAGtD;EAAI,GAAA,GAAA,IAAA;EAAA,OAAAb;CAAA,GAAA;AAGd;iCAAC,CAAA,OAAA,CAAA"}

dist/cjs/link.cjs

@@ -14,5 +14,8 @@ const require_runtime = require("./_virtual/_rolldown/runtime.cjs");
 var timeoutMap = /* @__PURE__ */ new WeakMap();
+var cancelPreload = (eventTarget) => {
+	clearTimeout(timeoutMap.get(eventTarget));
+	timeoutMap.delete(eventTarget);
+};
 function useLinkProps(options) {
 	const router = require_useRouter.useRouter();
-	const [isTransitioning, setIsTransitioning] = solid_js.createSignal(false);
 	const shouldHydrateHash = !_tanstack_router_core_isServer.isServer && !!router.options.ssr;
@@ -104,3 +107,3 @@ const hasHydrated = require_ClientOnly.useHydrated();
 	const preload = solid_js.createMemo(() => {
-		if (options.reloadDocument || externalLink()) return false;
+		if (options.reloadDocument || externalLink() || local.disabled) return false;
 		return local.preload ?? router.options.defaultPreload;
@@ -137,10 +140,25 @@ });
 	});
-	const preloadViewportIoCallback = (entry) => {
-		if (entry?.isIntersecting) doPreload();
+	const [ref, setRef] = solid_js.createSignal(null);
+	const enqueuePreload = (e) => {
+		if (!e) {
+			cancelPreload(ref);
+			return;
+		}
+		if (!(e.isIntersecting ?? preload() === "intent")) {
+			if (e.isIntersecting === false) cancelPreload(ref);
+			return;
+		}
+		if (!preloadDelay()) {
+			doPreload();
+			return;
+		}
+		if (!timeoutMap.has(ref)) timeoutMap.set(ref, setTimeout(() => {
+			timeoutMap.delete(ref);
+			doPreload();
+		}, preloadDelay()));
 	};
-	const [ref, setRef] = solid_js.createSignal(null);
-	require_utils.useIntersectionObserver(ref, preloadViewportIoCallback, { rootMargin: "100px" }, !!local.disabled || preload() !== "viewport");
+	require_utils.useIntersectionObserver(ref, enqueuePreload, () => preload() !== "viewport");
 	solid_js.createEffect(() => {
 		if (hasRenderFetched) return;
-		if (!local.disabled && preload() === "render") {
+		if (preload() === "render") {
 			doPreload();
@@ -172,7 +190,2 @@ hasRenderFetched = true;
 			e.preventDefault();
-			setIsTransitioning(true);
-			const unsub = router.subscribe("onResolved", () => {
-				unsub();
-				setIsTransitioning(false);
-			});
 			router.navigate({
@@ -189,27 +202,8 @@ ...options,
 	};
-	const enqueueIntentPreload = (e) => {
-		if (local.disabled || preload() !== "intent") return;
-		if (!preloadDelay()) {
-			doPreload();
-			return;
-		}
-		const eventTarget = e.currentTarget || e.target;
-		if (!eventTarget || timeoutMap.has(eventTarget)) return;
-		timeoutMap.set(eventTarget, setTimeout(() => {
-			timeoutMap.delete(eventTarget);
-			doPreload();
-		}, preloadDelay()));
-	};
-	const handleTouchStart = (_) => {
-		if (local.disabled || preload() !== "intent") return;
+	const handleTouchStart = () => {
+		if (preload() !== "intent") return;
 		doPreload();
 	};
-	const handleLeave = (e) => {
-		if (local.disabled) return;
-		const eventTarget = e.currentTarget || e.target;
-		if (eventTarget) {
-			const id = timeoutMap.get(eventTarget);
-			clearTimeout(id);
-			timeoutMap.delete(eventTarget);
-		}
+	const handleLeave = () => {
+		if (preload() === "intent") cancelPreload(ref);
 	};
@@ -219,5 +213,5 @@ const simpleStyling = solid_js.createMemo(() => local.activeProps === STATIC_ACTIVE_PROPS_GET && local.inactiveProps === STATIC_INACTIVE_PROPS_GET && local.class === void 0 && local.style === void 0);
 	const onBlur = createComposedHandler(() => local.onBlur, handleLeave);
-	const onFocus = createComposedHandler(() => local.onFocus, enqueueIntentPreload);
-	const onMouseEnter = createComposedHandler(() => local.onMouseEnter, enqueueIntentPreload);
-	const onMouseOver = createComposedHandler(() => local.onMouseOver, enqueueIntentPreload);
+	const onFocus = createComposedHandler(() => local.onFocus, enqueuePreload);
+	const onMouseEnter = createComposedHandler(() => local.onMouseEnter, enqueuePreload);
+	const onMouseOver = createComposedHandler(() => local.onMouseOver, enqueuePreload);
 	const onMouseLeave = createComposedHandler(() => local.onMouseLeave, handleLeave);
@@ -241,4 +235,3 @@ const onMouseOut = createComposedHandler(() => local.onMouseOut, handleLeave);
 			target: local.target,
-			...local.disabled && STATIC_DISABLED_PROPS,
-			...isTransitioning() && STATIC_TRANSITIONING_ATTRIBUTES
+			...local.disabled && STATIC_DISABLED_PROPS
 		};
@@ -289,3 +282,2 @@ if (simpleStyling()) return {
 };
-var STATIC_TRANSITIONING_ATTRIBUTES = { "data-transitioning": "transitioning" };
 /** Call a JSX.EventHandlerUnion with the event. */
@@ -311,10 +303,5 @@ function callHandler(event, handler) {
 		const ch = local.children;
-		if (typeof ch === "function") return ch({
-			get isActive() {
-				return linkProps["data-status"] === "active";
-			},
-			get isTransitioning() {
-				return linkProps["data-transitioning"] === "transitioning";
-			}
-		});
+		if (typeof ch === "function") return ch({ get isActive() {
+			return linkProps["data-status"] === "active";
+		} });
 		return ch;
@@ -321,0 +308,0 @@ });

dist/cjs/link.cjs.map

@@ -1,1 +0,1 @@
-{"version":3,"file":"link.cjs","names":["Solid","mergeRefs","deepEqual","exactPathTest","functionalUpdate","hasKeys","isDangerousProtocol","preloadWarning","removeTrailingSlash","isServer","Dynamic","useRouter","useIntersectionObserver","useHydrated","AnyRouter","Constrain","LinkOptions","RegisteredRouter","RoutePaths","ValidateLinkOptions","ValidateLinkOptionsArray","timeoutMap","WeakMap","EventTarget","ReturnType","setTimeout","useLinkProps","TRouter","TFrom","options","UseLinkPropsOptions","TTo","TMaskFrom","TMaskTo","ComponentProps","router","isTransitioning","setIsTransitioning","createSignal","shouldHydrateHash","ssr","hasHydrated","hasRenderFetched","local","rest","splitProps","mergeProps","activeProps","STATIC_ACTIVE_PROPS_GET","inactiveProps","STATIC_INACTIVE_PROPS_GET","_","propsSafeToSpread","currentLocation","createMemo","stores","location","get","undefined","equals","prev","next","href","_fromLocation","nextOptions","untrack","buildLocation","hrefOption","disabled","maskedLocation","publicHref","external","history","createHref","externalLink","_href","protocolAllowlist","process","env","NODE_ENV","console","warn","to","safeInternal","isSafeInternal","indexOf","URL","preload","reloadDocument","defaultPreload","preloadDelay","defaultPreloadDelay","isActive","activeOptions","current","nextLocation","exact","testExact","pathname","basepath","currentPath","nextPath","pathIsFuzzyEqual","startsWith","length","includeSearch","searchTest","search","partial","ignoreUndefined","explicitUndefined","includeHash","currentHash","hash","doPreload","preloadRoute","_builtLocation","catch","err","preloadViewportIoCallback","entry","IntersectionObserverEntry","isIntersecting","ref","setRef","Element","rootMargin","createEffect","handleClick","e","MouseEvent","elementTarget","currentTarget","HTMLAnchorElement","SVGAElement","getAttribute","effectiveTarget","target","isCtrlEvent","defaultPrevented","button","preventDefault","unsub","subscribe","navigate","replace","resetScroll","hashScrollIntoView","startTransition","viewTransition","ignoreBlocker","enqueueIntentPreload","FocusEvent","eventTarget","has","set","delete","handleTouchStart","TouchEvent","handleLeave","id","clearTimeout","simpleStyling","class","style","onClick","createComposedHandler","onBlur","onFocus","onMouseEnter","onMouseOver","onMouseLeave","onMouseOut","onTouchStart","ResolvedLinkStateProps","Omit","JSX","CSSProperties","resolvedProps","active","base","STATIC_DISABLED_PROPS","STATIC_TRANSITIONING_ATTRIBUTES","STATIC_DEFAULT_ACTIVE_ATTRIBUTES","EMPTY_OBJECT","className","filter","Boolean","join","STATIC_ACTIVE_ATTRIBUTES","STATIC_ACTIVE_PROPS","role","callHandler","Event","event","TEvent","T","handler","EventHandlerUnion","getHandler","fallback","ActiveLinkOptions","ActiveLinkOptionProps","TComp","ActiveLinkProps","Partial","LinkComponentSolidProps","key","LinkProps","LinkPropsChildren","children","state","ValidComponent","CreateLinkProps","LinkComponentProps","LinkComponent","TDefaultFrom","props","LinkComponentRoute","defaultFrom","createLink","Comp","_$createComponent","Link","_$mergeProps","_asChild","linkProps","ch","svgLinkProps","_el$","_tmpl$","_el$2","firstChild","_$spread","_$insert","_el$3","_tmpl$2","component","metaKey","altKey","ctrlKey","shiftKey","zero","charCodeAt","LinkOptionsFnOptions","TOptions","ReadonlyArray","LinkOptionsFn","linkOptions"],"sources":["../../src/link.tsx"],"sourcesContent":["import * as Solid from 'solid-js'\n\nimport { mergeRefs } from '@solid-primitives/refs'\n\nimport {\n  deepEqual,\n  exactPathTest,\n  functionalUpdate,\n  hasKeys,\n  isDangerousProtocol,\n  preloadWarning,\n  removeTrailingSlash,\n} from '@tanstack/router-core'\n\nimport { isServer } from '@tanstack/router-core/isServer'\nimport { Dynamic } from 'solid-js/web'\nimport { useRouter } from './useRouter'\n\nimport { useIntersectionObserver } from './utils'\n\nimport { useHydrated } from './ClientOnly'\nimport type {\n  AnyRouter,\n  Constrain,\n  LinkOptions,\n  RegisteredRouter,\n  RoutePaths,\n} from '@tanstack/router-core'\nimport type {\n  ValidateLinkOptions,\n  ValidateLinkOptionsArray,\n} from './typePrimitives'\n\nconst timeoutMap = new WeakMap<EventTarget, ReturnType<typeof setTimeout>>()\n\nexport function useLinkProps<\n  TRouter extends AnyRouter = RegisteredRouter,\n  TFrom extends RoutePaths<TRouter['routeTree']> | string = string,\n  TTo extends string = '',\n  TMaskFrom extends RoutePaths<TRouter['routeTree']> | string = TFrom,\n  TMaskTo extends string = '',\n>(\n  options: UseLinkPropsOptions<TRouter, TFrom, TTo, TMaskFrom, TMaskTo>,\n): Solid.ComponentProps<'a'> {\n  const router = useRouter()\n  const [isTransitioning, setIsTransitioning] = Solid.createSignal(false)\n  const shouldHydrateHash = !isServer && !!router.options.ssr\n  const hasHydrated = useHydrated()\n\n  let hasRenderFetched = false\n\n  const [local, rest] = Solid.splitProps(\n    Solid.mergeProps(\n      {\n        activeProps: STATIC_ACTIVE_PROPS_GET,\n        inactiveProps: STATIC_INACTIVE_PROPS_GET,\n      },\n      options,\n    ),\n    [\n      'activeProps',\n      'inactiveProps',\n      'activeOptions',\n      'to',\n      'preload',\n      'preloadDelay',\n      'preloadIntentProximity',\n      'hashScrollIntoView',\n      'replace',\n      'startTransition',\n      'resetScroll',\n      'viewTransition',\n      'target',\n      'disabled',\n      'style',\n      'class',\n      'onClick',\n      'onBlur',\n      'onFocus',\n      'onMouseEnter',\n      'onMouseLeave',\n      'onMouseOver',\n      'onMouseOut',\n      'onTouchStart',\n      'ignoreBlocker',\n    ],\n  )\n\n  // const {\n  //   // custom props\n  //   activeProps = () => ({ class: 'active' }),\n  //   inactiveProps = () => ({}),\n  //   activeOptions,\n  //   to,\n  //   preload: userPreload,\n  //   preloadDelay: userPreloadDelay,\n  //   hashScrollIntoView,\n  //   replace,\n  //   startTransition,\n  //   resetScroll,\n  //   viewTransition,\n  //   // element props\n  //   children,\n  //   target,\n  //   disabled,\n  //   style,\n  //   class,\n  //   onClick,\n  //   onFocus,\n  //   onMouseEnter,\n  //   onMouseLeave,\n  //   onTouchStart,\n  //   ignoreBlocker,\n  //   ...rest\n  // } = options\n\n  const [_, propsSafeToSpread] = Solid.splitProps(rest, [\n    'params',\n    'search',\n    'hash',\n    'state',\n    'mask',\n    'reloadDocument',\n    'unsafeRelative',\n    'from',\n  ])\n\n  const currentLocation = Solid.createMemo(\n    () => router.stores.location.get(),\n    undefined,\n    { equals: (prev, next) => prev.href === next.href },\n  )\n\n  const next = Solid.createMemo(() => {\n    // Rebuild when inherited search/hash or the current route context changes.\n    const _fromLocation = currentLocation()\n    const nextOptions = { _fromLocation, ...options } as any\n    // untrack because router-core will also access stores, which are signals in solid\n    return Solid.untrack(() => router.buildLocation(nextOptions))\n  })\n\n  const hrefOption = Solid.createMemo(() => {\n    if (options.disabled) return undefined\n    // Use publicHref - it contains the correct href for display\n    // When a rewrite changes the origin, publicHref is the full URL\n    // Otherwise it's the origin-stripped path\n    // This avoids constructing URL objects in the hot path\n    const location = next().maskedLocation ?? next()\n    const publicHref = location.publicHref\n    const external = location.external\n\n    if (external) {\n      return { href: publicHref, external: true }\n    }\n\n    return {\n      href: router.history.createHref(publicHref) || '/',\n      external: false,\n    }\n  })\n\n  const externalLink = Solid.createMemo(() => {\n    const _href = hrefOption()\n    if (_href?.external) {\n      // Block dangerous protocols for external links\n      if (isDangerousProtocol(_href.href, router.protocolAllowlist)) {\n        if (process.env.NODE_ENV !== 'production') {\n          console.warn(`Blocked Link with dangerous protocol: ${_href.href}`)\n        }\n        return undefined\n      }\n      return _href.href\n    }\n    const to = options.to\n    const safeInternal = isSafeInternal(to)\n    if (safeInternal) return undefined\n    if (typeof to !== 'string' || to.indexOf(':') === -1) return undefined\n    try {\n      new URL(to as any)\n      // Block dangerous protocols like javascript:, blob:, data:\n      if (isDangerousProtocol(to, router.protocolAllowlist)) {\n        if (process.env.NODE_ENV !== 'production') {\n          console.warn(`Blocked Link with dangerous protocol: ${to}`)\n        }\n        return undefined\n      }\n      return to\n    } catch {}\n    return undefined\n  })\n\n  const preload = Solid.createMemo(() => {\n    if (options.reloadDocument || externalLink()) {\n      return false\n    }\n    return local.preload ?? router.options.defaultPreload\n  })\n  const preloadDelay = () =>\n    local.preloadDelay ?? router.options.defaultPreloadDelay ?? 0\n\n  const isActive = Solid.createMemo(() => {\n    if (externalLink()) return false\n    const activeOptions = local.activeOptions\n    const current = currentLocation()\n    const nextLocation = next()\n\n    if (activeOptions?.exact) {\n      const testExact = exactPathTest(\n        current.pathname,\n        nextLocation.pathname,\n        router.basepath,\n      )\n      if (!testExact) {\n        return false\n      }\n    } else {\n      const currentPath = removeTrailingSlash(current.pathname, router.basepath)\n      const nextPath = removeTrailingSlash(\n        nextLocation.pathname,\n        router.basepath,\n      )\n\n      const pathIsFuzzyEqual =\n        currentPath.startsWith(nextPath) &&\n        (currentPath.length === nextPath.length ||\n          currentPath[nextPath.length] === '/')\n      if (!pathIsFuzzyEqual) {\n        return false\n      }\n    }\n\n    if (activeOptions?.includeSearch ?? true) {\n      const searchTest = deepEqual(current.search, nextLocation.search, {\n        partial: !activeOptions?.exact,\n        ignoreUndefined: !activeOptions?.explicitUndefined,\n      })\n      if (!searchTest) {\n        return false\n      }\n    }\n\n    if (activeOptions?.includeHash) {\n      const currentHash =\n        shouldHydrateHash && !hasHydrated() ? '' : current.hash\n      return currentHash === nextLocation.hash\n    }\n    return true\n  })\n\n  const doPreload = () =>\n    router\n      .preloadRoute({ ...options, _builtLocation: next() } as any)\n      .catch((err: any) => {\n        console.warn(err)\n        console.warn(preloadWarning)\n      })\n\n  const preloadViewportIoCallback = (\n    entry: IntersectionObserverEntry | undefined,\n  ) => {\n    if (entry?.isIntersecting) {\n      doPreload()\n    }\n  }\n\n  const [ref, setRef] = Solid.createSignal<Element | null>(null)\n\n  useIntersectionObserver(\n    ref,\n    preloadViewportIoCallback,\n    { rootMargin: '100px' },\n    !!local.disabled || preload() !== 'viewport',\n  )\n\n  Solid.createEffect(() => {\n    if (hasRenderFetched) {\n      return\n    }\n    if (!local.disabled && preload() === 'render') {\n      doPreload()\n      hasRenderFetched = true\n    }\n  })\n\n  if (externalLink()) {\n    return Solid.mergeProps(\n      propsSafeToSpread,\n      {\n        ref: mergeRefs(setRef, options.ref),\n        href: externalLink(),\n      },\n      Solid.splitProps(local, [\n        'target',\n        'disabled',\n        'style',\n        'class',\n        'onClick',\n        'onBlur',\n        'onFocus',\n        'onMouseEnter',\n        'onMouseLeave',\n        'onMouseOut',\n        'onMouseOver',\n        'onTouchStart',\n      ])[0],\n    ) as any\n  }\n\n  // The click handler\n  const handleClick = (e: MouseEvent) => {\n    // Check actual element's target attribute as fallback\n    const elementTarget = (\n      e.currentTarget as HTMLAnchorElement | SVGAElement\n    ).getAttribute('target')\n    const effectiveTarget =\n      local.target !== undefined ? local.target : elementTarget\n\n    if (\n      !local.disabled &&\n      !isCtrlEvent(e) &&\n      !e.defaultPrevented &&\n      (!effectiveTarget || effectiveTarget === '_self') &&\n      e.button === 0\n    ) {\n      e.preventDefault()\n\n      setIsTransitioning(true)\n\n      const unsub = router.subscribe('onResolved', () => {\n        unsub()\n        setIsTransitioning(false)\n      })\n\n      // All is well? Navigate!\n      // N.B. we don't call `router.commitLocation(next) here because we want to run `validateSearch` before committing\n      router.navigate({\n        ...options,\n        replace: local.replace,\n        resetScroll: local.resetScroll,\n        hashScrollIntoView: local.hashScrollIntoView,\n        startTransition: local.startTransition,\n        viewTransition: local.viewTransition,\n        ignoreBlocker: local.ignoreBlocker,\n      })\n    }\n  }\n\n  const enqueueIntentPreload = (e: MouseEvent | FocusEvent) => {\n    if (local.disabled || preload() !== 'intent') return\n\n    if (!preloadDelay()) {\n      doPreload()\n      return\n    }\n\n    const eventTarget = e.currentTarget || e.target\n\n    if (!eventTarget || timeoutMap.has(eventTarget)) return\n\n    timeoutMap.set(\n      eventTarget,\n      setTimeout(() => {\n        timeoutMap.delete(eventTarget)\n        doPreload()\n      }, preloadDelay()),\n    )\n  }\n\n  const handleTouchStart = (_: TouchEvent) => {\n    if (local.disabled || preload() !== 'intent') return\n    doPreload()\n  }\n\n  const handleLeave = (e: MouseEvent | FocusEvent) => {\n    if (local.disabled) return\n    const eventTarget = e.currentTarget || e.target\n\n    if (eventTarget) {\n      const id = timeoutMap.get(eventTarget)\n      clearTimeout(id)\n      timeoutMap.delete(eventTarget)\n    }\n  }\n\n  const simpleStyling = Solid.createMemo(\n    () =>\n      local.activeProps === STATIC_ACTIVE_PROPS_GET &&\n      local.inactiveProps === STATIC_INACTIVE_PROPS_GET &&\n      local.class === undefined &&\n      local.style === undefined,\n  )\n\n  const onClick = createComposedHandler(() => local.onClick, handleClick)\n  const onBlur = createComposedHandler(() => local.onBlur, handleLeave)\n  const onFocus = createComposedHandler(\n    () => local.onFocus,\n    enqueueIntentPreload,\n  )\n  const onMouseEnter = createComposedHandler(\n    () => local.onMouseEnter,\n    enqueueIntentPreload,\n  )\n  const onMouseOver = createComposedHandler(\n    () => local.onMouseOver,\n    enqueueIntentPreload,\n  )\n  const onMouseLeave = createComposedHandler(\n    () => local.onMouseLeave,\n    handleLeave,\n  )\n  const onMouseOut = createComposedHandler(() => local.onMouseOut, handleLeave)\n  const onTouchStart = createComposedHandler(\n    () => local.onTouchStart,\n    handleTouchStart,\n  )\n\n  type ResolvedLinkStateProps = Omit<Solid.ComponentProps<'a'>, 'style'> & {\n    style?: Solid.JSX.CSSProperties\n  }\n\n  const resolvedProps = Solid.createMemo(() => {\n    const active = isActive()\n\n    const base = {\n      href: hrefOption()?.href,\n      ref: mergeRefs(setRef, options.ref),\n      onClick,\n      onBlur,\n      onFocus,\n      onMouseEnter,\n      onMouseOver,\n      onMouseLeave,\n      onMouseOut,\n      onTouchStart,\n      disabled: !!local.disabled,\n      target: local.target,\n      ...(local.disabled && STATIC_DISABLED_PROPS),\n      ...(isTransitioning() && STATIC_TRANSITIONING_ATTRIBUTES),\n    }\n\n    if (simpleStyling()) {\n      return {\n        ...base,\n        ...(active && STATIC_DEFAULT_ACTIVE_ATTRIBUTES),\n      }\n    }\n\n    const activeProps: ResolvedLinkStateProps = active\n      ? (functionalUpdate(local.activeProps as any, {}) ?? EMPTY_OBJECT)\n      : EMPTY_OBJECT\n    const inactiveProps: ResolvedLinkStateProps = active\n      ? EMPTY_OBJECT\n      : functionalUpdate(local.inactiveProps, {})\n    const style = {\n      ...local.style,\n      ...activeProps.style,\n      ...inactiveProps.style,\n    }\n    const className = [local.class, activeProps.class, inactiveProps.class]\n      .filter(Boolean)\n      .join(' ')\n\n    return {\n      ...activeProps,\n      ...inactiveProps,\n      ...base,\n      ...(hasKeys(style) ? { style } : undefined),\n      ...(className ? { class: className } : undefined),\n      ...(active && STATIC_ACTIVE_ATTRIBUTES),\n    } as ResolvedLinkStateProps\n  })\n\n  return Solid.mergeProps(propsSafeToSpread, resolvedProps) as any\n}\n\nconst STATIC_ACTIVE_PROPS = { class: 'active' }\nconst STATIC_ACTIVE_PROPS_GET = () => STATIC_ACTIVE_PROPS\nconst EMPTY_OBJECT = {}\nconst STATIC_INACTIVE_PROPS_GET = () => EMPTY_OBJECT\nconst STATIC_DEFAULT_ACTIVE_ATTRIBUTES = {\n  class: 'active',\n  'data-status': 'active',\n  'aria-current': 'page',\n}\nconst STATIC_DISABLED_PROPS = {\n  role: 'link',\n  'aria-disabled': true,\n}\nconst STATIC_ACTIVE_ATTRIBUTES = {\n  'data-status': 'active',\n  'aria-current': 'page',\n}\nconst STATIC_TRANSITIONING_ATTRIBUTES = {\n  'data-transitioning': 'transitioning',\n}\n\n/** Call a JSX.EventHandlerUnion with the event. */\nfunction callHandler<T, TEvent extends Event>(\n  event: TEvent & { currentTarget: T; target: Element },\n  handler: Solid.JSX.EventHandlerUnion<T, TEvent>,\n) {\n  if (typeof handler === 'function') {\n    handler(event)\n  } else {\n    handler[0](handler[1], event)\n  }\n  return event.defaultPrevented\n}\n\nfunction createComposedHandler<T, TEvent extends Event>(\n  getHandler: () => Solid.JSX.EventHandlerUnion<T, TEvent> | undefined,\n  fallback: (event: TEvent) => void,\n) {\n  return (event: TEvent & { currentTarget: T; target: Element }) => {\n    const handler = getHandler()\n    if (!handler || !callHandler(event, handler)) fallback(event)\n  }\n}\n\nexport type UseLinkPropsOptions<\n  TRouter extends AnyRouter = RegisteredRouter,\n  TFrom extends RoutePaths<TRouter['routeTree']> | string = string,\n  TTo extends string | undefined = '.',\n  TMaskFrom extends RoutePaths<TRouter['routeTree']> | string = TFrom,\n  TMaskTo extends string = '.',\n> = ActiveLinkOptions<'a', TRouter, TFrom, TTo, TMaskFrom, TMaskTo> &\n  Omit<Solid.ComponentProps<'a'>, 'style'> & { style?: Solid.JSX.CSSProperties }\n\nexport type ActiveLinkOptions<\n  TComp = 'a',\n  TRouter extends AnyRouter = RegisteredRouter,\n  TFrom extends string = string,\n  TTo extends string | undefined = '.',\n  TMaskFrom extends string = TFrom,\n  TMaskTo extends string = '.',\n> = LinkOptions<TRouter, TFrom, TTo, TMaskFrom, TMaskTo> &\n  ActiveLinkOptionProps<TComp>\n\ntype ActiveLinkProps<TComp> = Partial<\n  LinkComponentSolidProps<TComp> & {\n    [key: `data-${string}`]: unknown\n  }\n>\n\nexport interface ActiveLinkOptionProps<TComp = 'a'> {\n  /**\n   * A function that returns additional props for the `active` state of this link.\n   * These props override other props passed to the link (`style`'s are merged, `class`'s are concatenated)\n   */\n  activeProps?: ActiveLinkProps<TComp> | (() => ActiveLinkProps<TComp>)\n  /**\n   * A function that returns additional props for the `inactive` state of this link.\n   * These props override other props passed to the link (`style`'s are merged, `class`'s are concatenated)\n   */\n  inactiveProps?: ActiveLinkProps<TComp> | (() => ActiveLinkProps<TComp>)\n}\n\nexport type LinkProps<\n  TComp = 'a',\n  TRouter extends AnyRouter = RegisteredRouter,\n  TFrom extends string = string,\n  TTo extends string | undefined = '.',\n  TMaskFrom extends string = TFrom,\n  TMaskTo extends string = '.',\n> = ActiveLinkOptions<TComp, TRouter, TFrom, TTo, TMaskFrom, TMaskTo> &\n  LinkPropsChildren\n\nexport interface LinkPropsChildren {\n  // If a function is passed as a child, it will be given the `isActive` boolean to aid in further styling on the element it returns\n  children?:\n    | Solid.JSX.Element\n    | ((state: {\n        isActive: boolean\n        isTransitioning: boolean\n      }) => Solid.JSX.Element)\n}\n\ntype LinkComponentSolidProps<TComp> = TComp extends Solid.ValidComponent\n  ? Omit<Solid.ComponentProps<TComp>, keyof CreateLinkProps>\n  : never\n\nexport type LinkComponentProps<\n  TComp = 'a',\n  TRouter extends AnyRouter = RegisteredRouter,\n  TFrom extends string = string,\n  TTo extends string | undefined = '.',\n  TMaskFrom extends string = TFrom,\n  TMaskTo extends string = '.',\n> = LinkComponentSolidProps<TComp> &\n  LinkProps<TComp, TRouter, TFrom, TTo, TMaskFrom, TMaskTo>\n\nexport type CreateLinkProps = LinkProps<\n  any,\n  any,\n  string,\n  string,\n  string,\n  string\n>\n\nexport type LinkComponent<\n  in out TComp,\n  in out TDefaultFrom extends string = string,\n> = <\n  TRouter extends AnyRouter = RegisteredRouter,\n  const TFrom extends string = TDefaultFrom,\n  const TTo extends string | undefined = undefined,\n  const TMaskFrom extends string = TFrom,\n  const TMaskTo extends string = '',\n>(\n  props: LinkComponentProps<TComp, TRouter, TFrom, TTo, TMaskFrom, TMaskTo>,\n) => Solid.JSX.Element\n\nexport interface LinkComponentRoute<\n  in out TDefaultFrom extends string = string,\n> {\n  defaultFrom: TDefaultFrom;\n  <\n    TRouter extends AnyRouter = RegisteredRouter,\n    const TTo extends string | undefined = undefined,\n    const TMaskTo extends string = '',\n  >(\n    props: LinkComponentProps<\n      'a',\n      TRouter,\n      this['defaultFrom'],\n      TTo,\n      this['defaultFrom'],\n      TMaskTo\n    >,\n  ): Solid.JSX.Element\n}\n\nexport function createLink<const TComp>(\n  Comp: Constrain<TComp, any, (props: CreateLinkProps) => Solid.JSX.Element>,\n): LinkComponent<TComp> {\n  return (props) => <Link {...props} _asChild={Comp} />\n}\n\nexport const Link: LinkComponent<'a'> = (props) => {\n  const [local, rest] = Solid.splitProps(\n    props as typeof props & { _asChild: any },\n    ['_asChild', 'children'],\n  )\n\n  const [_, linkProps] = Solid.splitProps(\n    useLinkProps(rest as unknown as any),\n    ['type'],\n  )\n\n  const children = Solid.createMemo(() => {\n    const ch = local.children\n    if (typeof ch === 'function') {\n      return ch({\n        get isActive() {\n          return (linkProps as any)['data-status'] === 'active'\n        },\n        get isTransitioning() {\n          return (linkProps as any)['data-transitioning'] === 'transitioning'\n        },\n      })\n    }\n\n    return ch satisfies Solid.JSX.Element\n  })\n\n  if (local._asChild === 'svg') {\n    const [_, svgLinkProps] = Solid.splitProps(linkProps, ['class'])\n    return (\n      <svg>\n        <a {...svgLinkProps}>{children()}</a>\n      </svg>\n    )\n  }\n\n  if (!local._asChild) {\n    return <a {...linkProps}>{children()}</a>\n  }\n\n  return (\n    <Dynamic component={local._asChild as Solid.ValidComponent} {...linkProps}>\n      {children()}\n    </Dynamic>\n  )\n}\n\nfunction isCtrlEvent(e: MouseEvent) {\n  return !!(e.metaKey || e.altKey || e.ctrlKey || e.shiftKey)\n}\n\nfunction isSafeInternal(to: unknown) {\n  if (typeof to !== 'string') return false\n  const zero = to.charCodeAt(0)\n  if (zero === 47) return to.charCodeAt(1) !== 47 // '/' but not '//'\n  return zero === 46 // '.', '..', './', '../'\n}\n\nexport type LinkOptionsFnOptions<\n  TOptions,\n  TComp,\n  TRouter extends AnyRouter = RegisteredRouter,\n> =\n  TOptions extends ReadonlyArray<any>\n    ? ValidateLinkOptionsArray<TRouter, TOptions, string, TComp>\n    : ValidateLinkOptions<TRouter, TOptions, string, TComp>\n\nexport type LinkOptionsFn<TComp> = <\n  const TOptions,\n  TRouter extends AnyRouter = RegisteredRouter,\n>(\n  options: LinkOptionsFnOptions<TOptions, TComp, TRouter>,\n) => TOptions\n\nexport const linkOptions: LinkOptionsFn<'a'> = (options) => {\n  return options as any\n}\n"],"mappings":"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"}
+{"version":3,"file":"link.cjs","names":["Solid","mergeRefs","deepEqual","exactPathTest","functionalUpdate","hasKeys","isDangerousProtocol","preloadWarning","removeTrailingSlash","isServer","Dynamic","useRouter","useIntersectionObserver","useHydrated","AnyRouter","Constrain","LinkOptions","RegisteredRouter","RoutePaths","ValidateLinkOptions","ValidateLinkOptionsArray","timeoutMap","WeakMap","ReturnType","setTimeout","cancelPreload","eventTarget","clearTimeout","get","delete","useLinkProps","TRouter","TFrom","options","UseLinkPropsOptions","TTo","TMaskFrom","TMaskTo","ComponentProps","router","shouldHydrateHash","ssr","hasHydrated","hasRenderFetched","local","rest","splitProps","mergeProps","activeProps","STATIC_ACTIVE_PROPS_GET","inactiveProps","STATIC_INACTIVE_PROPS_GET","_","propsSafeToSpread","currentLocation","createMemo","stores","location","undefined","equals","prev","next","href","_fromLocation","nextOptions","untrack","buildLocation","hrefOption","disabled","maskedLocation","publicHref","external","history","createHref","externalLink","_href","protocolAllowlist","process","env","NODE_ENV","console","warn","to","safeInternal","isSafeInternal","indexOf","URL","preload","reloadDocument","defaultPreload","preloadDelay","defaultPreloadDelay","isActive","activeOptions","current","nextLocation","exact","testExact","pathname","basepath","currentPath","nextPath","pathIsFuzzyEqual","startsWith","length","includeSearch","searchTest","search","partial","ignoreUndefined","explicitUndefined","includeHash","currentHash","hash","doPreload","preloadRoute","_builtLocation","catch","err","ref","setRef","createSignal","Element","enqueuePreload","e","MouseEvent","FocusEvent","IntersectionObserverEntry","isIntersecting","has","set","createEffect","handleClick","elementTarget","currentTarget","HTMLAnchorElement","SVGAElement","getAttribute","effectiveTarget","target","isCtrlEvent","defaultPrevented","button","preventDefault","navigate","replace","resetScroll","hashScrollIntoView","startTransition","viewTransition","ignoreBlocker","handleTouchStart","handleLeave","simpleStyling","class","style","onClick","createComposedHandler","onBlur","onFocus","onMouseEnter","onMouseOver","onMouseLeave","onMouseOut","onTouchStart","ResolvedLinkStateProps","Omit","JSX","CSSProperties","resolvedProps","active","base","STATIC_DISABLED_PROPS","STATIC_DEFAULT_ACTIVE_ATTRIBUTES","EMPTY_OBJECT","className","filter","Boolean","join","STATIC_ACTIVE_ATTRIBUTES","STATIC_ACTIVE_PROPS","role","callHandler","Event","event","TEvent","T","handler","EventHandlerUnion","getHandler","fallback","ActiveLinkOptions","ActiveLinkOptionProps","TComp","ActiveLinkProps","Partial","LinkComponentSolidProps","key","LinkProps","LinkPropsChildren","children","state","ValidComponent","CreateLinkProps","LinkComponentProps","LinkComponent","TDefaultFrom","props","LinkComponentRoute","defaultFrom","createLink","Comp","_$createComponent","Link","_$mergeProps","_asChild","linkProps","ch","svgLinkProps","_el$","_tmpl$","_el$2","firstChild","_$spread","_$insert","_el$3","_tmpl$2","component","metaKey","altKey","ctrlKey","shiftKey","zero","charCodeAt","LinkOptionsFnOptions","TOptions","ReadonlyArray","LinkOptionsFn","linkOptions"],"sources":["../../src/link.tsx"],"sourcesContent":["import * as Solid from 'solid-js'\n\nimport { mergeRefs } from '@solid-primitives/refs'\n\nimport {\n  deepEqual,\n  exactPathTest,\n  functionalUpdate,\n  hasKeys,\n  isDangerousProtocol,\n  preloadWarning,\n  removeTrailingSlash,\n} from '@tanstack/router-core'\n\nimport { isServer } from '@tanstack/router-core/isServer'\nimport { Dynamic } from 'solid-js/web'\nimport { useRouter } from './useRouter'\n\nimport { useIntersectionObserver } from './utils'\n\nimport { useHydrated } from './ClientOnly'\nimport type {\n  AnyRouter,\n  Constrain,\n  LinkOptions,\n  RegisteredRouter,\n  RoutePaths,\n} from '@tanstack/router-core'\nimport type {\n  ValidateLinkOptions,\n  ValidateLinkOptionsArray,\n} from './typePrimitives'\n\nconst timeoutMap = new WeakMap<object, ReturnType<typeof setTimeout>>()\nconst cancelPreload = (eventTarget: object) => {\n  clearTimeout(timeoutMap.get(eventTarget))\n  timeoutMap.delete(eventTarget)\n}\n\nexport function useLinkProps<\n  TRouter extends AnyRouter = RegisteredRouter,\n  TFrom extends RoutePaths<TRouter['routeTree']> | string = string,\n  TTo extends string = '',\n  TMaskFrom extends RoutePaths<TRouter['routeTree']> | string = TFrom,\n  TMaskTo extends string = '',\n>(\n  options: UseLinkPropsOptions<TRouter, TFrom, TTo, TMaskFrom, TMaskTo>,\n): Solid.ComponentProps<'a'> {\n  const router = useRouter()\n  const shouldHydrateHash = !isServer && !!router.options.ssr\n  const hasHydrated = useHydrated()\n\n  let hasRenderFetched = false\n\n  const [local, rest] = Solid.splitProps(\n    Solid.mergeProps(\n      {\n        activeProps: STATIC_ACTIVE_PROPS_GET,\n        inactiveProps: STATIC_INACTIVE_PROPS_GET,\n      },\n      options,\n    ),\n    [\n      'activeProps',\n      'inactiveProps',\n      'activeOptions',\n      'to',\n      'preload',\n      'preloadDelay',\n      'preloadIntentProximity',\n      'hashScrollIntoView',\n      'replace',\n      'startTransition',\n      'resetScroll',\n      'viewTransition',\n      'target',\n      'disabled',\n      'style',\n      'class',\n      'onClick',\n      'onBlur',\n      'onFocus',\n      'onMouseEnter',\n      'onMouseLeave',\n      'onMouseOver',\n      'onMouseOut',\n      'onTouchStart',\n      'ignoreBlocker',\n    ],\n  )\n\n  // const {\n  //   // custom props\n  //   activeProps = () => ({ class: 'active' }),\n  //   inactiveProps = () => ({}),\n  //   activeOptions,\n  //   to,\n  //   preload: userPreload,\n  //   preloadDelay: userPreloadDelay,\n  //   hashScrollIntoView,\n  //   replace,\n  //   startTransition,\n  //   resetScroll,\n  //   viewTransition,\n  //   // element props\n  //   children,\n  //   target,\n  //   disabled,\n  //   style,\n  //   class,\n  //   onClick,\n  //   onFocus,\n  //   onMouseEnter,\n  //   onMouseLeave,\n  //   onTouchStart,\n  //   ignoreBlocker,\n  //   ...rest\n  // } = options\n\n  const [_, propsSafeToSpread] = Solid.splitProps(rest, [\n    'params',\n    'search',\n    'hash',\n    'state',\n    'mask',\n    'reloadDocument',\n    'unsafeRelative',\n    'from',\n  ])\n\n  const currentLocation = Solid.createMemo(\n    () => router.stores.location.get(),\n    undefined,\n    { equals: (prev, next) => prev.href === next.href },\n  )\n\n  const next = Solid.createMemo(() => {\n    // Rebuild when inherited search/hash or the current route context changes.\n    const _fromLocation = currentLocation()\n    const nextOptions = { _fromLocation, ...options } as any\n    // untrack because router-core will also access stores, which are signals in solid\n    return Solid.untrack(() => router.buildLocation(nextOptions))\n  })\n\n  const hrefOption = Solid.createMemo(() => {\n    if (options.disabled) return undefined\n    // Use publicHref - it contains the correct href for display\n    // When a rewrite changes the origin, publicHref is the full URL\n    // Otherwise it's the origin-stripped path\n    // This avoids constructing URL objects in the hot path\n    const location = next().maskedLocation ?? next()\n    const publicHref = location.publicHref\n    const external = location.external\n\n    if (external) {\n      return { href: publicHref, external: true }\n    }\n\n    return {\n      href: router.history.createHref(publicHref) || '/',\n      external: false,\n    }\n  })\n\n  const externalLink = Solid.createMemo(() => {\n    const _href = hrefOption()\n    if (_href?.external) {\n      // Block dangerous protocols for external links\n      if (isDangerousProtocol(_href.href, router.protocolAllowlist)) {\n        if (process.env.NODE_ENV !== 'production') {\n          console.warn(`Blocked Link with dangerous protocol: ${_href.href}`)\n        }\n        return undefined\n      }\n      return _href.href\n    }\n    const to = options.to\n    const safeInternal = isSafeInternal(to)\n    if (safeInternal) return undefined\n    if (typeof to !== 'string' || to.indexOf(':') === -1) return undefined\n    try {\n      new URL(to as any)\n      // Block dangerous protocols like javascript:, blob:, data:\n      if (isDangerousProtocol(to, router.protocolAllowlist)) {\n        if (process.env.NODE_ENV !== 'production') {\n          console.warn(`Blocked Link with dangerous protocol: ${to}`)\n        }\n        return undefined\n      }\n      return to\n    } catch {}\n    return undefined\n  })\n\n  const preload = Solid.createMemo(() => {\n    if (options.reloadDocument || externalLink() || local.disabled) {\n      return false\n    }\n    return local.preload ?? router.options.defaultPreload\n  })\n  const preloadDelay = () =>\n    local.preloadDelay ?? router.options.defaultPreloadDelay ?? 0\n\n  const isActive = Solid.createMemo(() => {\n    if (externalLink()) return false\n    const activeOptions = local.activeOptions\n    const current = currentLocation()\n    const nextLocation = next()\n\n    if (activeOptions?.exact) {\n      const testExact = exactPathTest(\n        current.pathname,\n        nextLocation.pathname,\n        router.basepath,\n      )\n      if (!testExact) {\n        return false\n      }\n    } else {\n      const currentPath = removeTrailingSlash(current.pathname, router.basepath)\n      const nextPath = removeTrailingSlash(\n        nextLocation.pathname,\n        router.basepath,\n      )\n\n      const pathIsFuzzyEqual =\n        currentPath.startsWith(nextPath) &&\n        (currentPath.length === nextPath.length ||\n          currentPath[nextPath.length] === '/')\n      if (!pathIsFuzzyEqual) {\n        return false\n      }\n    }\n\n    if (activeOptions?.includeSearch ?? true) {\n      const searchTest = deepEqual(current.search, nextLocation.search, {\n        partial: !activeOptions?.exact,\n        ignoreUndefined: !activeOptions?.explicitUndefined,\n      })\n      if (!searchTest) {\n        return false\n      }\n    }\n\n    if (activeOptions?.includeHash) {\n      const currentHash =\n        shouldHydrateHash && !hasHydrated() ? '' : current.hash\n      return currentHash === nextLocation.hash\n    }\n    return true\n  })\n\n  const doPreload = () =>\n    router\n      .preloadRoute({ ...options, _builtLocation: next() } as any)\n      .catch((err: any) => {\n        console.warn(err)\n        console.warn(preloadWarning)\n      })\n\n  const [ref, setRef] = Solid.createSignal<Element | null>(null)\n\n  const enqueuePreload = (\n    e?: MouseEvent | FocusEvent | IntersectionObserverEntry,\n  ) => {\n    if (!e) {\n      cancelPreload(ref)\n      return\n    }\n\n    if (\n      !(\n        (e as IntersectionObserverEntry).isIntersecting ??\n        preload() === 'intent'\n      )\n    ) {\n      if ((e as IntersectionObserverEntry).isIntersecting === false) {\n        cancelPreload(ref)\n      }\n      return\n    }\n\n    if (!preloadDelay()) {\n      doPreload()\n      return\n    }\n\n    if (!timeoutMap.has(ref)) {\n      timeoutMap.set(\n        ref,\n        setTimeout(() => {\n          timeoutMap.delete(ref)\n          doPreload()\n        }, preloadDelay()),\n      )\n    }\n  }\n\n  useIntersectionObserver(ref, enqueuePreload, () => preload() !== 'viewport')\n\n  Solid.createEffect(() => {\n    if (hasRenderFetched) {\n      return\n    }\n    if (preload() === 'render') {\n      doPreload()\n      hasRenderFetched = true\n    }\n  })\n\n  if (externalLink()) {\n    return Solid.mergeProps(\n      propsSafeToSpread,\n      {\n        ref: mergeRefs(setRef, options.ref),\n        href: externalLink(),\n      },\n      Solid.splitProps(local, [\n        'target',\n        'disabled',\n        'style',\n        'class',\n        'onClick',\n        'onBlur',\n        'onFocus',\n        'onMouseEnter',\n        'onMouseLeave',\n        'onMouseOut',\n        'onMouseOver',\n        'onTouchStart',\n      ])[0],\n    ) as any\n  }\n\n  // The click handler\n  const handleClick = (e: MouseEvent) => {\n    // Check actual element's target attribute as fallback\n    const elementTarget = (\n      e.currentTarget as HTMLAnchorElement | SVGAElement\n    ).getAttribute('target')\n    const effectiveTarget =\n      local.target !== undefined ? local.target : elementTarget\n\n    if (\n      !local.disabled &&\n      !isCtrlEvent(e) &&\n      !e.defaultPrevented &&\n      (!effectiveTarget || effectiveTarget === '_self') &&\n      e.button === 0\n    ) {\n      e.preventDefault()\n\n      // All is well? Navigate!\n      // N.B. we don't call `router.commitLocation(next) here because we want to run `validateSearch` before committing\n      router.navigate({\n        ...options,\n        replace: local.replace,\n        resetScroll: local.resetScroll,\n        hashScrollIntoView: local.hashScrollIntoView,\n        startTransition: local.startTransition,\n        viewTransition: local.viewTransition,\n        ignoreBlocker: local.ignoreBlocker,\n      })\n    }\n  }\n\n  const handleTouchStart = () => {\n    if (preload() !== 'intent') return\n    doPreload()\n  }\n\n  const handleLeave = () => {\n    if (preload() === 'intent') {\n      cancelPreload(ref)\n    }\n  }\n\n  const simpleStyling = Solid.createMemo(\n    () =>\n      local.activeProps === STATIC_ACTIVE_PROPS_GET &&\n      local.inactiveProps === STATIC_INACTIVE_PROPS_GET &&\n      local.class === undefined &&\n      local.style === undefined,\n  )\n\n  const onClick = createComposedHandler(() => local.onClick, handleClick)\n  const onBlur = createComposedHandler(() => local.onBlur, handleLeave)\n  const onFocus = createComposedHandler(() => local.onFocus, enqueuePreload)\n  const onMouseEnter = createComposedHandler(\n    () => local.onMouseEnter,\n    enqueuePreload,\n  )\n  const onMouseOver = createComposedHandler(\n    () => local.onMouseOver,\n    enqueuePreload,\n  )\n  const onMouseLeave = createComposedHandler(\n    () => local.onMouseLeave,\n    handleLeave,\n  )\n  const onMouseOut = createComposedHandler(() => local.onMouseOut, handleLeave)\n  const onTouchStart = createComposedHandler(\n    () => local.onTouchStart,\n    handleTouchStart,\n  )\n\n  type ResolvedLinkStateProps = Omit<Solid.ComponentProps<'a'>, 'style'> & {\n    style?: Solid.JSX.CSSProperties\n  }\n\n  const resolvedProps = Solid.createMemo(() => {\n    const active = isActive()\n\n    const base = {\n      href: hrefOption()?.href,\n      ref: mergeRefs(setRef, options.ref),\n      onClick,\n      onBlur,\n      onFocus,\n      onMouseEnter,\n      onMouseOver,\n      onMouseLeave,\n      onMouseOut,\n      onTouchStart,\n      disabled: !!local.disabled,\n      target: local.target,\n      ...(local.disabled && STATIC_DISABLED_PROPS),\n    }\n\n    if (simpleStyling()) {\n      return {\n        ...base,\n        ...(active && STATIC_DEFAULT_ACTIVE_ATTRIBUTES),\n      }\n    }\n\n    const activeProps: ResolvedLinkStateProps = active\n      ? (functionalUpdate(local.activeProps as any, {}) ?? EMPTY_OBJECT)\n      : EMPTY_OBJECT\n    const inactiveProps: ResolvedLinkStateProps = active\n      ? EMPTY_OBJECT\n      : functionalUpdate(local.inactiveProps, {})\n    const style = {\n      ...local.style,\n      ...activeProps.style,\n      ...inactiveProps.style,\n    }\n    const className = [local.class, activeProps.class, inactiveProps.class]\n      .filter(Boolean)\n      .join(' ')\n\n    return {\n      ...activeProps,\n      ...inactiveProps,\n      ...base,\n      ...(hasKeys(style) ? { style } : undefined),\n      ...(className ? { class: className } : undefined),\n      ...(active && STATIC_ACTIVE_ATTRIBUTES),\n    } as ResolvedLinkStateProps\n  })\n\n  return Solid.mergeProps(propsSafeToSpread, resolvedProps) as any\n}\n\nconst STATIC_ACTIVE_PROPS = { class: 'active' }\nconst STATIC_ACTIVE_PROPS_GET = () => STATIC_ACTIVE_PROPS\nconst EMPTY_OBJECT = {}\nconst STATIC_INACTIVE_PROPS_GET = () => EMPTY_OBJECT\nconst STATIC_DEFAULT_ACTIVE_ATTRIBUTES = {\n  class: 'active',\n  'data-status': 'active',\n  'aria-current': 'page',\n}\nconst STATIC_DISABLED_PROPS = {\n  role: 'link',\n  'aria-disabled': true,\n}\nconst STATIC_ACTIVE_ATTRIBUTES = {\n  'data-status': 'active',\n  'aria-current': 'page',\n}\n\n/** Call a JSX.EventHandlerUnion with the event. */\nfunction callHandler<T, TEvent extends Event>(\n  event: TEvent & { currentTarget: T; target: Element },\n  handler: Solid.JSX.EventHandlerUnion<T, TEvent>,\n) {\n  if (typeof handler === 'function') {\n    handler(event)\n  } else {\n    handler[0](handler[1], event)\n  }\n  return event.defaultPrevented\n}\n\nfunction createComposedHandler<T, TEvent extends Event>(\n  getHandler: () => Solid.JSX.EventHandlerUnion<T, TEvent> | undefined,\n  fallback: (event: TEvent) => void,\n) {\n  return (event: TEvent & { currentTarget: T; target: Element }) => {\n    const handler = getHandler()\n    if (!handler || !callHandler(event, handler)) fallback(event)\n  }\n}\n\nexport type UseLinkPropsOptions<\n  TRouter extends AnyRouter = RegisteredRouter,\n  TFrom extends RoutePaths<TRouter['routeTree']> | string = string,\n  TTo extends string | undefined = '.',\n  TMaskFrom extends RoutePaths<TRouter['routeTree']> | string = TFrom,\n  TMaskTo extends string = '.',\n> = ActiveLinkOptions<'a', TRouter, TFrom, TTo, TMaskFrom, TMaskTo> &\n  Omit<Solid.ComponentProps<'a'>, 'style'> & { style?: Solid.JSX.CSSProperties }\n\nexport type ActiveLinkOptions<\n  TComp = 'a',\n  TRouter extends AnyRouter = RegisteredRouter,\n  TFrom extends string = string,\n  TTo extends string | undefined = '.',\n  TMaskFrom extends string = TFrom,\n  TMaskTo extends string = '.',\n> = LinkOptions<TRouter, TFrom, TTo, TMaskFrom, TMaskTo> &\n  ActiveLinkOptionProps<TComp>\n\ntype ActiveLinkProps<TComp> = Partial<\n  LinkComponentSolidProps<TComp> & {\n    [key: `data-${string}`]: unknown\n  }\n>\n\nexport interface ActiveLinkOptionProps<TComp = 'a'> {\n  /**\n   * A function that returns additional props for the `active` state of this link.\n   * These props override other props passed to the link (`style`'s are merged, `class`'s are concatenated)\n   */\n  activeProps?: ActiveLinkProps<TComp> | (() => ActiveLinkProps<TComp>)\n  /**\n   * A function that returns additional props for the `inactive` state of this link.\n   * These props override other props passed to the link (`style`'s are merged, `class`'s are concatenated)\n   */\n  inactiveProps?: ActiveLinkProps<TComp> | (() => ActiveLinkProps<TComp>)\n}\n\nexport type LinkProps<\n  TComp = 'a',\n  TRouter extends AnyRouter = RegisteredRouter,\n  TFrom extends string = string,\n  TTo extends string | undefined = '.',\n  TMaskFrom extends string = TFrom,\n  TMaskTo extends string = '.',\n> = ActiveLinkOptions<TComp, TRouter, TFrom, TTo, TMaskFrom, TMaskTo> &\n  LinkPropsChildren\n\nexport interface LinkPropsChildren {\n  // If a function is passed as a child, it will be given the `isActive` boolean to aid in further styling on the element it returns\n  children?:\n    | Solid.JSX.Element\n    | ((state: { isActive: boolean }) => Solid.JSX.Element)\n}\n\ntype LinkComponentSolidProps<TComp> = TComp extends Solid.ValidComponent\n  ? Omit<Solid.ComponentProps<TComp>, keyof CreateLinkProps>\n  : never\n\nexport type LinkComponentProps<\n  TComp = 'a',\n  TRouter extends AnyRouter = RegisteredRouter,\n  TFrom extends string = string,\n  TTo extends string | undefined = '.',\n  TMaskFrom extends string = TFrom,\n  TMaskTo extends string = '.',\n> = LinkComponentSolidProps<TComp> &\n  LinkProps<TComp, TRouter, TFrom, TTo, TMaskFrom, TMaskTo>\n\nexport type CreateLinkProps = LinkProps<\n  any,\n  any,\n  string,\n  string,\n  string,\n  string\n>\n\nexport type LinkComponent<\n  in out TComp,\n  in out TDefaultFrom extends string = string,\n> = <\n  TRouter extends AnyRouter = RegisteredRouter,\n  const TFrom extends string = TDefaultFrom,\n  const TTo extends string | undefined = undefined,\n  const TMaskFrom extends string = TFrom,\n  const TMaskTo extends string = '',\n>(\n  props: LinkComponentProps<TComp, TRouter, TFrom, TTo, TMaskFrom, TMaskTo>,\n) => Solid.JSX.Element\n\nexport interface LinkComponentRoute<\n  in out TDefaultFrom extends string = string,\n> {\n  defaultFrom: TDefaultFrom;\n  <\n    TRouter extends AnyRouter = RegisteredRouter,\n    const TTo extends string | undefined = undefined,\n    const TMaskTo extends string = '',\n  >(\n    props: LinkComponentProps<\n      'a',\n      TRouter,\n      this['defaultFrom'],\n      TTo,\n      this['defaultFrom'],\n      TMaskTo\n    >,\n  ): Solid.JSX.Element\n}\n\nexport function createLink<const TComp>(\n  Comp: Constrain<TComp, any, (props: CreateLinkProps) => Solid.JSX.Element>,\n): LinkComponent<TComp> {\n  return (props) => <Link {...props} _asChild={Comp} />\n}\n\nexport const Link: LinkComponent<'a'> = (props) => {\n  const [local, rest] = Solid.splitProps(\n    props as typeof props & { _asChild: any },\n    ['_asChild', 'children'],\n  )\n\n  const [_, linkProps] = Solid.splitProps(\n    useLinkProps(rest as unknown as any),\n    ['type'],\n  )\n\n  const children = Solid.createMemo(() => {\n    const ch = local.children\n    if (typeof ch === 'function') {\n      return ch({\n        get isActive() {\n          return (linkProps as any)['data-status'] === 'active'\n        },\n      })\n    }\n\n    return ch satisfies Solid.JSX.Element\n  })\n\n  if (local._asChild === 'svg') {\n    const [_, svgLinkProps] = Solid.splitProps(linkProps, ['class'])\n    return (\n      <svg>\n        <a {...svgLinkProps}>{children()}</a>\n      </svg>\n    )\n  }\n\n  if (!local._asChild) {\n    return <a {...linkProps}>{children()}</a>\n  }\n\n  return (\n    <Dynamic component={local._asChild as Solid.ValidComponent} {...linkProps}>\n      {children()}\n    </Dynamic>\n  )\n}\n\nfunction isCtrlEvent(e: MouseEvent) {\n  return !!(e.metaKey || e.altKey || e.ctrlKey || e.shiftKey)\n}\n\nfunction isSafeInternal(to: unknown) {\n  if (typeof to !== 'string') return false\n  const zero = to.charCodeAt(0)\n  if (zero === 47) return to.charCodeAt(1) !== 47 // '/' but not '//'\n  return zero === 46 // '.', '..', './', '../'\n}\n\nexport type LinkOptionsFnOptions<\n  TOptions,\n  TComp,\n  TRouter extends AnyRouter = RegisteredRouter,\n> =\n  TOptions extends ReadonlyArray<any>\n    ? ValidateLinkOptionsArray<TRouter, TOptions, string, TComp>\n    : ValidateLinkOptions<TRouter, TOptions, string, TComp>\n\nexport type LinkOptionsFn<TComp> = <\n  const TOptions,\n  TRouter extends AnyRouter = RegisteredRouter,\n>(\n  options: LinkOptionsFnOptions<TOptions, TComp, TRouter>,\n) => TOptions\n\nexport const linkOptions: LinkOptionsFn<'a'> = (options) => {\n  return options as any\n}\n"],"mappings":"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"}

dist/cjs/link.d.cts

@@ -28,3 +28,2 @@ import { AnyRouter, Constrain, LinkOptions, RegisteredRouter, RoutePaths } from '@tanstack/router-core';
         isActive: boolean;
-        isTransitioning: boolean;
     }) => Solid.JSX.Element);
@@ -31,0 +30,0 @@ }

dist/cjs/Match.cjs

 const require_runtime = require("./_virtual/_rolldown/runtime.cjs");
+const require_nonRouteComponentContext = require("./nonRouteComponentContext.cjs");
 const require_CatchBoundary = require("./CatchBoundary.cjs");
@@ -37,2 +38,5 @@ const require_ClientOnly = require("./ClientOnly.cjs");
 		get fallback() {
+			if (process.env.NODE_ENV !== "production") return require_nonRouteComponentContext.renderInNonRouteComponentContext(() => (0, solid_js_web.createComponent)(solid_js_web.Dynamic, { get component() {
+				return resolvePendingComponent();
+			} }), "pendingComponent");
 			return (0, solid_js_web.createComponent)(solid_js_web.Dynamic, { get component() {
@@ -52,4 +56,8 @@ return resolvePendingComponent();
 					get fallback() {
-						return (0, solid_js_web.memo)(() => !!shouldSkipSuspenseFallback())() ? void 0 : (0, solid_js_web.createComponent)(solid_js_web.Dynamic, { get component() {
+						if (shouldSkipSuspenseFallback()) return;
+						if (process.env.NODE_ENV !== "production") return require_nonRouteComponentContext.renderInNonRouteComponentContext(() => (0, solid_js_web.createComponent)(solid_js_web.Dynamic, { get component() {
 							return resolvePendingComponent();
+						} }), "pendingComponent");
+						return (0, solid_js_web.createComponent)(solid_js_web.Dynamic, { get component() {
+							return resolvePendingComponent();
 						} });
@@ -84,4 +92,6 @@ },
 										if (notFoundError.routeId !== currentMatch().routeId) throw notFoundError;
-										return (0, solid_js_web.createComponent)(solid_js_web.Dynamic, (0, solid_js_web.mergeProps)({ get component() {
+										return process.env.NODE_ENV !== "production" ? require_nonRouteComponentContext.renderInNonRouteComponentContext(() => (0, solid_js_web.createComponent)(solid_js_web.Dynamic, (0, solid_js_web.mergeProps)({ get component() {
 											return routeNotFoundComponent();
+										} }, notFoundError)), "notFoundComponent") : (0, solid_js_web.createComponent)(solid_js_web.Dynamic, (0, solid_js_web.mergeProps)({ get component() {
+											return routeNotFoundComponent();
 										} }, notFoundError));
@@ -98,2 +108,5 @@ },
 														get fallback() {
+															if (process.env.NODE_ENV !== "production") return require_nonRouteComponentContext.renderInNonRouteComponentContext(() => (0, solid_js_web.createComponent)(solid_js_web.Dynamic, { get component() {
+																return resolvePendingComponent();
+															} }), "pendingComponent");
 															return (0, solid_js_web.createComponent)(solid_js_web.Dynamic, { get component() {
@@ -169,8 +182,16 @@ return resolvePendingComponent();
 				children: (_) => {
-					if (_tanstack_router_core_isServer.isServer ?? router.isServer) return (0, solid_js_web.createComponent)((route.options.errorComponent ?? router.options.defaultErrorComponent) || require_CatchBoundary.ErrorComponent, {
-						get error() {
-							return currentMatch().error;
-						},
-						info: { componentStack: "" }
-					});
+					if (_tanstack_router_core_isServer.isServer ?? router.isServer) {
+						const RouteErrorComponent = (route.options.errorComponent ?? router.options.defaultErrorComponent) || require_CatchBoundary.ErrorComponent;
+						return process.env.NODE_ENV !== "production" ? require_nonRouteComponentContext.renderInNonRouteComponentContext(() => (0, solid_js_web.createComponent)(RouteErrorComponent, {
+							get error() {
+								return currentMatch().error;
+							},
+							info: { componentStack: "" }
+						}), "errorComponent") : (0, solid_js_web.createComponent)(RouteErrorComponent, {
+							get error() {
+								return currentMatch().error;
+							},
+							info: { componentStack: "" }
+						});
+					}
 					throw currentMatch().error;
@@ -191,2 +212,6 @@ }
 var Outlet = () => {
+	if (process.env.NODE_ENV !== "production") {
+		const nonRouteComponent = solid_js.useContext(require_nonRouteComponentContext.nonRouteComponentContext);
+		if (nonRouteComponent) console.warn(`Warning: An <Outlet /> was rendered inside a ${nonRouteComponent}. <Outlet /> should only be rendered inside a route component.`);
+	}
 	const router = require_useRouter.useRouter();
@@ -223,2 +248,5 @@ const nearestParentMatch = solid_js.useContext(require_matchContext.nearestMatchContext);
 						get fallback() {
+							if (process.env.NODE_ENV !== "production") return require_nonRouteComponentContext.renderInNonRouteComponentContext(() => (0, solid_js_web.createComponent)(solid_js_web.Dynamic, { get component() {
+								return router.options.defaultPendingComponent;
+							} }), "pendingComponent");
 							return (0, solid_js_web.createComponent)(solid_js_web.Dynamic, { get component() {
@@ -225,0 +253,0 @@ return router.options.defaultPendingComponent;

dist/cjs/Match.cjs.map

@@ -1,1 +0,1 @@
-{"version":3,"file":"Match.cjs","names":["Solid","rootRouteId","isServer","Dynamic","CatchBoundary","ErrorComponent","useRouter","CatchNotFound","getNotFound","nearestMatchContext","SafeFragment","renderRouteNotFound","ScrollRestoration","ClientOnly","AnyRoute","AnyRouter","RootRouteOptions","renderScrollRestoration","undefined","router","route","parentRoute","id","options","scrollRestoration","_$createComponent","Match","props","routeId","currentMatch","createMemo","stores","byRoute","get","nearestMatch","const","routesById","routeOptions","resolvePendingComponent","pendingComponent","defaultPendingComponent","routeErrorComponent","errorComponent","defaultErrorComponent","routeNotFoundComponent","isRoot","notFoundComponent","notFoundRoute","component","resolvedNoSsr","ssr","shouldSkipSuspenseFallback","ShellComponent","shellComponent","MatchContent","Show","when","status","fallback","children","MatchInner","Provider","value","Suspense","_$memo","getResetKey","onCatch","error","Error","notFoundError","process","env","NODE_ENV","console","warn","defaultOnCatch","_$mergeProps","Switch","useContext","match","componentKey","current","remount","remountDeps","defaultRemountDeps","deps","loaderDeps","params","_strictParams","search","_strictSearch","JSON","stringify","out","Comp","defaultComponent","Outlet","keyedOut","keyed","_key","_","RouteErrorComponent","info","componentStack","nearestParentMatch","parentMatch","childRouteId","_notFound","ids","indexOf","_routeKey"],"sources":["../../src/Match.tsx"],"sourcesContent":["import * as Solid from 'solid-js'\nimport { rootRouteId } from '@tanstack/router-core'\nimport { isServer } from '@tanstack/router-core/isServer'\nimport { Dynamic } from 'solid-js/web'\nimport { CatchBoundary, ErrorComponent } from './CatchBoundary'\nimport { useRouter } from './useRouter'\nimport { CatchNotFound, getNotFound } from './not-found'\nimport { nearestMatchContext } from './matchContext'\nimport { SafeFragment } from './SafeFragment'\nimport { renderRouteNotFound } from './renderRouteNotFound'\nimport { ScrollRestoration } from './scroll-restoration'\nimport { ClientOnly } from './ClientOnly'\nimport type {\n  AnyRoute,\n  AnyRouter,\n  RootRouteOptions,\n} from '@tanstack/router-core'\n\n// Keep the client constant undefined so the server-only script can be dropped.\nconst renderScrollRestoration =\n  isServer === false\n    ? undefined\n    : (router: AnyRouter, route: AnyRoute) =>\n        (isServer ?? router.isServer) &&\n        route.parentRoute?.id === rootRouteId &&\n        router.options.scrollRestoration ? (\n          <ScrollRestoration />\n        ) : null\n\nexport const Match = (props: { routeId: string }) => {\n  const router = useRouter()\n\n  const currentMatch = Solid.createMemo(\n    () => router.stores.byRoute.get(props.routeId)!.get()!,\n  )\n\n  const nearestMatch = [() => props.routeId, currentMatch] as const\n\n  const route: AnyRoute = router.routesById[props.routeId]\n\n  // Lazy route option mutations become observable with the next client match\n  // publication. Server stores are non-reactive and options load before render.\n  const routeOptions =\n    (isServer ?? router.isServer)\n      ? () => route.options\n      : () => {\n          currentMatch()\n          return route.options\n        }\n\n  const resolvePendingComponent = () =>\n    routeOptions().pendingComponent ?? router.options.defaultPendingComponent\n\n  const routeErrorComponent = () =>\n    routeOptions().errorComponent ?? router.options.defaultErrorComponent\n\n  const routeNotFoundComponent = () =>\n    route.isRoot\n      ? // If it's the root route, use the _notFound option, with fallback to the notFoundRoute's component\n        (routeOptions().notFoundComponent ??\n        router.options.notFoundRoute?.options.component)\n      : routeOptions().notFoundComponent\n\n  const resolvedNoSsr = () =>\n    currentMatch().ssr === false || currentMatch().ssr === 'data-only'\n\n  const shouldSkipSuspenseFallback = () =>\n    (isServer ?? router.isServer)\n      ? resolvedNoSsr()\n      : currentMatch().ssr === 'data-only'\n\n  const ShellComponent = route.isRoot\n    ? ((route.options as RootRouteOptions).shellComponent ?? SafeFragment)\n    : SafeFragment\n\n  const MatchContent = () => (\n    <Solid.Show\n      when={currentMatch().status !== 'pending'}\n      fallback={<Dynamic component={resolvePendingComponent()} />}\n    >\n      <MatchInner />\n    </Solid.Show>\n  )\n\n  return (\n    <ShellComponent>\n      <nearestMatchContext.Provider value={nearestMatch}>\n        <Solid.Suspense\n          fallback={\n            // Data-only SSR renders the inner fallback on the server, so\n            // avoid adding an extra suspense fallback on the client.\n            shouldSkipSuspenseFallback() ? undefined : (\n              <Dynamic component={resolvePendingComponent()} />\n            )\n          }\n        >\n          <Dynamic\n            component={routeErrorComponent() ? CatchBoundary : SafeFragment}\n            getResetKey={currentMatch}\n            errorComponent={routeErrorComponent() as any}\n            onCatch={(error: Error) => {\n              // Forward not found errors (we don't want to show the error component for these)\n              const notFoundError = getNotFound(error)\n              if (notFoundError) {\n                notFoundError.routeId ??= currentMatch().routeId\n                throw notFoundError\n              }\n              if (process.env.NODE_ENV !== 'production') {\n                console.warn(\n                  `Warning: Error in route match: ${currentMatch().routeId}`,\n                )\n              }\n              ;(route.options.onCatch ?? router.options.defaultOnCatch)?.(error)\n            }}\n          >\n            <Dynamic\n              component={\n                routeNotFoundComponent() ? CatchNotFound : SafeFragment\n              }\n              fallback={(error: any) => {\n                const notFoundError = getNotFound(error) ?? error\n\n                notFoundError.routeId ??= currentMatch().routeId\n\n                if (notFoundError.routeId !== currentMatch().routeId) {\n                  throw notFoundError\n                }\n\n                return (\n                  <Dynamic\n                    component={routeNotFoundComponent()}\n                    {...notFoundError}\n                  />\n                )\n              }}\n            >\n              <Solid.Switch>\n                <Solid.Match when={resolvedNoSsr()}>\n                  <ClientOnly\n                    fallback={<Dynamic component={resolvePendingComponent()} />}\n                  >\n                    <MatchContent />\n                  </ClientOnly>\n                </Solid.Match>\n                <Solid.Match when={!resolvedNoSsr()}>\n                  <MatchContent />\n                </Solid.Match>\n              </Solid.Switch>\n            </Dynamic>\n          </Dynamic>\n        </Solid.Suspense>\n      </nearestMatchContext.Provider>\n\n      {renderScrollRestoration?.(router, route)}\n    </ShellComponent>\n  )\n}\n\nexport const MatchInner = (): any => {\n  const router = useRouter()\n  const nearestMatch = Solid.useContext(nearestMatchContext)\n  const match = nearestMatch[1 /* match */]\n  const routeId = nearestMatch[0 /* route id */]\n  const route = router.routesById[routeId()!]!\n  const currentMatch = () => match()!\n\n  const componentKey = () => {\n    const current = currentMatch()\n    const remount =\n      route.options.remountDeps ?? router.options.defaultRemountDeps\n    const deps = remount?.({\n      routeId: routeId()!,\n      loaderDeps: current.loaderDeps,\n      params: current._strictParams,\n      search: current._strictSearch,\n    })\n    return deps ? JSON.stringify(deps) : current.id\n  }\n\n  const out = () => {\n    const Comp = route.options.component ?? router.options.defaultComponent\n    if (Comp) {\n      return <Comp />\n    }\n    return <Outlet />\n  }\n\n  const keyedOut = () => (\n    <Solid.Show when={componentKey()} keyed>\n      {(_key) => out()}\n    </Solid.Show>\n  )\n\n  return (\n    <Solid.Switch>\n      <Solid.Match when={currentMatch().status === 'notFound'}>\n        {(_) => renderRouteNotFound(router, route, currentMatch().error)}\n      </Solid.Match>\n      <Solid.Match when={currentMatch().status === 'error'}>\n        {(_) => {\n          if (isServer ?? router.isServer) {\n            const RouteErrorComponent =\n              (route.options.errorComponent ??\n                router.options.defaultErrorComponent) ||\n              ErrorComponent\n\n            return (\n              <RouteErrorComponent\n                error={currentMatch().error}\n                info={{\n                  componentStack: '',\n                }}\n              />\n            )\n          }\n\n          throw currentMatch().error\n        }}\n      </Solid.Match>\n      <Solid.Match when={currentMatch().status === 'success'}>\n        {keyedOut()}\n      </Solid.Match>\n    </Solid.Switch>\n  )\n}\n\nexport const Outlet = () => {\n  const router = useRouter()\n  const nearestParentMatch = Solid.useContext(nearestMatchContext)\n  const parentMatch = nearestParentMatch[1 /* match */]\n  const routeId = nearestParentMatch[0 /* route id */]\n  const route = router.routesById[routeId()!]!\n\n  const childRouteId = () => {\n    if (parentMatch()!._notFound) {\n      return\n    }\n    const ids = router.stores.ids.get()\n    return ids[ids.indexOf(routeId()!) + 1]\n  }\n\n  return (\n    <Solid.Show\n      when={childRouteId()}\n      keyed\n      fallback={\n        parentMatch()!._notFound\n          ? renderRouteNotFound(router, route, parentMatch()!.error)\n          : undefined\n      }\n    >\n      {(_routeKey: string) => {\n        return (\n          <Solid.Show\n            when={routeId() === rootRouteId}\n            fallback={<Match routeId={childRouteId()!} />}\n          >\n            <Solid.Suspense\n              fallback={\n                <Dynamic component={router.options.defaultPendingComponent} />\n              }\n            >\n              <Match routeId={childRouteId()!} />\n            </Solid.Suspense>\n          </Solid.Show>\n        )\n      }}\n    </Solid.Show>\n  )\n}\n"],"mappings":"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"}
+{"version":3,"file":"Match.cjs","names":["Solid","rootRouteId","isServer","Dynamic","CatchBoundary","ErrorComponent","useRouter","CatchNotFound","getNotFound","nearestMatchContext","SafeFragment","renderRouteNotFound","ScrollRestoration","ClientOnly","nonRouteComponentContext","renderInNonRouteComponentContext","AnyRoute","AnyRouter","RootRouteOptions","renderScrollRestoration","undefined","router","route","parentRoute","id","options","scrollRestoration","_$createComponent","Match","props","routeId","currentMatch","createMemo","stores","byRoute","get","nearestMatch","const","routesById","routeOptions","resolvePendingComponent","pendingComponent","defaultPendingComponent","routeErrorComponent","errorComponent","defaultErrorComponent","routeNotFoundComponent","isRoot","notFoundComponent","notFoundRoute","component","resolvedNoSsr","ssr","shouldSkipSuspenseFallback","ShellComponent","shellComponent","MatchContent","Show","when","status","fallback","process","env","NODE_ENV","children","MatchInner","Provider","value","Suspense","getResetKey","onCatch","error","Error","notFoundError","console","warn","defaultOnCatch","_$mergeProps","Switch","_$memo","useContext","match","componentKey","current","remount","remountDeps","defaultRemountDeps","deps","loaderDeps","params","_strictParams","search","_strictSearch","JSON","stringify","out","Comp","defaultComponent","Outlet","keyedOut","keyed","_key","_","RouteErrorComponent","info","componentStack","nonRouteComponent","nearestParentMatch","parentMatch","childRouteId","_notFound","ids","indexOf","_routeKey"],"sources":["../../src/Match.tsx"],"sourcesContent":["import * as Solid from 'solid-js'\nimport { rootRouteId } from '@tanstack/router-core'\nimport { isServer } from '@tanstack/router-core/isServer'\nimport { Dynamic } from 'solid-js/web'\nimport { CatchBoundary, ErrorComponent } from './CatchBoundary'\nimport { useRouter } from './useRouter'\nimport { CatchNotFound, getNotFound } from './not-found'\nimport { nearestMatchContext } from './matchContext'\nimport { SafeFragment } from './SafeFragment'\nimport { renderRouteNotFound } from './renderRouteNotFound'\nimport { ScrollRestoration } from './scroll-restoration'\nimport { ClientOnly } from './ClientOnly'\nimport {\n  nonRouteComponentContext,\n  renderInNonRouteComponentContext,\n} from './nonRouteComponentContext'\nimport type {\n  AnyRoute,\n  AnyRouter,\n  RootRouteOptions,\n} from '@tanstack/router-core'\n\n// Keep the client constant undefined so the server-only script can be dropped.\nconst renderScrollRestoration =\n  isServer === false\n    ? undefined\n    : (router: AnyRouter, route: AnyRoute) =>\n        (isServer ?? router.isServer) &&\n        route.parentRoute?.id === rootRouteId &&\n        router.options.scrollRestoration ? (\n          <ScrollRestoration />\n        ) : null\n\nexport const Match = (props: { routeId: string }) => {\n  const router = useRouter()\n\n  const currentMatch = Solid.createMemo(\n    () => router.stores.byRoute.get(props.routeId)!.get()!,\n  )\n\n  const nearestMatch = [() => props.routeId, currentMatch] as const\n\n  const route: AnyRoute = router.routesById[props.routeId]\n\n  // Lazy route option mutations become observable with the next client match\n  // publication. Server stores are non-reactive and options load before render.\n  const routeOptions =\n    (isServer ?? router.isServer)\n      ? () => route.options\n      : () => {\n          currentMatch()\n          return route.options\n        }\n\n  const resolvePendingComponent = () =>\n    routeOptions().pendingComponent ?? router.options.defaultPendingComponent\n\n  const routeErrorComponent = () =>\n    routeOptions().errorComponent ?? router.options.defaultErrorComponent\n\n  const routeNotFoundComponent = () =>\n    route.isRoot\n      ? // If it's the root route, use the _notFound option, with fallback to the notFoundRoute's component\n        (routeOptions().notFoundComponent ??\n        router.options.notFoundRoute?.options.component)\n      : routeOptions().notFoundComponent\n\n  const resolvedNoSsr = () =>\n    currentMatch().ssr === false || currentMatch().ssr === 'data-only'\n\n  const shouldSkipSuspenseFallback = () =>\n    (isServer ?? router.isServer)\n      ? resolvedNoSsr()\n      : currentMatch().ssr === 'data-only'\n\n  const ShellComponent = route.isRoot\n    ? ((route.options as RootRouteOptions).shellComponent ?? SafeFragment)\n    : SafeFragment\n\n  const MatchContent = () => (\n    <Solid.Show\n      when={currentMatch().status !== 'pending'}\n      fallback={(() => {\n        if (process.env.NODE_ENV !== 'production') {\n          return renderInNonRouteComponentContext(\n            () => <Dynamic component={resolvePendingComponent()} />,\n            'pendingComponent',\n          )\n        }\n        return <Dynamic component={resolvePendingComponent()} />\n      })()}\n    >\n      <MatchInner />\n    </Solid.Show>\n  )\n\n  return (\n    <ShellComponent>\n      <nearestMatchContext.Provider value={nearestMatch}>\n        <Solid.Suspense\n          fallback={(() => {\n            // Data-only SSR renders the inner fallback on the server, so\n            // avoid adding an extra suspense fallback on the client.\n            if (shouldSkipSuspenseFallback()) {\n              return undefined\n            }\n            if (process.env.NODE_ENV !== 'production') {\n              return renderInNonRouteComponentContext(\n                () => <Dynamic component={resolvePendingComponent()} />,\n                'pendingComponent',\n              )\n            }\n            return <Dynamic component={resolvePendingComponent()} />\n          })()}\n        >\n          <Dynamic\n            component={routeErrorComponent() ? CatchBoundary : SafeFragment}\n            getResetKey={currentMatch}\n            errorComponent={routeErrorComponent() as any}\n            onCatch={(error: Error) => {\n              // Forward not found errors (we don't want to show the error component for these)\n              const notFoundError = getNotFound(error)\n              if (notFoundError) {\n                notFoundError.routeId ??= currentMatch().routeId\n                throw notFoundError\n              }\n              if (process.env.NODE_ENV !== 'production') {\n                console.warn(\n                  `Warning: Error in route match: ${currentMatch().routeId}`,\n                )\n              }\n              ;(route.options.onCatch ?? router.options.defaultOnCatch)?.(error)\n            }}\n          >\n            <Dynamic\n              component={\n                routeNotFoundComponent() ? CatchNotFound : SafeFragment\n              }\n              fallback={(error: any) => {\n                const notFoundError = getNotFound(error) ?? error\n\n                notFoundError.routeId ??= currentMatch().routeId\n\n                if (notFoundError.routeId !== currentMatch().routeId) {\n                  throw notFoundError\n                }\n\n                return process.env.NODE_ENV !== 'production' ? (\n                  renderInNonRouteComponentContext(\n                    () => (\n                      <Dynamic\n                        component={routeNotFoundComponent()}\n                        {...notFoundError}\n                      />\n                    ),\n                    'notFoundComponent',\n                  )\n                ) : (\n                  <Dynamic\n                    component={routeNotFoundComponent()}\n                    {...notFoundError}\n                  />\n                )\n              }}\n            >\n              <Solid.Switch>\n                <Solid.Match when={resolvedNoSsr()}>\n                  <ClientOnly\n                    fallback={(() => {\n                      if (process.env.NODE_ENV !== 'production') {\n                        return renderInNonRouteComponentContext(\n                          () => (\n                            <Dynamic component={resolvePendingComponent()} />\n                          ),\n                          'pendingComponent',\n                        )\n                      }\n                      return <Dynamic component={resolvePendingComponent()} />\n                    })()}\n                  >\n                    <MatchContent />\n                  </ClientOnly>\n                </Solid.Match>\n                <Solid.Match when={!resolvedNoSsr()}>\n                  <MatchContent />\n                </Solid.Match>\n              </Solid.Switch>\n            </Dynamic>\n          </Dynamic>\n        </Solid.Suspense>\n      </nearestMatchContext.Provider>\n\n      {renderScrollRestoration?.(router, route)}\n    </ShellComponent>\n  )\n}\n\nexport const MatchInner = (): any => {\n  const router = useRouter()\n  const nearestMatch = Solid.useContext(nearestMatchContext)\n  const match = nearestMatch[1 /* match */]\n  const routeId = nearestMatch[0 /* route id */]\n  const route = router.routesById[routeId()!]!\n  const currentMatch = () => match()!\n\n  const componentKey = () => {\n    const current = currentMatch()\n    const remount =\n      route.options.remountDeps ?? router.options.defaultRemountDeps\n    const deps = remount?.({\n      routeId: routeId()!,\n      loaderDeps: current.loaderDeps,\n      params: current._strictParams,\n      search: current._strictSearch,\n    })\n    return deps ? JSON.stringify(deps) : current.id\n  }\n\n  const out = () => {\n    const Comp = route.options.component ?? router.options.defaultComponent\n    if (Comp) {\n      return <Comp />\n    }\n    return <Outlet />\n  }\n\n  const keyedOut = () => (\n    <Solid.Show when={componentKey()} keyed>\n      {(_key) => out()}\n    </Solid.Show>\n  )\n\n  return (\n    <Solid.Switch>\n      <Solid.Match when={currentMatch().status === 'notFound'}>\n        {(_) => renderRouteNotFound(router, route, currentMatch().error)}\n      </Solid.Match>\n      <Solid.Match when={currentMatch().status === 'error'}>\n        {(_) => {\n          if (isServer ?? router.isServer) {\n            const RouteErrorComponent =\n              (route.options.errorComponent ??\n                router.options.defaultErrorComponent) ||\n              ErrorComponent\n\n            return process.env.NODE_ENV !== 'production' ? (\n              renderInNonRouteComponentContext(\n                () => (\n                  <RouteErrorComponent\n                    error={currentMatch().error}\n                    info={{\n                      componentStack: '',\n                    }}\n                  />\n                ),\n                'errorComponent',\n              )\n            ) : (\n              <RouteErrorComponent\n                error={currentMatch().error}\n                info={{\n                  componentStack: '',\n                }}\n              />\n            )\n          }\n\n          throw currentMatch().error\n        }}\n      </Solid.Match>\n      <Solid.Match when={currentMatch().status === 'success'}>\n        {keyedOut()}\n      </Solid.Match>\n    </Solid.Switch>\n  )\n}\n\nexport const Outlet = () => {\n  if (process.env.NODE_ENV !== 'production') {\n    const nonRouteComponent = Solid.useContext(nonRouteComponentContext!)\n    if (nonRouteComponent) {\n      console.warn(\n        `Warning: An <Outlet /> was rendered inside a ${nonRouteComponent}. <Outlet /> should only be rendered inside a route component.`,\n      )\n    }\n  }\n\n  const router = useRouter()\n  const nearestParentMatch = Solid.useContext(nearestMatchContext)\n  const parentMatch = nearestParentMatch[1 /* match */]\n  const routeId = nearestParentMatch[0 /* route id */]\n  const route = router.routesById[routeId()!]!\n\n  const childRouteId = () => {\n    if (parentMatch()!._notFound) {\n      return\n    }\n    const ids = router.stores.ids.get()\n    return ids[ids.indexOf(routeId()!) + 1]\n  }\n\n  return (\n    <Solid.Show\n      when={childRouteId()}\n      keyed\n      fallback={\n        parentMatch()!._notFound\n          ? renderRouteNotFound(router, route, parentMatch()!.error)\n          : undefined\n      }\n    >\n      {(_routeKey: string) => {\n        return (\n          <Solid.Show\n            when={routeId() === rootRouteId}\n            fallback={<Match routeId={childRouteId()!} />}\n          >\n            <Solid.Suspense\n              fallback={(() => {\n                if (process.env.NODE_ENV !== 'production') {\n                  return renderInNonRouteComponentContext(\n                    () => (\n                      <Dynamic\n                        component={router.options.defaultPendingComponent}\n                      />\n                    ),\n                    'pendingComponent',\n                  )\n                }\n                return (\n                  <Dynamic component={router.options.defaultPendingComponent} />\n                )\n              })()}\n            >\n              <Match routeId={childRouteId()!} />\n            </Solid.Suspense>\n          </Solid.Show>\n        )\n      }}\n    </Solid.Show>\n  )\n}\n"],"mappings":"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"}

dist/cjs/Matches.cjs

 const require_runtime = require("./_virtual/_rolldown/runtime.cjs");
+const require_nonRouteComponentContext = require("./nonRouteComponentContext.cjs");
 const require_CatchBoundary = require("./CatchBoundary.cjs");
@@ -22,3 +23,6 @@ const require_useRouter = require("./useRouter.cjs");
 			get fallback() {
-				return PendingComponent ? (0, solid_js_web.createComponent)(PendingComponent, {}) : null;
+				return PendingComponent ? (() => {
+					if (process.env.NODE_ENV !== "production") return require_nonRouteComponentContext.renderInNonRouteComponentContext(() => (0, solid_js_web.createComponent)(PendingComponent, {}), "pendingComponent");
+					return (0, solid_js_web.createComponent)(PendingComponent, {});
+				})() : null;
 			},
@@ -25,0 +29,0 @@ get children() {

dist/cjs/Matches.cjs.map

@@ -1,1 +0,1 @@
-{"version":3,"file":"Matches.cjs","names":["Solid","replaceEqualDeep","rootRouteId","isServer","CatchBoundary","ErrorComponent","useRouter","Rendered","Transitioner","nearestMatchContext","SafeFragment","Match","AnyRoute","AnyRouter","DeepPartial","Expand","MakeOptionalPathParams","MakeOptionalSearchParams","MakeRouteMatchUnion","MaskOptions","MatchRouteOptions","RegisteredRouter","ResolveRoute","ToSubOptionsProps","RouteMatchExtensions","meta","Array","JSX","IntrinsicElements","links","scripts","styles","headScripts","Matches","router","ResolvedSuspense","document","ssr","Suspense","rootRoute","routesById","PendingComponent","options","pendingComponent","defaultPendingComponent","OptionalWrapper","InnerWrap","_$createComponent","children","fallback","MatchesInner","routeId","stores","ids","get","match","byRoute","undefined","nearestMatch","const","matchComponent","Show","when","Provider","value","_$memo","disableGlobalCatchBoundary","getResetKey","errorComponent","onCatch","process","env","NODE_ENV","error","console","warn","message","toString","UseMatchRouteOptions","TFrom","TRouter","TTo","TMaskFrom","TMaskTo","useMatchRoute","opts","Accessor","createMemo","pending","caseSensitive","fuzzy","includeSearch","rest","location","resolvedLocation","status","matchRoute","MakeMatchRouteOptions","params","Element","MatchRoute","props","renderedChild","matchedParams","child","UseMatchesBaseOptions","select","matches","TSelected","UseMatchesResult","useMatches","prev","res","useParentMatches","contextRouteId","useContext","slice","findIndex","d","useChildMatches"],"sources":["../../src/Matches.tsx"],"sourcesContent":["import * as Solid from 'solid-js'\nimport { replaceEqualDeep, rootRouteId } from '@tanstack/router-core'\nimport { isServer } from '@tanstack/router-core/isServer'\nimport { CatchBoundary, ErrorComponent } from './CatchBoundary'\nimport { useRouter } from './useRouter'\nimport { Rendered, Transitioner } from './Transitioner'\nimport { nearestMatchContext } from './matchContext'\nimport { SafeFragment } from './SafeFragment'\nimport { Match } from './Match'\nimport type {\n  AnyRoute,\n  AnyRouter,\n  DeepPartial,\n  Expand,\n  MakeOptionalPathParams,\n  MakeOptionalSearchParams,\n  MakeRouteMatchUnion,\n  MaskOptions,\n  MatchRouteOptions,\n  RegisteredRouter,\n  ResolveRoute,\n  ToSubOptionsProps,\n} from '@tanstack/router-core'\n\ndeclare module '@tanstack/router-core' {\n  export interface RouteMatchExtensions {\n    meta?: Array<Solid.JSX.IntrinsicElements['meta'] | undefined>\n    links?: Array<Solid.JSX.IntrinsicElements['link'] | undefined>\n    scripts?: Array<Solid.JSX.IntrinsicElements['script'] | undefined>\n    styles?: Array<Solid.JSX.IntrinsicElements['style'] | undefined>\n    headScripts?: Array<Solid.JSX.IntrinsicElements['script'] | undefined>\n  }\n}\n\nexport function Matches() {\n  const router = useRouter()\n\n  const ResolvedSuspense =\n    (isServer ?? router.isServer) ||\n    (typeof document !== 'undefined' && router.ssr)\n      ? SafeFragment\n      : Solid.Suspense\n\n  const rootRoute: () => AnyRoute = () => router.routesById[rootRouteId]\n  const PendingComponent =\n    rootRoute().options.pendingComponent ??\n    router.options.defaultPendingComponent\n\n  const OptionalWrapper = router.options.InnerWrap || SafeFragment\n\n  return (\n    <OptionalWrapper>\n      <ResolvedSuspense\n        fallback={PendingComponent ? <PendingComponent /> : null}\n      >\n        <Transitioner />\n        <MatchesInner />\n        <Rendered />\n      </ResolvedSuspense>\n    </OptionalWrapper>\n  )\n}\n\nfunction MatchesInner() {\n  const router = useRouter()\n  const routeId = () => router.stores.ids.get()[0]\n  const match = () =>\n    routeId() ? router.stores.byRoute.get(routeId()!)?.get() : undefined\n  const nearestMatch = [routeId, match] as const\n\n  const matchComponent = () => {\n    return (\n      <Solid.Show when={routeId()}>\n        <Match routeId={routeId()!} />\n      </Solid.Show>\n    )\n  }\n\n  return (\n    <nearestMatchContext.Provider value={nearestMatch}>\n      {router.options.disableGlobalCatchBoundary ? (\n        matchComponent()\n      ) : (\n        <CatchBoundary\n          getResetKey={match}\n          errorComponent={ErrorComponent}\n          onCatch={\n            process.env.NODE_ENV !== 'production'\n              ? (error) => {\n                  console.warn(\n                    `Warning: The following error wasn't caught by any route! At the very least, consider setting an 'errorComponent' in your RootRoute!`,\n                  )\n                  console.warn(`Warning: ${error.message || error.toString()}`)\n                }\n              : undefined\n          }\n        >\n          {matchComponent()}\n        </CatchBoundary>\n      )}\n    </nearestMatchContext.Provider>\n  )\n}\n\nexport type UseMatchRouteOptions<\n  TRouter extends AnyRouter = RegisteredRouter,\n  TFrom extends string = string,\n  TTo extends string | undefined = undefined,\n  TMaskFrom extends string = TFrom,\n  TMaskTo extends string = '',\n> = ToSubOptionsProps<TRouter, TFrom, TTo> &\n  DeepPartial<MakeOptionalSearchParams<TRouter, TFrom, TTo>> &\n  DeepPartial<MakeOptionalPathParams<TRouter, TFrom, TTo>> &\n  MaskOptions<TRouter, TMaskFrom, TMaskTo> &\n  MatchRouteOptions\n\nexport function useMatchRoute<TRouter extends AnyRouter = RegisteredRouter>() {\n  const router = useRouter()\n\n  return <\n    const TFrom extends string = string,\n    const TTo extends string | undefined = undefined,\n    const TMaskFrom extends string = TFrom,\n    const TMaskTo extends string = '',\n  >(\n    opts: UseMatchRouteOptions<TRouter, TFrom, TTo, TMaskFrom, TMaskTo>,\n  ): Solid.Accessor<\n    false | Expand<ResolveRoute<TRouter, TFrom, TTo>['types']['allParams']>\n  > => {\n    return Solid.createMemo(() => {\n      const { pending, caseSensitive, fuzzy, includeSearch, ...rest } = opts\n\n      router.stores.location.get()\n      router.stores.resolvedLocation.get()\n      router.stores.status.get()\n      return router.matchRoute(rest as any, {\n        pending,\n        caseSensitive,\n        fuzzy,\n        includeSearch,\n      })\n    })\n  }\n}\n\nexport type MakeMatchRouteOptions<\n  TRouter extends AnyRouter = RegisteredRouter,\n  TFrom extends string = string,\n  TTo extends string | undefined = undefined,\n  TMaskFrom extends string = TFrom,\n  TMaskTo extends string = '',\n> = UseMatchRouteOptions<TRouter, TFrom, TTo, TMaskFrom, TMaskTo> & {\n  // If a function is passed as a child, it will be given the `isActive` boolean to aid in further styling on the element it returns\n  children?:\n    | ((\n        params?: Expand<\n          ResolveRoute<TRouter, TFrom, TTo>['types']['allParams']\n        >,\n      ) => Solid.JSX.Element)\n    | Solid.JSX.Element\n}\n\nexport function MatchRoute<\n  TRouter extends AnyRouter = RegisteredRouter,\n  const TFrom extends string = string,\n  const TTo extends string | undefined = undefined,\n  const TMaskFrom extends string = TFrom,\n  const TMaskTo extends string = '',\n>(props: MakeMatchRouteOptions<TRouter, TFrom, TTo, TMaskFrom, TMaskTo>): any {\n  const matchRoute = useMatchRoute()\n  const params = matchRoute(props as any)\n\n  const renderedChild = Solid.createMemo(() => {\n    const matchedParams = params()\n    const child = props.children\n\n    if (typeof child === 'function') {\n      return (child as any)(matchedParams)\n    }\n\n    return matchedParams ? child : null\n  })\n\n  return <>{renderedChild()}</>\n}\n\nexport interface UseMatchesBaseOptions<TRouter extends AnyRouter, TSelected> {\n  select?: (matches: Array<MakeRouteMatchUnion<TRouter>>) => TSelected\n}\n\nexport type UseMatchesResult<\n  TRouter extends AnyRouter,\n  TSelected,\n> = unknown extends TSelected ? Array<MakeRouteMatchUnion<TRouter>> : TSelected\n\nexport function useMatches<\n  TRouter extends AnyRouter = RegisteredRouter,\n  TSelected = unknown,\n>(\n  opts?: UseMatchesBaseOptions<TRouter, TSelected>,\n): Solid.Accessor<UseMatchesResult<TRouter, TSelected>> {\n  const router = useRouter<TRouter>()\n  return Solid.createMemo((prev: TSelected | undefined) => {\n    const matches = router.stores.matches.get() as Array<\n      MakeRouteMatchUnion<TRouter>\n    >\n    const res = opts?.select ? opts.select(matches) : matches\n    if (prev === undefined) return res\n    return replaceEqualDeep(prev, res) as any\n  }) as Solid.Accessor<UseMatchesResult<TRouter, TSelected>>\n}\n\nexport function useParentMatches<\n  TRouter extends AnyRouter = RegisteredRouter,\n  TSelected = unknown,\n>(\n  opts?: UseMatchesBaseOptions<TRouter, TSelected>,\n): Solid.Accessor<UseMatchesResult<TRouter, TSelected>> {\n  const contextRouteId = Solid.useContext(nearestMatchContext)[0 /* route id */]\n\n  return useMatches({\n    select: (matches: Array<MakeRouteMatchUnion<TRouter>>) => {\n      matches = matches.slice(\n        0,\n        matches.findIndex((d) => d.routeId === contextRouteId()),\n      )\n      return opts?.select ? opts.select(matches) : matches\n    },\n  } as any)\n}\n\nexport function useChildMatches<\n  TRouter extends AnyRouter = RegisteredRouter,\n  TSelected = unknown,\n>(\n  opts?: UseMatchesBaseOptions<TRouter, TSelected>,\n): Solid.Accessor<UseMatchesResult<TRouter, TSelected>> {\n  const contextRouteId = Solid.useContext(nearestMatchContext)[0 /* route id */]\n\n  return useMatches({\n    select: (matches: Array<MakeRouteMatchUnion<TRouter>>) => {\n      matches = matches.slice(\n        matches.findIndex((d) => d.routeId === contextRouteId()) + 1,\n      )\n      return opts?.select ? opts.select(matches) : matches\n    },\n  } as any)\n}\n"],"mappings":";;;;;;;;;;;;;AAkCA,SAAgBiC,UAAU;CACxB,MAAMC,SAAS5B,kBAAAA,UAAU;CAEzB,MAAM6B,oBACHhC,+BAAAA,YAAY+B,OAAO/B,aACnB,OAAOiC,aAAa,eAAeF,OAAOG,MACvC3B,qBAAAA,eACAV,SAAMsC;CAEZ,MAAMC,kBAAkCL,OAAOM,WAAWtC,sBAAAA;CAC1D,MAAMuC,mBACJF,UAAU,EAAEG,QAAQC,oBACpBT,OAAOQ,QAAQE;CAIjB,QAAA,GAAA,aAAA,iBAFwBV,OAAOQ,QAAQI,aAAapC,qBAAAA,cAGlC,EAAA,IAAAsC,WAAA;EAAA,QAAA,GAAA,aAAA,iBACbb,kBAAgB;GAAA,IACfc,WAAQ;IAAA,OAAER,oBAAAA,GAAAA,aAAAA,iBAAoBA,kBAAgB,CAAA,CAAA,IAAM;GAAI;GAAA,IAAAO,WAAA;IAAA,OAAA;uCAEvDxC,qBAAAA,cAAY,CAAA,CAAA;uCACZ0C,cAAY,CAAA,CAAA;uCACZ3C,qBAAAA,UAAQ,CAAA,CAAA;IAAA;GAAA;EAAA,CAAA;CAAA,EAAA,CAAA;AAIjB;AAEA,SAAS2C,eAAe;CACtB,MAAMhB,SAAS5B,kBAAAA,UAAU;CACzB,MAAM6C,gBAAgBjB,OAAOkB,OAAOC,IAAIC,IAAI,EAAE;CAC9C,MAAMC,cACJJ,QAAQ,IAAIjB,OAAOkB,OAAOI,QAAQF,IAAIH,QAAQ,CAAE,GAAGG,IAAI,IAAIG,KAAAA;CAC7D,MAAMC,eAAe,CAACP,SAASI,KAAK;CAEpC,MAAMK,uBAAuB;EAC3B,QAAA,GAAA,aAAA,iBACG5D,SAAM6D,MAAI;GAAA,IAACC,OAAI;IAAA,OAAEX,QAAQ;GAAC;GAAA,IAAAH,WAAA;IAAA,QAAA,GAAA,aAAA,iBACxBrC,cAAAA,OAAK,EAAA,IAACwC,UAAO;KAAA,OAAEA,QAAQ;IAAE,EAAA,CAAA;GAAA;EAAA,CAAA;CAGhC;CAEA,QAAA,GAAA,aAAA,iBACG1C,qBAAAA,oBAAoBsD,UAAQ;EAACC,OAAON;EAAY,IAAAV,WAAA;GAAA,QAAA,GAAA,aAAA,YAC9C,CAAA,CAAAd,OAAOQ,QAAQwB,0BAA0B,EAAA,IACxCN,eAAe,KAAA,GAAA,aAAA,iBAEdxD,sBAAAA,eAAa;IACZ+D,aAAaZ;IACba,gBAAgB/D,sBAAAA;IAAc,IAC9BgE,UAAO;KAAA,OAAA,QAAA,IAAA,aACoB,gBACpBI,UAAU;MACTC,QAAQC,KACN,qIACF;MACAD,QAAQC,KAAK,YAAYF,MAAMG,WAAWH,MAAMI,SAAS,GAAG;KAC9D,IACApB,KAAAA;IAAS;IAAA,IAAAT,WAAA;KAAA,OAGdY,eAAe;IAAC;GAAA,CAAA;EAEpB;CAAA,CAAA;AAGP;AAcA,SAAgBwB,gBAA8D;CAC5E,MAAMlD,SAAS5B,kBAAAA,UAAU;CAEzB,QAME+E,SAGG;EACH,OAAOrF,SAAMuF,iBAAiB;GAC5B,MAAM,EAAEC,SAASC,eAAeC,OAAOC,eAAe,GAAGC,SAASP;GAElEnD,OAAOkB,OAAOyC,SAASvC,IAAI;GAC3BpB,OAAOkB,OAAO0C,iBAAiBxC,IAAI;GACnCpB,OAAOkB,OAAO2C,OAAOzC,IAAI;GACzB,OAAOpB,OAAO8D,WAAWJ,MAAa;IACpCJ;IACAC;IACAC;IACAC;GACF,CAAC;EACH,CAAC;CACH;AACF;AAmBA,SAAgBS,WAMdC,OAA4E;CAE5E,MAAMH,SADad,cACJY,EAAWK,KAAY;CAatC,QAAA,GAAA,aAAA,MAXsBrG,SAAMuF,iBAAiB;EAC3C,MAAMgB,gBAAgBL,OAAO;EAC7B,MAAMM,QAAQH,MAAMrD;EAEpB,IAAI,OAAOwD,UAAU,YACnB,OAAQA,MAAcD,aAAa;EAGrC,OAAOA,gBAAgBC,QAAQ;CACjC,CAEUF,CAAa;AACzB;AAWA,SAAgBQ,WAIdzB,MACsD;CACtD,MAAMnD,SAAS5B,kBAAAA,UAAmB;CAClC,OAAON,SAAMuF,YAAYwB,SAAgC;EACvD,MAAMJ,UAAUzE,OAAOkB,OAAOuD,QAAQrD,IAAI;EAG1C,MAAM0D,MAAM3B,MAAMqB,SAASrB,KAAKqB,OAAOC,OAAO,IAAIA;EAClD,IAAII,SAAStD,KAAAA,GAAW,OAAOuD;EAC/B,QAAA,GAAA,sBAAA,kBAAwBD,MAAMC,GAAG;CACnC,CAAC;AACH;AAEA,SAAgBC,iBAId5B,MACsD;CACtD,MAAM6B,iBAAiBlH,SAAMmH,WAAW1G,qBAAAA,mBAAmB,EAAE;CAE7D,OAAOqG,WAAW,EAChBJ,SAASC,YAAiD;EACxDA,UAAUA,QAAQS,MAChB,GACAT,QAAQU,WAAWC,MAAMA,EAAEnE,YAAY+D,eAAe,CAAC,CACzD;EACA,OAAO7B,MAAMqB,SAASrB,KAAKqB,OAAOC,OAAO,IAAIA;CAC/C,EACF,CAAQ;AACV;AAEA,SAAgBY,gBAIdlC,MACsD;CACtD,MAAM6B,iBAAiBlH,SAAMmH,WAAW1G,qBAAAA,mBAAmB,EAAE;CAE7D,OAAOqG,WAAW,EAChBJ,SAASC,YAAiD;EACxDA,UAAUA,QAAQS,MAChBT,QAAQU,WAAWC,MAAMA,EAAEnE,YAAY+D,eAAe,CAAC,IAAI,CAC7D;EACA,OAAO7B,MAAMqB,SAASrB,KAAKqB,OAAOC,OAAO,IAAIA;CAC/C,EACF,CAAQ;AACV"}
+{"version":3,"file":"Matches.cjs","names":["Solid","replaceEqualDeep","rootRouteId","isServer","CatchBoundary","ErrorComponent","useRouter","Rendered","Transitioner","nearestMatchContext","SafeFragment","Match","renderInNonRouteComponentContext","AnyRoute","AnyRouter","DeepPartial","Expand","MakeOptionalPathParams","MakeOptionalSearchParams","MakeRouteMatchUnion","MaskOptions","MatchRouteOptions","RegisteredRouter","ResolveRoute","ToSubOptionsProps","RouteMatchExtensions","meta","Array","JSX","IntrinsicElements","links","scripts","styles","headScripts","Matches","router","ResolvedSuspense","document","ssr","Suspense","rootRoute","routesById","PendingComponent","options","pendingComponent","defaultPendingComponent","OptionalWrapper","InnerWrap","_$createComponent","children","fallback","process","env","NODE_ENV","MatchesInner","routeId","stores","ids","get","match","byRoute","undefined","nearestMatch","const","matchComponent","Show","when","Provider","value","_$memo","disableGlobalCatchBoundary","getResetKey","errorComponent","onCatch","error","console","warn","message","toString","UseMatchRouteOptions","TFrom","TRouter","TTo","TMaskFrom","TMaskTo","useMatchRoute","opts","Accessor","createMemo","pending","caseSensitive","fuzzy","includeSearch","rest","location","resolvedLocation","status","matchRoute","MakeMatchRouteOptions","params","Element","MatchRoute","props","renderedChild","matchedParams","child","UseMatchesBaseOptions","select","matches","TSelected","UseMatchesResult","useMatches","prev","res","useParentMatches","contextRouteId","useContext","slice","findIndex","d","useChildMatches"],"sources":["../../src/Matches.tsx"],"sourcesContent":["import * as Solid from 'solid-js'\nimport { replaceEqualDeep, rootRouteId } from '@tanstack/router-core'\nimport { isServer } from '@tanstack/router-core/isServer'\nimport { CatchBoundary, ErrorComponent } from './CatchBoundary'\nimport { useRouter } from './useRouter'\nimport { Rendered, Transitioner } from './Transitioner'\nimport { nearestMatchContext } from './matchContext'\nimport { SafeFragment } from './SafeFragment'\nimport { Match } from './Match'\nimport { renderInNonRouteComponentContext } from './nonRouteComponentContext'\nimport type {\n  AnyRoute,\n  AnyRouter,\n  DeepPartial,\n  Expand,\n  MakeOptionalPathParams,\n  MakeOptionalSearchParams,\n  MakeRouteMatchUnion,\n  MaskOptions,\n  MatchRouteOptions,\n  RegisteredRouter,\n  ResolveRoute,\n  ToSubOptionsProps,\n} from '@tanstack/router-core'\n\ndeclare module '@tanstack/router-core' {\n  export interface RouteMatchExtensions {\n    meta?: Array<Solid.JSX.IntrinsicElements['meta'] | undefined>\n    links?: Array<Solid.JSX.IntrinsicElements['link'] | undefined>\n    scripts?: Array<Solid.JSX.IntrinsicElements['script'] | undefined>\n    styles?: Array<Solid.JSX.IntrinsicElements['style'] | undefined>\n    headScripts?: Array<Solid.JSX.IntrinsicElements['script'] | undefined>\n  }\n}\n\nexport function Matches() {\n  const router = useRouter()\n\n  const ResolvedSuspense =\n    (isServer ?? router.isServer) ||\n    (typeof document !== 'undefined' && router.ssr)\n      ? SafeFragment\n      : Solid.Suspense\n\n  const rootRoute: () => AnyRoute = () => router.routesById[rootRouteId]\n  const PendingComponent =\n    rootRoute().options.pendingComponent ??\n    router.options.defaultPendingComponent\n\n  const OptionalWrapper = router.options.InnerWrap || SafeFragment\n\n  return (\n    <OptionalWrapper>\n      <ResolvedSuspense\n        fallback={\n          PendingComponent\n            ? (() => {\n                if (process.env.NODE_ENV !== 'production') {\n                  return renderInNonRouteComponentContext(\n                    () => <PendingComponent />,\n                    'pendingComponent',\n                  )\n                }\n                return <PendingComponent />\n              })()\n            : null\n        }\n      >\n        <Transitioner />\n        <MatchesInner />\n        <Rendered />\n      </ResolvedSuspense>\n    </OptionalWrapper>\n  )\n}\n\nfunction MatchesInner() {\n  const router = useRouter()\n  const routeId = () => router.stores.ids.get()[0]\n  const match = () =>\n    routeId() ? router.stores.byRoute.get(routeId()!)?.get() : undefined\n  const nearestMatch = [routeId, match] as const\n\n  const matchComponent = () => {\n    return (\n      <Solid.Show when={routeId()}>\n        <Match routeId={routeId()!} />\n      </Solid.Show>\n    )\n  }\n\n  return (\n    <nearestMatchContext.Provider value={nearestMatch}>\n      {router.options.disableGlobalCatchBoundary ? (\n        matchComponent()\n      ) : (\n        <CatchBoundary\n          getResetKey={match}\n          errorComponent={ErrorComponent}\n          onCatch={\n            process.env.NODE_ENV !== 'production'\n              ? (error) => {\n                  console.warn(\n                    `Warning: The following error wasn't caught by any route! At the very least, consider setting an 'errorComponent' in your RootRoute!`,\n                  )\n                  console.warn(`Warning: ${error.message || error.toString()}`)\n                }\n              : undefined\n          }\n        >\n          {matchComponent()}\n        </CatchBoundary>\n      )}\n    </nearestMatchContext.Provider>\n  )\n}\n\nexport type UseMatchRouteOptions<\n  TRouter extends AnyRouter = RegisteredRouter,\n  TFrom extends string = string,\n  TTo extends string | undefined = undefined,\n  TMaskFrom extends string = TFrom,\n  TMaskTo extends string = '',\n> = ToSubOptionsProps<TRouter, TFrom, TTo> &\n  DeepPartial<MakeOptionalSearchParams<TRouter, TFrom, TTo>> &\n  DeepPartial<MakeOptionalPathParams<TRouter, TFrom, TTo>> &\n  MaskOptions<TRouter, TMaskFrom, TMaskTo> &\n  MatchRouteOptions\n\nexport function useMatchRoute<TRouter extends AnyRouter = RegisteredRouter>() {\n  const router = useRouter()\n\n  return <\n    const TFrom extends string = string,\n    const TTo extends string | undefined = undefined,\n    const TMaskFrom extends string = TFrom,\n    const TMaskTo extends string = '',\n  >(\n    opts: UseMatchRouteOptions<TRouter, TFrom, TTo, TMaskFrom, TMaskTo>,\n  ): Solid.Accessor<\n    false | Expand<ResolveRoute<TRouter, TFrom, TTo>['types']['allParams']>\n  > => {\n    return Solid.createMemo(() => {\n      const { pending, caseSensitive, fuzzy, includeSearch, ...rest } = opts\n\n      router.stores.location.get()\n      router.stores.resolvedLocation.get()\n      router.stores.status.get()\n      return router.matchRoute(rest as any, {\n        pending,\n        caseSensitive,\n        fuzzy,\n        includeSearch,\n      })\n    })\n  }\n}\n\nexport type MakeMatchRouteOptions<\n  TRouter extends AnyRouter = RegisteredRouter,\n  TFrom extends string = string,\n  TTo extends string | undefined = undefined,\n  TMaskFrom extends string = TFrom,\n  TMaskTo extends string = '',\n> = UseMatchRouteOptions<TRouter, TFrom, TTo, TMaskFrom, TMaskTo> & {\n  // If a function is passed as a child, it will be given the `isActive` boolean to aid in further styling on the element it returns\n  children?:\n    | ((\n        params?: Expand<\n          ResolveRoute<TRouter, TFrom, TTo>['types']['allParams']\n        >,\n      ) => Solid.JSX.Element)\n    | Solid.JSX.Element\n}\n\nexport function MatchRoute<\n  TRouter extends AnyRouter = RegisteredRouter,\n  const TFrom extends string = string,\n  const TTo extends string | undefined = undefined,\n  const TMaskFrom extends string = TFrom,\n  const TMaskTo extends string = '',\n>(props: MakeMatchRouteOptions<TRouter, TFrom, TTo, TMaskFrom, TMaskTo>): any {\n  const matchRoute = useMatchRoute()\n  const params = matchRoute(props as any)\n\n  const renderedChild = Solid.createMemo(() => {\n    const matchedParams = params()\n    const child = props.children\n\n    if (typeof child === 'function') {\n      return (child as any)(matchedParams)\n    }\n\n    return matchedParams ? child : null\n  })\n\n  return <>{renderedChild()}</>\n}\n\nexport interface UseMatchesBaseOptions<TRouter extends AnyRouter, TSelected> {\n  select?: (matches: Array<MakeRouteMatchUnion<TRouter>>) => TSelected\n}\n\nexport type UseMatchesResult<\n  TRouter extends AnyRouter,\n  TSelected,\n> = unknown extends TSelected ? Array<MakeRouteMatchUnion<TRouter>> : TSelected\n\nexport function useMatches<\n  TRouter extends AnyRouter = RegisteredRouter,\n  TSelected = unknown,\n>(\n  opts?: UseMatchesBaseOptions<TRouter, TSelected>,\n): Solid.Accessor<UseMatchesResult<TRouter, TSelected>> {\n  const router = useRouter<TRouter>()\n  return Solid.createMemo((prev: TSelected | undefined) => {\n    const matches = router.stores.matches.get() as Array<\n      MakeRouteMatchUnion<TRouter>\n    >\n    const res = opts?.select ? opts.select(matches) : matches\n    if (prev === undefined) return res\n    return replaceEqualDeep(prev, res) as any\n  }) as Solid.Accessor<UseMatchesResult<TRouter, TSelected>>\n}\n\nexport function useParentMatches<\n  TRouter extends AnyRouter = RegisteredRouter,\n  TSelected = unknown,\n>(\n  opts?: UseMatchesBaseOptions<TRouter, TSelected>,\n): Solid.Accessor<UseMatchesResult<TRouter, TSelected>> {\n  const contextRouteId = Solid.useContext(nearestMatchContext)[0 /* route id */]\n\n  return useMatches({\n    select: (matches: Array<MakeRouteMatchUnion<TRouter>>) => {\n      matches = matches.slice(\n        0,\n        matches.findIndex((d) => d.routeId === contextRouteId()),\n      )\n      return opts?.select ? opts.select(matches) : matches\n    },\n  } as any)\n}\n\nexport function useChildMatches<\n  TRouter extends AnyRouter = RegisteredRouter,\n  TSelected = unknown,\n>(\n  opts?: UseMatchesBaseOptions<TRouter, TSelected>,\n): Solid.Accessor<UseMatchesResult<TRouter, TSelected>> {\n  const contextRouteId = Solid.useContext(nearestMatchContext)[0 /* route id */]\n\n  return useMatches({\n    select: (matches: Array<MakeRouteMatchUnion<TRouter>>) => {\n      matches = matches.slice(\n        matches.findIndex((d) => d.routeId === contextRouteId()) + 1,\n      )\n      return opts?.select ? opts.select(matches) : matches\n    },\n  } as any)\n}\n"],"mappings":"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"}

dist/cjs/renderRouteNotFound.cjs

@@ -0,1 +1,2 @@
+const require_nonRouteComponentContext = require("./nonRouteComponentContext.cjs");
 const require_not_found = require("./not-found.cjs");
@@ -13,7 +14,16 @@ let solid_js_web = require("solid-js/web");
 function renderRouteNotFound(router, route, data) {
+	if (process.env.NODE_ENV !== "production") {
+		if (!route.options.notFoundComponent) {
+			if (router.options.defaultNotFoundComponent) {
+				const DefaultNotFoundComponent = router.options.defaultNotFoundComponent;
+				return require_nonRouteComponentContext.renderInNonRouteComponentContext(() => (0, solid_js_web.createComponent)(DefaultNotFoundComponent, data), "notFoundComponent");
+			}
+			console.warn(`Warning: A notFoundError was encountered on the route with ID "${route.id}", but a notFoundComponent option was not configured, nor was a router level defaultNotFoundComponent configured. Consider configuring at least one of these to avoid TanStack Router's overly generic defaultNotFoundComponent (<p>Not Found</p>)`);
+			return (0, solid_js_web.createComponent)(require_not_found.DefaultGlobalNotFound, {});
+		}
+		const NotFoundComponent = route.options.notFoundComponent;
+		return require_nonRouteComponentContext.renderInNonRouteComponentContext(() => (0, solid_js_web.createComponent)(NotFoundComponent, data), "notFoundComponent");
+	}
 	if (!route.options.notFoundComponent) {
 		if (router.options.defaultNotFoundComponent) return (0, solid_js_web.createComponent)(router.options.defaultNotFoundComponent, data);
-		if (process.env.NODE_ENV !== "production") {
-			if (!route.options.notFoundComponent) console.warn(`Warning: A notFoundError was encountered on the route with ID "${route.id}", but a notFoundComponent option was not configured, nor was a router level defaultNotFoundComponent configured. Consider configuring at least one of these to avoid TanStack Router's overly generic defaultNotFoundComponent (<p>Not Found</p>)`);
-		}
 		return (0, solid_js_web.createComponent)(require_not_found.DefaultGlobalNotFound, {});
@@ -20,0 +30,0 @@ }

dist/cjs/renderRouteNotFound.cjs.map

@@ -1,1 +0,1 @@
-{"version":3,"file":"renderRouteNotFound.cjs","names":["DefaultGlobalNotFound","AnyRoute","AnyRouter","renderRouteNotFound","router","route","data","options","notFoundComponent","defaultNotFoundComponent","_$createComponent","process","env","NODE_ENV","console","warn","id"],"sources":["../../src/renderRouteNotFound.tsx"],"sourcesContent":["import { DefaultGlobalNotFound } from './not-found'\nimport type { AnyRoute, AnyRouter } from '@tanstack/router-core'\n\n/**\n * Renders a not found component for a route when no matching route is found.\n *\n * @param router - The router instance containing the route configuration\n * @param route - The route that triggered the not found state\n * @param data - Additional data to pass to the not found component\n * @returns The rendered not found component or a default fallback component\n */\nexport function renderRouteNotFound(\n  router: AnyRouter,\n  route: AnyRoute,\n  data: any,\n) {\n  if (!route.options.notFoundComponent) {\n    if (router.options.defaultNotFoundComponent) {\n      return <router.options.defaultNotFoundComponent {...data} />\n    }\n\n    if (process.env.NODE_ENV !== 'production') {\n      if (!route.options.notFoundComponent) {\n        console.warn(\n          `Warning: A notFoundError was encountered on the route with ID \"${route.id}\", but a notFoundComponent option was not configured, nor was a router level defaultNotFoundComponent configured. Consider configuring at least one of these to avoid TanStack Router's overly generic defaultNotFoundComponent (<p>Not Found</p>)`,\n        )\n      }\n    }\n\n    return <DefaultGlobalNotFound />\n  }\n\n  return <route.options.notFoundComponent {...data} />\n}\n"],"mappings":";;;;;;;;;;;AAWA,SAAgBG,oBACdC,QACAC,OACAC,MACA;CACA,IAAI,CAACD,MAAME,QAAQC,mBAAmB;EACpC,IAAIJ,OAAOG,QAAQE,0BACjB,QAAA,GAAA,aAAA,iBAAQL,OAAOG,QAAQE,0BAA6BH,IAAI;EAG1D,IAAA,QAAA,IAAA,aAA6B;OACvB,CAACD,MAAME,QAAQC,mBACjBM,QAAQC,KACN,kEAAkEV,MAAMW,GAAE,mPAC5E;EAAA;EAIJ,QAAA,GAAA,aAAA,iBAAQhB,kBAAAA,uBAAqB,CAAA,CAAA;CAC/B;CAEA,QAAA,GAAA,aAAA,iBAAQK,MAAME,QAAQC,mBAAsBF,IAAI;AAClD"}
+{"version":3,"file":"renderRouteNotFound.cjs","names":["DefaultGlobalNotFound","renderInNonRouteComponentContext","AnyRoute","AnyRouter","renderRouteNotFound","router","route","data","process","env","NODE_ENV","options","notFoundComponent","defaultNotFoundComponent","DefaultNotFoundComponent","_$createComponent","console","warn","id","NotFoundComponent"],"sources":["../../src/renderRouteNotFound.tsx"],"sourcesContent":["import { DefaultGlobalNotFound } from './not-found'\nimport { renderInNonRouteComponentContext } from './nonRouteComponentContext'\nimport type { AnyRoute, AnyRouter } from '@tanstack/router-core'\n\n/**\n * Renders a not found component for a route when no matching route is found.\n *\n * @param router - The router instance containing the route configuration\n * @param route - The route that triggered the not found state\n * @param data - Additional data to pass to the not found component\n * @returns The rendered not found component or a default fallback component\n */\nexport function renderRouteNotFound(\n  router: AnyRouter,\n  route: AnyRoute,\n  data: any,\n) {\n  if (process.env.NODE_ENV !== 'production') {\n    if (!route.options.notFoundComponent) {\n      if (router.options.defaultNotFoundComponent) {\n        const DefaultNotFoundComponent = router.options.defaultNotFoundComponent\n        return renderInNonRouteComponentContext(\n          () => <DefaultNotFoundComponent {...data} />,\n          'notFoundComponent',\n        )\n      }\n\n      console.warn(\n        `Warning: A notFoundError was encountered on the route with ID \"${route.id}\", but a notFoundComponent option was not configured, nor was a router level defaultNotFoundComponent configured. Consider configuring at least one of these to avoid TanStack Router's overly generic defaultNotFoundComponent (<p>Not Found</p>)`,\n      )\n\n      return <DefaultGlobalNotFound />\n    }\n\n    const NotFoundComponent = route.options.notFoundComponent\n    return renderInNonRouteComponentContext(\n      () => <NotFoundComponent {...data} />,\n      'notFoundComponent',\n    )\n  }\n\n  if (!route.options.notFoundComponent) {\n    if (router.options.defaultNotFoundComponent) {\n      return <router.options.defaultNotFoundComponent {...data} />\n    }\n\n    return <DefaultGlobalNotFound />\n  }\n\n  return <route.options.notFoundComponent {...data} />\n}\n"],"mappings":";;;;;;;;;;;;AAYA,SAAgBI,oBACdC,QACAC,OACAC,MACA;CACA,IAAA,QAAA,IAAA,aAA6B,cAAc;EACzC,IAAI,CAACD,MAAMK,QAAQC,mBAAmB;GACpC,IAAIP,OAAOM,QAAQE,0BAA0B;IAC3C,MAAMC,2BAA2BT,OAAOM,QAAQE;IAChD,OAAOZ,iCAAAA,wCAAAA,GAAAA,aAAAA,iBACEa,0BAA6BP,IAAI,GACxC,mBACF;GACF;GAEAS,QAAQC,KACN,kEAAkEX,MAAMY,GAAE,mPAC5E;GAEA,QAAA,GAAA,aAAA,iBAAQlB,kBAAAA,uBAAqB,CAAA,CAAA;EAC/B;EAEA,MAAMmB,oBAAoBb,MAAMK,QAAQC;EACxC,OAAOX,iCAAAA,wCAAAA,GAAAA,aAAAA,iBACEkB,mBAAsBZ,IAAI,GACjC,mBACF;CACF;CAEA,IAAI,CAACD,MAAMK,QAAQC,mBAAmB;EACpC,IAAIP,OAAOM,QAAQE,0BACjB,QAAA,GAAA,aAAA,iBAAQR,OAAOM,QAAQE,0BAA6BN,IAAI;EAG1D,QAAA,GAAA,aAAA,iBAAQP,kBAAAA,uBAAqB,CAAA,CAAA;CAC/B;CAEA,QAAA,GAAA,aAAA,iBAAQM,MAAMK,QAAQC,mBAAsBL,IAAI;AAClD"}

dist/cjs/utils.cjs

@@ -13,5 +13,4 @@ const require_runtime = require("./_virtual/_rolldown/runtime.cjs");
 * @param ref - The ref to observe
-* @param intersectionObserverOptions - The options to pass to the IntersectionObserver
+* @param callback - The callback to call when the intersection changes
 * @param disabled - Whether observation is disabled
-* @param callback - The callback to call when the intersection changes
 * @returns The IntersectionObserver instance
@@ -25,3 +24,2 @@ * @example
 *  (entry) => { doSomething(entry) },
-*  { rootMargin: '10px' },
 *  false
@@ -32,3 +30,3 @@ * )
 */
-function useIntersectionObserver(ref, callback, intersectionObserverOptions = {}, disabled) {
+function useIntersectionObserver(ref, callback, disabled) {
 	const isIntersectionObserverAvailable = typeof IntersectionObserver === "function";
@@ -38,9 +36,13 @@ let observerRef = null;
 		const r = ref();
-		if (!r || !isIntersectionObserverAvailable || disabled) return;
-		observerRef = new IntersectionObserver(([entry]) => {
-			callback(entry);
-		}, intersectionObserverOptions);
+		if (disabled() || !r || !isIntersectionObserverAvailable) {
+			solid_js.onCleanup(() => callback());
+			return;
+		}
+		observerRef = new IntersectionObserver((entries) => {
+			callback(entries.pop());
+		}, { rootMargin: "100px" });
 		observerRef.observe(r);
 		solid_js.onCleanup(() => {
 			observerRef?.disconnect();
+			callback();
 		});
@@ -47,0 +49,0 @@ });

dist/cjs/utils.cjs.map

@@ -1,1 +0,1 @@
-{"version":3,"file":"utils.cjs","names":[],"sources":["../../src/utils.ts"],"sourcesContent":["import * as Solid from 'solid-js'\n\n/**\n * React hook to wrap `IntersectionObserver`.\n *\n * This hook will create an `IntersectionObserver` and observe the ref passed to it.\n *\n * When the intersection changes, the callback will be called with the `IntersectionObserverEntry`.\n *\n * @param ref - The ref to observe\n * @param intersectionObserverOptions - The options to pass to the IntersectionObserver\n * @param disabled - Whether observation is disabled\n * @param callback - The callback to call when the intersection changes\n * @returns The IntersectionObserver instance\n * @example\n * ```tsx\n * const MyComponent = () => {\n * const ref = React.useRef<HTMLDivElement>(null)\n * useIntersectionObserver(\n *  ref,\n *  (entry) => { doSomething(entry) },\n *  { rootMargin: '10px' },\n *  false\n * )\n * return <div ref={ref} />\n * ```\n */\nexport function useIntersectionObserver<T extends Element>(\n  ref: Solid.Accessor<T | null>,\n  callback: (entry: IntersectionObserverEntry | undefined) => void,\n  intersectionObserverOptions: IntersectionObserverInit = {},\n  disabled?: boolean,\n): Solid.Accessor<IntersectionObserver | null> {\n  const isIntersectionObserverAvailable =\n    typeof IntersectionObserver === 'function'\n  let observerRef: IntersectionObserver | null = null\n\n  Solid.createEffect(() => {\n    const r = ref()\n    if (!r || !isIntersectionObserverAvailable || disabled) {\n      return\n    }\n\n    observerRef = new IntersectionObserver(([entry]) => {\n      callback(entry)\n    }, intersectionObserverOptions)\n\n    observerRef.observe(r)\n\n    Solid.onCleanup(() => {\n      observerRef?.disconnect()\n    })\n  })\n\n  return () => observerRef\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA2BA,SAAgB,wBACd,KACA,UACA,8BAAwD,CAAC,GACzD,UAC6C;CAC7C,MAAM,kCACJ,OAAO,yBAAyB;CAClC,IAAI,cAA2C;CAE/C,SAAM,mBAAmB;EACvB,MAAM,IAAI,IAAI;EACd,IAAI,CAAC,KAAK,CAAC,mCAAmC,UAC5C;EAGF,cAAc,IAAI,sBAAsB,CAAC,WAAW;GAClD,SAAS,KAAK;EAChB,GAAG,2BAA2B;EAE9B,YAAY,QAAQ,CAAC;EAErB,SAAM,gBAAgB;GACpB,aAAa,WAAW;EAC1B,CAAC;CACH,CAAC;CAED,aAAa;AACf"}
+{"version":3,"file":"utils.cjs","names":[],"sources":["../../src/utils.ts"],"sourcesContent":["import * as Solid from 'solid-js'\n\n/**\n * React hook to wrap `IntersectionObserver`.\n *\n * This hook will create an `IntersectionObserver` and observe the ref passed to it.\n *\n * When the intersection changes, the callback will be called with the `IntersectionObserverEntry`.\n *\n * @param ref - The ref to observe\n * @param callback - The callback to call when the intersection changes\n * @param disabled - Whether observation is disabled\n * @returns The IntersectionObserver instance\n * @example\n * ```tsx\n * const MyComponent = () => {\n * const ref = React.useRef<HTMLDivElement>(null)\n * useIntersectionObserver(\n *  ref,\n *  (entry) => { doSomething(entry) },\n *  false\n * )\n * return <div ref={ref} />\n * ```\n */\nexport function useIntersectionObserver<T extends Element>(\n  ref: Solid.Accessor<T | null>,\n  callback: (entry?: IntersectionObserverEntry) => void,\n  disabled: Solid.Accessor<boolean>,\n): Solid.Accessor<IntersectionObserver | null> {\n  const isIntersectionObserverAvailable =\n    typeof IntersectionObserver === 'function'\n  let observerRef: IntersectionObserver | null = null\n\n  Solid.createEffect(() => {\n    const r = ref()\n    if (disabled() || !r || !isIntersectionObserverAvailable) {\n      Solid.onCleanup(() => callback())\n      return\n    }\n\n    observerRef = new IntersectionObserver(\n      (entries) => {\n        callback(entries.pop())\n      },\n      { rootMargin: '100px' },\n    )\n\n    observerRef.observe(r)\n\n    Solid.onCleanup(() => {\n      observerRef?.disconnect()\n      callback()\n    })\n  })\n\n  return () => observerRef\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;AAyBA,SAAgB,wBACd,KACA,UACA,UAC6C;CAC7C,MAAM,kCACJ,OAAO,yBAAyB;CAClC,IAAI,cAA2C;CAE/C,SAAM,mBAAmB;EACvB,MAAM,IAAI,IAAI;EACd,IAAI,SAAS,KAAK,CAAC,KAAK,CAAC,iCAAiC;GACxD,SAAM,gBAAgB,SAAS,CAAC;GAChC;EACF;EAEA,cAAc,IAAI,sBACf,YAAY;GACX,SAAS,QAAQ,IAAI,CAAC;EACxB,GACA,EAAE,YAAY,QAAQ,CACxB;EAEA,YAAY,QAAQ,CAAC;EAErB,SAAM,gBAAgB;GACpB,aAAa,WAAW;GACxB,SAAS;EACX,CAAC;CACH,CAAC;CAED,aAAa;AACf"}

dist/cjs/utils.d.cts

@@ -10,5 +10,4 @@ import * as Solid from 'solid-js';
  * @param ref - The ref to observe
- * @param intersectionObserverOptions - The options to pass to the IntersectionObserver
+ * @param callback - The callback to call when the intersection changes
  * @param disabled - Whether observation is disabled
- * @param callback - The callback to call when the intersection changes
  * @returns The IntersectionObserver instance
@@ -22,3 +21,2 @@ * @example
  *  (entry) => { doSomething(entry) },
- *  { rootMargin: '10px' },
  *  false
@@ -29,2 +27,2 @@ * )
  */
-export declare function useIntersectionObserver<T extends Element>(ref: Solid.Accessor<T | null>, callback: (entry: IntersectionObserverEntry | undefined) => void, intersectionObserverOptions?: IntersectionObserverInit, disabled?: boolean): Solid.Accessor<IntersectionObserver | null>;
+export declare function useIntersectionObserver<T extends Element>(ref: Solid.Accessor<T | null>, callback: (entry?: IntersectionObserverEntry) => void, disabled: Solid.Accessor<boolean>): Solid.Accessor<IntersectionObserver | null>;

dist/esm/CatchBoundary.js

@@ -0,1 +1,2 @@
+import { renderInNonRouteComponentContext } from "./nonRouteComponentContext.js";
 import { Dynamic, createComponent, delegateEvents, insert, memo, template } from "solid-js/web";
@@ -10,3 +11,3 @@ import * as Solid from "solid-js";
 			Solid.createEffect(Solid.on(props.getResetKey, () => reset(), { defer: true }));
-			return createComponent(Dynamic, {
+			return process.env.NODE_ENV !== "production" ? renderInNonRouteComponentContext(() => createComponent(Dynamic, {
 				get component() {
@@ -17,2 +18,8 @@ return props.errorComponent ?? ErrorComponent;
 				reset
+			}), "errorComponent") : createComponent(Dynamic, {
+				get component() {
+					return props.errorComponent ?? ErrorComponent;
+				},
+				error,
+				reset
 			});
@@ -19,0 +26,0 @@ },

dist/esm/CatchBoundary.js.map

@@ -1,1 +0,1 @@
-{"version":3,"file":"CatchBoundary.js","names":["Solid","Dynamic","ErrorRouteComponent","CatchBoundary","props","getResetKey","children","JSX","Element","errorComponent","onCatch","error","Error","ParentProps","_$createComponent","ErrorBoundary","fallback","reset","createEffect","on","defer","component","ErrorComponent","show","setShow","createSignal","process","env","NODE_ENV","_el$","_tmpl$","_el$2","firstChild","_el$3","_el$4","nextSibling","_el$5","$$click","d","_$insert","_c$","_$memo","_el$6","_tmpl$2","_el$7","_c$2","message","_el$8","_tmpl$3","_$delegateEvents"],"sources":["../../src/CatchBoundary.tsx"],"sourcesContent":["import * as Solid from 'solid-js'\nimport { Dynamic } from 'solid-js/web'\nimport type { ErrorRouteComponent } from './route'\n\nexport function CatchBoundary(\n  props: {\n    getResetKey: () => unknown\n    children: Solid.JSX.Element\n    errorComponent?: ErrorRouteComponent\n    onCatch?: (error: Error) => void\n  } & Solid.ParentProps,\n) {\n  return (\n    <Solid.ErrorBoundary\n      fallback={(error, reset) => {\n        props.onCatch?.(error)\n\n        Solid.createEffect(\n          Solid.on(props.getResetKey, () => reset(), { defer: true }),\n        )\n\n        return (\n          <Dynamic\n            component={props.errorComponent ?? ErrorComponent}\n            error={error}\n            reset={reset}\n          />\n        )\n      }}\n    >\n      {props.children}\n    </Solid.ErrorBoundary>\n  )\n}\n\nexport function ErrorComponent({ error }: { error: any }) {\n  const [show, setShow] = Solid.createSignal(\n    process.env.NODE_ENV !== 'production',\n  )\n\n  return (\n    <div style={{ padding: '.5rem', 'max-width': '100%' }}>\n      <div style={{ display: 'flex', 'align-items': 'center', gap: '.5rem' }}>\n        <strong style={{ 'font-size': '1rem' }}>Something went wrong!</strong>\n        <button\n          style={{\n            appearance: 'none',\n            'font-size': '.6em',\n            border: '1px solid currentColor',\n            padding: '.1rem .2rem',\n            'font-weight': 'bold',\n            'border-radius': '.25rem',\n          }}\n          onClick={() => setShow((d) => !d)}\n        >\n          {show() ? 'Hide Error' : 'Show Error'}\n        </button>\n      </div>\n      <div style={{ height: '.25rem' }} />\n      {show() ? (\n        <div>\n          <pre\n            style={{\n              'font-size': '.7em',\n              border: '1px solid red',\n              'border-radius': '.25rem',\n              padding: '.3rem',\n              color: 'red',\n              overflow: 'auto',\n            }}\n          >\n            {error.message ? <code>{error.message}</code> : null}\n          </pre>\n        </div>\n      ) : null}\n    </div>\n  )\n}\n"],"mappings":";;;;AAIA,SAAgBG,cACdC,OAMA;CACA,OAAAU,gBACGd,MAAMe,eAAa;EAClBC,WAAWL,OAAOM,UAAU;GAC1Bb,MAAMM,UAAUC,KAAK;GAErBX,MAAMkB,aACJlB,MAAMmB,GAAGf,MAAMC,mBAAmBY,MAAM,GAAG,EAAEG,OAAO,KAAK,CAAC,CAC5D;GAEA,OAAAN,gBACGb,SAAO;IAAA,IACNoB,YAAS;KAAA,OAAEjB,MAAMK,kBAAkBa;IAAc;IAC1CX;IACAM;GAAK,CAAA;EAGlB;EAAC,IAAAX,WAAA;GAAA,OAEAF,MAAME;EAAQ;CAAA,CAAA;AAGrB;AAEA,SAAgBgB,eAAe,EAAEX,SAAyB;CACxD,MAAM,CAACY,MAAMC,WAAWxB,MAAMyB,aAAAA,QAAAA,IAAAA,aACH,YAC3B;CAEA,cAAA;EAAA,IAAAI,OAAAC,OAAA,GAAAC,QAAAF,KAAAG,YAAAE,QAAAH,MAAAC,WAAAG;EAAAJ,MAAAI;EAAAD,MAAAG,gBAauBb,SAASc,MAAM,CAACA,CAAC;EAACC,OAAAL,aAEhCX,KAAK,IAAI,eAAe,YAAY;EAAAgB,OAAAV,aAAA;GAAA,IAAAW,MAAAC,WAAA,CAAA,CAIxClB,KAAK,CAAC;GAAA,aAANiB,IAAA,WAAA;IAAA,IAAAE,QAAAC,QAAA,GAAAC,QAAAF,MAAAV;IAAAO,OAAAK,cAAA;KAAA,IAAAC,OAAAJ,WAAA,CAAA,CAYM9B,MAAMmC,OAAO;KAAA,aAAbD,KAAA,WAAA;MAAA,IAAAE,QAAAC,QAAA;MAAAT,OAAAQ,aAAuBpC,MAAMmC,OAAO;MAAA,OAAAC;KAAA,GAAA,IAAW;IAAI,GAAA,CAAA;IAAA,OAAAL;GAAA,GAAA,IAGtD;EAAI,GAAA,GAAA,IAAA;EAAA,OAAAb;CAAA,GAAA;AAGd;AAACoB,eAAA,CAAA,OAAA,CAAA"}
+{"version":3,"file":"CatchBoundary.js","names":["Solid","Dynamic","renderInNonRouteComponentContext","ErrorRouteComponent","CatchBoundary","props","getResetKey","children","JSX","Element","errorComponent","onCatch","error","Error","ParentProps","_$createComponent","ErrorBoundary","fallback","reset","createEffect","on","defer","process","env","NODE_ENV","component","ErrorComponent","show","setShow","createSignal","_el$","_tmpl$","_el$2","firstChild","_el$3","_el$4","nextSibling","_el$5","$$click","d","_$insert","_c$","_$memo","_el$6","_tmpl$2","_el$7","_c$2","message","_el$8","_tmpl$3","_$delegateEvents"],"sources":["../../src/CatchBoundary.tsx"],"sourcesContent":["import * as Solid from 'solid-js'\nimport { Dynamic } from 'solid-js/web'\nimport { renderInNonRouteComponentContext } from './nonRouteComponentContext'\nimport type { ErrorRouteComponent } from './route'\n\nexport function CatchBoundary(\n  props: {\n    getResetKey: () => unknown\n    children: Solid.JSX.Element\n    errorComponent?: ErrorRouteComponent\n    onCatch?: (error: Error) => void\n  } & Solid.ParentProps,\n) {\n  return (\n    <Solid.ErrorBoundary\n      fallback={(error, reset) => {\n        props.onCatch?.(error)\n\n        Solid.createEffect(\n          Solid.on(props.getResetKey, () => reset(), { defer: true }),\n        )\n\n        return process.env.NODE_ENV !== 'production' ? (\n          renderInNonRouteComponentContext(\n            () => (\n              <Dynamic\n                component={props.errorComponent ?? ErrorComponent}\n                error={error}\n                reset={reset}\n              />\n            ),\n            'errorComponent',\n          )\n        ) : (\n          <Dynamic\n            component={props.errorComponent ?? ErrorComponent}\n            error={error}\n            reset={reset}\n          />\n        )\n      }}\n    >\n      {props.children}\n    </Solid.ErrorBoundary>\n  )\n}\n\nexport function ErrorComponent({ error }: { error: any }) {\n  const [show, setShow] = Solid.createSignal(\n    process.env.NODE_ENV !== 'production',\n  )\n\n  return (\n    <div style={{ padding: '.5rem', 'max-width': '100%' }}>\n      <div style={{ display: 'flex', 'align-items': 'center', gap: '.5rem' }}>\n        <strong style={{ 'font-size': '1rem' }}>Something went wrong!</strong>\n        <button\n          style={{\n            appearance: 'none',\n            'font-size': '.6em',\n            border: '1px solid currentColor',\n            padding: '.1rem .2rem',\n            'font-weight': 'bold',\n            'border-radius': '.25rem',\n          }}\n          onClick={() => setShow((d) => !d)}\n        >\n          {show() ? 'Hide Error' : 'Show Error'}\n        </button>\n      </div>\n      <div style={{ height: '.25rem' }} />\n      {show() ? (\n        <div>\n          <pre\n            style={{\n              'font-size': '.7em',\n              border: '1px solid red',\n              'border-radius': '.25rem',\n              padding: '.3rem',\n              color: 'red',\n              overflow: 'auto',\n            }}\n          >\n            {error.message ? <code>{error.message}</code> : null}\n          </pre>\n        </div>\n      ) : null}\n    </div>\n  )\n}\n"],"mappings":";;;;;AAKA,SAAgBI,cACdC,OAMA;CACA,OAAAU,gBACGf,MAAMgB,eAAa;EAClBC,WAAWL,OAAOM,UAAU;GAC1Bb,MAAMM,UAAUC,KAAK;GAErBZ,MAAMmB,aACJnB,MAAMoB,GAAGf,MAAMC,mBAAmBY,MAAM,GAAG,EAAEG,OAAO,KAAK,CAAC,CAC5D;GAEA,OAAA,QAAA,IAAA,aAAgC,eAC9BnB,uCACEa,gBACGd,SAAO;IAAA,IACNwB,YAAS;KAAA,OAAEpB,MAAMK,kBAAkBgB;IAAc;IAC1Cd;IACAM;GAAK,CAAA,GAGhB,gBACF,IAACH,gBAEAd,SAAO;IAAA,IACNwB,YAAS;KAAA,OAAEpB,MAAMK,kBAAkBgB;IAAc;IAC1Cd;IACAM;GAAK,CAAA;EAGlB;EAAC,IAAAX,WAAA;GAAA,OAEAF,MAAME;EAAQ;CAAA,CAAA;AAGrB;AAEA,SAAgBmB,eAAe,EAAEd,SAAyB;CACxD,MAAM,CAACe,MAAMC,WAAW5B,MAAM6B,aAAAA,QAAAA,IAAAA,aACH,YAC3B;CAEA,cAAA;EAAA,IAAAC,OAAAC,OAAA,GAAAC,QAAAF,KAAAG,YAAAE,QAAAH,MAAAC,WAAAG;EAAAJ,MAAAI;EAAAD,MAAAG,gBAauBV,SAASW,MAAM,CAACA,CAAC;EAACC,OAAAL,aAEhCR,KAAK,IAAI,eAAe,YAAY;EAAAa,OAAAV,aAAA;GAAA,IAAAW,MAAAC,WAAA,CAAA,CAIxCf,KAAK,CAAC;GAAA,aAANc,IAAA,WAAA;IAAA,IAAAE,QAAAC,QAAA,GAAAC,QAAAF,MAAAV;IAAAO,OAAAK,cAAA;KAAA,IAAAC,OAAAJ,WAAA,CAAA,CAYM9B,MAAMmC,OAAO;KAAA,aAAbD,KAAA,WAAA;MAAA,IAAAE,QAAAC,QAAA;MAAAT,OAAAQ,aAAuBpC,MAAMmC,OAAO;MAAA,OAAAC;KAAA,GAAA,IAAW;IAAI,GAAA,CAAA;IAAA,OAAAL;GAAA,GAAA,IAGtD;EAAI,GAAA,GAAA,IAAA;EAAA,OAAAb;CAAA,GAAA;AAGd;AAACoB,eAAA,CAAA,OAAA,CAAA"}

dist/esm/link.d.ts

@@ -28,3 +28,2 @@ import { AnyRouter, Constrain, LinkOptions, RegisteredRouter, RoutePaths } from '@tanstack/router-core';
         isActive: boolean;
-        isTransitioning: boolean;
     }) => Solid.JSX.Element);
@@ -31,0 +30,0 @@ }

dist/esm/link.js

@@ -12,5 +12,8 @@ import { useHydrated } from "./ClientOnly.js";
 var timeoutMap = /* @__PURE__ */ new WeakMap();
+var cancelPreload = (eventTarget) => {
+	clearTimeout(timeoutMap.get(eventTarget));
+	timeoutMap.delete(eventTarget);
+};
 function useLinkProps(options) {
 	const router = useRouter();
-	const [isTransitioning, setIsTransitioning] = Solid.createSignal(false);
 	const shouldHydrateHash = !isServer && !!router.options.ssr;
@@ -102,3 +105,3 @@ const hasHydrated = useHydrated();
 	const preload = Solid.createMemo(() => {
-		if (options.reloadDocument || externalLink()) return false;
+		if (options.reloadDocument || externalLink() || local.disabled) return false;
 		return local.preload ?? router.options.defaultPreload;
@@ -135,10 +138,25 @@ });
 	});
-	const preloadViewportIoCallback = (entry) => {
-		if (entry?.isIntersecting) doPreload();
+	const [ref, setRef] = Solid.createSignal(null);
+	const enqueuePreload = (e) => {
+		if (!e) {
+			cancelPreload(ref);
+			return;
+		}
+		if (!(e.isIntersecting ?? preload() === "intent")) {
+			if (e.isIntersecting === false) cancelPreload(ref);
+			return;
+		}
+		if (!preloadDelay()) {
+			doPreload();
+			return;
+		}
+		if (!timeoutMap.has(ref)) timeoutMap.set(ref, setTimeout(() => {
+			timeoutMap.delete(ref);
+			doPreload();
+		}, preloadDelay()));
 	};
-	const [ref, setRef] = Solid.createSignal(null);
-	useIntersectionObserver(ref, preloadViewportIoCallback, { rootMargin: "100px" }, !!local.disabled || preload() !== "viewport");
+	useIntersectionObserver(ref, enqueuePreload, () => preload() !== "viewport");
 	Solid.createEffect(() => {
 		if (hasRenderFetched) return;
-		if (!local.disabled && preload() === "render") {
+		if (preload() === "render") {
 			doPreload();
@@ -170,7 +188,2 @@ hasRenderFetched = true;
 			e.preventDefault();
-			setIsTransitioning(true);
-			const unsub = router.subscribe("onResolved", () => {
-				unsub();
-				setIsTransitioning(false);
-			});
 			router.navigate({
@@ -187,27 +200,8 @@ ...options,
 	};
-	const enqueueIntentPreload = (e) => {
-		if (local.disabled || preload() !== "intent") return;
-		if (!preloadDelay()) {
-			doPreload();
-			return;
-		}
-		const eventTarget = e.currentTarget || e.target;
-		if (!eventTarget || timeoutMap.has(eventTarget)) return;
-		timeoutMap.set(eventTarget, setTimeout(() => {
-			timeoutMap.delete(eventTarget);
-			doPreload();
-		}, preloadDelay()));
-	};
-	const handleTouchStart = (_) => {
-		if (local.disabled || preload() !== "intent") return;
+	const handleTouchStart = () => {
+		if (preload() !== "intent") return;
 		doPreload();
 	};
-	const handleLeave = (e) => {
-		if (local.disabled) return;
-		const eventTarget = e.currentTarget || e.target;
-		if (eventTarget) {
-			const id = timeoutMap.get(eventTarget);
-			clearTimeout(id);
-			timeoutMap.delete(eventTarget);
-		}
+	const handleLeave = () => {
+		if (preload() === "intent") cancelPreload(ref);
 	};
@@ -217,5 +211,5 @@ const simpleStyling = Solid.createMemo(() => local.activeProps === STATIC_ACTIVE_PROPS_GET && local.inactiveProps === STATIC_INACTIVE_PROPS_GET && local.class === void 0 && local.style === void 0);
 	const onBlur = createComposedHandler(() => local.onBlur, handleLeave);
-	const onFocus = createComposedHandler(() => local.onFocus, enqueueIntentPreload);
-	const onMouseEnter = createComposedHandler(() => local.onMouseEnter, enqueueIntentPreload);
-	const onMouseOver = createComposedHandler(() => local.onMouseOver, enqueueIntentPreload);
+	const onFocus = createComposedHandler(() => local.onFocus, enqueuePreload);
+	const onMouseEnter = createComposedHandler(() => local.onMouseEnter, enqueuePreload);
+	const onMouseOver = createComposedHandler(() => local.onMouseOver, enqueuePreload);
 	const onMouseLeave = createComposedHandler(() => local.onMouseLeave, handleLeave);
@@ -239,4 +233,3 @@ const onMouseOut = createComposedHandler(() => local.onMouseOut, handleLeave);
 			target: local.target,
-			...local.disabled && STATIC_DISABLED_PROPS,
-			...isTransitioning() && STATIC_TRANSITIONING_ATTRIBUTES
+			...local.disabled && STATIC_DISABLED_PROPS
 		};
@@ -287,3 +280,2 @@ if (simpleStyling()) return {
 };
-var STATIC_TRANSITIONING_ATTRIBUTES = { "data-transitioning": "transitioning" };
 /** Call a JSX.EventHandlerUnion with the event. */
@@ -309,10 +301,5 @@ function callHandler(event, handler) {
 		const ch = local.children;
-		if (typeof ch === "function") return ch({
-			get isActive() {
-				return linkProps["data-status"] === "active";
-			},
-			get isTransitioning() {
-				return linkProps["data-transitioning"] === "transitioning";
-			}
-		});
+		if (typeof ch === "function") return ch({ get isActive() {
+			return linkProps["data-status"] === "active";
+		} });
 		return ch;
@@ -319,0 +306,0 @@ });

dist/esm/link.js.map

@@ -1,1 +0,1 @@
-{"version":3,"file":"link.js","names":["Solid","mergeRefs","deepEqual","exactPathTest","functionalUpdate","hasKeys","isDangerousProtocol","preloadWarning","removeTrailingSlash","isServer","Dynamic","useRouter","useIntersectionObserver","useHydrated","AnyRouter","Constrain","LinkOptions","RegisteredRouter","RoutePaths","ValidateLinkOptions","ValidateLinkOptionsArray","timeoutMap","WeakMap","EventTarget","ReturnType","setTimeout","useLinkProps","TRouter","TFrom","options","UseLinkPropsOptions","TTo","TMaskFrom","TMaskTo","ComponentProps","router","isTransitioning","setIsTransitioning","createSignal","shouldHydrateHash","ssr","hasHydrated","hasRenderFetched","local","rest","splitProps","mergeProps","activeProps","STATIC_ACTIVE_PROPS_GET","inactiveProps","STATIC_INACTIVE_PROPS_GET","_","propsSafeToSpread","currentLocation","createMemo","stores","location","get","undefined","equals","prev","next","href","_fromLocation","nextOptions","untrack","buildLocation","hrefOption","disabled","maskedLocation","publicHref","external","history","createHref","externalLink","_href","protocolAllowlist","process","env","NODE_ENV","console","warn","to","safeInternal","isSafeInternal","indexOf","URL","preload","reloadDocument","defaultPreload","preloadDelay","defaultPreloadDelay","isActive","activeOptions","current","nextLocation","exact","testExact","pathname","basepath","currentPath","nextPath","pathIsFuzzyEqual","startsWith","length","includeSearch","searchTest","search","partial","ignoreUndefined","explicitUndefined","includeHash","currentHash","hash","doPreload","preloadRoute","_builtLocation","catch","err","preloadViewportIoCallback","entry","IntersectionObserverEntry","isIntersecting","ref","setRef","Element","rootMargin","createEffect","handleClick","e","MouseEvent","elementTarget","currentTarget","HTMLAnchorElement","SVGAElement","getAttribute","effectiveTarget","target","isCtrlEvent","defaultPrevented","button","preventDefault","unsub","subscribe","navigate","replace","resetScroll","hashScrollIntoView","startTransition","viewTransition","ignoreBlocker","enqueueIntentPreload","FocusEvent","eventTarget","has","set","delete","handleTouchStart","TouchEvent","handleLeave","id","clearTimeout","simpleStyling","class","style","onClick","createComposedHandler","onBlur","onFocus","onMouseEnter","onMouseOver","onMouseLeave","onMouseOut","onTouchStart","ResolvedLinkStateProps","Omit","JSX","CSSProperties","resolvedProps","active","base","STATIC_DISABLED_PROPS","STATIC_TRANSITIONING_ATTRIBUTES","STATIC_DEFAULT_ACTIVE_ATTRIBUTES","EMPTY_OBJECT","className","filter","Boolean","join","STATIC_ACTIVE_ATTRIBUTES","STATIC_ACTIVE_PROPS","role","callHandler","Event","event","TEvent","T","handler","EventHandlerUnion","getHandler","fallback","ActiveLinkOptions","ActiveLinkOptionProps","TComp","ActiveLinkProps","Partial","LinkComponentSolidProps","key","LinkProps","LinkPropsChildren","children","state","ValidComponent","CreateLinkProps","LinkComponentProps","LinkComponent","TDefaultFrom","props","LinkComponentRoute","defaultFrom","createLink","Comp","_$createComponent","Link","_$mergeProps","_asChild","linkProps","ch","svgLinkProps","_el$","_tmpl$","_el$2","firstChild","_$spread","_$insert","_el$3","_tmpl$2","component","metaKey","altKey","ctrlKey","shiftKey","zero","charCodeAt","LinkOptionsFnOptions","TOptions","ReadonlyArray","LinkOptionsFn","linkOptions"],"sources":["../../src/link.tsx"],"sourcesContent":["import * as Solid from 'solid-js'\n\nimport { mergeRefs } from '@solid-primitives/refs'\n\nimport {\n  deepEqual,\n  exactPathTest,\n  functionalUpdate,\n  hasKeys,\n  isDangerousProtocol,\n  preloadWarning,\n  removeTrailingSlash,\n} from '@tanstack/router-core'\n\nimport { isServer } from '@tanstack/router-core/isServer'\nimport { Dynamic } from 'solid-js/web'\nimport { useRouter } from './useRouter'\n\nimport { useIntersectionObserver } from './utils'\n\nimport { useHydrated } from './ClientOnly'\nimport type {\n  AnyRouter,\n  Constrain,\n  LinkOptions,\n  RegisteredRouter,\n  RoutePaths,\n} from '@tanstack/router-core'\nimport type {\n  ValidateLinkOptions,\n  ValidateLinkOptionsArray,\n} from './typePrimitives'\n\nconst timeoutMap = new WeakMap<EventTarget, ReturnType<typeof setTimeout>>()\n\nexport function useLinkProps<\n  TRouter extends AnyRouter = RegisteredRouter,\n  TFrom extends RoutePaths<TRouter['routeTree']> | string = string,\n  TTo extends string = '',\n  TMaskFrom extends RoutePaths<TRouter['routeTree']> | string = TFrom,\n  TMaskTo extends string = '',\n>(\n  options: UseLinkPropsOptions<TRouter, TFrom, TTo, TMaskFrom, TMaskTo>,\n): Solid.ComponentProps<'a'> {\n  const router = useRouter()\n  const [isTransitioning, setIsTransitioning] = Solid.createSignal(false)\n  const shouldHydrateHash = !isServer && !!router.options.ssr\n  const hasHydrated = useHydrated()\n\n  let hasRenderFetched = false\n\n  const [local, rest] = Solid.splitProps(\n    Solid.mergeProps(\n      {\n        activeProps: STATIC_ACTIVE_PROPS_GET,\n        inactiveProps: STATIC_INACTIVE_PROPS_GET,\n      },\n      options,\n    ),\n    [\n      'activeProps',\n      'inactiveProps',\n      'activeOptions',\n      'to',\n      'preload',\n      'preloadDelay',\n      'preloadIntentProximity',\n      'hashScrollIntoView',\n      'replace',\n      'startTransition',\n      'resetScroll',\n      'viewTransition',\n      'target',\n      'disabled',\n      'style',\n      'class',\n      'onClick',\n      'onBlur',\n      'onFocus',\n      'onMouseEnter',\n      'onMouseLeave',\n      'onMouseOver',\n      'onMouseOut',\n      'onTouchStart',\n      'ignoreBlocker',\n    ],\n  )\n\n  // const {\n  //   // custom props\n  //   activeProps = () => ({ class: 'active' }),\n  //   inactiveProps = () => ({}),\n  //   activeOptions,\n  //   to,\n  //   preload: userPreload,\n  //   preloadDelay: userPreloadDelay,\n  //   hashScrollIntoView,\n  //   replace,\n  //   startTransition,\n  //   resetScroll,\n  //   viewTransition,\n  //   // element props\n  //   children,\n  //   target,\n  //   disabled,\n  //   style,\n  //   class,\n  //   onClick,\n  //   onFocus,\n  //   onMouseEnter,\n  //   onMouseLeave,\n  //   onTouchStart,\n  //   ignoreBlocker,\n  //   ...rest\n  // } = options\n\n  const [_, propsSafeToSpread] = Solid.splitProps(rest, [\n    'params',\n    'search',\n    'hash',\n    'state',\n    'mask',\n    'reloadDocument',\n    'unsafeRelative',\n    'from',\n  ])\n\n  const currentLocation = Solid.createMemo(\n    () => router.stores.location.get(),\n    undefined,\n    { equals: (prev, next) => prev.href === next.href },\n  )\n\n  const next = Solid.createMemo(() => {\n    // Rebuild when inherited search/hash or the current route context changes.\n    const _fromLocation = currentLocation()\n    const nextOptions = { _fromLocation, ...options } as any\n    // untrack because router-core will also access stores, which are signals in solid\n    return Solid.untrack(() => router.buildLocation(nextOptions))\n  })\n\n  const hrefOption = Solid.createMemo(() => {\n    if (options.disabled) return undefined\n    // Use publicHref - it contains the correct href for display\n    // When a rewrite changes the origin, publicHref is the full URL\n    // Otherwise it's the origin-stripped path\n    // This avoids constructing URL objects in the hot path\n    const location = next().maskedLocation ?? next()\n    const publicHref = location.publicHref\n    const external = location.external\n\n    if (external) {\n      return { href: publicHref, external: true }\n    }\n\n    return {\n      href: router.history.createHref(publicHref) || '/',\n      external: false,\n    }\n  })\n\n  const externalLink = Solid.createMemo(() => {\n    const _href = hrefOption()\n    if (_href?.external) {\n      // Block dangerous protocols for external links\n      if (isDangerousProtocol(_href.href, router.protocolAllowlist)) {\n        if (process.env.NODE_ENV !== 'production') {\n          console.warn(`Blocked Link with dangerous protocol: ${_href.href}`)\n        }\n        return undefined\n      }\n      return _href.href\n    }\n    const to = options.to\n    const safeInternal = isSafeInternal(to)\n    if (safeInternal) return undefined\n    if (typeof to !== 'string' || to.indexOf(':') === -1) return undefined\n    try {\n      new URL(to as any)\n      // Block dangerous protocols like javascript:, blob:, data:\n      if (isDangerousProtocol(to, router.protocolAllowlist)) {\n        if (process.env.NODE_ENV !== 'production') {\n          console.warn(`Blocked Link with dangerous protocol: ${to}`)\n        }\n        return undefined\n      }\n      return to\n    } catch {}\n    return undefined\n  })\n\n  const preload = Solid.createMemo(() => {\n    if (options.reloadDocument || externalLink()) {\n      return false\n    }\n    return local.preload ?? router.options.defaultPreload\n  })\n  const preloadDelay = () =>\n    local.preloadDelay ?? router.options.defaultPreloadDelay ?? 0\n\n  const isActive = Solid.createMemo(() => {\n    if (externalLink()) return false\n    const activeOptions = local.activeOptions\n    const current = currentLocation()\n    const nextLocation = next()\n\n    if (activeOptions?.exact) {\n      const testExact = exactPathTest(\n        current.pathname,\n        nextLocation.pathname,\n        router.basepath,\n      )\n      if (!testExact) {\n        return false\n      }\n    } else {\n      const currentPath = removeTrailingSlash(current.pathname, router.basepath)\n      const nextPath = removeTrailingSlash(\n        nextLocation.pathname,\n        router.basepath,\n      )\n\n      const pathIsFuzzyEqual =\n        currentPath.startsWith(nextPath) &&\n        (currentPath.length === nextPath.length ||\n          currentPath[nextPath.length] === '/')\n      if (!pathIsFuzzyEqual) {\n        return false\n      }\n    }\n\n    if (activeOptions?.includeSearch ?? true) {\n      const searchTest = deepEqual(current.search, nextLocation.search, {\n        partial: !activeOptions?.exact,\n        ignoreUndefined: !activeOptions?.explicitUndefined,\n      })\n      if (!searchTest) {\n        return false\n      }\n    }\n\n    if (activeOptions?.includeHash) {\n      const currentHash =\n        shouldHydrateHash && !hasHydrated() ? '' : current.hash\n      return currentHash === nextLocation.hash\n    }\n    return true\n  })\n\n  const doPreload = () =>\n    router\n      .preloadRoute({ ...options, _builtLocation: next() } as any)\n      .catch((err: any) => {\n        console.warn(err)\n        console.warn(preloadWarning)\n      })\n\n  const preloadViewportIoCallback = (\n    entry: IntersectionObserverEntry | undefined,\n  ) => {\n    if (entry?.isIntersecting) {\n      doPreload()\n    }\n  }\n\n  const [ref, setRef] = Solid.createSignal<Element | null>(null)\n\n  useIntersectionObserver(\n    ref,\n    preloadViewportIoCallback,\n    { rootMargin: '100px' },\n    !!local.disabled || preload() !== 'viewport',\n  )\n\n  Solid.createEffect(() => {\n    if (hasRenderFetched) {\n      return\n    }\n    if (!local.disabled && preload() === 'render') {\n      doPreload()\n      hasRenderFetched = true\n    }\n  })\n\n  if (externalLink()) {\n    return Solid.mergeProps(\n      propsSafeToSpread,\n      {\n        ref: mergeRefs(setRef, options.ref),\n        href: externalLink(),\n      },\n      Solid.splitProps(local, [\n        'target',\n        'disabled',\n        'style',\n        'class',\n        'onClick',\n        'onBlur',\n        'onFocus',\n        'onMouseEnter',\n        'onMouseLeave',\n        'onMouseOut',\n        'onMouseOver',\n        'onTouchStart',\n      ])[0],\n    ) as any\n  }\n\n  // The click handler\n  const handleClick = (e: MouseEvent) => {\n    // Check actual element's target attribute as fallback\n    const elementTarget = (\n      e.currentTarget as HTMLAnchorElement | SVGAElement\n    ).getAttribute('target')\n    const effectiveTarget =\n      local.target !== undefined ? local.target : elementTarget\n\n    if (\n      !local.disabled &&\n      !isCtrlEvent(e) &&\n      !e.defaultPrevented &&\n      (!effectiveTarget || effectiveTarget === '_self') &&\n      e.button === 0\n    ) {\n      e.preventDefault()\n\n      setIsTransitioning(true)\n\n      const unsub = router.subscribe('onResolved', () => {\n        unsub()\n        setIsTransitioning(false)\n      })\n\n      // All is well? Navigate!\n      // N.B. we don't call `router.commitLocation(next) here because we want to run `validateSearch` before committing\n      router.navigate({\n        ...options,\n        replace: local.replace,\n        resetScroll: local.resetScroll,\n        hashScrollIntoView: local.hashScrollIntoView,\n        startTransition: local.startTransition,\n        viewTransition: local.viewTransition,\n        ignoreBlocker: local.ignoreBlocker,\n      })\n    }\n  }\n\n  const enqueueIntentPreload = (e: MouseEvent | FocusEvent) => {\n    if (local.disabled || preload() !== 'intent') return\n\n    if (!preloadDelay()) {\n      doPreload()\n      return\n    }\n\n    const eventTarget = e.currentTarget || e.target\n\n    if (!eventTarget || timeoutMap.has(eventTarget)) return\n\n    timeoutMap.set(\n      eventTarget,\n      setTimeout(() => {\n        timeoutMap.delete(eventTarget)\n        doPreload()\n      }, preloadDelay()),\n    )\n  }\n\n  const handleTouchStart = (_: TouchEvent) => {\n    if (local.disabled || preload() !== 'intent') return\n    doPreload()\n  }\n\n  const handleLeave = (e: MouseEvent | FocusEvent) => {\n    if (local.disabled) return\n    const eventTarget = e.currentTarget || e.target\n\n    if (eventTarget) {\n      const id = timeoutMap.get(eventTarget)\n      clearTimeout(id)\n      timeoutMap.delete(eventTarget)\n    }\n  }\n\n  const simpleStyling = Solid.createMemo(\n    () =>\n      local.activeProps === STATIC_ACTIVE_PROPS_GET &&\n      local.inactiveProps === STATIC_INACTIVE_PROPS_GET &&\n      local.class === undefined &&\n      local.style === undefined,\n  )\n\n  const onClick = createComposedHandler(() => local.onClick, handleClick)\n  const onBlur = createComposedHandler(() => local.onBlur, handleLeave)\n  const onFocus = createComposedHandler(\n    () => local.onFocus,\n    enqueueIntentPreload,\n  )\n  const onMouseEnter = createComposedHandler(\n    () => local.onMouseEnter,\n    enqueueIntentPreload,\n  )\n  const onMouseOver = createComposedHandler(\n    () => local.onMouseOver,\n    enqueueIntentPreload,\n  )\n  const onMouseLeave = createComposedHandler(\n    () => local.onMouseLeave,\n    handleLeave,\n  )\n  const onMouseOut = createComposedHandler(() => local.onMouseOut, handleLeave)\n  const onTouchStart = createComposedHandler(\n    () => local.onTouchStart,\n    handleTouchStart,\n  )\n\n  type ResolvedLinkStateProps = Omit<Solid.ComponentProps<'a'>, 'style'> & {\n    style?: Solid.JSX.CSSProperties\n  }\n\n  const resolvedProps = Solid.createMemo(() => {\n    const active = isActive()\n\n    const base = {\n      href: hrefOption()?.href,\n      ref: mergeRefs(setRef, options.ref),\n      onClick,\n      onBlur,\n      onFocus,\n      onMouseEnter,\n      onMouseOver,\n      onMouseLeave,\n      onMouseOut,\n      onTouchStart,\n      disabled: !!local.disabled,\n      target: local.target,\n      ...(local.disabled && STATIC_DISABLED_PROPS),\n      ...(isTransitioning() && STATIC_TRANSITIONING_ATTRIBUTES),\n    }\n\n    if (simpleStyling()) {\n      return {\n        ...base,\n        ...(active && STATIC_DEFAULT_ACTIVE_ATTRIBUTES),\n      }\n    }\n\n    const activeProps: ResolvedLinkStateProps = active\n      ? (functionalUpdate(local.activeProps as any, {}) ?? EMPTY_OBJECT)\n      : EMPTY_OBJECT\n    const inactiveProps: ResolvedLinkStateProps = active\n      ? EMPTY_OBJECT\n      : functionalUpdate(local.inactiveProps, {})\n    const style = {\n      ...local.style,\n      ...activeProps.style,\n      ...inactiveProps.style,\n    }\n    const className = [local.class, activeProps.class, inactiveProps.class]\n      .filter(Boolean)\n      .join(' ')\n\n    return {\n      ...activeProps,\n      ...inactiveProps,\n      ...base,\n      ...(hasKeys(style) ? { style } : undefined),\n      ...(className ? { class: className } : undefined),\n      ...(active && STATIC_ACTIVE_ATTRIBUTES),\n    } as ResolvedLinkStateProps\n  })\n\n  return Solid.mergeProps(propsSafeToSpread, resolvedProps) as any\n}\n\nconst STATIC_ACTIVE_PROPS = { class: 'active' }\nconst STATIC_ACTIVE_PROPS_GET = () => STATIC_ACTIVE_PROPS\nconst EMPTY_OBJECT = {}\nconst STATIC_INACTIVE_PROPS_GET = () => EMPTY_OBJECT\nconst STATIC_DEFAULT_ACTIVE_ATTRIBUTES = {\n  class: 'active',\n  'data-status': 'active',\n  'aria-current': 'page',\n}\nconst STATIC_DISABLED_PROPS = {\n  role: 'link',\n  'aria-disabled': true,\n}\nconst STATIC_ACTIVE_ATTRIBUTES = {\n  'data-status': 'active',\n  'aria-current': 'page',\n}\nconst STATIC_TRANSITIONING_ATTRIBUTES = {\n  'data-transitioning': 'transitioning',\n}\n\n/** Call a JSX.EventHandlerUnion with the event. */\nfunction callHandler<T, TEvent extends Event>(\n  event: TEvent & { currentTarget: T; target: Element },\n  handler: Solid.JSX.EventHandlerUnion<T, TEvent>,\n) {\n  if (typeof handler === 'function') {\n    handler(event)\n  } else {\n    handler[0](handler[1], event)\n  }\n  return event.defaultPrevented\n}\n\nfunction createComposedHandler<T, TEvent extends Event>(\n  getHandler: () => Solid.JSX.EventHandlerUnion<T, TEvent> | undefined,\n  fallback: (event: TEvent) => void,\n) {\n  return (event: TEvent & { currentTarget: T; target: Element }) => {\n    const handler = getHandler()\n    if (!handler || !callHandler(event, handler)) fallback(event)\n  }\n}\n\nexport type UseLinkPropsOptions<\n  TRouter extends AnyRouter = RegisteredRouter,\n  TFrom extends RoutePaths<TRouter['routeTree']> | string = string,\n  TTo extends string | undefined = '.',\n  TMaskFrom extends RoutePaths<TRouter['routeTree']> | string = TFrom,\n  TMaskTo extends string = '.',\n> = ActiveLinkOptions<'a', TRouter, TFrom, TTo, TMaskFrom, TMaskTo> &\n  Omit<Solid.ComponentProps<'a'>, 'style'> & { style?: Solid.JSX.CSSProperties }\n\nexport type ActiveLinkOptions<\n  TComp = 'a',\n  TRouter extends AnyRouter = RegisteredRouter,\n  TFrom extends string = string,\n  TTo extends string | undefined = '.',\n  TMaskFrom extends string = TFrom,\n  TMaskTo extends string = '.',\n> = LinkOptions<TRouter, TFrom, TTo, TMaskFrom, TMaskTo> &\n  ActiveLinkOptionProps<TComp>\n\ntype ActiveLinkProps<TComp> = Partial<\n  LinkComponentSolidProps<TComp> & {\n    [key: `data-${string}`]: unknown\n  }\n>\n\nexport interface ActiveLinkOptionProps<TComp = 'a'> {\n  /**\n   * A function that returns additional props for the `active` state of this link.\n   * These props override other props passed to the link (`style`'s are merged, `class`'s are concatenated)\n   */\n  activeProps?: ActiveLinkProps<TComp> | (() => ActiveLinkProps<TComp>)\n  /**\n   * A function that returns additional props for the `inactive` state of this link.\n   * These props override other props passed to the link (`style`'s are merged, `class`'s are concatenated)\n   */\n  inactiveProps?: ActiveLinkProps<TComp> | (() => ActiveLinkProps<TComp>)\n}\n\nexport type LinkProps<\n  TComp = 'a',\n  TRouter extends AnyRouter = RegisteredRouter,\n  TFrom extends string = string,\n  TTo extends string | undefined = '.',\n  TMaskFrom extends string = TFrom,\n  TMaskTo extends string = '.',\n> = ActiveLinkOptions<TComp, TRouter, TFrom, TTo, TMaskFrom, TMaskTo> &\n  LinkPropsChildren\n\nexport interface LinkPropsChildren {\n  // If a function is passed as a child, it will be given the `isActive` boolean to aid in further styling on the element it returns\n  children?:\n    | Solid.JSX.Element\n    | ((state: {\n        isActive: boolean\n        isTransitioning: boolean\n      }) => Solid.JSX.Element)\n}\n\ntype LinkComponentSolidProps<TComp> = TComp extends Solid.ValidComponent\n  ? Omit<Solid.ComponentProps<TComp>, keyof CreateLinkProps>\n  : never\n\nexport type LinkComponentProps<\n  TComp = 'a',\n  TRouter extends AnyRouter = RegisteredRouter,\n  TFrom extends string = string,\n  TTo extends string | undefined = '.',\n  TMaskFrom extends string = TFrom,\n  TMaskTo extends string = '.',\n> = LinkComponentSolidProps<TComp> &\n  LinkProps<TComp, TRouter, TFrom, TTo, TMaskFrom, TMaskTo>\n\nexport type CreateLinkProps = LinkProps<\n  any,\n  any,\n  string,\n  string,\n  string,\n  string\n>\n\nexport type LinkComponent<\n  in out TComp,\n  in out TDefaultFrom extends string = string,\n> = <\n  TRouter extends AnyRouter = RegisteredRouter,\n  const TFrom extends string = TDefaultFrom,\n  const TTo extends string | undefined = undefined,\n  const TMaskFrom extends string = TFrom,\n  const TMaskTo extends string = '',\n>(\n  props: LinkComponentProps<TComp, TRouter, TFrom, TTo, TMaskFrom, TMaskTo>,\n) => Solid.JSX.Element\n\nexport interface LinkComponentRoute<\n  in out TDefaultFrom extends string = string,\n> {\n  defaultFrom: TDefaultFrom;\n  <\n    TRouter extends AnyRouter = RegisteredRouter,\n    const TTo extends string | undefined = undefined,\n    const TMaskTo extends string = '',\n  >(\n    props: LinkComponentProps<\n      'a',\n      TRouter,\n      this['defaultFrom'],\n      TTo,\n      this['defaultFrom'],\n      TMaskTo\n    >,\n  ): Solid.JSX.Element\n}\n\nexport function createLink<const TComp>(\n  Comp: Constrain<TComp, any, (props: CreateLinkProps) => Solid.JSX.Element>,\n): LinkComponent<TComp> {\n  return (props) => <Link {...props} _asChild={Comp} />\n}\n\nexport const Link: LinkComponent<'a'> = (props) => {\n  const [local, rest] = Solid.splitProps(\n    props as typeof props & { _asChild: any },\n    ['_asChild', 'children'],\n  )\n\n  const [_, linkProps] = Solid.splitProps(\n    useLinkProps(rest as unknown as any),\n    ['type'],\n  )\n\n  const children = Solid.createMemo(() => {\n    const ch = local.children\n    if (typeof ch === 'function') {\n      return ch({\n        get isActive() {\n          return (linkProps as any)['data-status'] === 'active'\n        },\n        get isTransitioning() {\n          return (linkProps as any)['data-transitioning'] === 'transitioning'\n        },\n      })\n    }\n\n    return ch satisfies Solid.JSX.Element\n  })\n\n  if (local._asChild === 'svg') {\n    const [_, svgLinkProps] = Solid.splitProps(linkProps, ['class'])\n    return (\n      <svg>\n        <a {...svgLinkProps}>{children()}</a>\n      </svg>\n    )\n  }\n\n  if (!local._asChild) {\n    return <a {...linkProps}>{children()}</a>\n  }\n\n  return (\n    <Dynamic component={local._asChild as Solid.ValidComponent} {...linkProps}>\n      {children()}\n    </Dynamic>\n  )\n}\n\nfunction isCtrlEvent(e: MouseEvent) {\n  return !!(e.metaKey || e.altKey || e.ctrlKey || e.shiftKey)\n}\n\nfunction isSafeInternal(to: unknown) {\n  if (typeof to !== 'string') return false\n  const zero = to.charCodeAt(0)\n  if (zero === 47) return to.charCodeAt(1) !== 47 // '/' but not '//'\n  return zero === 46 // '.', '..', './', '../'\n}\n\nexport type LinkOptionsFnOptions<\n  TOptions,\n  TComp,\n  TRouter extends AnyRouter = RegisteredRouter,\n> =\n  TOptions extends ReadonlyArray<any>\n    ? ValidateLinkOptionsArray<TRouter, TOptions, string, TComp>\n    : ValidateLinkOptions<TRouter, TOptions, string, TComp>\n\nexport type LinkOptionsFn<TComp> = <\n  const TOptions,\n  TRouter extends AnyRouter = RegisteredRouter,\n>(\n  options: LinkOptionsFnOptions<TOptions, TComp, TRouter>,\n) => TOptions\n\nexport const linkOptions: LinkOptionsFn<'a'> = (options) => {\n  return options as any\n}\n"],"mappings":"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"}
+{"version":3,"file":"link.js","names":["Solid","mergeRefs","deepEqual","exactPathTest","functionalUpdate","hasKeys","isDangerousProtocol","preloadWarning","removeTrailingSlash","isServer","Dynamic","useRouter","useIntersectionObserver","useHydrated","AnyRouter","Constrain","LinkOptions","RegisteredRouter","RoutePaths","ValidateLinkOptions","ValidateLinkOptionsArray","timeoutMap","WeakMap","ReturnType","setTimeout","cancelPreload","eventTarget","clearTimeout","get","delete","useLinkProps","TRouter","TFrom","options","UseLinkPropsOptions","TTo","TMaskFrom","TMaskTo","ComponentProps","router","shouldHydrateHash","ssr","hasHydrated","hasRenderFetched","local","rest","splitProps","mergeProps","activeProps","STATIC_ACTIVE_PROPS_GET","inactiveProps","STATIC_INACTIVE_PROPS_GET","_","propsSafeToSpread","currentLocation","createMemo","stores","location","undefined","equals","prev","next","href","_fromLocation","nextOptions","untrack","buildLocation","hrefOption","disabled","maskedLocation","publicHref","external","history","createHref","externalLink","_href","protocolAllowlist","process","env","NODE_ENV","console","warn","to","safeInternal","isSafeInternal","indexOf","URL","preload","reloadDocument","defaultPreload","preloadDelay","defaultPreloadDelay","isActive","activeOptions","current","nextLocation","exact","testExact","pathname","basepath","currentPath","nextPath","pathIsFuzzyEqual","startsWith","length","includeSearch","searchTest","search","partial","ignoreUndefined","explicitUndefined","includeHash","currentHash","hash","doPreload","preloadRoute","_builtLocation","catch","err","ref","setRef","createSignal","Element","enqueuePreload","e","MouseEvent","FocusEvent","IntersectionObserverEntry","isIntersecting","has","set","createEffect","handleClick","elementTarget","currentTarget","HTMLAnchorElement","SVGAElement","getAttribute","effectiveTarget","target","isCtrlEvent","defaultPrevented","button","preventDefault","navigate","replace","resetScroll","hashScrollIntoView","startTransition","viewTransition","ignoreBlocker","handleTouchStart","handleLeave","simpleStyling","class","style","onClick","createComposedHandler","onBlur","onFocus","onMouseEnter","onMouseOver","onMouseLeave","onMouseOut","onTouchStart","ResolvedLinkStateProps","Omit","JSX","CSSProperties","resolvedProps","active","base","STATIC_DISABLED_PROPS","STATIC_DEFAULT_ACTIVE_ATTRIBUTES","EMPTY_OBJECT","className","filter","Boolean","join","STATIC_ACTIVE_ATTRIBUTES","STATIC_ACTIVE_PROPS","role","callHandler","Event","event","TEvent","T","handler","EventHandlerUnion","getHandler","fallback","ActiveLinkOptions","ActiveLinkOptionProps","TComp","ActiveLinkProps","Partial","LinkComponentSolidProps","key","LinkProps","LinkPropsChildren","children","state","ValidComponent","CreateLinkProps","LinkComponentProps","LinkComponent","TDefaultFrom","props","LinkComponentRoute","defaultFrom","createLink","Comp","_$createComponent","Link","_$mergeProps","_asChild","linkProps","ch","svgLinkProps","_el$","_tmpl$","_el$2","firstChild","_$spread","_$insert","_el$3","_tmpl$2","component","metaKey","altKey","ctrlKey","shiftKey","zero","charCodeAt","LinkOptionsFnOptions","TOptions","ReadonlyArray","LinkOptionsFn","linkOptions"],"sources":["../../src/link.tsx"],"sourcesContent":["import * as Solid from 'solid-js'\n\nimport { mergeRefs } from '@solid-primitives/refs'\n\nimport {\n  deepEqual,\n  exactPathTest,\n  functionalUpdate,\n  hasKeys,\n  isDangerousProtocol,\n  preloadWarning,\n  removeTrailingSlash,\n} from '@tanstack/router-core'\n\nimport { isServer } from '@tanstack/router-core/isServer'\nimport { Dynamic } from 'solid-js/web'\nimport { useRouter } from './useRouter'\n\nimport { useIntersectionObserver } from './utils'\n\nimport { useHydrated } from './ClientOnly'\nimport type {\n  AnyRouter,\n  Constrain,\n  LinkOptions,\n  RegisteredRouter,\n  RoutePaths,\n} from '@tanstack/router-core'\nimport type {\n  ValidateLinkOptions,\n  ValidateLinkOptionsArray,\n} from './typePrimitives'\n\nconst timeoutMap = new WeakMap<object, ReturnType<typeof setTimeout>>()\nconst cancelPreload = (eventTarget: object) => {\n  clearTimeout(timeoutMap.get(eventTarget))\n  timeoutMap.delete(eventTarget)\n}\n\nexport function useLinkProps<\n  TRouter extends AnyRouter = RegisteredRouter,\n  TFrom extends RoutePaths<TRouter['routeTree']> | string = string,\n  TTo extends string = '',\n  TMaskFrom extends RoutePaths<TRouter['routeTree']> | string = TFrom,\n  TMaskTo extends string = '',\n>(\n  options: UseLinkPropsOptions<TRouter, TFrom, TTo, TMaskFrom, TMaskTo>,\n): Solid.ComponentProps<'a'> {\n  const router = useRouter()\n  const shouldHydrateHash = !isServer && !!router.options.ssr\n  const hasHydrated = useHydrated()\n\n  let hasRenderFetched = false\n\n  const [local, rest] = Solid.splitProps(\n    Solid.mergeProps(\n      {\n        activeProps: STATIC_ACTIVE_PROPS_GET,\n        inactiveProps: STATIC_INACTIVE_PROPS_GET,\n      },\n      options,\n    ),\n    [\n      'activeProps',\n      'inactiveProps',\n      'activeOptions',\n      'to',\n      'preload',\n      'preloadDelay',\n      'preloadIntentProximity',\n      'hashScrollIntoView',\n      'replace',\n      'startTransition',\n      'resetScroll',\n      'viewTransition',\n      'target',\n      'disabled',\n      'style',\n      'class',\n      'onClick',\n      'onBlur',\n      'onFocus',\n      'onMouseEnter',\n      'onMouseLeave',\n      'onMouseOver',\n      'onMouseOut',\n      'onTouchStart',\n      'ignoreBlocker',\n    ],\n  )\n\n  // const {\n  //   // custom props\n  //   activeProps = () => ({ class: 'active' }),\n  //   inactiveProps = () => ({}),\n  //   activeOptions,\n  //   to,\n  //   preload: userPreload,\n  //   preloadDelay: userPreloadDelay,\n  //   hashScrollIntoView,\n  //   replace,\n  //   startTransition,\n  //   resetScroll,\n  //   viewTransition,\n  //   // element props\n  //   children,\n  //   target,\n  //   disabled,\n  //   style,\n  //   class,\n  //   onClick,\n  //   onFocus,\n  //   onMouseEnter,\n  //   onMouseLeave,\n  //   onTouchStart,\n  //   ignoreBlocker,\n  //   ...rest\n  // } = options\n\n  const [_, propsSafeToSpread] = Solid.splitProps(rest, [\n    'params',\n    'search',\n    'hash',\n    'state',\n    'mask',\n    'reloadDocument',\n    'unsafeRelative',\n    'from',\n  ])\n\n  const currentLocation = Solid.createMemo(\n    () => router.stores.location.get(),\n    undefined,\n    { equals: (prev, next) => prev.href === next.href },\n  )\n\n  const next = Solid.createMemo(() => {\n    // Rebuild when inherited search/hash or the current route context changes.\n    const _fromLocation = currentLocation()\n    const nextOptions = { _fromLocation, ...options } as any\n    // untrack because router-core will also access stores, which are signals in solid\n    return Solid.untrack(() => router.buildLocation(nextOptions))\n  })\n\n  const hrefOption = Solid.createMemo(() => {\n    if (options.disabled) return undefined\n    // Use publicHref - it contains the correct href for display\n    // When a rewrite changes the origin, publicHref is the full URL\n    // Otherwise it's the origin-stripped path\n    // This avoids constructing URL objects in the hot path\n    const location = next().maskedLocation ?? next()\n    const publicHref = location.publicHref\n    const external = location.external\n\n    if (external) {\n      return { href: publicHref, external: true }\n    }\n\n    return {\n      href: router.history.createHref(publicHref) || '/',\n      external: false,\n    }\n  })\n\n  const externalLink = Solid.createMemo(() => {\n    const _href = hrefOption()\n    if (_href?.external) {\n      // Block dangerous protocols for external links\n      if (isDangerousProtocol(_href.href, router.protocolAllowlist)) {\n        if (process.env.NODE_ENV !== 'production') {\n          console.warn(`Blocked Link with dangerous protocol: ${_href.href}`)\n        }\n        return undefined\n      }\n      return _href.href\n    }\n    const to = options.to\n    const safeInternal = isSafeInternal(to)\n    if (safeInternal) return undefined\n    if (typeof to !== 'string' || to.indexOf(':') === -1) return undefined\n    try {\n      new URL(to as any)\n      // Block dangerous protocols like javascript:, blob:, data:\n      if (isDangerousProtocol(to, router.protocolAllowlist)) {\n        if (process.env.NODE_ENV !== 'production') {\n          console.warn(`Blocked Link with dangerous protocol: ${to}`)\n        }\n        return undefined\n      }\n      return to\n    } catch {}\n    return undefined\n  })\n\n  const preload = Solid.createMemo(() => {\n    if (options.reloadDocument || externalLink() || local.disabled) {\n      return false\n    }\n    return local.preload ?? router.options.defaultPreload\n  })\n  const preloadDelay = () =>\n    local.preloadDelay ?? router.options.defaultPreloadDelay ?? 0\n\n  const isActive = Solid.createMemo(() => {\n    if (externalLink()) return false\n    const activeOptions = local.activeOptions\n    const current = currentLocation()\n    const nextLocation = next()\n\n    if (activeOptions?.exact) {\n      const testExact = exactPathTest(\n        current.pathname,\n        nextLocation.pathname,\n        router.basepath,\n      )\n      if (!testExact) {\n        return false\n      }\n    } else {\n      const currentPath = removeTrailingSlash(current.pathname, router.basepath)\n      const nextPath = removeTrailingSlash(\n        nextLocation.pathname,\n        router.basepath,\n      )\n\n      const pathIsFuzzyEqual =\n        currentPath.startsWith(nextPath) &&\n        (currentPath.length === nextPath.length ||\n          currentPath[nextPath.length] === '/')\n      if (!pathIsFuzzyEqual) {\n        return false\n      }\n    }\n\n    if (activeOptions?.includeSearch ?? true) {\n      const searchTest = deepEqual(current.search, nextLocation.search, {\n        partial: !activeOptions?.exact,\n        ignoreUndefined: !activeOptions?.explicitUndefined,\n      })\n      if (!searchTest) {\n        return false\n      }\n    }\n\n    if (activeOptions?.includeHash) {\n      const currentHash =\n        shouldHydrateHash && !hasHydrated() ? '' : current.hash\n      return currentHash === nextLocation.hash\n    }\n    return true\n  })\n\n  const doPreload = () =>\n    router\n      .preloadRoute({ ...options, _builtLocation: next() } as any)\n      .catch((err: any) => {\n        console.warn(err)\n        console.warn(preloadWarning)\n      })\n\n  const [ref, setRef] = Solid.createSignal<Element | null>(null)\n\n  const enqueuePreload = (\n    e?: MouseEvent | FocusEvent | IntersectionObserverEntry,\n  ) => {\n    if (!e) {\n      cancelPreload(ref)\n      return\n    }\n\n    if (\n      !(\n        (e as IntersectionObserverEntry).isIntersecting ??\n        preload() === 'intent'\n      )\n    ) {\n      if ((e as IntersectionObserverEntry).isIntersecting === false) {\n        cancelPreload(ref)\n      }\n      return\n    }\n\n    if (!preloadDelay()) {\n      doPreload()\n      return\n    }\n\n    if (!timeoutMap.has(ref)) {\n      timeoutMap.set(\n        ref,\n        setTimeout(() => {\n          timeoutMap.delete(ref)\n          doPreload()\n        }, preloadDelay()),\n      )\n    }\n  }\n\n  useIntersectionObserver(ref, enqueuePreload, () => preload() !== 'viewport')\n\n  Solid.createEffect(() => {\n    if (hasRenderFetched) {\n      return\n    }\n    if (preload() === 'render') {\n      doPreload()\n      hasRenderFetched = true\n    }\n  })\n\n  if (externalLink()) {\n    return Solid.mergeProps(\n      propsSafeToSpread,\n      {\n        ref: mergeRefs(setRef, options.ref),\n        href: externalLink(),\n      },\n      Solid.splitProps(local, [\n        'target',\n        'disabled',\n        'style',\n        'class',\n        'onClick',\n        'onBlur',\n        'onFocus',\n        'onMouseEnter',\n        'onMouseLeave',\n        'onMouseOut',\n        'onMouseOver',\n        'onTouchStart',\n      ])[0],\n    ) as any\n  }\n\n  // The click handler\n  const handleClick = (e: MouseEvent) => {\n    // Check actual element's target attribute as fallback\n    const elementTarget = (\n      e.currentTarget as HTMLAnchorElement | SVGAElement\n    ).getAttribute('target')\n    const effectiveTarget =\n      local.target !== undefined ? local.target : elementTarget\n\n    if (\n      !local.disabled &&\n      !isCtrlEvent(e) &&\n      !e.defaultPrevented &&\n      (!effectiveTarget || effectiveTarget === '_self') &&\n      e.button === 0\n    ) {\n      e.preventDefault()\n\n      // All is well? Navigate!\n      // N.B. we don't call `router.commitLocation(next) here because we want to run `validateSearch` before committing\n      router.navigate({\n        ...options,\n        replace: local.replace,\n        resetScroll: local.resetScroll,\n        hashScrollIntoView: local.hashScrollIntoView,\n        startTransition: local.startTransition,\n        viewTransition: local.viewTransition,\n        ignoreBlocker: local.ignoreBlocker,\n      })\n    }\n  }\n\n  const handleTouchStart = () => {\n    if (preload() !== 'intent') return\n    doPreload()\n  }\n\n  const handleLeave = () => {\n    if (preload() === 'intent') {\n      cancelPreload(ref)\n    }\n  }\n\n  const simpleStyling = Solid.createMemo(\n    () =>\n      local.activeProps === STATIC_ACTIVE_PROPS_GET &&\n      local.inactiveProps === STATIC_INACTIVE_PROPS_GET &&\n      local.class === undefined &&\n      local.style === undefined,\n  )\n\n  const onClick = createComposedHandler(() => local.onClick, handleClick)\n  const onBlur = createComposedHandler(() => local.onBlur, handleLeave)\n  const onFocus = createComposedHandler(() => local.onFocus, enqueuePreload)\n  const onMouseEnter = createComposedHandler(\n    () => local.onMouseEnter,\n    enqueuePreload,\n  )\n  const onMouseOver = createComposedHandler(\n    () => local.onMouseOver,\n    enqueuePreload,\n  )\n  const onMouseLeave = createComposedHandler(\n    () => local.onMouseLeave,\n    handleLeave,\n  )\n  const onMouseOut = createComposedHandler(() => local.onMouseOut, handleLeave)\n  const onTouchStart = createComposedHandler(\n    () => local.onTouchStart,\n    handleTouchStart,\n  )\n\n  type ResolvedLinkStateProps = Omit<Solid.ComponentProps<'a'>, 'style'> & {\n    style?: Solid.JSX.CSSProperties\n  }\n\n  const resolvedProps = Solid.createMemo(() => {\n    const active = isActive()\n\n    const base = {\n      href: hrefOption()?.href,\n      ref: mergeRefs(setRef, options.ref),\n      onClick,\n      onBlur,\n      onFocus,\n      onMouseEnter,\n      onMouseOver,\n      onMouseLeave,\n      onMouseOut,\n      onTouchStart,\n      disabled: !!local.disabled,\n      target: local.target,\n      ...(local.disabled && STATIC_DISABLED_PROPS),\n    }\n\n    if (simpleStyling()) {\n      return {\n        ...base,\n        ...(active && STATIC_DEFAULT_ACTIVE_ATTRIBUTES),\n      }\n    }\n\n    const activeProps: ResolvedLinkStateProps = active\n      ? (functionalUpdate(local.activeProps as any, {}) ?? EMPTY_OBJECT)\n      : EMPTY_OBJECT\n    const inactiveProps: ResolvedLinkStateProps = active\n      ? EMPTY_OBJECT\n      : functionalUpdate(local.inactiveProps, {})\n    const style = {\n      ...local.style,\n      ...activeProps.style,\n      ...inactiveProps.style,\n    }\n    const className = [local.class, activeProps.class, inactiveProps.class]\n      .filter(Boolean)\n      .join(' ')\n\n    return {\n      ...activeProps,\n      ...inactiveProps,\n      ...base,\n      ...(hasKeys(style) ? { style } : undefined),\n      ...(className ? { class: className } : undefined),\n      ...(active && STATIC_ACTIVE_ATTRIBUTES),\n    } as ResolvedLinkStateProps\n  })\n\n  return Solid.mergeProps(propsSafeToSpread, resolvedProps) as any\n}\n\nconst STATIC_ACTIVE_PROPS = { class: 'active' }\nconst STATIC_ACTIVE_PROPS_GET = () => STATIC_ACTIVE_PROPS\nconst EMPTY_OBJECT = {}\nconst STATIC_INACTIVE_PROPS_GET = () => EMPTY_OBJECT\nconst STATIC_DEFAULT_ACTIVE_ATTRIBUTES = {\n  class: 'active',\n  'data-status': 'active',\n  'aria-current': 'page',\n}\nconst STATIC_DISABLED_PROPS = {\n  role: 'link',\n  'aria-disabled': true,\n}\nconst STATIC_ACTIVE_ATTRIBUTES = {\n  'data-status': 'active',\n  'aria-current': 'page',\n}\n\n/** Call a JSX.EventHandlerUnion with the event. */\nfunction callHandler<T, TEvent extends Event>(\n  event: TEvent & { currentTarget: T; target: Element },\n  handler: Solid.JSX.EventHandlerUnion<T, TEvent>,\n) {\n  if (typeof handler === 'function') {\n    handler(event)\n  } else {\n    handler[0](handler[1], event)\n  }\n  return event.defaultPrevented\n}\n\nfunction createComposedHandler<T, TEvent extends Event>(\n  getHandler: () => Solid.JSX.EventHandlerUnion<T, TEvent> | undefined,\n  fallback: (event: TEvent) => void,\n) {\n  return (event: TEvent & { currentTarget: T; target: Element }) => {\n    const handler = getHandler()\n    if (!handler || !callHandler(event, handler)) fallback(event)\n  }\n}\n\nexport type UseLinkPropsOptions<\n  TRouter extends AnyRouter = RegisteredRouter,\n  TFrom extends RoutePaths<TRouter['routeTree']> | string = string,\n  TTo extends string | undefined = '.',\n  TMaskFrom extends RoutePaths<TRouter['routeTree']> | string = TFrom,\n  TMaskTo extends string = '.',\n> = ActiveLinkOptions<'a', TRouter, TFrom, TTo, TMaskFrom, TMaskTo> &\n  Omit<Solid.ComponentProps<'a'>, 'style'> & { style?: Solid.JSX.CSSProperties }\n\nexport type ActiveLinkOptions<\n  TComp = 'a',\n  TRouter extends AnyRouter = RegisteredRouter,\n  TFrom extends string = string,\n  TTo extends string | undefined = '.',\n  TMaskFrom extends string = TFrom,\n  TMaskTo extends string = '.',\n> = LinkOptions<TRouter, TFrom, TTo, TMaskFrom, TMaskTo> &\n  ActiveLinkOptionProps<TComp>\n\ntype ActiveLinkProps<TComp> = Partial<\n  LinkComponentSolidProps<TComp> & {\n    [key: `data-${string}`]: unknown\n  }\n>\n\nexport interface ActiveLinkOptionProps<TComp = 'a'> {\n  /**\n   * A function that returns additional props for the `active` state of this link.\n   * These props override other props passed to the link (`style`'s are merged, `class`'s are concatenated)\n   */\n  activeProps?: ActiveLinkProps<TComp> | (() => ActiveLinkProps<TComp>)\n  /**\n   * A function that returns additional props for the `inactive` state of this link.\n   * These props override other props passed to the link (`style`'s are merged, `class`'s are concatenated)\n   */\n  inactiveProps?: ActiveLinkProps<TComp> | (() => ActiveLinkProps<TComp>)\n}\n\nexport type LinkProps<\n  TComp = 'a',\n  TRouter extends AnyRouter = RegisteredRouter,\n  TFrom extends string = string,\n  TTo extends string | undefined = '.',\n  TMaskFrom extends string = TFrom,\n  TMaskTo extends string = '.',\n> = ActiveLinkOptions<TComp, TRouter, TFrom, TTo, TMaskFrom, TMaskTo> &\n  LinkPropsChildren\n\nexport interface LinkPropsChildren {\n  // If a function is passed as a child, it will be given the `isActive` boolean to aid in further styling on the element it returns\n  children?:\n    | Solid.JSX.Element\n    | ((state: { isActive: boolean }) => Solid.JSX.Element)\n}\n\ntype LinkComponentSolidProps<TComp> = TComp extends Solid.ValidComponent\n  ? Omit<Solid.ComponentProps<TComp>, keyof CreateLinkProps>\n  : never\n\nexport type LinkComponentProps<\n  TComp = 'a',\n  TRouter extends AnyRouter = RegisteredRouter,\n  TFrom extends string = string,\n  TTo extends string | undefined = '.',\n  TMaskFrom extends string = TFrom,\n  TMaskTo extends string = '.',\n> = LinkComponentSolidProps<TComp> &\n  LinkProps<TComp, TRouter, TFrom, TTo, TMaskFrom, TMaskTo>\n\nexport type CreateLinkProps = LinkProps<\n  any,\n  any,\n  string,\n  string,\n  string,\n  string\n>\n\nexport type LinkComponent<\n  in out TComp,\n  in out TDefaultFrom extends string = string,\n> = <\n  TRouter extends AnyRouter = RegisteredRouter,\n  const TFrom extends string = TDefaultFrom,\n  const TTo extends string | undefined = undefined,\n  const TMaskFrom extends string = TFrom,\n  const TMaskTo extends string = '',\n>(\n  props: LinkComponentProps<TComp, TRouter, TFrom, TTo, TMaskFrom, TMaskTo>,\n) => Solid.JSX.Element\n\nexport interface LinkComponentRoute<\n  in out TDefaultFrom extends string = string,\n> {\n  defaultFrom: TDefaultFrom;\n  <\n    TRouter extends AnyRouter = RegisteredRouter,\n    const TTo extends string | undefined = undefined,\n    const TMaskTo extends string = '',\n  >(\n    props: LinkComponentProps<\n      'a',\n      TRouter,\n      this['defaultFrom'],\n      TTo,\n      this['defaultFrom'],\n      TMaskTo\n    >,\n  ): Solid.JSX.Element\n}\n\nexport function createLink<const TComp>(\n  Comp: Constrain<TComp, any, (props: CreateLinkProps) => Solid.JSX.Element>,\n): LinkComponent<TComp> {\n  return (props) => <Link {...props} _asChild={Comp} />\n}\n\nexport const Link: LinkComponent<'a'> = (props) => {\n  const [local, rest] = Solid.splitProps(\n    props as typeof props & { _asChild: any },\n    ['_asChild', 'children'],\n  )\n\n  const [_, linkProps] = Solid.splitProps(\n    useLinkProps(rest as unknown as any),\n    ['type'],\n  )\n\n  const children = Solid.createMemo(() => {\n    const ch = local.children\n    if (typeof ch === 'function') {\n      return ch({\n        get isActive() {\n          return (linkProps as any)['data-status'] === 'active'\n        },\n      })\n    }\n\n    return ch satisfies Solid.JSX.Element\n  })\n\n  if (local._asChild === 'svg') {\n    const [_, svgLinkProps] = Solid.splitProps(linkProps, ['class'])\n    return (\n      <svg>\n        <a {...svgLinkProps}>{children()}</a>\n      </svg>\n    )\n  }\n\n  if (!local._asChild) {\n    return <a {...linkProps}>{children()}</a>\n  }\n\n  return (\n    <Dynamic component={local._asChild as Solid.ValidComponent} {...linkProps}>\n      {children()}\n    </Dynamic>\n  )\n}\n\nfunction isCtrlEvent(e: MouseEvent) {\n  return !!(e.metaKey || e.altKey || e.ctrlKey || e.shiftKey)\n}\n\nfunction isSafeInternal(to: unknown) {\n  if (typeof to !== 'string') return false\n  const zero = to.charCodeAt(0)\n  if (zero === 47) return to.charCodeAt(1) !== 47 // '/' but not '//'\n  return zero === 46 // '.', '..', './', '../'\n}\n\nexport type LinkOptionsFnOptions<\n  TOptions,\n  TComp,\n  TRouter extends AnyRouter = RegisteredRouter,\n> =\n  TOptions extends ReadonlyArray<any>\n    ? ValidateLinkOptionsArray<TRouter, TOptions, string, TComp>\n    : ValidateLinkOptions<TRouter, TOptions, string, TComp>\n\nexport type LinkOptionsFn<TComp> = <\n  const TOptions,\n  TRouter extends AnyRouter = RegisteredRouter,\n>(\n  options: LinkOptionsFnOptions<TOptions, TComp, TRouter>,\n) => TOptions\n\nexport const linkOptions: LinkOptionsFn<'a'> = (options) => {\n  return options as any\n}\n"],"mappings":"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"}

dist/esm/Match.js

@@ -0,1 +1,2 @@
+import { nonRouteComponentContext, renderInNonRouteComponentContext } from "./nonRouteComponentContext.js";
 import { CatchBoundary, ErrorComponent } from "./CatchBoundary.js";
@@ -35,2 +36,5 @@ import { ClientOnly } from "./ClientOnly.js";
 		get fallback() {
+			if (process.env.NODE_ENV !== "production") return renderInNonRouteComponentContext(() => createComponent(Dynamic, { get component() {
+				return resolvePendingComponent();
+			} }), "pendingComponent");
 			return createComponent(Dynamic, { get component() {
@@ -50,4 +54,8 @@ return resolvePendingComponent();
 					get fallback() {
-						return memo(() => !!shouldSkipSuspenseFallback())() ? void 0 : createComponent(Dynamic, { get component() {
+						if (shouldSkipSuspenseFallback()) return;
+						if (process.env.NODE_ENV !== "production") return renderInNonRouteComponentContext(() => createComponent(Dynamic, { get component() {
 							return resolvePendingComponent();
+						} }), "pendingComponent");
+						return createComponent(Dynamic, { get component() {
+							return resolvePendingComponent();
 						} });
@@ -82,4 +90,6 @@ },
 										if (notFoundError.routeId !== currentMatch().routeId) throw notFoundError;
-										return createComponent(Dynamic, mergeProps({ get component() {
+										return process.env.NODE_ENV !== "production" ? renderInNonRouteComponentContext(() => createComponent(Dynamic, mergeProps({ get component() {
 											return routeNotFoundComponent();
+										} }, notFoundError)), "notFoundComponent") : createComponent(Dynamic, mergeProps({ get component() {
+											return routeNotFoundComponent();
 										} }, notFoundError));
@@ -96,2 +106,5 @@ },
 														get fallback() {
+															if (process.env.NODE_ENV !== "production") return renderInNonRouteComponentContext(() => createComponent(Dynamic, { get component() {
+																return resolvePendingComponent();
+															} }), "pendingComponent");
 															return createComponent(Dynamic, { get component() {
@@ -167,8 +180,16 @@ return resolvePendingComponent();
 				children: (_) => {
-					if (isServer ?? router.isServer) return createComponent((route.options.errorComponent ?? router.options.defaultErrorComponent) || ErrorComponent, {
-						get error() {
-							return currentMatch().error;
-						},
-						info: { componentStack: "" }
-					});
+					if (isServer ?? router.isServer) {
+						const RouteErrorComponent = (route.options.errorComponent ?? router.options.defaultErrorComponent) || ErrorComponent;
+						return process.env.NODE_ENV !== "production" ? renderInNonRouteComponentContext(() => createComponent(RouteErrorComponent, {
+							get error() {
+								return currentMatch().error;
+							},
+							info: { componentStack: "" }
+						}), "errorComponent") : createComponent(RouteErrorComponent, {
+							get error() {
+								return currentMatch().error;
+							},
+							info: { componentStack: "" }
+						});
+					}
 					throw currentMatch().error;
@@ -189,2 +210,6 @@ }
 var Outlet = () => {
+	if (process.env.NODE_ENV !== "production") {
+		const nonRouteComponent = Solid.useContext(nonRouteComponentContext);
+		if (nonRouteComponent) console.warn(`Warning: An <Outlet /> was rendered inside a ${nonRouteComponent}. <Outlet /> should only be rendered inside a route component.`);
+	}
 	const router = useRouter();
@@ -221,2 +246,5 @@ const nearestParentMatch = Solid.useContext(nearestMatchContext);
 						get fallback() {
+							if (process.env.NODE_ENV !== "production") return renderInNonRouteComponentContext(() => createComponent(Dynamic, { get component() {
+								return router.options.defaultPendingComponent;
+							} }), "pendingComponent");
 							return createComponent(Dynamic, { get component() {
@@ -223,0 +251,0 @@ return router.options.defaultPendingComponent;

dist/esm/Match.js.map

@@ -1,1 +0,1 @@
-{"version":3,"file":"Match.js","names":["Solid","rootRouteId","isServer","Dynamic","CatchBoundary","ErrorComponent","useRouter","CatchNotFound","getNotFound","nearestMatchContext","SafeFragment","renderRouteNotFound","ScrollRestoration","ClientOnly","AnyRoute","AnyRouter","RootRouteOptions","renderScrollRestoration","undefined","router","route","parentRoute","id","options","scrollRestoration","_$createComponent","Match","props","routeId","currentMatch","createMemo","stores","byRoute","get","nearestMatch","const","routesById","routeOptions","resolvePendingComponent","pendingComponent","defaultPendingComponent","routeErrorComponent","errorComponent","defaultErrorComponent","routeNotFoundComponent","isRoot","notFoundComponent","notFoundRoute","component","resolvedNoSsr","ssr","shouldSkipSuspenseFallback","ShellComponent","shellComponent","MatchContent","Show","when","status","fallback","children","MatchInner","Provider","value","Suspense","_$memo","getResetKey","onCatch","error","Error","notFoundError","process","env","NODE_ENV","console","warn","defaultOnCatch","_$mergeProps","Switch","useContext","match","componentKey","current","remount","remountDeps","defaultRemountDeps","deps","loaderDeps","params","_strictParams","search","_strictSearch","JSON","stringify","out","Comp","defaultComponent","Outlet","keyedOut","keyed","_key","_","RouteErrorComponent","info","componentStack","nearestParentMatch","parentMatch","childRouteId","_notFound","ids","indexOf","_routeKey"],"sources":["../../src/Match.tsx"],"sourcesContent":["import * as Solid from 'solid-js'\nimport { rootRouteId } from '@tanstack/router-core'\nimport { isServer } from '@tanstack/router-core/isServer'\nimport { Dynamic } from 'solid-js/web'\nimport { CatchBoundary, ErrorComponent } from './CatchBoundary'\nimport { useRouter } from './useRouter'\nimport { CatchNotFound, getNotFound } from './not-found'\nimport { nearestMatchContext } from './matchContext'\nimport { SafeFragment } from './SafeFragment'\nimport { renderRouteNotFound } from './renderRouteNotFound'\nimport { ScrollRestoration } from './scroll-restoration'\nimport { ClientOnly } from './ClientOnly'\nimport type {\n  AnyRoute,\n  AnyRouter,\n  RootRouteOptions,\n} from '@tanstack/router-core'\n\n// Keep the client constant undefined so the server-only script can be dropped.\nconst renderScrollRestoration =\n  isServer === false\n    ? undefined\n    : (router: AnyRouter, route: AnyRoute) =>\n        (isServer ?? router.isServer) &&\n        route.parentRoute?.id === rootRouteId &&\n        router.options.scrollRestoration ? (\n          <ScrollRestoration />\n        ) : null\n\nexport const Match = (props: { routeId: string }) => {\n  const router = useRouter()\n\n  const currentMatch = Solid.createMemo(\n    () => router.stores.byRoute.get(props.routeId)!.get()!,\n  )\n\n  const nearestMatch = [() => props.routeId, currentMatch] as const\n\n  const route: AnyRoute = router.routesById[props.routeId]\n\n  // Lazy route option mutations become observable with the next client match\n  // publication. Server stores are non-reactive and options load before render.\n  const routeOptions =\n    (isServer ?? router.isServer)\n      ? () => route.options\n      : () => {\n          currentMatch()\n          return route.options\n        }\n\n  const resolvePendingComponent = () =>\n    routeOptions().pendingComponent ?? router.options.defaultPendingComponent\n\n  const routeErrorComponent = () =>\n    routeOptions().errorComponent ?? router.options.defaultErrorComponent\n\n  const routeNotFoundComponent = () =>\n    route.isRoot\n      ? // If it's the root route, use the _notFound option, with fallback to the notFoundRoute's component\n        (routeOptions().notFoundComponent ??\n        router.options.notFoundRoute?.options.component)\n      : routeOptions().notFoundComponent\n\n  const resolvedNoSsr = () =>\n    currentMatch().ssr === false || currentMatch().ssr === 'data-only'\n\n  const shouldSkipSuspenseFallback = () =>\n    (isServer ?? router.isServer)\n      ? resolvedNoSsr()\n      : currentMatch().ssr === 'data-only'\n\n  const ShellComponent = route.isRoot\n    ? ((route.options as RootRouteOptions).shellComponent ?? SafeFragment)\n    : SafeFragment\n\n  const MatchContent = () => (\n    <Solid.Show\n      when={currentMatch().status !== 'pending'}\n      fallback={<Dynamic component={resolvePendingComponent()} />}\n    >\n      <MatchInner />\n    </Solid.Show>\n  )\n\n  return (\n    <ShellComponent>\n      <nearestMatchContext.Provider value={nearestMatch}>\n        <Solid.Suspense\n          fallback={\n            // Data-only SSR renders the inner fallback on the server, so\n            // avoid adding an extra suspense fallback on the client.\n            shouldSkipSuspenseFallback() ? undefined : (\n              <Dynamic component={resolvePendingComponent()} />\n            )\n          }\n        >\n          <Dynamic\n            component={routeErrorComponent() ? CatchBoundary : SafeFragment}\n            getResetKey={currentMatch}\n            errorComponent={routeErrorComponent() as any}\n            onCatch={(error: Error) => {\n              // Forward not found errors (we don't want to show the error component for these)\n              const notFoundError = getNotFound(error)\n              if (notFoundError) {\n                notFoundError.routeId ??= currentMatch().routeId\n                throw notFoundError\n              }\n              if (process.env.NODE_ENV !== 'production') {\n                console.warn(\n                  `Warning: Error in route match: ${currentMatch().routeId}`,\n                )\n              }\n              ;(route.options.onCatch ?? router.options.defaultOnCatch)?.(error)\n            }}\n          >\n            <Dynamic\n              component={\n                routeNotFoundComponent() ? CatchNotFound : SafeFragment\n              }\n              fallback={(error: any) => {\n                const notFoundError = getNotFound(error) ?? error\n\n                notFoundError.routeId ??= currentMatch().routeId\n\n                if (notFoundError.routeId !== currentMatch().routeId) {\n                  throw notFoundError\n                }\n\n                return (\n                  <Dynamic\n                    component={routeNotFoundComponent()}\n                    {...notFoundError}\n                  />\n                )\n              }}\n            >\n              <Solid.Switch>\n                <Solid.Match when={resolvedNoSsr()}>\n                  <ClientOnly\n                    fallback={<Dynamic component={resolvePendingComponent()} />}\n                  >\n                    <MatchContent />\n                  </ClientOnly>\n                </Solid.Match>\n                <Solid.Match when={!resolvedNoSsr()}>\n                  <MatchContent />\n                </Solid.Match>\n              </Solid.Switch>\n            </Dynamic>\n          </Dynamic>\n        </Solid.Suspense>\n      </nearestMatchContext.Provider>\n\n      {renderScrollRestoration?.(router, route)}\n    </ShellComponent>\n  )\n}\n\nexport const MatchInner = (): any => {\n  const router = useRouter()\n  const nearestMatch = Solid.useContext(nearestMatchContext)\n  const match = nearestMatch[1 /* match */]\n  const routeId = nearestMatch[0 /* route id */]\n  const route = router.routesById[routeId()!]!\n  const currentMatch = () => match()!\n\n  const componentKey = () => {\n    const current = currentMatch()\n    const remount =\n      route.options.remountDeps ?? router.options.defaultRemountDeps\n    const deps = remount?.({\n      routeId: routeId()!,\n      loaderDeps: current.loaderDeps,\n      params: current._strictParams,\n      search: current._strictSearch,\n    })\n    return deps ? JSON.stringify(deps) : current.id\n  }\n\n  const out = () => {\n    const Comp = route.options.component ?? router.options.defaultComponent\n    if (Comp) {\n      return <Comp />\n    }\n    return <Outlet />\n  }\n\n  const keyedOut = () => (\n    <Solid.Show when={componentKey()} keyed>\n      {(_key) => out()}\n    </Solid.Show>\n  )\n\n  return (\n    <Solid.Switch>\n      <Solid.Match when={currentMatch().status === 'notFound'}>\n        {(_) => renderRouteNotFound(router, route, currentMatch().error)}\n      </Solid.Match>\n      <Solid.Match when={currentMatch().status === 'error'}>\n        {(_) => {\n          if (isServer ?? router.isServer) {\n            const RouteErrorComponent =\n              (route.options.errorComponent ??\n                router.options.defaultErrorComponent) ||\n              ErrorComponent\n\n            return (\n              <RouteErrorComponent\n                error={currentMatch().error}\n                info={{\n                  componentStack: '',\n                }}\n              />\n            )\n          }\n\n          throw currentMatch().error\n        }}\n      </Solid.Match>\n      <Solid.Match when={currentMatch().status === 'success'}>\n        {keyedOut()}\n      </Solid.Match>\n    </Solid.Switch>\n  )\n}\n\nexport const Outlet = () => {\n  const router = useRouter()\n  const nearestParentMatch = Solid.useContext(nearestMatchContext)\n  const parentMatch = nearestParentMatch[1 /* match */]\n  const routeId = nearestParentMatch[0 /* route id */]\n  const route = router.routesById[routeId()!]!\n\n  const childRouteId = () => {\n    if (parentMatch()!._notFound) {\n      return\n    }\n    const ids = router.stores.ids.get()\n    return ids[ids.indexOf(routeId()!) + 1]\n  }\n\n  return (\n    <Solid.Show\n      when={childRouteId()}\n      keyed\n      fallback={\n        parentMatch()!._notFound\n          ? renderRouteNotFound(router, route, parentMatch()!.error)\n          : undefined\n      }\n    >\n      {(_routeKey: string) => {\n        return (\n          <Solid.Show\n            when={routeId() === rootRouteId}\n            fallback={<Match routeId={childRouteId()!} />}\n          >\n            <Solid.Suspense\n              fallback={\n                <Dynamic component={router.options.defaultPendingComponent} />\n              }\n            >\n              <Match routeId={childRouteId()!} />\n            </Solid.Suspense>\n          </Solid.Show>\n        )\n      }}\n    </Solid.Show>\n  )\n}\n"],"mappings":"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"}
+{"version":3,"file":"Match.js","names":["Solid","rootRouteId","isServer","Dynamic","CatchBoundary","ErrorComponent","useRouter","CatchNotFound","getNotFound","nearestMatchContext","SafeFragment","renderRouteNotFound","ScrollRestoration","ClientOnly","nonRouteComponentContext","renderInNonRouteComponentContext","AnyRoute","AnyRouter","RootRouteOptions","renderScrollRestoration","undefined","router","route","parentRoute","id","options","scrollRestoration","_$createComponent","Match","props","routeId","currentMatch","createMemo","stores","byRoute","get","nearestMatch","const","routesById","routeOptions","resolvePendingComponent","pendingComponent","defaultPendingComponent","routeErrorComponent","errorComponent","defaultErrorComponent","routeNotFoundComponent","isRoot","notFoundComponent","notFoundRoute","component","resolvedNoSsr","ssr","shouldSkipSuspenseFallback","ShellComponent","shellComponent","MatchContent","Show","when","status","fallback","process","env","NODE_ENV","children","MatchInner","Provider","value","Suspense","getResetKey","onCatch","error","Error","notFoundError","console","warn","defaultOnCatch","_$mergeProps","Switch","_$memo","useContext","match","componentKey","current","remount","remountDeps","defaultRemountDeps","deps","loaderDeps","params","_strictParams","search","_strictSearch","JSON","stringify","out","Comp","defaultComponent","Outlet","keyedOut","keyed","_key","_","RouteErrorComponent","info","componentStack","nonRouteComponent","nearestParentMatch","parentMatch","childRouteId","_notFound","ids","indexOf","_routeKey"],"sources":["../../src/Match.tsx"],"sourcesContent":["import * as Solid from 'solid-js'\nimport { rootRouteId } from '@tanstack/router-core'\nimport { isServer } from '@tanstack/router-core/isServer'\nimport { Dynamic } from 'solid-js/web'\nimport { CatchBoundary, ErrorComponent } from './CatchBoundary'\nimport { useRouter } from './useRouter'\nimport { CatchNotFound, getNotFound } from './not-found'\nimport { nearestMatchContext } from './matchContext'\nimport { SafeFragment } from './SafeFragment'\nimport { renderRouteNotFound } from './renderRouteNotFound'\nimport { ScrollRestoration } from './scroll-restoration'\nimport { ClientOnly } from './ClientOnly'\nimport {\n  nonRouteComponentContext,\n  renderInNonRouteComponentContext,\n} from './nonRouteComponentContext'\nimport type {\n  AnyRoute,\n  AnyRouter,\n  RootRouteOptions,\n} from '@tanstack/router-core'\n\n// Keep the client constant undefined so the server-only script can be dropped.\nconst renderScrollRestoration =\n  isServer === false\n    ? undefined\n    : (router: AnyRouter, route: AnyRoute) =>\n        (isServer ?? router.isServer) &&\n        route.parentRoute?.id === rootRouteId &&\n        router.options.scrollRestoration ? (\n          <ScrollRestoration />\n        ) : null\n\nexport const Match = (props: { routeId: string }) => {\n  const router = useRouter()\n\n  const currentMatch = Solid.createMemo(\n    () => router.stores.byRoute.get(props.routeId)!.get()!,\n  )\n\n  const nearestMatch = [() => props.routeId, currentMatch] as const\n\n  const route: AnyRoute = router.routesById[props.routeId]\n\n  // Lazy route option mutations become observable with the next client match\n  // publication. Server stores are non-reactive and options load before render.\n  const routeOptions =\n    (isServer ?? router.isServer)\n      ? () => route.options\n      : () => {\n          currentMatch()\n          return route.options\n        }\n\n  const resolvePendingComponent = () =>\n    routeOptions().pendingComponent ?? router.options.defaultPendingComponent\n\n  const routeErrorComponent = () =>\n    routeOptions().errorComponent ?? router.options.defaultErrorComponent\n\n  const routeNotFoundComponent = () =>\n    route.isRoot\n      ? // If it's the root route, use the _notFound option, with fallback to the notFoundRoute's component\n        (routeOptions().notFoundComponent ??\n        router.options.notFoundRoute?.options.component)\n      : routeOptions().notFoundComponent\n\n  const resolvedNoSsr = () =>\n    currentMatch().ssr === false || currentMatch().ssr === 'data-only'\n\n  const shouldSkipSuspenseFallback = () =>\n    (isServer ?? router.isServer)\n      ? resolvedNoSsr()\n      : currentMatch().ssr === 'data-only'\n\n  const ShellComponent = route.isRoot\n    ? ((route.options as RootRouteOptions).shellComponent ?? SafeFragment)\n    : SafeFragment\n\n  const MatchContent = () => (\n    <Solid.Show\n      when={currentMatch().status !== 'pending'}\n      fallback={(() => {\n        if (process.env.NODE_ENV !== 'production') {\n          return renderInNonRouteComponentContext(\n            () => <Dynamic component={resolvePendingComponent()} />,\n            'pendingComponent',\n          )\n        }\n        return <Dynamic component={resolvePendingComponent()} />\n      })()}\n    >\n      <MatchInner />\n    </Solid.Show>\n  )\n\n  return (\n    <ShellComponent>\n      <nearestMatchContext.Provider value={nearestMatch}>\n        <Solid.Suspense\n          fallback={(() => {\n            // Data-only SSR renders the inner fallback on the server, so\n            // avoid adding an extra suspense fallback on the client.\n            if (shouldSkipSuspenseFallback()) {\n              return undefined\n            }\n            if (process.env.NODE_ENV !== 'production') {\n              return renderInNonRouteComponentContext(\n                () => <Dynamic component={resolvePendingComponent()} />,\n                'pendingComponent',\n              )\n            }\n            return <Dynamic component={resolvePendingComponent()} />\n          })()}\n        >\n          <Dynamic\n            component={routeErrorComponent() ? CatchBoundary : SafeFragment}\n            getResetKey={currentMatch}\n            errorComponent={routeErrorComponent() as any}\n            onCatch={(error: Error) => {\n              // Forward not found errors (we don't want to show the error component for these)\n              const notFoundError = getNotFound(error)\n              if (notFoundError) {\n                notFoundError.routeId ??= currentMatch().routeId\n                throw notFoundError\n              }\n              if (process.env.NODE_ENV !== 'production') {\n                console.warn(\n                  `Warning: Error in route match: ${currentMatch().routeId}`,\n                )\n              }\n              ;(route.options.onCatch ?? router.options.defaultOnCatch)?.(error)\n            }}\n          >\n            <Dynamic\n              component={\n                routeNotFoundComponent() ? CatchNotFound : SafeFragment\n              }\n              fallback={(error: any) => {\n                const notFoundError = getNotFound(error) ?? error\n\n                notFoundError.routeId ??= currentMatch().routeId\n\n                if (notFoundError.routeId !== currentMatch().routeId) {\n                  throw notFoundError\n                }\n\n                return process.env.NODE_ENV !== 'production' ? (\n                  renderInNonRouteComponentContext(\n                    () => (\n                      <Dynamic\n                        component={routeNotFoundComponent()}\n                        {...notFoundError}\n                      />\n                    ),\n                    'notFoundComponent',\n                  )\n                ) : (\n                  <Dynamic\n                    component={routeNotFoundComponent()}\n                    {...notFoundError}\n                  />\n                )\n              }}\n            >\n              <Solid.Switch>\n                <Solid.Match when={resolvedNoSsr()}>\n                  <ClientOnly\n                    fallback={(() => {\n                      if (process.env.NODE_ENV !== 'production') {\n                        return renderInNonRouteComponentContext(\n                          () => (\n                            <Dynamic component={resolvePendingComponent()} />\n                          ),\n                          'pendingComponent',\n                        )\n                      }\n                      return <Dynamic component={resolvePendingComponent()} />\n                    })()}\n                  >\n                    <MatchContent />\n                  </ClientOnly>\n                </Solid.Match>\n                <Solid.Match when={!resolvedNoSsr()}>\n                  <MatchContent />\n                </Solid.Match>\n              </Solid.Switch>\n            </Dynamic>\n          </Dynamic>\n        </Solid.Suspense>\n      </nearestMatchContext.Provider>\n\n      {renderScrollRestoration?.(router, route)}\n    </ShellComponent>\n  )\n}\n\nexport const MatchInner = (): any => {\n  const router = useRouter()\n  const nearestMatch = Solid.useContext(nearestMatchContext)\n  const match = nearestMatch[1 /* match */]\n  const routeId = nearestMatch[0 /* route id */]\n  const route = router.routesById[routeId()!]!\n  const currentMatch = () => match()!\n\n  const componentKey = () => {\n    const current = currentMatch()\n    const remount =\n      route.options.remountDeps ?? router.options.defaultRemountDeps\n    const deps = remount?.({\n      routeId: routeId()!,\n      loaderDeps: current.loaderDeps,\n      params: current._strictParams,\n      search: current._strictSearch,\n    })\n    return deps ? JSON.stringify(deps) : current.id\n  }\n\n  const out = () => {\n    const Comp = route.options.component ?? router.options.defaultComponent\n    if (Comp) {\n      return <Comp />\n    }\n    return <Outlet />\n  }\n\n  const keyedOut = () => (\n    <Solid.Show when={componentKey()} keyed>\n      {(_key) => out()}\n    </Solid.Show>\n  )\n\n  return (\n    <Solid.Switch>\n      <Solid.Match when={currentMatch().status === 'notFound'}>\n        {(_) => renderRouteNotFound(router, route, currentMatch().error)}\n      </Solid.Match>\n      <Solid.Match when={currentMatch().status === 'error'}>\n        {(_) => {\n          if (isServer ?? router.isServer) {\n            const RouteErrorComponent =\n              (route.options.errorComponent ??\n                router.options.defaultErrorComponent) ||\n              ErrorComponent\n\n            return process.env.NODE_ENV !== 'production' ? (\n              renderInNonRouteComponentContext(\n                () => (\n                  <RouteErrorComponent\n                    error={currentMatch().error}\n                    info={{\n                      componentStack: '',\n                    }}\n                  />\n                ),\n                'errorComponent',\n              )\n            ) : (\n              <RouteErrorComponent\n                error={currentMatch().error}\n                info={{\n                  componentStack: '',\n                }}\n              />\n            )\n          }\n\n          throw currentMatch().error\n        }}\n      </Solid.Match>\n      <Solid.Match when={currentMatch().status === 'success'}>\n        {keyedOut()}\n      </Solid.Match>\n    </Solid.Switch>\n  )\n}\n\nexport const Outlet = () => {\n  if (process.env.NODE_ENV !== 'production') {\n    const nonRouteComponent = Solid.useContext(nonRouteComponentContext!)\n    if (nonRouteComponent) {\n      console.warn(\n        `Warning: An <Outlet /> was rendered inside a ${nonRouteComponent}. <Outlet /> should only be rendered inside a route component.`,\n      )\n    }\n  }\n\n  const router = useRouter()\n  const nearestParentMatch = Solid.useContext(nearestMatchContext)\n  const parentMatch = nearestParentMatch[1 /* match */]\n  const routeId = nearestParentMatch[0 /* route id */]\n  const route = router.routesById[routeId()!]!\n\n  const childRouteId = () => {\n    if (parentMatch()!._notFound) {\n      return\n    }\n    const ids = router.stores.ids.get()\n    return ids[ids.indexOf(routeId()!) + 1]\n  }\n\n  return (\n    <Solid.Show\n      when={childRouteId()}\n      keyed\n      fallback={\n        parentMatch()!._notFound\n          ? renderRouteNotFound(router, route, parentMatch()!.error)\n          : undefined\n      }\n    >\n      {(_routeKey: string) => {\n        return (\n          <Solid.Show\n            when={routeId() === rootRouteId}\n            fallback={<Match routeId={childRouteId()!} />}\n          >\n            <Solid.Suspense\n              fallback={(() => {\n                if (process.env.NODE_ENV !== 'production') {\n                  return renderInNonRouteComponentContext(\n                    () => (\n                      <Dynamic\n                        component={router.options.defaultPendingComponent}\n                      />\n                    ),\n                    'pendingComponent',\n                  )\n                }\n                return (\n                  <Dynamic component={router.options.defaultPendingComponent} />\n                )\n              })()}\n            >\n              <Match routeId={childRouteId()!} />\n            </Solid.Suspense>\n          </Solid.Show>\n        )\n      }}\n    </Solid.Show>\n  )\n}\n"],"mappings":"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"}

dist/esm/Matches.js

@@ -0,1 +1,2 @@
+import { renderInNonRouteComponentContext } from "./nonRouteComponentContext.js";
 import { CatchBoundary, ErrorComponent } from "./CatchBoundary.js";
@@ -20,3 +21,6 @@ import { useRouter } from "./useRouter.js";
 			get fallback() {
-				return PendingComponent ? createComponent(PendingComponent, {}) : null;
+				return PendingComponent ? (() => {
+					if (process.env.NODE_ENV !== "production") return renderInNonRouteComponentContext(() => createComponent(PendingComponent, {}), "pendingComponent");
+					return createComponent(PendingComponent, {});
+				})() : null;
 			},
@@ -23,0 +27,0 @@ get children() {

dist/esm/Matches.js.map

@@ -1,1 +0,1 @@
-{"version":3,"file":"Matches.js","names":["Solid","replaceEqualDeep","rootRouteId","isServer","CatchBoundary","ErrorComponent","useRouter","Rendered","Transitioner","nearestMatchContext","SafeFragment","Match","AnyRoute","AnyRouter","DeepPartial","Expand","MakeOptionalPathParams","MakeOptionalSearchParams","MakeRouteMatchUnion","MaskOptions","MatchRouteOptions","RegisteredRouter","ResolveRoute","ToSubOptionsProps","RouteMatchExtensions","meta","Array","JSX","IntrinsicElements","links","scripts","styles","headScripts","Matches","router","ResolvedSuspense","document","ssr","Suspense","rootRoute","routesById","PendingComponent","options","pendingComponent","defaultPendingComponent","OptionalWrapper","InnerWrap","_$createComponent","children","fallback","MatchesInner","routeId","stores","ids","get","match","byRoute","undefined","nearestMatch","const","matchComponent","Show","when","Provider","value","_$memo","disableGlobalCatchBoundary","getResetKey","errorComponent","onCatch","process","env","NODE_ENV","error","console","warn","message","toString","UseMatchRouteOptions","TFrom","TRouter","TTo","TMaskFrom","TMaskTo","useMatchRoute","opts","Accessor","createMemo","pending","caseSensitive","fuzzy","includeSearch","rest","location","resolvedLocation","status","matchRoute","MakeMatchRouteOptions","params","Element","MatchRoute","props","renderedChild","matchedParams","child","UseMatchesBaseOptions","select","matches","TSelected","UseMatchesResult","useMatches","prev","res","useParentMatches","contextRouteId","useContext","slice","findIndex","d","useChildMatches"],"sources":["../../src/Matches.tsx"],"sourcesContent":["import * as Solid from 'solid-js'\nimport { replaceEqualDeep, rootRouteId } from '@tanstack/router-core'\nimport { isServer } from '@tanstack/router-core/isServer'\nimport { CatchBoundary, ErrorComponent } from './CatchBoundary'\nimport { useRouter } from './useRouter'\nimport { Rendered, Transitioner } from './Transitioner'\nimport { nearestMatchContext } from './matchContext'\nimport { SafeFragment } from './SafeFragment'\nimport { Match } from './Match'\nimport type {\n  AnyRoute,\n  AnyRouter,\n  DeepPartial,\n  Expand,\n  MakeOptionalPathParams,\n  MakeOptionalSearchParams,\n  MakeRouteMatchUnion,\n  MaskOptions,\n  MatchRouteOptions,\n  RegisteredRouter,\n  ResolveRoute,\n  ToSubOptionsProps,\n} from '@tanstack/router-core'\n\ndeclare module '@tanstack/router-core' {\n  export interface RouteMatchExtensions {\n    meta?: Array<Solid.JSX.IntrinsicElements['meta'] | undefined>\n    links?: Array<Solid.JSX.IntrinsicElements['link'] | undefined>\n    scripts?: Array<Solid.JSX.IntrinsicElements['script'] | undefined>\n    styles?: Array<Solid.JSX.IntrinsicElements['style'] | undefined>\n    headScripts?: Array<Solid.JSX.IntrinsicElements['script'] | undefined>\n  }\n}\n\nexport function Matches() {\n  const router = useRouter()\n\n  const ResolvedSuspense =\n    (isServer ?? router.isServer) ||\n    (typeof document !== 'undefined' && router.ssr)\n      ? SafeFragment\n      : Solid.Suspense\n\n  const rootRoute: () => AnyRoute = () => router.routesById[rootRouteId]\n  const PendingComponent =\n    rootRoute().options.pendingComponent ??\n    router.options.defaultPendingComponent\n\n  const OptionalWrapper = router.options.InnerWrap || SafeFragment\n\n  return (\n    <OptionalWrapper>\n      <ResolvedSuspense\n        fallback={PendingComponent ? <PendingComponent /> : null}\n      >\n        <Transitioner />\n        <MatchesInner />\n        <Rendered />\n      </ResolvedSuspense>\n    </OptionalWrapper>\n  )\n}\n\nfunction MatchesInner() {\n  const router = useRouter()\n  const routeId = () => router.stores.ids.get()[0]\n  const match = () =>\n    routeId() ? router.stores.byRoute.get(routeId()!)?.get() : undefined\n  const nearestMatch = [routeId, match] as const\n\n  const matchComponent = () => {\n    return (\n      <Solid.Show when={routeId()}>\n        <Match routeId={routeId()!} />\n      </Solid.Show>\n    )\n  }\n\n  return (\n    <nearestMatchContext.Provider value={nearestMatch}>\n      {router.options.disableGlobalCatchBoundary ? (\n        matchComponent()\n      ) : (\n        <CatchBoundary\n          getResetKey={match}\n          errorComponent={ErrorComponent}\n          onCatch={\n            process.env.NODE_ENV !== 'production'\n              ? (error) => {\n                  console.warn(\n                    `Warning: The following error wasn't caught by any route! At the very least, consider setting an 'errorComponent' in your RootRoute!`,\n                  )\n                  console.warn(`Warning: ${error.message || error.toString()}`)\n                }\n              : undefined\n          }\n        >\n          {matchComponent()}\n        </CatchBoundary>\n      )}\n    </nearestMatchContext.Provider>\n  )\n}\n\nexport type UseMatchRouteOptions<\n  TRouter extends AnyRouter = RegisteredRouter,\n  TFrom extends string = string,\n  TTo extends string | undefined = undefined,\n  TMaskFrom extends string = TFrom,\n  TMaskTo extends string = '',\n> = ToSubOptionsProps<TRouter, TFrom, TTo> &\n  DeepPartial<MakeOptionalSearchParams<TRouter, TFrom, TTo>> &\n  DeepPartial<MakeOptionalPathParams<TRouter, TFrom, TTo>> &\n  MaskOptions<TRouter, TMaskFrom, TMaskTo> &\n  MatchRouteOptions\n\nexport function useMatchRoute<TRouter extends AnyRouter = RegisteredRouter>() {\n  const router = useRouter()\n\n  return <\n    const TFrom extends string = string,\n    const TTo extends string | undefined = undefined,\n    const TMaskFrom extends string = TFrom,\n    const TMaskTo extends string = '',\n  >(\n    opts: UseMatchRouteOptions<TRouter, TFrom, TTo, TMaskFrom, TMaskTo>,\n  ): Solid.Accessor<\n    false | Expand<ResolveRoute<TRouter, TFrom, TTo>['types']['allParams']>\n  > => {\n    return Solid.createMemo(() => {\n      const { pending, caseSensitive, fuzzy, includeSearch, ...rest } = opts\n\n      router.stores.location.get()\n      router.stores.resolvedLocation.get()\n      router.stores.status.get()\n      return router.matchRoute(rest as any, {\n        pending,\n        caseSensitive,\n        fuzzy,\n        includeSearch,\n      })\n    })\n  }\n}\n\nexport type MakeMatchRouteOptions<\n  TRouter extends AnyRouter = RegisteredRouter,\n  TFrom extends string = string,\n  TTo extends string | undefined = undefined,\n  TMaskFrom extends string = TFrom,\n  TMaskTo extends string = '',\n> = UseMatchRouteOptions<TRouter, TFrom, TTo, TMaskFrom, TMaskTo> & {\n  // If a function is passed as a child, it will be given the `isActive` boolean to aid in further styling on the element it returns\n  children?:\n    | ((\n        params?: Expand<\n          ResolveRoute<TRouter, TFrom, TTo>['types']['allParams']\n        >,\n      ) => Solid.JSX.Element)\n    | Solid.JSX.Element\n}\n\nexport function MatchRoute<\n  TRouter extends AnyRouter = RegisteredRouter,\n  const TFrom extends string = string,\n  const TTo extends string | undefined = undefined,\n  const TMaskFrom extends string = TFrom,\n  const TMaskTo extends string = '',\n>(props: MakeMatchRouteOptions<TRouter, TFrom, TTo, TMaskFrom, TMaskTo>): any {\n  const matchRoute = useMatchRoute()\n  const params = matchRoute(props as any)\n\n  const renderedChild = Solid.createMemo(() => {\n    const matchedParams = params()\n    const child = props.children\n\n    if (typeof child === 'function') {\n      return (child as any)(matchedParams)\n    }\n\n    return matchedParams ? child : null\n  })\n\n  return <>{renderedChild()}</>\n}\n\nexport interface UseMatchesBaseOptions<TRouter extends AnyRouter, TSelected> {\n  select?: (matches: Array<MakeRouteMatchUnion<TRouter>>) => TSelected\n}\n\nexport type UseMatchesResult<\n  TRouter extends AnyRouter,\n  TSelected,\n> = unknown extends TSelected ? Array<MakeRouteMatchUnion<TRouter>> : TSelected\n\nexport function useMatches<\n  TRouter extends AnyRouter = RegisteredRouter,\n  TSelected = unknown,\n>(\n  opts?: UseMatchesBaseOptions<TRouter, TSelected>,\n): Solid.Accessor<UseMatchesResult<TRouter, TSelected>> {\n  const router = useRouter<TRouter>()\n  return Solid.createMemo((prev: TSelected | undefined) => {\n    const matches = router.stores.matches.get() as Array<\n      MakeRouteMatchUnion<TRouter>\n    >\n    const res = opts?.select ? opts.select(matches) : matches\n    if (prev === undefined) return res\n    return replaceEqualDeep(prev, res) as any\n  }) as Solid.Accessor<UseMatchesResult<TRouter, TSelected>>\n}\n\nexport function useParentMatches<\n  TRouter extends AnyRouter = RegisteredRouter,\n  TSelected = unknown,\n>(\n  opts?: UseMatchesBaseOptions<TRouter, TSelected>,\n): Solid.Accessor<UseMatchesResult<TRouter, TSelected>> {\n  const contextRouteId = Solid.useContext(nearestMatchContext)[0 /* route id */]\n\n  return useMatches({\n    select: (matches: Array<MakeRouteMatchUnion<TRouter>>) => {\n      matches = matches.slice(\n        0,\n        matches.findIndex((d) => d.routeId === contextRouteId()),\n      )\n      return opts?.select ? opts.select(matches) : matches\n    },\n  } as any)\n}\n\nexport function useChildMatches<\n  TRouter extends AnyRouter = RegisteredRouter,\n  TSelected = unknown,\n>(\n  opts?: UseMatchesBaseOptions<TRouter, TSelected>,\n): Solid.Accessor<UseMatchesResult<TRouter, TSelected>> {\n  const contextRouteId = Solid.useContext(nearestMatchContext)[0 /* route id */]\n\n  return useMatches({\n    select: (matches: Array<MakeRouteMatchUnion<TRouter>>) => {\n      matches = matches.slice(\n        matches.findIndex((d) => d.routeId === contextRouteId()) + 1,\n      )\n      return opts?.select ? opts.select(matches) : matches\n    },\n  } as any)\n}\n"],"mappings":"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"}
+{"version":3,"file":"Matches.js","names":["Solid","replaceEqualDeep","rootRouteId","isServer","CatchBoundary","ErrorComponent","useRouter","Rendered","Transitioner","nearestMatchContext","SafeFragment","Match","renderInNonRouteComponentContext","AnyRoute","AnyRouter","DeepPartial","Expand","MakeOptionalPathParams","MakeOptionalSearchParams","MakeRouteMatchUnion","MaskOptions","MatchRouteOptions","RegisteredRouter","ResolveRoute","ToSubOptionsProps","RouteMatchExtensions","meta","Array","JSX","IntrinsicElements","links","scripts","styles","headScripts","Matches","router","ResolvedSuspense","document","ssr","Suspense","rootRoute","routesById","PendingComponent","options","pendingComponent","defaultPendingComponent","OptionalWrapper","InnerWrap","_$createComponent","children","fallback","process","env","NODE_ENV","MatchesInner","routeId","stores","ids","get","match","byRoute","undefined","nearestMatch","const","matchComponent","Show","when","Provider","value","_$memo","disableGlobalCatchBoundary","getResetKey","errorComponent","onCatch","error","console","warn","message","toString","UseMatchRouteOptions","TFrom","TRouter","TTo","TMaskFrom","TMaskTo","useMatchRoute","opts","Accessor","createMemo","pending","caseSensitive","fuzzy","includeSearch","rest","location","resolvedLocation","status","matchRoute","MakeMatchRouteOptions","params","Element","MatchRoute","props","renderedChild","matchedParams","child","UseMatchesBaseOptions","select","matches","TSelected","UseMatchesResult","useMatches","prev","res","useParentMatches","contextRouteId","useContext","slice","findIndex","d","useChildMatches"],"sources":["../../src/Matches.tsx"],"sourcesContent":["import * as Solid from 'solid-js'\nimport { replaceEqualDeep, rootRouteId } from '@tanstack/router-core'\nimport { isServer } from '@tanstack/router-core/isServer'\nimport { CatchBoundary, ErrorComponent } from './CatchBoundary'\nimport { useRouter } from './useRouter'\nimport { Rendered, Transitioner } from './Transitioner'\nimport { nearestMatchContext } from './matchContext'\nimport { SafeFragment } from './SafeFragment'\nimport { Match } from './Match'\nimport { renderInNonRouteComponentContext } from './nonRouteComponentContext'\nimport type {\n  AnyRoute,\n  AnyRouter,\n  DeepPartial,\n  Expand,\n  MakeOptionalPathParams,\n  MakeOptionalSearchParams,\n  MakeRouteMatchUnion,\n  MaskOptions,\n  MatchRouteOptions,\n  RegisteredRouter,\n  ResolveRoute,\n  ToSubOptionsProps,\n} from '@tanstack/router-core'\n\ndeclare module '@tanstack/router-core' {\n  export interface RouteMatchExtensions {\n    meta?: Array<Solid.JSX.IntrinsicElements['meta'] | undefined>\n    links?: Array<Solid.JSX.IntrinsicElements['link'] | undefined>\n    scripts?: Array<Solid.JSX.IntrinsicElements['script'] | undefined>\n    styles?: Array<Solid.JSX.IntrinsicElements['style'] | undefined>\n    headScripts?: Array<Solid.JSX.IntrinsicElements['script'] | undefined>\n  }\n}\n\nexport function Matches() {\n  const router = useRouter()\n\n  const ResolvedSuspense =\n    (isServer ?? router.isServer) ||\n    (typeof document !== 'undefined' && router.ssr)\n      ? SafeFragment\n      : Solid.Suspense\n\n  const rootRoute: () => AnyRoute = () => router.routesById[rootRouteId]\n  const PendingComponent =\n    rootRoute().options.pendingComponent ??\n    router.options.defaultPendingComponent\n\n  const OptionalWrapper = router.options.InnerWrap || SafeFragment\n\n  return (\n    <OptionalWrapper>\n      <ResolvedSuspense\n        fallback={\n          PendingComponent\n            ? (() => {\n                if (process.env.NODE_ENV !== 'production') {\n                  return renderInNonRouteComponentContext(\n                    () => <PendingComponent />,\n                    'pendingComponent',\n                  )\n                }\n                return <PendingComponent />\n              })()\n            : null\n        }\n      >\n        <Transitioner />\n        <MatchesInner />\n        <Rendered />\n      </ResolvedSuspense>\n    </OptionalWrapper>\n  )\n}\n\nfunction MatchesInner() {\n  const router = useRouter()\n  const routeId = () => router.stores.ids.get()[0]\n  const match = () =>\n    routeId() ? router.stores.byRoute.get(routeId()!)?.get() : undefined\n  const nearestMatch = [routeId, match] as const\n\n  const matchComponent = () => {\n    return (\n      <Solid.Show when={routeId()}>\n        <Match routeId={routeId()!} />\n      </Solid.Show>\n    )\n  }\n\n  return (\n    <nearestMatchContext.Provider value={nearestMatch}>\n      {router.options.disableGlobalCatchBoundary ? (\n        matchComponent()\n      ) : (\n        <CatchBoundary\n          getResetKey={match}\n          errorComponent={ErrorComponent}\n          onCatch={\n            process.env.NODE_ENV !== 'production'\n              ? (error) => {\n                  console.warn(\n                    `Warning: The following error wasn't caught by any route! At the very least, consider setting an 'errorComponent' in your RootRoute!`,\n                  )\n                  console.warn(`Warning: ${error.message || error.toString()}`)\n                }\n              : undefined\n          }\n        >\n          {matchComponent()}\n        </CatchBoundary>\n      )}\n    </nearestMatchContext.Provider>\n  )\n}\n\nexport type UseMatchRouteOptions<\n  TRouter extends AnyRouter = RegisteredRouter,\n  TFrom extends string = string,\n  TTo extends string | undefined = undefined,\n  TMaskFrom extends string = TFrom,\n  TMaskTo extends string = '',\n> = ToSubOptionsProps<TRouter, TFrom, TTo> &\n  DeepPartial<MakeOptionalSearchParams<TRouter, TFrom, TTo>> &\n  DeepPartial<MakeOptionalPathParams<TRouter, TFrom, TTo>> &\n  MaskOptions<TRouter, TMaskFrom, TMaskTo> &\n  MatchRouteOptions\n\nexport function useMatchRoute<TRouter extends AnyRouter = RegisteredRouter>() {\n  const router = useRouter()\n\n  return <\n    const TFrom extends string = string,\n    const TTo extends string | undefined = undefined,\n    const TMaskFrom extends string = TFrom,\n    const TMaskTo extends string = '',\n  >(\n    opts: UseMatchRouteOptions<TRouter, TFrom, TTo, TMaskFrom, TMaskTo>,\n  ): Solid.Accessor<\n    false | Expand<ResolveRoute<TRouter, TFrom, TTo>['types']['allParams']>\n  > => {\n    return Solid.createMemo(() => {\n      const { pending, caseSensitive, fuzzy, includeSearch, ...rest } = opts\n\n      router.stores.location.get()\n      router.stores.resolvedLocation.get()\n      router.stores.status.get()\n      return router.matchRoute(rest as any, {\n        pending,\n        caseSensitive,\n        fuzzy,\n        includeSearch,\n      })\n    })\n  }\n}\n\nexport type MakeMatchRouteOptions<\n  TRouter extends AnyRouter = RegisteredRouter,\n  TFrom extends string = string,\n  TTo extends string | undefined = undefined,\n  TMaskFrom extends string = TFrom,\n  TMaskTo extends string = '',\n> = UseMatchRouteOptions<TRouter, TFrom, TTo, TMaskFrom, TMaskTo> & {\n  // If a function is passed as a child, it will be given the `isActive` boolean to aid in further styling on the element it returns\n  children?:\n    | ((\n        params?: Expand<\n          ResolveRoute<TRouter, TFrom, TTo>['types']['allParams']\n        >,\n      ) => Solid.JSX.Element)\n    | Solid.JSX.Element\n}\n\nexport function MatchRoute<\n  TRouter extends AnyRouter = RegisteredRouter,\n  const TFrom extends string = string,\n  const TTo extends string | undefined = undefined,\n  const TMaskFrom extends string = TFrom,\n  const TMaskTo extends string = '',\n>(props: MakeMatchRouteOptions<TRouter, TFrom, TTo, TMaskFrom, TMaskTo>): any {\n  const matchRoute = useMatchRoute()\n  const params = matchRoute(props as any)\n\n  const renderedChild = Solid.createMemo(() => {\n    const matchedParams = params()\n    const child = props.children\n\n    if (typeof child === 'function') {\n      return (child as any)(matchedParams)\n    }\n\n    return matchedParams ? child : null\n  })\n\n  return <>{renderedChild()}</>\n}\n\nexport interface UseMatchesBaseOptions<TRouter extends AnyRouter, TSelected> {\n  select?: (matches: Array<MakeRouteMatchUnion<TRouter>>) => TSelected\n}\n\nexport type UseMatchesResult<\n  TRouter extends AnyRouter,\n  TSelected,\n> = unknown extends TSelected ? Array<MakeRouteMatchUnion<TRouter>> : TSelected\n\nexport function useMatches<\n  TRouter extends AnyRouter = RegisteredRouter,\n  TSelected = unknown,\n>(\n  opts?: UseMatchesBaseOptions<TRouter, TSelected>,\n): Solid.Accessor<UseMatchesResult<TRouter, TSelected>> {\n  const router = useRouter<TRouter>()\n  return Solid.createMemo((prev: TSelected | undefined) => {\n    const matches = router.stores.matches.get() as Array<\n      MakeRouteMatchUnion<TRouter>\n    >\n    const res = opts?.select ? opts.select(matches) : matches\n    if (prev === undefined) return res\n    return replaceEqualDeep(prev, res) as any\n  }) as Solid.Accessor<UseMatchesResult<TRouter, TSelected>>\n}\n\nexport function useParentMatches<\n  TRouter extends AnyRouter = RegisteredRouter,\n  TSelected = unknown,\n>(\n  opts?: UseMatchesBaseOptions<TRouter, TSelected>,\n): Solid.Accessor<UseMatchesResult<TRouter, TSelected>> {\n  const contextRouteId = Solid.useContext(nearestMatchContext)[0 /* route id */]\n\n  return useMatches({\n    select: (matches: Array<MakeRouteMatchUnion<TRouter>>) => {\n      matches = matches.slice(\n        0,\n        matches.findIndex((d) => d.routeId === contextRouteId()),\n      )\n      return opts?.select ? opts.select(matches) : matches\n    },\n  } as any)\n}\n\nexport function useChildMatches<\n  TRouter extends AnyRouter = RegisteredRouter,\n  TSelected = unknown,\n>(\n  opts?: UseMatchesBaseOptions<TRouter, TSelected>,\n): Solid.Accessor<UseMatchesResult<TRouter, TSelected>> {\n  const contextRouteId = Solid.useContext(nearestMatchContext)[0 /* route id */]\n\n  return useMatches({\n    select: (matches: Array<MakeRouteMatchUnion<TRouter>>) => {\n      matches = matches.slice(\n        matches.findIndex((d) => d.routeId === contextRouteId()) + 1,\n      )\n      return opts?.select ? opts.select(matches) : matches\n    },\n  } as any)\n}\n"],"mappings":"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"}

dist/esm/renderRouteNotFound.js

@@ -0,1 +1,2 @@
+import { renderInNonRouteComponentContext } from "./nonRouteComponentContext.js";
 import { DefaultGlobalNotFound } from "./not-found.js";
@@ -13,7 +14,16 @@ import { createComponent } from "solid-js/web";
 function renderRouteNotFound(router, route, data) {
+	if (process.env.NODE_ENV !== "production") {
+		if (!route.options.notFoundComponent) {
+			if (router.options.defaultNotFoundComponent) {
+				const DefaultNotFoundComponent = router.options.defaultNotFoundComponent;
+				return renderInNonRouteComponentContext(() => createComponent(DefaultNotFoundComponent, data), "notFoundComponent");
+			}
+			console.warn(`Warning: A notFoundError was encountered on the route with ID "${route.id}", but a notFoundComponent option was not configured, nor was a router level defaultNotFoundComponent configured. Consider configuring at least one of these to avoid TanStack Router's overly generic defaultNotFoundComponent (<p>Not Found</p>)`);
+			return createComponent(DefaultGlobalNotFound, {});
+		}
+		const NotFoundComponent = route.options.notFoundComponent;
+		return renderInNonRouteComponentContext(() => createComponent(NotFoundComponent, data), "notFoundComponent");
+	}
 	if (!route.options.notFoundComponent) {
 		if (router.options.defaultNotFoundComponent) return createComponent(router.options.defaultNotFoundComponent, data);
-		if (process.env.NODE_ENV !== "production") {
-			if (!route.options.notFoundComponent) console.warn(`Warning: A notFoundError was encountered on the route with ID "${route.id}", but a notFoundComponent option was not configured, nor was a router level defaultNotFoundComponent configured. Consider configuring at least one of these to avoid TanStack Router's overly generic defaultNotFoundComponent (<p>Not Found</p>)`);
-		}
 		return createComponent(DefaultGlobalNotFound, {});
@@ -20,0 +30,0 @@ }

dist/esm/renderRouteNotFound.js.map

@@ -1,1 +0,1 @@
-{"version":3,"file":"renderRouteNotFound.js","names":["DefaultGlobalNotFound","AnyRoute","AnyRouter","renderRouteNotFound","router","route","data","options","notFoundComponent","defaultNotFoundComponent","_$createComponent","process","env","NODE_ENV","console","warn","id"],"sources":["../../src/renderRouteNotFound.tsx"],"sourcesContent":["import { DefaultGlobalNotFound } from './not-found'\nimport type { AnyRoute, AnyRouter } from '@tanstack/router-core'\n\n/**\n * Renders a not found component for a route when no matching route is found.\n *\n * @param router - The router instance containing the route configuration\n * @param route - The route that triggered the not found state\n * @param data - Additional data to pass to the not found component\n * @returns The rendered not found component or a default fallback component\n */\nexport function renderRouteNotFound(\n  router: AnyRouter,\n  route: AnyRoute,\n  data: any,\n) {\n  if (!route.options.notFoundComponent) {\n    if (router.options.defaultNotFoundComponent) {\n      return <router.options.defaultNotFoundComponent {...data} />\n    }\n\n    if (process.env.NODE_ENV !== 'production') {\n      if (!route.options.notFoundComponent) {\n        console.warn(\n          `Warning: A notFoundError was encountered on the route with ID \"${route.id}\", but a notFoundComponent option was not configured, nor was a router level defaultNotFoundComponent configured. Consider configuring at least one of these to avoid TanStack Router's overly generic defaultNotFoundComponent (<p>Not Found</p>)`,\n        )\n      }\n    }\n\n    return <DefaultGlobalNotFound />\n  }\n\n  return <route.options.notFoundComponent {...data} />\n}\n"],"mappings":";;;;;;;;;;;AAWA,SAAgBG,oBACdC,QACAC,OACAC,MACA;CACA,IAAI,CAACD,MAAME,QAAQC,mBAAmB;EACpC,IAAIJ,OAAOG,QAAQE,0BACjB,OAAAC,gBAAQN,OAAOG,QAAQE,0BAA6BH,IAAI;EAG1D,IAAA,QAAA,IAAA,aAA6B;OACvB,CAACD,MAAME,QAAQC,mBACjBM,QAAQC,KACN,kEAAkEV,MAAMW,GAAE,mPAC5E;EAAA;EAIJ,OAAAN,gBAAQV,uBAAqB,CAAA,CAAA;CAC/B;CAEA,OAAAU,gBAAQL,MAAME,QAAQC,mBAAsBF,IAAI;AAClD"}
+{"version":3,"file":"renderRouteNotFound.js","names":["DefaultGlobalNotFound","renderInNonRouteComponentContext","AnyRoute","AnyRouter","renderRouteNotFound","router","route","data","process","env","NODE_ENV","options","notFoundComponent","defaultNotFoundComponent","DefaultNotFoundComponent","_$createComponent","console","warn","id","NotFoundComponent"],"sources":["../../src/renderRouteNotFound.tsx"],"sourcesContent":["import { DefaultGlobalNotFound } from './not-found'\nimport { renderInNonRouteComponentContext } from './nonRouteComponentContext'\nimport type { AnyRoute, AnyRouter } from '@tanstack/router-core'\n\n/**\n * Renders a not found component for a route when no matching route is found.\n *\n * @param router - The router instance containing the route configuration\n * @param route - The route that triggered the not found state\n * @param data - Additional data to pass to the not found component\n * @returns The rendered not found component or a default fallback component\n */\nexport function renderRouteNotFound(\n  router: AnyRouter,\n  route: AnyRoute,\n  data: any,\n) {\n  if (process.env.NODE_ENV !== 'production') {\n    if (!route.options.notFoundComponent) {\n      if (router.options.defaultNotFoundComponent) {\n        const DefaultNotFoundComponent = router.options.defaultNotFoundComponent\n        return renderInNonRouteComponentContext(\n          () => <DefaultNotFoundComponent {...data} />,\n          'notFoundComponent',\n        )\n      }\n\n      console.warn(\n        `Warning: A notFoundError was encountered on the route with ID \"${route.id}\", but a notFoundComponent option was not configured, nor was a router level defaultNotFoundComponent configured. Consider configuring at least one of these to avoid TanStack Router's overly generic defaultNotFoundComponent (<p>Not Found</p>)`,\n      )\n\n      return <DefaultGlobalNotFound />\n    }\n\n    const NotFoundComponent = route.options.notFoundComponent\n    return renderInNonRouteComponentContext(\n      () => <NotFoundComponent {...data} />,\n      'notFoundComponent',\n    )\n  }\n\n  if (!route.options.notFoundComponent) {\n    if (router.options.defaultNotFoundComponent) {\n      return <router.options.defaultNotFoundComponent {...data} />\n    }\n\n    return <DefaultGlobalNotFound />\n  }\n\n  return <route.options.notFoundComponent {...data} />\n}\n"],"mappings":";;;;;;;;;;;;AAYA,SAAgBI,oBACdC,QACAC,OACAC,MACA;CACA,IAAA,QAAA,IAAA,aAA6B,cAAc;EACzC,IAAI,CAACD,MAAMK,QAAQC,mBAAmB;GACpC,IAAIP,OAAOM,QAAQE,0BAA0B;IAC3C,MAAMC,2BAA2BT,OAAOM,QAAQE;IAChD,OAAOZ,uCACLc,gBAAOD,0BAA6BP,IAAI,GACxC,mBACF;GACF;GAEAS,QAAQC,KACN,kEAAkEX,MAAMY,GAAE,mPAC5E;GAEA,OAAAH,gBAAQf,uBAAqB,CAAA,CAAA;EAC/B;EAEA,MAAMmB,oBAAoBb,MAAMK,QAAQC;EACxC,OAAOX,uCACLc,gBAAOI,mBAAsBZ,IAAI,GACjC,mBACF;CACF;CAEA,IAAI,CAACD,MAAMK,QAAQC,mBAAmB;EACpC,IAAIP,OAAOM,QAAQE,0BACjB,OAAAE,gBAAQV,OAAOM,QAAQE,0BAA6BN,IAAI;EAG1D,OAAAQ,gBAAQf,uBAAqB,CAAA,CAAA;CAC/B;CAEA,OAAAe,gBAAQT,MAAMK,QAAQC,mBAAsBL,IAAI;AAClD"}

dist/esm/utils.d.ts

@@ -10,5 +10,4 @@ import * as Solid from 'solid-js';
  * @param ref - The ref to observe
- * @param intersectionObserverOptions - The options to pass to the IntersectionObserver
+ * @param callback - The callback to call when the intersection changes
  * @param disabled - Whether observation is disabled
- * @param callback - The callback to call when the intersection changes
  * @returns The IntersectionObserver instance
@@ -22,3 +21,2 @@ * @example
  *  (entry) => { doSomething(entry) },
- *  { rootMargin: '10px' },
  *  false
@@ -29,2 +27,2 @@ * )
  */
-export declare function useIntersectionObserver<T extends Element>(ref: Solid.Accessor<T | null>, callback: (entry: IntersectionObserverEntry | undefined) => void, intersectionObserverOptions?: IntersectionObserverInit, disabled?: boolean): Solid.Accessor<IntersectionObserver | null>;
+export declare function useIntersectionObserver<T extends Element>(ref: Solid.Accessor<T | null>, callback: (entry?: IntersectionObserverEntry) => void, disabled: Solid.Accessor<boolean>): Solid.Accessor<IntersectionObserver | null>;

dist/esm/utils.js

@@ -11,5 +11,4 @@ import * as Solid from "solid-js";
 * @param ref - The ref to observe
-* @param intersectionObserverOptions - The options to pass to the IntersectionObserver
+* @param callback - The callback to call when the intersection changes
 * @param disabled - Whether observation is disabled
-* @param callback - The callback to call when the intersection changes
 * @returns The IntersectionObserver instance
@@ -23,3 +22,2 @@ * @example
 *  (entry) => { doSomething(entry) },
-*  { rootMargin: '10px' },
 *  false
@@ -30,3 +28,3 @@ * )
 */
-function useIntersectionObserver(ref, callback, intersectionObserverOptions = {}, disabled) {
+function useIntersectionObserver(ref, callback, disabled) {
 	const isIntersectionObserverAvailable = typeof IntersectionObserver === "function";
@@ -36,9 +34,13 @@ let observerRef = null;
 		const r = ref();
-		if (!r || !isIntersectionObserverAvailable || disabled) return;
-		observerRef = new IntersectionObserver(([entry]) => {
-			callback(entry);
-		}, intersectionObserverOptions);
+		if (disabled() || !r || !isIntersectionObserverAvailable) {
+			Solid.onCleanup(() => callback());
+			return;
+		}
+		observerRef = new IntersectionObserver((entries) => {
+			callback(entries.pop());
+		}, { rootMargin: "100px" });
 		observerRef.observe(r);
 		Solid.onCleanup(() => {
 			observerRef?.disconnect();
+			callback();
 		});
@@ -45,0 +47,0 @@ });

dist/esm/utils.js.map

@@ -1,1 +0,1 @@
-{"version":3,"file":"utils.js","names":[],"sources":["../../src/utils.ts"],"sourcesContent":["import * as Solid from 'solid-js'\n\n/**\n * React hook to wrap `IntersectionObserver`.\n *\n * This hook will create an `IntersectionObserver` and observe the ref passed to it.\n *\n * When the intersection changes, the callback will be called with the `IntersectionObserverEntry`.\n *\n * @param ref - The ref to observe\n * @param intersectionObserverOptions - The options to pass to the IntersectionObserver\n * @param disabled - Whether observation is disabled\n * @param callback - The callback to call when the intersection changes\n * @returns The IntersectionObserver instance\n * @example\n * ```tsx\n * const MyComponent = () => {\n * const ref = React.useRef<HTMLDivElement>(null)\n * useIntersectionObserver(\n *  ref,\n *  (entry) => { doSomething(entry) },\n *  { rootMargin: '10px' },\n *  false\n * )\n * return <div ref={ref} />\n * ```\n */\nexport function useIntersectionObserver<T extends Element>(\n  ref: Solid.Accessor<T | null>,\n  callback: (entry: IntersectionObserverEntry | undefined) => void,\n  intersectionObserverOptions: IntersectionObserverInit = {},\n  disabled?: boolean,\n): Solid.Accessor<IntersectionObserver | null> {\n  const isIntersectionObserverAvailable =\n    typeof IntersectionObserver === 'function'\n  let observerRef: IntersectionObserver | null = null\n\n  Solid.createEffect(() => {\n    const r = ref()\n    if (!r || !isIntersectionObserverAvailable || disabled) {\n      return\n    }\n\n    observerRef = new IntersectionObserver(([entry]) => {\n      callback(entry)\n    }, intersectionObserverOptions)\n\n    observerRef.observe(r)\n\n    Solid.onCleanup(() => {\n      observerRef?.disconnect()\n    })\n  })\n\n  return () => observerRef\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;AA2BA,SAAgB,wBACd,KACA,UACA,8BAAwD,CAAC,GACzD,UAC6C;CAC7C,MAAM,kCACJ,OAAO,yBAAyB;CAClC,IAAI,cAA2C;CAE/C,MAAM,mBAAmB;EACvB,MAAM,IAAI,IAAI;EACd,IAAI,CAAC,KAAK,CAAC,mCAAmC,UAC5C;EAGF,cAAc,IAAI,sBAAsB,CAAC,WAAW;GAClD,SAAS,KAAK;EAChB,GAAG,2BAA2B;EAE9B,YAAY,QAAQ,CAAC;EAErB,MAAM,gBAAgB;GACpB,aAAa,WAAW;EAC1B,CAAC;CACH,CAAC;CAED,aAAa;AACf"}
+{"version":3,"file":"utils.js","names":[],"sources":["../../src/utils.ts"],"sourcesContent":["import * as Solid from 'solid-js'\n\n/**\n * React hook to wrap `IntersectionObserver`.\n *\n * This hook will create an `IntersectionObserver` and observe the ref passed to it.\n *\n * When the intersection changes, the callback will be called with the `IntersectionObserverEntry`.\n *\n * @param ref - The ref to observe\n * @param callback - The callback to call when the intersection changes\n * @param disabled - Whether observation is disabled\n * @returns The IntersectionObserver instance\n * @example\n * ```tsx\n * const MyComponent = () => {\n * const ref = React.useRef<HTMLDivElement>(null)\n * useIntersectionObserver(\n *  ref,\n *  (entry) => { doSomething(entry) },\n *  false\n * )\n * return <div ref={ref} />\n * ```\n */\nexport function useIntersectionObserver<T extends Element>(\n  ref: Solid.Accessor<T | null>,\n  callback: (entry?: IntersectionObserverEntry) => void,\n  disabled: Solid.Accessor<boolean>,\n): Solid.Accessor<IntersectionObserver | null> {\n  const isIntersectionObserverAvailable =\n    typeof IntersectionObserver === 'function'\n  let observerRef: IntersectionObserver | null = null\n\n  Solid.createEffect(() => {\n    const r = ref()\n    if (disabled() || !r || !isIntersectionObserverAvailable) {\n      Solid.onCleanup(() => callback())\n      return\n    }\n\n    observerRef = new IntersectionObserver(\n      (entries) => {\n        callback(entries.pop())\n      },\n      { rootMargin: '100px' },\n    )\n\n    observerRef.observe(r)\n\n    Solid.onCleanup(() => {\n      observerRef?.disconnect()\n      callback()\n    })\n  })\n\n  return () => observerRef\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAyBA,SAAgB,wBACd,KACA,UACA,UAC6C;CAC7C,MAAM,kCACJ,OAAO,yBAAyB;CAClC,IAAI,cAA2C;CAE/C,MAAM,mBAAmB;EACvB,MAAM,IAAI,IAAI;EACd,IAAI,SAAS,KAAK,CAAC,KAAK,CAAC,iCAAiC;GACxD,MAAM,gBAAgB,SAAS,CAAC;GAChC;EACF;EAEA,cAAc,IAAI,sBACf,YAAY;GACX,SAAS,QAAQ,IAAI,CAAC;EACxB,GACA,EAAE,YAAY,QAAQ,CACxB;EAEA,YAAY,QAAQ,CAAC;EAErB,MAAM,gBAAgB;GACpB,aAAa,WAAW;GACxB,SAAS;EACX,CAAC;CACH,CAAC;CAED,aAAa;AACf"}

dist/source/CatchBoundary.jsx

 import * as Solid from 'solid-js';
 import { Dynamic } from 'solid-js/web';
+import { renderInNonRouteComponentContext } from './nonRouteComponentContext';
 export function CatchBoundary(props) {
@@ -7,3 +8,3 @@ return (<Solid.ErrorBoundary fallback={(error, reset) => {
             Solid.createEffect(Solid.on(props.getResetKey, () => reset(), { defer: true }));
-            return (<Dynamic component={props.errorComponent ?? ErrorComponent} error={error} reset={reset}/>);
+            return process.env.NODE_ENV !== 'production' ? (renderInNonRouteComponentContext(() => (<Dynamic component={props.errorComponent ?? ErrorComponent} error={error} reset={reset}/>), 'errorComponent')) : (<Dynamic component={props.errorComponent ?? ErrorComponent} error={error} reset={reset}/>);
         }}>
@@ -10,0 +11,0 @@ {props.children}

dist/source/CatchBoundary.jsx.map

@@ -1,1 +0,1 @@
-{"version":3,"file":"CatchBoundary.jsx","sourceRoot":"","sources":["../../src/CatchBoundary.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,UAAU,CAAA;AACjC,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AAGtC,MAAM,UAAU,aAAa,CAC3B,KAKqB;IAErB,OAAO,CACL,CAAC,KAAK,CAAC,aAAa,CAClB,QAAQ,CAAC,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE;YACzB,KAAK,CAAC,OAAO,EAAE,CAAC,KAAK,CAAC,CAAA;YAEtB,KAAK,CAAC,YAAY,CAChB,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,WAAW,EAAE,GAAG,EAAE,CAAC,KAAK,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAC5D,CAAA;YAED,OAAO,CACL,CAAC,OAAO,CACN,SAAS,CAAC,CAAC,KAAK,CAAC,cAAc,IAAI,cAAc,CAAC,CAClD,KAAK,CAAC,CAAC,KAAK,CAAC,CACb,KAAK,CAAC,CAAC,KAAK,CAAC,EACb,CACH,CAAA;QACH,CAAC,CAAC,CAEF;MAAA,CAAC,KAAK,CAAC,QAAQ,CACjB;IAAA,EAAE,KAAK,CAAC,aAAa,CAAC,CACvB,CAAA;AACH,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,EAAE,KAAK,EAAkB;IACtD,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,KAAK,CAAC,YAAY,CACxC,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,YAAY,CACtC,CAAA;IAED,OAAO,CACL,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,CAAC,CACpD;MAAA,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,QAAQ,EAAE,GAAG,EAAE,OAAO,EAAE,CAAC,CACrE;QAAA,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,WAAW,EAAE,MAAM,EAAE,CAAC,CAAC,qBAAqB,EAAE,MAAM,CACrE;QAAA,CAAC,MAAM,CACL,KAAK,CAAC,CAAC;YACL,UAAU,EAAE,MAAM;YAClB,WAAW,EAAE,MAAM;YACnB,MAAM,EAAE,wBAAwB;YAChC,OAAO,EAAE,aAAa;YACtB,aAAa,EAAE,MAAM;YACrB,eAAe,EAAE,QAAQ;SAC1B,CAAC,CACF,OAAO,CAAC,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAElC;UAAA,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,YAAY,CACvC;QAAA,EAAE,MAAM,CACV;MAAA,EAAE,GAAG,CACL;MAAA,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,EACjC;MAAA,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CACR,CAAC,GAAG,CACF;UAAA,CAAC,GAAG,CACF,KAAK,CAAC,CAAC;gBACL,WAAW,EAAE,MAAM;gBACnB,MAAM,EAAE,eAAe;gBACvB,eAAe,EAAE,QAAQ;gBACzB,OAAO,EAAE,OAAO;gBAChB,KAAK,EAAE,KAAK;gBACZ,QAAQ,EAAE,MAAM;aACjB,CAAC,CAEF;YAAA,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CACtD;UAAA,EAAE,GAAG,CACP;QAAA,EAAE,GAAG,CAAC,CACP,CAAC,CAAC,CAAC,IAAI,CACV;IAAA,EAAE,GAAG,CAAC,CACP,CAAA;AACH,CAAC"}
+{"version":3,"file":"CatchBoundary.jsx","sourceRoot":"","sources":["../../src/CatchBoundary.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,UAAU,CAAA;AACjC,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AACtC,OAAO,EAAE,gCAAgC,EAAE,MAAM,4BAA4B,CAAA;AAG7E,MAAM,UAAU,aAAa,CAC3B,KAKqB;IAErB,OAAO,CACL,CAAC,KAAK,CAAC,aAAa,CAClB,QAAQ,CAAC,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE;YACzB,KAAK,CAAC,OAAO,EAAE,CAAC,KAAK,CAAC,CAAA;YAEtB,KAAK,CAAC,YAAY,CAChB,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,WAAW,EAAE,GAAG,EAAE,CAAC,KAAK,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAC5D,CAAA;YAED,OAAO,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,YAAY,CAAC,CAAC,CAAC,CAC7C,gCAAgC,CAC9B,GAAG,EAAE,CAAC,CACJ,CAAC,OAAO,CACN,SAAS,CAAC,CAAC,KAAK,CAAC,cAAc,IAAI,cAAc,CAAC,CAClD,KAAK,CAAC,CAAC,KAAK,CAAC,CACb,KAAK,CAAC,CAAC,KAAK,CAAC,EACb,CACH,EACD,gBAAgB,CACjB,CACF,CAAC,CAAC,CAAC,CACF,CAAC,OAAO,CACN,SAAS,CAAC,CAAC,KAAK,CAAC,cAAc,IAAI,cAAc,CAAC,CAClD,KAAK,CAAC,CAAC,KAAK,CAAC,CACb,KAAK,CAAC,CAAC,KAAK,CAAC,EACb,CACH,CAAA;QACH,CAAC,CAAC,CAEF;MAAA,CAAC,KAAK,CAAC,QAAQ,CACjB;IAAA,EAAE,KAAK,CAAC,aAAa,CAAC,CACvB,CAAA;AACH,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,EAAE,KAAK,EAAkB;IACtD,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,KAAK,CAAC,YAAY,CACxC,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,YAAY,CACtC,CAAA;IAED,OAAO,CACL,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,CAAC,CACpD;MAAA,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,QAAQ,EAAE,GAAG,EAAE,OAAO,EAAE,CAAC,CACrE;QAAA,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,WAAW,EAAE,MAAM,EAAE,CAAC,CAAC,qBAAqB,EAAE,MAAM,CACrE;QAAA,CAAC,MAAM,CACL,KAAK,CAAC,CAAC;YACL,UAAU,EAAE,MAAM;YAClB,WAAW,EAAE,MAAM;YACnB,MAAM,EAAE,wBAAwB;YAChC,OAAO,EAAE,aAAa;YACtB,aAAa,EAAE,MAAM;YACrB,eAAe,EAAE,QAAQ;SAC1B,CAAC,CACF,OAAO,CAAC,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAElC;UAAA,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,YAAY,CACvC;QAAA,EAAE,MAAM,CACV;MAAA,EAAE,GAAG,CACL;MAAA,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,EACjC;MAAA,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CACR,CAAC,GAAG,CACF;UAAA,CAAC,GAAG,CACF,KAAK,CAAC,CAAC;gBACL,WAAW,EAAE,MAAM;gBACnB,MAAM,EAAE,eAAe;gBACvB,eAAe,EAAE,QAAQ;gBACzB,OAAO,EAAE,OAAO;gBAChB,KAAK,EAAE,KAAK;gBACZ,QAAQ,EAAE,MAAM;aACjB,CAAC,CAEF;YAAA,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CACtD;UAAA,EAAE,GAAG,CACP;QAAA,EAAE,GAAG,CAAC,CACP,CAAC,CAAC,CAAC,IAAI,CACV;IAAA,EAAE,GAAG,CAAC,CACP,CAAA;AACH,CAAC"}

dist/source/link.d.ts

@@ -28,3 +28,2 @@ import * as Solid from 'solid-js';
         isActive: boolean;
-        isTransitioning: boolean;
     }) => Solid.JSX.Element);
@@ -31,0 +30,0 @@ }

dist/source/link.jsx

@@ -10,5 +10,8 @@ import * as Solid from 'solid-js';
 const timeoutMap = new WeakMap();
+const cancelPreload = (eventTarget) => {
+    clearTimeout(timeoutMap.get(eventTarget));
+    timeoutMap.delete(eventTarget);
+};
 export function useLinkProps(options) {
     const router = useRouter();
-    const [isTransitioning, setIsTransitioning] = Solid.createSignal(false);
     const shouldHydrateHash = !isServer && !!router.options.ssr;
@@ -143,3 +146,3 @@ const hasHydrated = useHydrated();
     const preload = Solid.createMemo(() => {
-        if (options.reloadDocument || externalLink()) {
+        if (options.reloadDocument || externalLink() || local.disabled) {
             return false;
@@ -193,9 +196,27 @@ }
     });
-    const preloadViewportIoCallback = (entry) => {
-        if (entry?.isIntersecting) {
+    const [ref, setRef] = Solid.createSignal(null);
+    const enqueuePreload = (e) => {
+        if (!e) {
+            cancelPreload(ref);
+            return;
+        }
+        if (!(e.isIntersecting ??
+            preload() === 'intent')) {
+            if (e.isIntersecting === false) {
+                cancelPreload(ref);
+            }
+            return;
+        }
+        if (!preloadDelay()) {
             doPreload();
+            return;
         }
+        if (!timeoutMap.has(ref)) {
+            timeoutMap.set(ref, setTimeout(() => {
+                timeoutMap.delete(ref);
+                doPreload();
+            }, preloadDelay()));
+        }
     };
-    const [ref, setRef] = Solid.createSignal(null);
-    useIntersectionObserver(ref, preloadViewportIoCallback, { rootMargin: '100px' }, !!local.disabled || preload() !== 'viewport');
+    useIntersectionObserver(ref, enqueuePreload, () => preload() !== 'viewport');
     Solid.createEffect(() => {
@@ -205,3 +226,3 @@ if (hasRenderFetched) {
         }
-        if (!local.disabled && preload() === 'render') {
+        if (preload() === 'render') {
             doPreload();
@@ -241,7 +262,2 @@ hasRenderFetched = true;
             e.preventDefault();
-            setIsTransitioning(true);
-            const unsub = router.subscribe('onResolved', () => {
-                unsub();
-                setIsTransitioning(false);
-            });
             // All is well? Navigate!
@@ -260,30 +276,10 @@ // N.B. we don't call `router.commitLocation(next) here because we want to run `validateSearch` before committing
     };
-    const enqueueIntentPreload = (e) => {
-        if (local.disabled || preload() !== 'intent')
+    const handleTouchStart = () => {
+        if (preload() !== 'intent')
             return;
-        if (!preloadDelay()) {
-            doPreload();
-            return;
-        }
-        const eventTarget = e.currentTarget || e.target;
-        if (!eventTarget || timeoutMap.has(eventTarget))
-            return;
-        timeoutMap.set(eventTarget, setTimeout(() => {
-            timeoutMap.delete(eventTarget);
-            doPreload();
-        }, preloadDelay()));
-    };
-    const handleTouchStart = (_) => {
-        if (local.disabled || preload() !== 'intent')
-            return;
         doPreload();
     };
-    const handleLeave = (e) => {
-        if (local.disabled)
-            return;
-        const eventTarget = e.currentTarget || e.target;
-        if (eventTarget) {
-            const id = timeoutMap.get(eventTarget);
-            clearTimeout(id);
-            timeoutMap.delete(eventTarget);
+    const handleLeave = () => {
+        if (preload() === 'intent') {
+            cancelPreload(ref);
         }
@@ -297,5 +293,5 @@ };
     const onBlur = createComposedHandler(() => local.onBlur, handleLeave);
-    const onFocus = createComposedHandler(() => local.onFocus, enqueueIntentPreload);
-    const onMouseEnter = createComposedHandler(() => local.onMouseEnter, enqueueIntentPreload);
-    const onMouseOver = createComposedHandler(() => local.onMouseOver, enqueueIntentPreload);
+    const onFocus = createComposedHandler(() => local.onFocus, enqueuePreload);
+    const onMouseEnter = createComposedHandler(() => local.onMouseEnter, enqueuePreload);
+    const onMouseOver = createComposedHandler(() => local.onMouseOver, enqueuePreload);
     const onMouseLeave = createComposedHandler(() => local.onMouseLeave, handleLeave);
@@ -320,3 +316,2 @@ const onMouseOut = createComposedHandler(() => local.onMouseOut, handleLeave);
             ...(local.disabled && STATIC_DISABLED_PROPS),
-            ...(isTransitioning() && STATIC_TRANSITIONING_ATTRIBUTES),
         };
@@ -371,5 +366,2 @@ if (simpleStyling()) {
 };
-const STATIC_TRANSITIONING_ATTRIBUTES = {
-    'data-transitioning': 'transitioning',
-};
 /** Call a JSX.EventHandlerUnion with the event. */
@@ -405,5 +397,2 @@ function callHandler(event, handler) {
                 },
-                get isTransitioning() {
-                    return linkProps['data-transitioning'] === 'transitioning';
-                },
             });
@@ -410,0 +399,0 @@ }

dist/source/link.jsx.map

@@ -1,1 +0,1 @@
-{"version":3,"file":"link.jsx","sourceRoot":"","sources":["../../src/link.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"link.jsx","sourceRoot":"","sources":["../../src/link.tsx"],"names":[],"mappings":"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"}

dist/source/Match.jsx

@@ -13,2 +13,3 @@ import * as Solid from 'solid-js';
 import { ClientOnly } from './ClientOnly';
+import { nonRouteComponentContext, renderInNonRouteComponentContext, } from './nonRouteComponentContext';
 // Keep the client constant undefined so the server-only script can be dropped.
@@ -47,3 +48,8 @@ const renderScrollRestoration = isServer === false
         : SafeFragment;
-    const MatchContent = () => (<Solid.Show when={currentMatch().status !== 'pending'} fallback={<Dynamic component={resolvePendingComponent()}/>}>
+    const MatchContent = () => (<Solid.Show when={currentMatch().status !== 'pending'} fallback={(() => {
+            if (process.env.NODE_ENV !== 'production') {
+                return renderInNonRouteComponentContext(() => <Dynamic component={resolvePendingComponent()}/>, 'pendingComponent');
+            }
+            return <Dynamic component={resolvePendingComponent()}/>;
+        })()}>
       <MatchInner />
@@ -53,6 +59,13 @@ </Solid.Show>);
       <nearestMatchContext.Provider value={nearestMatch}>
-        <Solid.Suspense fallback={
-        // Data-only SSR renders the inner fallback on the server, so
-        // avoid adding an extra suspense fallback on the client.
-        shouldSkipSuspenseFallback() ? undefined : (<Dynamic component={resolvePendingComponent()}/>)}>
+        <Solid.Suspense fallback={(() => {
+            // Data-only SSR renders the inner fallback on the server, so
+            // avoid adding an extra suspense fallback on the client.
+            if (shouldSkipSuspenseFallback()) {
+                return undefined;
+            }
+            if (process.env.NODE_ENV !== 'production') {
+                return renderInNonRouteComponentContext(() => <Dynamic component={resolvePendingComponent()}/>, 'pendingComponent');
+            }
+            return <Dynamic component={resolvePendingComponent()}/>;
+        })()}>
           <Dynamic component={routeErrorComponent() ? CatchBoundary : SafeFragment} getResetKey={currentMatch} errorComponent={routeErrorComponent()} onCatch={(error) => {
@@ -77,7 +90,12 @@ // Forward not found errors (we don't want to show the error component for these)
             }
-            return (<Dynamic component={routeNotFoundComponent()} {...notFoundError}/>);
+            return process.env.NODE_ENV !== 'production' ? (renderInNonRouteComponentContext(() => (<Dynamic component={routeNotFoundComponent()} {...notFoundError}/>), 'notFoundComponent')) : (<Dynamic component={routeNotFoundComponent()} {...notFoundError}/>);
         }}>
               <Solid.Switch>
                 <Solid.Match when={resolvedNoSsr()}>
-                  <ClientOnly fallback={<Dynamic component={resolvePendingComponent()}/>}>
+                  <ClientOnly fallback={(() => {
+            if (process.env.NODE_ENV !== 'production') {
+                return renderInNonRouteComponentContext(() => (<Dynamic component={resolvePendingComponent()}/>), 'pendingComponent');
+            }
+            return <Dynamic component={resolvePendingComponent()}/>;
+        })()}>
                     <MatchContent />
@@ -136,4 +154,6 @@ </ClientOnly>
                     ErrorComponent;
-                return (<RouteErrorComponent error={currentMatch().error} info={{
+                return process.env.NODE_ENV !== 'production' ? (renderInNonRouteComponentContext(() => (<RouteErrorComponent error={currentMatch().error} info={{
                         componentStack: '',
+                    }}/>), 'errorComponent')) : (<RouteErrorComponent error={currentMatch().error} info={{
+                        componentStack: '',
                     }}/>);
@@ -150,2 +170,8 @@ }
 export const Outlet = () => {
+    if (process.env.NODE_ENV !== 'production') {
+        const nonRouteComponent = Solid.useContext(nonRouteComponentContext);
+        if (nonRouteComponent) {
+            console.warn(`Warning: An <Outlet /> was rendered inside a ${nonRouteComponent}. <Outlet /> should only be rendered inside a route component.`);
+        }
+    }
     const router = useRouter();
@@ -168,3 +194,8 @@ const nearestParentMatch = Solid.useContext(nearestMatchContext);
             return (<Solid.Show when={routeId() === rootRouteId} fallback={<Match routeId={childRouteId()}/>}>
-            <Solid.Suspense fallback={<Dynamic component={router.options.defaultPendingComponent}/>}>
+            <Solid.Suspense fallback={(() => {
+                    if (process.env.NODE_ENV !== 'production') {
+                        return renderInNonRouteComponentContext(() => (<Dynamic component={router.options.defaultPendingComponent}/>), 'pendingComponent');
+                    }
+                    return (<Dynamic component={router.options.defaultPendingComponent}/>);
+                })()}>
               <Match routeId={childRouteId()}/>
@@ -171,0 +202,0 @@ </Solid.Suspense>

dist/source/Match.jsx.map

@@ -1,1 +0,1 @@
-{"version":3,"file":"Match.jsx","sourceRoot":"","sources":["../../src/Match.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,UAAU,CAAA;AACjC,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAA;AACnD,OAAO,EAAE,QAAQ,EAAE,MAAM,gCAAgC,CAAA;AACzD,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AACtC,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAA;AAC/D,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AACvC,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,aAAa,CAAA;AACxD,OAAO,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAA;AACpD,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAC7C,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAA;AAC3D,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAA;AACxD,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AAOzC,+EAA+E;AAC/E,MAAM,uBAAuB,GAC3B,QAAQ,KAAK,KAAK;IAChB,CAAC,CAAC,SAAS;IACX,CAAC,CAAC,CAAC,MAAiB,EAAE,KAAe,EAAE,EAAE,CACrC,CAAC,QAAQ,IAAI,MAAM,CAAC,QAAQ,CAAC;QAC7B,KAAK,CAAC,WAAW,EAAE,EAAE,KAAK,WAAW;QACrC,MAAM,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAAC,CACjC,CAAC,iBAAiB,CAAC,AAAD,EAAG,CACtB,CAAC,CAAC,CAAC,IAAI,CAAA;AAEhB,MAAM,CAAC,MAAM,KAAK,GAAG,CAAC,KAA0B,EAAE,EAAE;IAClD,MAAM,MAAM,GAAG,SAAS,EAAE,CAAA;IAE1B,MAAM,YAAY,GAAG,KAAK,CAAC,UAAU,CACnC,GAAG,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAE,CAAC,GAAG,EAAG,CACvD,CAAA;IAED,MAAM,YAAY,GAAG,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,OAAO,EAAE,YAAY,CAAU,CAAA;IAEjE,MAAM,KAAK,GAAa,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;IAExD,2EAA2E;IAC3E,8EAA8E;IAC9E,MAAM,YAAY,GAChB,CAAC,QAAQ,IAAI,MAAM,CAAC,QAAQ,CAAC;QAC3B,CAAC,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,OAAO;QACrB,CAAC,CAAC,GAAG,EAAE;YACH,YAAY,EAAE,CAAA;YACd,OAAO,KAAK,CAAC,OAAO,CAAA;QACtB,CAAC,CAAA;IAEP,MAAM,uBAAuB,GAAG,GAAG,EAAE,CACnC,YAAY,EAAE,CAAC,gBAAgB,IAAI,MAAM,CAAC,OAAO,CAAC,uBAAuB,CAAA;IAE3E,MAAM,mBAAmB,GAAG,GAAG,EAAE,CAC/B,YAAY,EAAE,CAAC,cAAc,IAAI,MAAM,CAAC,OAAO,CAAC,qBAAqB,CAAA;IAEvE,MAAM,sBAAsB,GAAG,GAAG,EAAE,CAClC,KAAK,CAAC,MAAM;QACV,CAAC,CAAC,mGAAmG;YACnG,CAAC,YAAY,EAAE,CAAC,iBAAiB;gBACjC,MAAM,CAAC,OAAO,CAAC,aAAa,EAAE,OAAO,CAAC,SAAS,CAAC;QAClD,CAAC,CAAC,YAAY,EAAE,CAAC,iBAAiB,CAAA;IAEtC,MAAM,aAAa,GAAG,GAAG,EAAE,CACzB,YAAY,EAAE,CAAC,GAAG,KAAK,KAAK,IAAI,YAAY,EAAE,CAAC,GAAG,KAAK,WAAW,CAAA;IAEpE,MAAM,0BAA0B,GAAG,GAAG,EAAE,CACtC,CAAC,QAAQ,IAAI,MAAM,CAAC,QAAQ,CAAC;QAC3B,CAAC,CAAC,aAAa,EAAE;QACjB,CAAC,CAAC,YAAY,EAAE,CAAC,GAAG,KAAK,WAAW,CAAA;IAExC,MAAM,cAAc,GAAG,KAAK,CAAC,MAAM;QACjC,CAAC,CAAC,CAAE,KAAK,CAAC,OAA4B,CAAC,cAAc,IAAI,YAAY,CAAC;QACtE,CAAC,CAAC,YAAY,CAAA;IAEhB,MAAM,YAAY,GAAG,GAAG,EAAE,CAAC,CACzB,CAAC,KAAK,CAAC,IAAI,CACT,IAAI,CAAC,CAAC,YAAY,EAAE,CAAC,MAAM,KAAK,SAAS,CAAC,CAC1C,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,uBAAuB,EAAE,CAAC,EAAG,CAAC,CAE5D;MAAA,CAAC,UAAU,CAAC,AAAD,EACb;IAAA,EAAE,KAAK,CAAC,IAAI,CAAC,CACd,CAAA;IAED,OAAO,CACL,CAAC,cAAc,CACb;MAAA,CAAC,mBAAmB,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,YAAY,CAAC,CAChD;QAAA,CAAC,KAAK,CAAC,QAAQ,CACb,QAAQ,CAAC,CAAC;QACR,6DAA6D;QAC7D,yDAAyD;QACzD,0BAA0B,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CACzC,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,uBAAuB,EAAE,CAAC,EAAG,CAErD,CAAC,CAED;UAAA,CAAC,OAAO,CACN,SAAS,CAAC,CAAC,mBAAmB,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,YAAY,CAAC,CAChE,WAAW,CAAC,CAAC,YAAY,CAAC,CAC1B,cAAc,CAAC,CAAC,mBAAmB,EAAS,CAAC,CAC7C,OAAO,CAAC,CAAC,CAAC,KAAY,EAAE,EAAE;YACxB,iFAAiF;YACjF,MAAM,aAAa,GAAG,WAAW,CAAC,KAAK,CAAC,CAAA;YACxC,IAAI,aAAa,EAAE,CAAC;gBAClB,aAAa,CAAC,OAAO,KAArB,aAAa,CAAC,OAAO,GAAK,YAAY,EAAE,CAAC,OAAO,EAAA;gBAChD,MAAM,aAAa,CAAA;YACrB,CAAC;YACD,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,YAAY,EAAE,CAAC;gBAC1C,OAAO,CAAC,IAAI,CACV,kCAAkC,YAAY,EAAE,CAAC,OAAO,EAAE,CAC3D,CAAA;YACH,CAAC;YACD,CAAC;YAAA,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,IAAI,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC,EAAE,CAAC,KAAK,CAAC,CAAA;QACpE,CAAC,CAAC,CAEF;YAAA,CAAC,OAAO,CACN,SAAS,CAAC,CACR,sBAAsB,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,YAC7C,CAAC,CACD,QAAQ,CAAC,CAAC,CAAC,KAAU,EAAE,EAAE;YACvB,MAAM,aAAa,GAAG,WAAW,CAAC,KAAK,CAAC,IAAI,KAAK,CAAA;YAEjD,aAAa,CAAC,OAAO,KAArB,aAAa,CAAC,OAAO,GAAK,YAAY,EAAE,CAAC,OAAO,EAAA;YAEhD,IAAI,aAAa,CAAC,OAAO,KAAK,YAAY,EAAE,CAAC,OAAO,EAAE,CAAC;gBACrD,MAAM,aAAa,CAAA;YACrB,CAAC;YAED,OAAO,CACL,CAAC,OAAO,CACN,SAAS,CAAC,CAAC,sBAAsB,EAAE,CAAC,CACpC,IAAI,aAAa,CAAC,EAClB,CACH,CAAA;QACH,CAAC,CAAC,CAEF;cAAA,CAAC,KAAK,CAAC,MAAM,CACX;gBAAA,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,aAAa,EAAE,CAAC,CACjC;kBAAA,CAAC,UAAU,CACT,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,uBAAuB,EAAE,CAAC,EAAG,CAAC,CAE5D;oBAAA,CAAC,YAAY,CAAC,AAAD,EACf;kBAAA,EAAE,UAAU,CACd;gBAAA,EAAE,KAAK,CAAC,KAAK,CACb;gBAAA,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,aAAa,EAAE,CAAC,CAClC;kBAAA,CAAC,YAAY,CAAC,AAAD,EACf;gBAAA,EAAE,KAAK,CAAC,KAAK,CACf;cAAA,EAAE,KAAK,CAAC,MAAM,CAChB;YAAA,EAAE,OAAO,CACX;UAAA,EAAE,OAAO,CACX;QAAA,EAAE,KAAK,CAAC,QAAQ,CAClB;MAAA,EAAE,mBAAmB,CAAC,QAAQ,CAE9B;;MAAA,CAAC,uBAAuB,EAAE,CAAC,MAAM,EAAE,KAAK,CAAC,CAC3C;IAAA,EAAE,cAAc,CAAC,CAClB,CAAA;AACH,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,UAAU,GAAG,GAAQ,EAAE;IAClC,MAAM,MAAM,GAAG,SAAS,EAAE,CAAA;IAC1B,MAAM,YAAY,GAAG,KAAK,CAAC,UAAU,CAAC,mBAAmB,CAAC,CAAA;IAC1D,MAAM,KAAK,GAAG,YAAY,CAAC,CAAC,CAAC,WAAW,CAAC,CAAA;IACzC,MAAM,OAAO,GAAG,YAAY,CAAC,CAAC,CAAC,cAAc,CAAC,CAAA;IAC9C,MAAM,KAAK,GAAG,MAAM,CAAC,UAAU,CAAC,OAAO,EAAG,CAAE,CAAA;IAC5C,MAAM,YAAY,GAAG,GAAG,EAAE,CAAC,KAAK,EAAG,CAAA;IAEnC,MAAM,YAAY,GAAG,GAAG,EAAE;QACxB,MAAM,OAAO,GAAG,YAAY,EAAE,CAAA;QAC9B,MAAM,OAAO,GACX,KAAK,CAAC,OAAO,CAAC,WAAW,IAAI,MAAM,CAAC,OAAO,CAAC,kBAAkB,CAAA;QAChE,MAAM,IAAI,GAAG,OAAO,EAAE,CAAC;YACrB,OAAO,EAAE,OAAO,EAAG;YACnB,UAAU,EAAE,OAAO,CAAC,UAAU;YAC9B,MAAM,EAAE,OAAO,CAAC,aAAa;YAC7B,MAAM,EAAE,OAAO,CAAC,aAAa;SAC9B,CAAC,CAAA;QACF,OAAO,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,CAAA;IACjD,CAAC,CAAA;IAED,MAAM,GAAG,GAAG,GAAG,EAAE;QACf,MAAM,IAAI,GAAG,KAAK,CAAC,OAAO,CAAC,SAAS,IAAI,MAAM,CAAC,OAAO,CAAC,gBAAgB,CAAA;QACvE,IAAI,IAAI,EAAE,CAAC;YACT,OAAO,CAAC,IAAI,CAAC,AAAD,EAAG,CAAA;QACjB,CAAC;QACD,OAAO,CAAC,MAAM,CAAC,AAAD,EAAG,CAAA;IACnB,CAAC,CAAA;IAED,MAAM,QAAQ,GAAG,GAAG,EAAE,CAAC,CACrB,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,YAAY,EAAE,CAAC,CAAC,KAAK,CACrC;MAAA,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,GAAG,EAAE,CAClB;IAAA,EAAE,KAAK,CAAC,IAAI,CAAC,CACd,CAAA;IAED,OAAO,CACL,CAAC,KAAK,CAAC,MAAM,CACX;MAAA,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,YAAY,EAAE,CAAC,MAAM,KAAK,UAAU,CAAC,CACtD;QAAA,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,mBAAmB,CAAC,MAAM,EAAE,KAAK,EAAE,YAAY,EAAE,CAAC,KAAK,CAAC,CAClE;MAAA,EAAE,KAAK,CAAC,KAAK,CACb;MAAA,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,YAAY,EAAE,CAAC,MAAM,KAAK,OAAO,CAAC,CACnD;QAAA,CAAC,CAAC,CAAC,EAAE,EAAE;YACL,IAAI,QAAQ,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;gBAChC,MAAM,mBAAmB,GACvB,CAAC,KAAK,CAAC,OAAO,CAAC,cAAc;oBAC3B,MAAM,CAAC,OAAO,CAAC,qBAAqB,CAAC;oBACvC,cAAc,CAAA;gBAEhB,OAAO,CACL,CAAC,mBAAmB,CAClB,KAAK,CAAC,CAAC,YAAY,EAAE,CAAC,KAAK,CAAC,CAC5B,IAAI,CAAC,CAAC;wBACJ,cAAc,EAAE,EAAE;qBACnB,CAAC,EACF,CACH,CAAA;YACH,CAAC;YAED,MAAM,YAAY,EAAE,CAAC,KAAK,CAAA;QAC5B,CAAC,CACH;MAAA,EAAE,KAAK,CAAC,KAAK,CACb;MAAA,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,YAAY,EAAE,CAAC,MAAM,KAAK,SAAS,CAAC,CACrD;QAAA,CAAC,QAAQ,EAAE,CACb;MAAA,EAAE,KAAK,CAAC,KAAK,CACf;IAAA,EAAE,KAAK,CAAC,MAAM,CAAC,CAChB,CAAA;AACH,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,MAAM,GAAG,GAAG,EAAE;IACzB,MAAM,MAAM,GAAG,SAAS,EAAE,CAAA;IAC1B,MAAM,kBAAkB,GAAG,KAAK,CAAC,UAAU,CAAC,mBAAmB,CAAC,CAAA;IAChE,MAAM,WAAW,GAAG,kBAAkB,CAAC,CAAC,CAAC,WAAW,CAAC,CAAA;IACrD,MAAM,OAAO,GAAG,kBAAkB,CAAC,CAAC,CAAC,cAAc,CAAC,CAAA;IACpD,MAAM,KAAK,GAAG,MAAM,CAAC,UAAU,CAAC,OAAO,EAAG,CAAE,CAAA;IAE5C,MAAM,YAAY,GAAG,GAAG,EAAE;QACxB,IAAI,WAAW,EAAG,CAAC,SAAS,EAAE,CAAC;YAC7B,OAAM;QACR,CAAC;QACD,MAAM,GAAG,GAAG,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,CAAA;QACnC,OAAO,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,EAAG,CAAC,GAAG,CAAC,CAAC,CAAA;IACzC,CAAC,CAAA;IAED,OAAO,CACL,CAAC,KAAK,CAAC,IAAI,CACT,IAAI,CAAC,CAAC,YAAY,EAAE,CAAC,CACrB,KAAK,CACL,QAAQ,CAAC,CACP,WAAW,EAAG,CAAC,SAAS;YACtB,CAAC,CAAC,mBAAmB,CAAC,MAAM,EAAE,KAAK,EAAE,WAAW,EAAG,CAAC,KAAK,CAAC;YAC1D,CAAC,CAAC,SACN,CAAC,CAED;MAAA,CAAC,CAAC,SAAiB,EAAE,EAAE;YACrB,OAAO,CACL,CAAC,KAAK,CAAC,IAAI,CACT,IAAI,CAAC,CAAC,OAAO,EAAE,KAAK,WAAW,CAAC,CAChC,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,YAAY,EAAG,CAAC,EAAG,CAAC,CAE9C;YAAA,CAAC,KAAK,CAAC,QAAQ,CACb,QAAQ,CAAC,CACP,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,uBAAuB,CAAC,EAC7D,CAAC,CAED;cAAA,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,YAAY,EAAG,CAAC,EAClC;YAAA,EAAE,KAAK,CAAC,QAAQ,CAClB;UAAA,EAAE,KAAK,CAAC,IAAI,CAAC,CACd,CAAA;QACH,CAAC,CACH;IAAA,EAAE,KAAK,CAAC,IAAI,CAAC,CACd,CAAA;AACH,CAAC,CAAA"}
+{"version":3,"file":"Match.jsx","sourceRoot":"","sources":["../../src/Match.tsx"],"names":[],"mappings":"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"}

dist/source/Matches.jsx

@@ -10,2 +10,3 @@ import * as Solid from 'solid-js';
 import { Match } from './Match';
+import { renderInNonRouteComponentContext } from './nonRouteComponentContext';
 export function Matches() {
@@ -22,3 +23,10 @@ const router = useRouter();
     return (<OptionalWrapper>
-      <ResolvedSuspense fallback={PendingComponent ? <PendingComponent /> : null}>
+      <ResolvedSuspense fallback={PendingComponent
+            ? (() => {
+                if (process.env.NODE_ENV !== 'production') {
+                    return renderInNonRouteComponentContext(() => <PendingComponent />, 'pendingComponent');
+                }
+                return <PendingComponent />;
+            })()
+            : null}>
         <Transitioner />
@@ -25,0 +33,0 @@ <MatchesInner />

dist/source/Matches.jsx.map

@@ -1,1 +0,1 @@
-{"version":3,"file":"Matches.jsx","sourceRoot":"","sources":["../../src/Matches.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"Matches.jsx","sourceRoot":"","sources":["../../src/Matches.tsx"],"names":[],"mappings":"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"}

dist/source/renderRouteNotFound.jsx

 import { DefaultGlobalNotFound } from './not-found';
+import { renderInNonRouteComponentContext } from './nonRouteComponentContext';
 /**
@@ -11,2 +12,14 @@ * Renders a not found component for a route when no matching route is found.
 export function renderRouteNotFound(router, route, data) {
+    if (process.env.NODE_ENV !== 'production') {
+        if (!route.options.notFoundComponent) {
+            if (router.options.defaultNotFoundComponent) {
+                const DefaultNotFoundComponent = router.options.defaultNotFoundComponent;
+                return renderInNonRouteComponentContext(() => <DefaultNotFoundComponent {...data}/>, 'notFoundComponent');
+            }
+            console.warn(`Warning: A notFoundError was encountered on the route with ID "${route.id}", but a notFoundComponent option was not configured, nor was a router level defaultNotFoundComponent configured. Consider configuring at least one of these to avoid TanStack Router's overly generic defaultNotFoundComponent (<p>Not Found</p>)`);
+            return <DefaultGlobalNotFound />;
+        }
+        const NotFoundComponent = route.options.notFoundComponent;
+        return renderInNonRouteComponentContext(() => <NotFoundComponent {...data}/>, 'notFoundComponent');
+    }
     if (!route.options.notFoundComponent) {
@@ -16,7 +29,2 @@ if (router.options.defaultNotFoundComponent) {
         }
-        if (process.env.NODE_ENV !== 'production') {
-            if (!route.options.notFoundComponent) {
-                console.warn(`Warning: A notFoundError was encountered on the route with ID "${route.id}", but a notFoundComponent option was not configured, nor was a router level defaultNotFoundComponent configured. Consider configuring at least one of these to avoid TanStack Router's overly generic defaultNotFoundComponent (<p>Not Found</p>)`);
-            }
-        }
         return <DefaultGlobalNotFound />;
@@ -23,0 +31,0 @@ }

dist/source/renderRouteNotFound.jsx.map

@@ -1,1 +0,1 @@
-{"version":3,"file":"renderRouteNotFound.jsx","sourceRoot":"","sources":["../../src/renderRouteNotFound.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAA;AAGnD;;;;;;;GAOG;AACH,MAAM,UAAU,mBAAmB,CACjC,MAAiB,EACjB,KAAe,EACf,IAAS;IAET,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,iBAAiB,EAAE,CAAC;QACrC,IAAI,MAAM,CAAC,OAAO,CAAC,wBAAwB,EAAE,CAAC;YAC5C,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,wBAAwB,CAAC,IAAI,IAAI,CAAC,EAAG,CAAA;QAC9D,CAAC;QAED,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,YAAY,EAAE,CAAC;YAC1C,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,iBAAiB,EAAE,CAAC;gBACrC,OAAO,CAAC,IAAI,CACV,kEAAkE,KAAK,CAAC,EAAE,oPAAoP,CAC/T,CAAA;YACH,CAAC;QACH,CAAC;QAED,OAAO,CAAC,qBAAqB,CAAC,AAAD,EAAG,CAAA;IAClC,CAAC;IAED,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,iBAAiB,CAAC,IAAI,IAAI,CAAC,EAAG,CAAA;AACtD,CAAC"}
+{"version":3,"file":"renderRouteNotFound.jsx","sourceRoot":"","sources":["../../src/renderRouteNotFound.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAA;AACnD,OAAO,EAAE,gCAAgC,EAAE,MAAM,4BAA4B,CAAA;AAG7E;;;;;;;GAOG;AACH,MAAM,UAAU,mBAAmB,CACjC,MAAiB,EACjB,KAAe,EACf,IAAS;IAET,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,YAAY,EAAE,CAAC;QAC1C,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,iBAAiB,EAAE,CAAC;YACrC,IAAI,MAAM,CAAC,OAAO,CAAC,wBAAwB,EAAE,CAAC;gBAC5C,MAAM,wBAAwB,GAAG,MAAM,CAAC,OAAO,CAAC,wBAAwB,CAAA;gBACxE,OAAO,gCAAgC,CACrC,GAAG,EAAE,CAAC,CAAC,wBAAwB,CAAC,IAAI,IAAI,CAAC,EAAG,EAC5C,mBAAmB,CACpB,CAAA;YACH,CAAC;YAED,OAAO,CAAC,IAAI,CACV,kEAAkE,KAAK,CAAC,EAAE,oPAAoP,CAC/T,CAAA;YAED,OAAO,CAAC,qBAAqB,CAAC,AAAD,EAAG,CAAA;QAClC,CAAC;QAED,MAAM,iBAAiB,GAAG,KAAK,CAAC,OAAO,CAAC,iBAAiB,CAAA;QACzD,OAAO,gCAAgC,CACrC,GAAG,EAAE,CAAC,CAAC,iBAAiB,CAAC,IAAI,IAAI,CAAC,EAAG,EACrC,mBAAmB,CACpB,CAAA;IACH,CAAC;IAED,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,iBAAiB,EAAE,CAAC;QACrC,IAAI,MAAM,CAAC,OAAO,CAAC,wBAAwB,EAAE,CAAC;YAC5C,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,wBAAwB,CAAC,IAAI,IAAI,CAAC,EAAG,CAAA;QAC9D,CAAC;QAED,OAAO,CAAC,qBAAqB,CAAC,AAAD,EAAG,CAAA;IAClC,CAAC;IAED,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,iBAAiB,CAAC,IAAI,IAAI,CAAC,EAAG,CAAA;AACtD,CAAC"}

dist/source/utils.d.ts

@@ -10,5 +10,4 @@ import * as Solid from 'solid-js';
  * @param ref - The ref to observe
- * @param intersectionObserverOptions - The options to pass to the IntersectionObserver
+ * @param callback - The callback to call when the intersection changes
  * @param disabled - Whether observation is disabled
- * @param callback - The callback to call when the intersection changes
  * @returns The IntersectionObserver instance
@@ -22,3 +21,2 @@ * @example
  *  (entry) => { doSomething(entry) },
- *  { rootMargin: '10px' },
  *  false
@@ -29,2 +27,2 @@ * )
  */
-export declare function useIntersectionObserver<T extends Element>(ref: Solid.Accessor<T | null>, callback: (entry: IntersectionObserverEntry | undefined) => void, intersectionObserverOptions?: IntersectionObserverInit, disabled?: boolean): Solid.Accessor<IntersectionObserver | null>;
+export declare function useIntersectionObserver<T extends Element>(ref: Solid.Accessor<T | null>, callback: (entry?: IntersectionObserverEntry) => void, disabled: Solid.Accessor<boolean>): Solid.Accessor<IntersectionObserver | null>;

dist/source/utils.js

@@ -10,5 +10,4 @@ import * as Solid from 'solid-js';
  * @param ref - The ref to observe
- * @param intersectionObserverOptions - The options to pass to the IntersectionObserver
+ * @param callback - The callback to call when the intersection changes
  * @param disabled - Whether observation is disabled
- * @param callback - The callback to call when the intersection changes
  * @returns The IntersectionObserver instance
@@ -22,3 +21,2 @@ * @example
  *  (entry) => { doSomething(entry) },
- *  { rootMargin: '10px' },
  *  false
@@ -29,3 +27,3 @@ * )
  */
-export function useIntersectionObserver(ref, callback, intersectionObserverOptions = {}, disabled) {
+export function useIntersectionObserver(ref, callback, disabled) {
     const isIntersectionObserverAvailable = typeof IntersectionObserver === 'function';
@@ -35,11 +33,13 @@ let observerRef = null;
         const r = ref();
-        if (!r || !isIntersectionObserverAvailable || disabled) {
+        if (disabled() || !r || !isIntersectionObserverAvailable) {
+            Solid.onCleanup(() => callback());
             return;
         }
-        observerRef = new IntersectionObserver(([entry]) => {
-            callback(entry);
-        }, intersectionObserverOptions);
+        observerRef = new IntersectionObserver((entries) => {
+            callback(entries.pop());
+        }, { rootMargin: '100px' });
         observerRef.observe(r);
         Solid.onCleanup(() => {
             observerRef?.disconnect();
+            callback();
         });
@@ -46,0 +46,0 @@ });

dist/source/utils.js.map

@@ -1,1 +0,1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,UAAU,CAAA;AAEjC;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,MAAM,UAAU,uBAAuB,CACrC,GAA6B,EAC7B,QAAgE,EAChE,2BAA2B,GAA6B,EAAE,EAC1D,QAAkB;IAElB,MAAM,+BAA+B,GACnC,OAAO,oBAAoB,KAAK,UAAU,CAAA;IAC5C,IAAI,WAAW,GAAgC,IAAI,CAAA;IAEnD,KAAK,CAAC,YAAY,CAAC,GAAG,EAAE;QACtB,MAAM,CAAC,GAAG,GAAG,EAAE,CAAA;QACf,IAAI,CAAC,CAAC,IAAI,CAAC,+BAA+B,IAAI,QAAQ,EAAE,CAAC;YACvD,OAAM;QACR,CAAC;QAED,WAAW,GAAG,IAAI,oBAAoB,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,EAAE;YACjD,QAAQ,CAAC,KAAK,CAAC,CAAA;QACjB,CAAC,EAAE,2BAA2B,CAAC,CAAA;QAE/B,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,CAAA;QAEtB,KAAK,CAAC,SAAS,CAAC,GAAG,EAAE;YACnB,WAAW,EAAE,UAAU,EAAE,CAAA;QAC3B,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;IAEF,OAAO,GAAG,EAAE,CAAC,WAAW,CAAA;AAC1B,CAAC"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,UAAU,CAAA;AAEjC;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,MAAM,UAAU,uBAAuB,CACrC,GAA6B,EAC7B,QAAqD,EACrD,QAAiC;IAEjC,MAAM,+BAA+B,GACnC,OAAO,oBAAoB,KAAK,UAAU,CAAA;IAC5C,IAAI,WAAW,GAAgC,IAAI,CAAA;IAEnD,KAAK,CAAC,YAAY,CAAC,GAAG,EAAE;QACtB,MAAM,CAAC,GAAG,GAAG,EAAE,CAAA;QACf,IAAI,QAAQ,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC,+BAA+B,EAAE,CAAC;YACzD,KAAK,CAAC,SAAS,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAA;YACjC,OAAM;QACR,CAAC;QAED,WAAW,GAAG,IAAI,oBAAoB,CACpC,CAAC,OAAO,EAAE,EAAE;YACV,QAAQ,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAA;QACzB,CAAC,EACD,EAAE,UAAU,EAAE,OAAO,EAAE,CACxB,CAAA;QAED,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,CAAA;QAEtB,KAAK,CAAC,SAAS,CAAC,GAAG,EAAE;YACnB,WAAW,EAAE,UAAU,EAAE,CAAA;YACzB,QAAQ,EAAE,CAAA;QACZ,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;IAEF,OAAO,GAAG,EAAE,CAAC,WAAW,CAAA;AAC1B,CAAC"}

package.json

 {
   "name": "@tanstack/solid-router",
-  "version": "1.170.24",
+  "version": "1.170.25",
   "description": "Modern and scalable routing for Solid applications",
@@ -94,3 +94,3 @@ "author": "Tanner Linsley",
     "@tanstack/history": "1.162.1",
-    "@tanstack/router-core": "1.171.21"
+    "@tanstack/router-core": "1.171.22"
   },
@@ -97,0 +97,0 @@ "devDependencies": {

src/CatchBoundary.tsx

 import * as Solid from 'solid-js'
 import { Dynamic } from 'solid-js/web'
+import { renderInNonRouteComponentContext } from './nonRouteComponentContext'
 import type { ErrorRouteComponent } from './route'
@@ -22,3 +23,14 @@
 
-        return (
+        return process.env.NODE_ENV !== 'production' ? (
+          renderInNonRouteComponentContext(
+            () => (
+              <Dynamic
+                component={props.errorComponent ?? ErrorComponent}
+                error={error}
+                reset={reset}
+              />
+            ),
+            'errorComponent',
+          )
+        ) : (
           <Dynamic
@@ -25,0 +37,0 @@ component={props.errorComponent ?? ErrorComponent}

src/link.tsx

@@ -34,3 +34,7 @@ import * as Solid from 'solid-js'
 
-const timeoutMap = new WeakMap<EventTarget, ReturnType<typeof setTimeout>>()
+const timeoutMap = new WeakMap<object, ReturnType<typeof setTimeout>>()
+const cancelPreload = (eventTarget: object) => {
+  clearTimeout(timeoutMap.get(eventTarget))
+  timeoutMap.delete(eventTarget)
+}
 
@@ -47,3 +51,2 @@ export function useLinkProps<
   const router = useRouter()
-  const [isTransitioning, setIsTransitioning] = Solid.createSignal(false)
   const shouldHydrateHash = !isServer && !!router.options.ssr
@@ -195,3 +198,3 @@ const hasHydrated = useHydrated()
   const preload = Solid.createMemo(() => {
-    if (options.reloadDocument || externalLink()) {
+    if (options.reloadDocument || externalLink() || local.disabled) {
       return false
@@ -261,19 +264,42 @@ }
 
-  const preloadViewportIoCallback = (
-    entry: IntersectionObserverEntry | undefined,
+  const [ref, setRef] = Solid.createSignal<Element | null>(null)
+
+  const enqueuePreload = (
+    e?: MouseEvent | FocusEvent | IntersectionObserverEntry,
   ) => {
-    if (entry?.isIntersecting) {
+    if (!e) {
+      cancelPreload(ref)
+      return
+    }
+
+    if (
+      !(
+        (e as IntersectionObserverEntry).isIntersecting ??
+        preload() === 'intent'
+      )
+    ) {
+      if ((e as IntersectionObserverEntry).isIntersecting === false) {
+        cancelPreload(ref)
+      }
+      return
+    }
+
+    if (!preloadDelay()) {
       doPreload()
+      return
     }
+
+    if (!timeoutMap.has(ref)) {
+      timeoutMap.set(
+        ref,
+        setTimeout(() => {
+          timeoutMap.delete(ref)
+          doPreload()
+        }, preloadDelay()),
+      )
+    }
   }
 
-  const [ref, setRef] = Solid.createSignal<Element | null>(null)
+  useIntersectionObserver(ref, enqueuePreload, () => preload() !== 'viewport')
 
-  useIntersectionObserver(
-    ref,
-    preloadViewportIoCallback,
-    { rootMargin: '100px' },
-    !!local.disabled || preload() !== 'viewport',
-  )
-
   Solid.createEffect(() => {
@@ -283,3 +309,3 @@ if (hasRenderFetched) {
     }
-    if (!local.disabled && preload() === 'render') {
+    if (preload() === 'render') {
       doPreload()
@@ -332,9 +358,2 @@ hasRenderFetched = true
 
-      setIsTransitioning(true)
-
-      const unsub = router.subscribe('onResolved', () => {
-        unsub()
-        setIsTransitioning(false)
-      })
-
       // All is well? Navigate!
@@ -354,36 +373,10 @@ // N.B. we don't call `router.commitLocation(next) here because we want to run `validateSearch` before committing
 
-  const enqueueIntentPreload = (e: MouseEvent | FocusEvent) => {
-    if (local.disabled || preload() !== 'intent') return
-
-    if (!preloadDelay()) {
-      doPreload()
-      return
-    }
-
-    const eventTarget = e.currentTarget || e.target
-
-    if (!eventTarget || timeoutMap.has(eventTarget)) return
-
-    timeoutMap.set(
-      eventTarget,
-      setTimeout(() => {
-        timeoutMap.delete(eventTarget)
-        doPreload()
-      }, preloadDelay()),
-    )
-  }
-
-  const handleTouchStart = (_: TouchEvent) => {
-    if (local.disabled || preload() !== 'intent') return
+  const handleTouchStart = () => {
+    if (preload() !== 'intent') return
     doPreload()
   }
 
-  const handleLeave = (e: MouseEvent | FocusEvent) => {
-    if (local.disabled) return
-    const eventTarget = e.currentTarget || e.target
-
-    if (eventTarget) {
-      const id = timeoutMap.get(eventTarget)
-      clearTimeout(id)
-      timeoutMap.delete(eventTarget)
+  const handleLeave = () => {
+    if (preload() === 'intent') {
+      cancelPreload(ref)
     }
@@ -402,13 +395,10 @@ }
   const onBlur = createComposedHandler(() => local.onBlur, handleLeave)
-  const onFocus = createComposedHandler(
-    () => local.onFocus,
-    enqueueIntentPreload,
-  )
+  const onFocus = createComposedHandler(() => local.onFocus, enqueuePreload)
   const onMouseEnter = createComposedHandler(
     () => local.onMouseEnter,
-    enqueueIntentPreload,
+    enqueuePreload,
   )
   const onMouseOver = createComposedHandler(
     () => local.onMouseOver,
-    enqueueIntentPreload,
+    enqueuePreload,
   )
@@ -446,3 +436,2 @@ const onMouseLeave = createComposedHandler(
       ...(local.disabled && STATIC_DISABLED_PROPS),
-      ...(isTransitioning() && STATIC_TRANSITIONING_ATTRIBUTES),
     }
@@ -502,5 +491,2 @@
 }
-const STATIC_TRANSITIONING_ATTRIBUTES = {
-  'data-transitioning': 'transitioning',
-}
 
@@ -582,6 +568,3 @@ /** Call a JSX.EventHandlerUnion with the event. */
     | Solid.JSX.Element
-    | ((state: {
-        isActive: boolean
-        isTransitioning: boolean
-      }) => Solid.JSX.Element)
+    | ((state: { isActive: boolean }) => Solid.JSX.Element)
 }
@@ -669,5 +652,2 @@
         },
-        get isTransitioning() {
-          return (linkProps as any)['data-transitioning'] === 'transitioning'
-        },
       })
@@ -674,0 +654,0 @@ }

src/Match.tsx

@@ -13,2 +13,6 @@ import * as Solid from 'solid-js'
 import { ClientOnly } from './ClientOnly'
+import {
+  nonRouteComponentContext,
+  renderInNonRouteComponentContext,
+} from './nonRouteComponentContext'
 import type {
@@ -80,3 +84,11 @@ AnyRoute,
       when={currentMatch().status !== 'pending'}
-      fallback={<Dynamic component={resolvePendingComponent()} />}
+      fallback={(() => {
+        if (process.env.NODE_ENV !== 'production') {
+          return renderInNonRouteComponentContext(
+            () => <Dynamic component={resolvePendingComponent()} />,
+            'pendingComponent',
+          )
+        }
+        return <Dynamic component={resolvePendingComponent()} />
+      })()}
     >
@@ -91,9 +103,16 @@ <MatchInner />
         <Solid.Suspense
-          fallback={
+          fallback={(() => {
             // Data-only SSR renders the inner fallback on the server, so
             // avoid adding an extra suspense fallback on the client.
-            shouldSkipSuspenseFallback() ? undefined : (
-              <Dynamic component={resolvePendingComponent()} />
-            )
-          }
+            if (shouldSkipSuspenseFallback()) {
+              return undefined
+            }
+            if (process.env.NODE_ENV !== 'production') {
+              return renderInNonRouteComponentContext(
+                () => <Dynamic component={resolvePendingComponent()} />,
+                'pendingComponent',
+              )
+            }
+            return <Dynamic component={resolvePendingComponent()} />
+          })()}
         >
@@ -132,3 +151,13 @@ <Dynamic
 
-                return (
+                return process.env.NODE_ENV !== 'production' ? (
+                  renderInNonRouteComponentContext(
+                    () => (
+                      <Dynamic
+                        component={routeNotFoundComponent()}
+                        {...notFoundError}
+                      />
+                    ),
+                    'notFoundComponent',
+                  )
+                ) : (
                   <Dynamic
@@ -144,3 +173,13 @@ component={routeNotFoundComponent()}
                   <ClientOnly
-                    fallback={<Dynamic component={resolvePendingComponent()} />}
+                    fallback={(() => {
+                      if (process.env.NODE_ENV !== 'production') {
+                        return renderInNonRouteComponentContext(
+                          () => (
+                            <Dynamic component={resolvePendingComponent()} />
+                          ),
+                          'pendingComponent',
+                        )
+                      }
+                      return <Dynamic component={resolvePendingComponent()} />
+                    })()}
                   >
@@ -212,3 +251,15 @@ <MatchContent />
 
-            return (
+            return process.env.NODE_ENV !== 'production' ? (
+              renderInNonRouteComponentContext(
+                () => (
+                  <RouteErrorComponent
+                    error={currentMatch().error}
+                    info={{
+                      componentStack: '',
+                    }}
+                  />
+                ),
+                'errorComponent',
+              )
+            ) : (
               <RouteErrorComponent
@@ -234,2 +285,11 @@ error={currentMatch().error}
 export const Outlet = () => {
+  if (process.env.NODE_ENV !== 'production') {
+    const nonRouteComponent = Solid.useContext(nonRouteComponentContext!)
+    if (nonRouteComponent) {
+      console.warn(
+        `Warning: An <Outlet /> was rendered inside a ${nonRouteComponent}. <Outlet /> should only be rendered inside a route component.`,
+      )
+    }
+  }
+
   const router = useRouter()
@@ -266,5 +326,17 @@ const nearestParentMatch = Solid.useContext(nearestMatchContext)
             <Solid.Suspense
-              fallback={
-                <Dynamic component={router.options.defaultPendingComponent} />
-              }
+              fallback={(() => {
+                if (process.env.NODE_ENV !== 'production') {
+                  return renderInNonRouteComponentContext(
+                    () => (
+                      <Dynamic
+                        component={router.options.defaultPendingComponent}
+                      />
+                    ),
+                    'pendingComponent',
+                  )
+                }
+                return (
+                  <Dynamic component={router.options.defaultPendingComponent} />
+                )
+              })()}
             >
@@ -271,0 +343,0 @@ <Match routeId={childRouteId()!} />

src/Matches.tsx

@@ -10,2 +10,3 @@ import * as Solid from 'solid-js'
 import { Match } from './Match'
+import { renderInNonRouteComponentContext } from './nonRouteComponentContext'
 import type {
@@ -55,3 +56,15 @@ AnyRoute,
       <ResolvedSuspense
-        fallback={PendingComponent ? <PendingComponent /> : null}
+        fallback={
+          PendingComponent
+            ? (() => {
+                if (process.env.NODE_ENV !== 'production') {
+                  return renderInNonRouteComponentContext(
+                    () => <PendingComponent />,
+                    'pendingComponent',
+                  )
+                }
+                return <PendingComponent />
+              })()
+            : null
+        }
       >
@@ -58,0 +71,0 @@ <Transitioner />

src/renderRouteNotFound.tsx

 import { DefaultGlobalNotFound } from './not-found'
+import { renderInNonRouteComponentContext } from './nonRouteComponentContext'
 import type { AnyRoute, AnyRouter } from '@tanstack/router-core'
@@ -17,2 +18,26 @@
 ) {
+  if (process.env.NODE_ENV !== 'production') {
+    if (!route.options.notFoundComponent) {
+      if (router.options.defaultNotFoundComponent) {
+        const DefaultNotFoundComponent = router.options.defaultNotFoundComponent
+        return renderInNonRouteComponentContext(
+          () => <DefaultNotFoundComponent {...data} />,
+          'notFoundComponent',
+        )
+      }
+
+      console.warn(
+        `Warning: A notFoundError was encountered on the route with ID "${route.id}", but a notFoundComponent option was not configured, nor was a router level defaultNotFoundComponent configured. Consider configuring at least one of these to avoid TanStack Router's overly generic defaultNotFoundComponent (<p>Not Found</p>)`,
+      )
+
+      return <DefaultGlobalNotFound />
+    }
+
+    const NotFoundComponent = route.options.notFoundComponent
+    return renderInNonRouteComponentContext(
+      () => <NotFoundComponent {...data} />,
+      'notFoundComponent',
+    )
+  }
+
   if (!route.options.notFoundComponent) {
@@ -23,10 +48,2 @@ if (router.options.defaultNotFoundComponent) {
 
-    if (process.env.NODE_ENV !== 'production') {
-      if (!route.options.notFoundComponent) {
-        console.warn(
-          `Warning: A notFoundError was encountered on the route with ID "${route.id}", but a notFoundComponent option was not configured, nor was a router level defaultNotFoundComponent configured. Consider configuring at least one of these to avoid TanStack Router's overly generic defaultNotFoundComponent (<p>Not Found</p>)`,
-        )
-      }
-    }
-
     return <DefaultGlobalNotFound />
@@ -33,0 +50,0 @@ }

src/utils.ts

@@ -11,5 +11,4 @@ import * as Solid from 'solid-js'
  * @param ref - The ref to observe
- * @param intersectionObserverOptions - The options to pass to the IntersectionObserver
+ * @param callback - The callback to call when the intersection changes
  * @param disabled - Whether observation is disabled
- * @param callback - The callback to call when the intersection changes
  * @returns The IntersectionObserver instance
@@ -23,3 +22,2 @@ * @example
  *  (entry) => { doSomething(entry) },
- *  { rootMargin: '10px' },
  *  false
@@ -32,5 +30,4 @@ * )
   ref: Solid.Accessor<T | null>,
-  callback: (entry: IntersectionObserverEntry | undefined) => void,
-  intersectionObserverOptions: IntersectionObserverInit = {},
-  disabled?: boolean,
+  callback: (entry?: IntersectionObserverEntry) => void,
+  disabled: Solid.Accessor<boolean>,
 ): Solid.Accessor<IntersectionObserver | null> {
@@ -43,9 +40,13 @@ const isIntersectionObserverAvailable =
     const r = ref()
-    if (!r || !isIntersectionObserverAvailable || disabled) {
+    if (disabled() || !r || !isIntersectionObserverAvailable) {
+      Solid.onCleanup(() => callback())
       return
     }
 
-    observerRef = new IntersectionObserver(([entry]) => {
-      callback(entry)
-    }, intersectionObserverOptions)
+    observerRef = new IntersectionObserver(
+      (entries) => {
+        callback(entries.pop())
+      },
+      { rootMargin: '100px' },
+    )
 
@@ -56,2 +57,3 @@ observerRef.observe(r)
       observerRef?.disconnect()
+      callback()
     })
@@ -58,0 +60,0 @@ })

No alert changes

Improved metrics

Total package byte prevSize

1177883

2.44%

Number of package files

509

2%

Lines of code

14750

1.84%

Worsened metrics

Number of low supply chain risk alerts

93

75.47%

Dependency changes

• + Added

  @tanstack/router-core@1.171.22
  (transitive)

• - Removed

  @tanstack/router-core@1.171.21
  (transitive)

• Updated

  @tanstack/router-core@1.171.22