@tanstack/solid-router 1.166.6 → 2.0.0-alpha.1

package/dist/esm/RouterProvider.js.map

@@ -1 +1 @@
-{"version":3,"file":"RouterProvider.js","sources":["../../src/RouterProvider.tsx"],"sourcesContent":["import { routerContext } from './routerContext'\nimport { SafeFragment } from './SafeFragment'\nimport { Matches } from './Matches'\nimport type {\n  AnyRouter,\n  RegisteredRouter,\n  RouterOptions,\n} from '@tanstack/router-core'\nimport type * as Solid from 'solid-js'\n\nexport function RouterContextProvider<\n  TRouter extends AnyRouter = RegisteredRouter,\n  TDehydrated extends Record<string, any> = Record<string, any>,\n>({\n  router,\n  children,\n  ...rest\n}: RouterProps<TRouter, TDehydrated> & {\n  children: () => Solid.JSX.Element\n}) {\n  // Allow the router to update options on the router instance\n  router.update({\n    ...router.options,\n    ...rest,\n    context: {\n      ...router.options.context,\n      ...rest.context,\n    },\n  })\n\n  const OptionalWrapper = router.options.Wrap || SafeFragment\n\n  return (\n    <OptionalWrapper>\n      <routerContext.Provider value={router as AnyRouter}>\n        {children()}\n      </routerContext.Provider>\n    </OptionalWrapper>\n  )\n}\n\nexport function RouterProvider<\n  TRouter extends AnyRouter = RegisteredRouter,\n  TDehydrated extends Record<string, any> = Record<string, any>,\n>({ router, ...rest }: RouterProps<TRouter, TDehydrated>) {\n  return (\n    <RouterContextProvider router={router} {...rest}>\n      {() => <Matches />}\n    </RouterContextProvider>\n  )\n}\n\nexport type RouterProps<\n  TRouter extends AnyRouter = RegisteredRouter,\n  TDehydrated extends Record<string, any> = Record<string, any>,\n> = Omit<\n  RouterOptions<\n    TRouter['routeTree'],\n    NonNullable<TRouter['options']['trailingSlash']>,\n    false,\n    TRouter['history'],\n    TDehydrated\n  >,\n  'context'\n> & {\n  router: TRouter\n  context?: Partial<\n    RouterOptions<\n      TRouter['routeTree'],\n      NonNullable<TRouter['options']['trailingSlash']>,\n      false,\n      TRouter['history'],\n      TDehydrated\n    >['context']\n  >\n}\n"],"names":["RouterContextProvider","router","children","rest","update","options","context","OptionalWrapper","Wrap","SafeFragment","_$createComponent","routerContext","Provider","value","RouterProvider","_$mergeProps","Matches"],"mappings":";;;;AAUO,SAASA,sBAGd;AAAA,EACAC;AAAAA,EACAC;AAAAA,EACA,GAAGC;AAGL,GAAG;AAEDF,SAAOG,OAAO;AAAA,IACZ,GAAGH,OAAOI;AAAAA,IACV,GAAGF;AAAAA,IACHG,SAAS;AAAA,MACP,GAAGL,OAAOI,QAAQC;AAAAA,MAClB,GAAGH,KAAKG;AAAAA,IAAAA;AAAAA,EACV,CACD;AAED,QAAMC,kBAAkBN,OAAOI,QAAQG,QAAQC;AAE/C,SAAAC,gBACGH,iBAAe;AAAA,IAAA,IAAAL,WAAA;AAAA,aAAAQ,gBACbC,cAAcC,UAAQ;AAAA,QAACC,OAAOZ;AAAAA,QAAmB,IAAAC,WAAA;AAAA,iBAC/CA,SAAAA;AAAAA,QAAU;AAAA,MAAA,CAAA;AAAA,IAAA;AAAA,EAAA,CAAA;AAInB;AAEO,SAASY,eAGd;AAAA,EAAEb;AAAAA,EAAQ,GAAGE;AAAwC,GAAG;AACxD,SAAAO,gBACGV,uBAAqBe,WAAA;AAAA,IAACd;AAAAA,EAAAA,GAAoBE,MAAI;AAAA,IAAAD,UAC5CA,MAAAQ,gBAAOM,SAAO,CAAA,CAAA;AAAA,EAAA,CAAG,CAAA;AAGxB;"}
+{"version":3,"file":"RouterProvider.js","sources":["../../src/RouterProvider.tsx"],"sourcesContent":["import { routerContext } from './routerContext'\nimport { SafeFragment } from './SafeFragment'\nimport { Matches } from './Matches'\nimport type {\n  AnyRouter,\n  RegisteredRouter,\n  RouterOptions,\n} from '@tanstack/router-core'\nimport type * as Solid from 'solid-js'\n\nconst RouterContext = routerContext as unknown as Solid.Component<{\n  value: any\n  children: any\n}>\n\nexport function RouterContextProvider<\n  TRouter extends AnyRouter = RegisteredRouter,\n  TDehydrated extends Record<string, any> = Record<string, any>,\n>({\n  router,\n  children,\n  ...rest\n}: RouterProps<TRouter, TDehydrated> & {\n  children: () => Solid.JSX.Element\n}) {\n  // Allow the router to update options on the router instance\n  router.update({\n    ...router.options,\n    ...rest,\n    context: {\n      ...router.options.context,\n      ...rest.context,\n    },\n  } as any)\n\n  const OptionalWrapper = router.options.Wrap || SafeFragment\n\n  return (\n    <OptionalWrapper>\n      <RouterContext value={router as AnyRouter}>{children()}</RouterContext>\n    </OptionalWrapper>\n  )\n}\n\nexport function RouterProvider<\n  TRouter extends AnyRouter = RegisteredRouter,\n  TDehydrated extends Record<string, any> = Record<string, any>,\n>({ router, ...rest }: RouterProps<TRouter, TDehydrated>) {\n  return (\n    <RouterContextProvider router={router} {...rest}>\n      {() => <Matches />}\n    </RouterContextProvider>\n  )\n}\n\nexport type RouterProps<\n  TRouter extends AnyRouter = RegisteredRouter,\n  TDehydrated extends Record<string, any> = Record<string, any>,\n> = Omit<\n  RouterOptions<\n    TRouter['routeTree'],\n    NonNullable<TRouter['options']['trailingSlash']>,\n    false,\n    TRouter['history'],\n    TDehydrated\n  >,\n  'context'\n> & {\n  router: TRouter\n  context?: Partial<\n    RouterOptions<\n      TRouter['routeTree'],\n      NonNullable<TRouter['options']['trailingSlash']>,\n      false,\n      TRouter['history'],\n      TDehydrated\n    >['context']\n  >\n}\n"],"names":["RouterContext","routerContext","RouterContextProvider","router","children","rest","update","options","context","OptionalWrapper","Wrap","SafeFragment","_$createComponent","value","RouterProvider","_$mergeProps","Matches"],"mappings":";;;;AAUA,MAAMA,gBAAgBC;AAKf,SAASC,sBAGd;AAAA,EACAC;AAAAA,EACAC;AAAAA,EACA,GAAGC;AAGL,GAAG;AAEDF,SAAOG,OAAO;AAAA,IACZ,GAAGH,OAAOI;AAAAA,IACV,GAAGF;AAAAA,IACHG,SAAS;AAAA,MACP,GAAGL,OAAOI,QAAQC;AAAAA,MAClB,GAAGH,KAAKG;AAAAA,IAAAA;AAAAA,EACV,CACM;AAER,QAAMC,kBAAkBN,OAAOI,QAAQG,QAAQC;AAE/C,SAAAC,gBACGH,iBAAe;AAAA,IAAA,IAAAL,WAAA;AAAA,aAAAQ,gBACbZ,eAAa;AAAA,QAACa,OAAOV;AAAAA,QAAmB,IAAAC,WAAA;AAAA,iBAAGA,SAAAA;AAAAA,QAAU;AAAA,MAAA,CAAA;AAAA,IAAA;AAAA,EAAA,CAAA;AAG5D;AAEO,SAASU,eAGd;AAAA,EAAEX;AAAAA,EAAQ,GAAGE;AAAwC,GAAG;AACxD,SAAAO,gBACGV,uBAAqBa,WAAA;AAAA,IAACZ;AAAAA,EAAAA,GAAoBE,MAAI;AAAA,IAAAD,UAC5CA,MAAAQ,gBAAOI,SAAO,CAAA,CAAA;AAAA,EAAA,CAAG,CAAA;AAGxB;"}

package/dist/esm/SafeFragment.js

@@ -1,4 +1,4 @@
-import { memo } from "solid-js/web";
+import { memo } from "@solidjs/web";
 function SafeFragment(props) {
   return memo(() => props.children);
 }

package/dist/esm/ScriptOnce.js

@@ -1,4 +1,4 @@
-import { template, effect, setAttribute } from "solid-js/web";
+import { template, effect, setAttribute } from "@solidjs/web";
 import { isServer } from "@tanstack/router-core/isServer";
 import { useRouter } from "./useRouter.js";
 var _tmpl$ = /* @__PURE__ */ template(`<script class=$tsr>`);
@@ -12,7 +12,9 @@ function ScriptOnce({
   return (() => {
     var _el$ = _tmpl$();
     _el$.innerHTML = children + ";document.currentScript.remove()";
-    effect(() => setAttribute(_el$, "nonce", router.options.ssr?.nonce));
+    effect(() => router.options.ssr?.nonce, (_v$) => {
+      setAttribute(_el$, "nonce", _v$);
+    });
     return _el$;
   })();
 }

package/dist/esm/ScriptOnce.js.map

@@ -1 +1 @@
-{"version":3,"file":"ScriptOnce.js","sources":["../../src/ScriptOnce.tsx"],"sourcesContent":["import { isServer } from '@tanstack/router-core/isServer'\nimport { useRouter } from './useRouter'\n\nexport function ScriptOnce({\n  children,\n}: {\n  children: string\n  log?: boolean\n  sync?: boolean\n}) {\n  const router = useRouter()\n  if (!(isServer ?? router.isServer)) {\n    return null\n  }\n  return (\n    <script\n      nonce={router.options.ssr?.nonce}\n      class=\"$tsr\"\n      innerHTML={children + ';document.currentScript.remove()'}\n    />\n  )\n}\n"],"names":["ScriptOnce","children","router","useRouter","isServer","_el$","_tmpl$","innerHTML","_$effect","_$setAttribute","options","ssr","nonce"],"mappings":";;;;AAGO,SAASA,WAAW;AAAA,EACzBC;AAKF,GAAG;AACD,QAAMC,SAASC,UAAAA;AACf,MAAI,EAAEC,YAAYF,OAAOE,WAAW;AAClC,WAAO;AAAA,EACT;AACA,UAAA,MAAA;AAAA,QAAAC,OAAAC,OAAAA;AAAAD,SAAAE,YAIeN,WAAW;AAAkCO,WAAA,MAAAC,aAAAJ,MAAA,SAFjDH,OAAOQ,QAAQC,KAAKC,KAAK,CAAA;AAAA,WAAAP;AAAAA,EAAA,GAAA;AAKtC;"}
+{"version":3,"file":"ScriptOnce.js","sources":["../../src/ScriptOnce.tsx"],"sourcesContent":["import { isServer } from '@tanstack/router-core/isServer'\nimport { useRouter } from './useRouter'\n\nexport function ScriptOnce({\n  children,\n}: {\n  children: string\n  log?: boolean\n  sync?: boolean\n}) {\n  const router = useRouter()\n  if (!(isServer ?? router.isServer)) {\n    return null\n  }\n  return (\n    <script\n      nonce={router.options.ssr?.nonce}\n      class=\"$tsr\"\n      innerHTML={children + ';document.currentScript.remove()'}\n    />\n  )\n}\n"],"names":["ScriptOnce","children","router","useRouter","isServer","_el$","_tmpl$","innerHTML","_$effect","options","ssr","nonce","_v$","_$setAttribute"],"mappings":";;;;AAGO,SAASA,WAAW;AAAA,EACzBC;AAKF,GAAG;AACD,QAAMC,SAASC,UAAAA;AACf,MAAI,EAAEC,YAAYF,OAAOE,WAAW;AAClC,WAAO;AAAA,EACT;AACA,UAAA,MAAA;AAAA,QAAAC,OAAAC,OAAAA;AAAAD,SAAAE,YAIeN,WAAW;AAAkCO,WAAA,MAFjDN,OAAOO,QAAQC,KAAKC,OAAKC,CAAAA,QAAA;AAAAC,mBAAAR,MAAA,SAAAO,GAAA;AAAA,IAAA,CAAA;AAAA,WAAAP;AAAAA,EAAA,GAAA;AAKtC;"}

package/dist/esm/Scripts.js

@@ -1,4 +1,4 @@
-import { memo, createComponent } from "solid-js/web";
+import { createComponent, NoHydration } from "@solidjs/web";
 import { Asset } from "./Asset.js";
 import { useRouterState } from "./useRouterState.js";
 import { useRouter } from "./useRouter.js";
@@ -48,7 +48,11 @@ const Scripts = () => {
   if (serverBufferedScript) {
     allScripts.unshift(serverBufferedScript);
   }
-  return memo(() => allScripts.map((asset, i) => createComponent(Asset, asset)));
+  return createComponent(NoHydration, {
+    get children() {
+      return allScripts.map((asset, _i) => createComponent(Asset, asset));
+    }
+  });
 };
 export {
   Scripts

package/dist/esm/Scripts.js.map

@@ -1 +1 @@
-{"version":3,"file":"Scripts.js","sources":["../../src/Scripts.tsx"],"sourcesContent":["import { Asset } from './Asset'\nimport { useRouterState } from './useRouterState'\nimport { useRouter } from './useRouter'\nimport type { RouterManagedTag } from '@tanstack/router-core'\n\nexport const Scripts = () => {\n  const router = useRouter()\n  const nonce = router.options.ssr?.nonce\n  const assetScripts = useRouterState({\n    select: (state) => {\n      const assetScripts: Array<RouterManagedTag> = []\n      const manifest = router.ssr?.manifest\n\n      if (!manifest) {\n        return []\n      }\n\n      state.matches\n        .map((match) => router.looseRoutesById[match.routeId]!)\n        .forEach((route) =>\n          manifest.routes[route.id]?.assets\n            ?.filter((d) => d.tag === 'script')\n            .forEach((asset) => {\n              assetScripts.push({\n                tag: 'script',\n                attrs: { ...asset.attrs, nonce },\n                children: asset.children,\n              } as any)\n            }),\n        )\n\n      return assetScripts\n    },\n  })\n\n  const scripts = useRouterState({\n    select: (state) => ({\n      scripts: (\n        state.matches\n          .map((match) => match.scripts!)\n          .flat(1)\n          .filter(Boolean) as Array<RouterManagedTag>\n      ).map(({ children, ...script }) => ({\n        tag: 'script',\n        attrs: {\n          ...script,\n          nonce,\n        },\n        children,\n      })),\n    }),\n  })\n\n  let serverBufferedScript: RouterManagedTag | undefined = undefined\n\n  if (router.serverSsr) {\n    serverBufferedScript = router.serverSsr.takeBufferedScripts()\n  }\n\n  const allScripts = [\n    ...scripts().scripts,\n    ...assetScripts(),\n  ] as Array<RouterManagedTag>\n\n  if (serverBufferedScript) {\n    allScripts.unshift(serverBufferedScript)\n  }\n\n  return (\n    <>\n      {allScripts.map((asset, i) => (\n        <Asset {...asset} />\n      ))}\n    </>\n  )\n}\n"],"names":["Scripts","router","useRouter","nonce","options","ssr","assetScripts","useRouterState","select","state","manifest","matches","map","match","looseRoutesById","routeId","forEach","route","routes","id","assets","filter","d","tag","asset","push","attrs","children","scripts","flat","Boolean","script","serverBufferedScript","undefined","serverSsr","takeBufferedScripts","allScripts","unshift","_$memo","i","_$createComponent","Asset"],"mappings":";;;;AAKO,MAAMA,UAAUA,MAAM;AAC3B,QAAMC,SAASC,UAAAA;AACf,QAAMC,QAAQF,OAAOG,QAAQC,KAAKF;AAClC,QAAMG,eAAeC,eAAe;AAAA,IAClCC,QAASC,CAAAA,UAAU;AACjB,YAAMH,gBAAwC,CAAA;AAC9C,YAAMI,WAAWT,OAAOI,KAAKK;AAE7B,UAAI,CAACA,UAAU;AACb,eAAO,CAAA;AAAA,MACT;AAEAD,YAAME,QACHC,IAAKC,CAAAA,UAAUZ,OAAOa,gBAAgBD,MAAME,OAAO,CAAE,EACrDC,QAASC,CAAAA,UACRP,SAASQ,OAAOD,MAAME,EAAE,GAAGC,QACvBC,OAAQC,CAAAA,MAAMA,EAAEC,QAAQ,QAAQ,EACjCP,QAASQ,CAAAA,UAAU;AAClBlB,sBAAamB,KAAK;AAAA,UAChBF,KAAK;AAAA,UACLG,OAAO;AAAA,YAAE,GAAGF,MAAME;AAAAA,YAAOvB;AAAAA,UAAAA;AAAAA,UACzBwB,UAAUH,MAAMG;AAAAA,QAAAA,CACV;AAAA,MACV,CAAC,CACL;AAEF,aAAOrB;AAAAA,IACT;AAAA,EAAA,CACD;AAED,QAAMsB,UAAUrB,eAAe;AAAA,IAC7BC,QAASC,CAAAA,WAAW;AAAA,MAClBmB,SACEnB,MAAME,QACHC,IAAKC,WAAUA,MAAMe,OAAQ,EAC7BC,KAAK,CAAC,EACNR,OAAOS,OAAO,EACjBlB,IAAI,CAAC;AAAA,QAAEe;AAAAA,QAAU,GAAGI;AAAAA,MAAAA,OAAc;AAAA,QAClCR,KAAK;AAAA,QACLG,OAAO;AAAA,UACL,GAAGK;AAAAA,UACH5B;AAAAA,QAAAA;AAAAA,QAEFwB;AAAAA,MAAAA,EACA;AAAA,IAAA;AAAA,EACJ,CACD;AAED,MAAIK,uBAAqDC;AAEzD,MAAIhC,OAAOiC,WAAW;AACpBF,2BAAuB/B,OAAOiC,UAAUC,oBAAAA;AAAAA,EAC1C;AAEA,QAAMC,aAAa,CACjB,GAAGR,QAAAA,EAAUA,SACb,GAAGtB,cAAc;AAGnB,MAAI0B,sBAAsB;AACxBI,eAAWC,QAAQL,oBAAoB;AAAA,EACzC;AAEA,SAAAM,KAAA,MAEKF,WAAWxB,IAAI,CAACY,OAAOe,MAACC,gBACtBC,OAAUjB,KAAK,CACjB,CAAC;AAGR;"}
+{"version":3,"file":"Scripts.js","sources":["../../src/Scripts.tsx"],"sourcesContent":["import { NoHydration } from '@solidjs/web'\nimport { Asset } from './Asset'\nimport { useRouterState } from './useRouterState'\nimport { useRouter } from './useRouter'\nimport type { RouterManagedTag } from '@tanstack/router-core'\n\nexport const Scripts = () => {\n  const router = useRouter()\n  const nonce = router.options.ssr?.nonce\n  const assetScripts = useRouterState({\n    select: (state) => {\n      const assetScripts: Array<RouterManagedTag> = []\n      const manifest = router.ssr?.manifest\n\n      if (!manifest) {\n        return []\n      }\n\n      state.matches\n        .map((match) => router.looseRoutesById[match.routeId]!)\n        .forEach((route) =>\n          manifest.routes[route.id]?.assets\n            ?.filter((d) => d.tag === 'script')\n            .forEach((asset) => {\n              assetScripts.push({\n                tag: 'script',\n                attrs: { ...asset.attrs, nonce },\n                children: asset.children,\n              } as any)\n            }),\n        )\n\n      return assetScripts\n    },\n  })\n\n  const scripts = useRouterState({\n    select: (state) => ({\n      scripts: (\n        state.matches\n          .map((match) => match.scripts!)\n          .flat(1)\n          .filter(Boolean) as Array<RouterManagedTag>\n      ).map(({ children, ...script }) => ({\n        tag: 'script',\n        attrs: {\n          ...script,\n          nonce,\n        },\n        children,\n      })),\n    }),\n  })\n\n  let serverBufferedScript: RouterManagedTag | undefined = undefined\n\n  if (router.serverSsr) {\n    serverBufferedScript = router.serverSsr.takeBufferedScripts()\n  }\n\n  const allScripts = [\n    ...scripts().scripts,\n    ...assetScripts(),\n  ] as Array<RouterManagedTag>\n\n  if (serverBufferedScript) {\n    allScripts.unshift(serverBufferedScript)\n  }\n\n  return (\n    <NoHydration>\n      {allScripts.map((asset, _i) => (\n        <Asset {...asset} />\n      ))}\n    </NoHydration>\n  )\n}\n"],"names":["Scripts","router","useRouter","nonce","options","ssr","assetScripts","useRouterState","select","state","manifest","matches","map","match","looseRoutesById","routeId","forEach","route","routes","id","assets","filter","d","tag","asset","push","attrs","children","scripts","flat","Boolean","script","serverBufferedScript","undefined","serverSsr","takeBufferedScripts","allScripts","unshift","_$createComponent","NoHydration","_i","Asset"],"mappings":";;;;AAMO,MAAMA,UAAUA,MAAM;AAC3B,QAAMC,SAASC,UAAAA;AACf,QAAMC,QAAQF,OAAOG,QAAQC,KAAKF;AAClC,QAAMG,eAAeC,eAAe;AAAA,IAClCC,QAASC,CAAAA,UAAU;AACjB,YAAMH,gBAAwC,CAAA;AAC9C,YAAMI,WAAWT,OAAOI,KAAKK;AAE7B,UAAI,CAACA,UAAU;AACb,eAAO,CAAA;AAAA,MACT;AAEAD,YAAME,QACHC,IAAKC,CAAAA,UAAUZ,OAAOa,gBAAgBD,MAAME,OAAO,CAAE,EACrDC,QAASC,CAAAA,UACRP,SAASQ,OAAOD,MAAME,EAAE,GAAGC,QACvBC,OAAQC,CAAAA,MAAMA,EAAEC,QAAQ,QAAQ,EACjCP,QAASQ,CAAAA,UAAU;AAClBlB,sBAAamB,KAAK;AAAA,UAChBF,KAAK;AAAA,UACLG,OAAO;AAAA,YAAE,GAAGF,MAAME;AAAAA,YAAOvB;AAAAA,UAAAA;AAAAA,UACzBwB,UAAUH,MAAMG;AAAAA,QAAAA,CACV;AAAA,MACV,CAAC,CACL;AAEF,aAAOrB;AAAAA,IACT;AAAA,EAAA,CACD;AAED,QAAMsB,UAAUrB,eAAe;AAAA,IAC7BC,QAASC,CAAAA,WAAW;AAAA,MAClBmB,SACEnB,MAAME,QACHC,IAAKC,WAAUA,MAAMe,OAAQ,EAC7BC,KAAK,CAAC,EACNR,OAAOS,OAAO,EACjBlB,IAAI,CAAC;AAAA,QAAEe;AAAAA,QAAU,GAAGI;AAAAA,MAAAA,OAAc;AAAA,QAClCR,KAAK;AAAA,QACLG,OAAO;AAAA,UACL,GAAGK;AAAAA,UACH5B;AAAAA,QAAAA;AAAAA,QAEFwB;AAAAA,MAAAA,EACA;AAAA,IAAA;AAAA,EACJ,CACD;AAED,MAAIK,uBAAqDC;AAEzD,MAAIhC,OAAOiC,WAAW;AACpBF,2BAAuB/B,OAAOiC,UAAUC,oBAAAA;AAAAA,EAC1C;AAEA,QAAMC,aAAa,CACjB,GAAGR,QAAAA,EAAUA,SACb,GAAGtB,cAAc;AAGnB,MAAI0B,sBAAsB;AACxBI,eAAWC,QAAQL,oBAAoB;AAAA,EACzC;AAEA,SAAAM,gBACGC,aAAW;AAAA,IAAA,IAAAZ,WAAA;AAAA,aACTS,WAAWxB,IAAI,CAACY,OAAOgB,OAAEF,gBACvBG,OAAUjB,KAAK,CACjB;AAAA,IAAC;AAAA,EAAA,CAAA;AAGR;"}

package/dist/esm/Transitioner.js

@@ -1,6 +1,5 @@
 import * as Solid from "solid-js";
 import { trimPathRight, getLocationChangeInfo, handleHashScroll } from "@tanstack/router-core";
-import { isServer } from "@tanstack/router-core/isServer";
 import { useRouter } from "./useRouter.js";
 import { useRouterState } from "./useRouterState.js";
 import { usePrevious } from "./utils.js";
@@ -15,10 +14,7 @@ function Transitioner() {
       isLoading: isLoading2
     }) => isLoading2
   });
-  if (isServer ?? router.isServer) {
-    return null;
-  }
-  const [isSolidTransitioning, startSolidTransition] = Solid.useTransition();
+  const [isSolidTransitioning] = [() => false];
   const hasPendingMatches = useRouterState({
     select: (s) => s.matches.some((d) => d.status === "pending")
   });
@@ -28,12 +24,11 @@ function Transitioner() {
   const isPagePending = () => isLoading() || hasPendingMatches();
   const previousIsPagePending = usePrevious(isPagePending);
   router.startTransition = (fn) => {
-    Solid.startTransition(() => {
-      startSolidTransition(fn);
-    });
+    Solid.runWithOwner(null, fn);
   };
-  Solid.onMount(() => {
+  Solid.onSettled(() => {
     const unsub = router.history.subscribe(router.load);
+    router.updateLatestLocation();
     const nextLocation = router.buildLocation({
       to: router.latestLocation.pathname,
       search: true,
@@ -52,7 +47,7 @@ function Transitioner() {
       unsub();
     });
   });
-  Solid.createRenderEffect(() => {
+  Solid.createTrackedEffect(() => {
     Solid.untrack(() => {
       if (
         // if we are hydrating from SSR, loading is triggered in ssr-client
@@ -74,23 +69,23 @@ function Transitioner() {
       tryLoad();
     });
   });
-  Solid.createRenderEffect(Solid.on([previousIsLoading, isLoading], ([previousIsLoading2, isLoading2]) => {
+  Solid.createEffect(() => [previousIsLoading(), isLoading()], ([previousIsLoading2, isLoading2]) => {
     if (previousIsLoading2.previous && !isLoading2) {
       router.emit({
         type: "onLoad",
         ...getLocationChangeInfo(router.state)
       });
     }
-  }));
-  Solid.createComputed(Solid.on([isPagePending, previousIsPagePending], ([isPagePending2, previousIsPagePending2]) => {
+  });
+  Solid.createEffect(() => [isPagePending(), previousIsPagePending()], ([isPagePending2, previousIsPagePending2]) => {
     if (previousIsPagePending2.previous && !isPagePending2) {
       router.emit({
         type: "onBeforeRouteMount",
         ...getLocationChangeInfo(router.state)
       });
     }
-  }));
-  Solid.createRenderEffect(Solid.on([isAnyPending, previousIsAnyPending], ([isAnyPending2, previousIsAnyPending2]) => {
+  });
+  Solid.createEffect(() => [isAnyPending(), previousIsAnyPending()], ([isAnyPending2, previousIsAnyPending2]) => {
     if (previousIsAnyPending2.previous && !isAnyPending2) {
       const changeInfo = getLocationChangeInfo(router.state);
       router.emit({
@@ -106,7 +101,7 @@ function Transitioner() {
         handleHashScroll(router);
       }
     }
-  }));
+  });
   return null;
 }
 export {

package/dist/esm/Transitioner.js.map

@@ -1 +1 @@
-{"version":3,"file":"Transitioner.js","sources":["../../src/Transitioner.tsx"],"sourcesContent":["import * as Solid from 'solid-js'\nimport {\n  getLocationChangeInfo,\n  handleHashScroll,\n  trimPathRight,\n} from '@tanstack/router-core'\nimport { isServer } from '@tanstack/router-core/isServer'\nimport { useRouter } from './useRouter'\nimport { useRouterState } from './useRouterState'\nimport { usePrevious } from './utils'\n\nexport function Transitioner() {\n  const router = useRouter()\n  let mountLoadForRouter = { router, mounted: false }\n  const isLoading = useRouterState({\n    select: ({ isLoading }) => isLoading,\n  })\n\n  if (isServer ?? router.isServer) {\n    return null\n  }\n\n  const [isSolidTransitioning, startSolidTransition] = Solid.useTransition()\n\n  // Track pending state changes\n  const hasPendingMatches = useRouterState({\n    select: (s) => s.matches.some((d) => d.status === 'pending'),\n  })\n\n  const previousIsLoading = usePrevious(isLoading)\n\n  const isAnyPending = () =>\n    isLoading() || isSolidTransitioning() || hasPendingMatches()\n  const previousIsAnyPending = usePrevious(isAnyPending)\n\n  const isPagePending = () => isLoading() || hasPendingMatches()\n  const previousIsPagePending = usePrevious(isPagePending)\n\n  router.startTransition = (fn: () => void | Promise<void>) => {\n    Solid.startTransition(() => {\n      startSolidTransition(fn)\n    })\n  }\n\n  // Subscribe to location changes\n  // and try to load the new location\n  Solid.onMount(() => {\n    const unsub = router.history.subscribe(router.load)\n\n    const nextLocation = router.buildLocation({\n      to: router.latestLocation.pathname,\n      search: true,\n      params: true,\n      hash: true,\n      state: true,\n      _includeValidateSearch: true,\n    })\n\n    // Check if the current URL matches the canonical form.\n    // Compare publicHref (browser-facing URL) for consistency with\n    // the server-side redirect check in router.beforeLoad.\n    if (\n      trimPathRight(router.latestLocation.publicHref) !==\n      trimPathRight(nextLocation.publicHref)\n    ) {\n      router.commitLocation({ ...nextLocation, replace: true })\n    }\n\n    Solid.onCleanup(() => {\n      unsub()\n    })\n  })\n\n  // Try to load the initial location\n  Solid.createRenderEffect(() => {\n    Solid.untrack(() => {\n      if (\n        // if we are hydrating from SSR, loading is triggered in ssr-client\n        (typeof window !== 'undefined' && router.ssr) ||\n        (mountLoadForRouter.router === router && mountLoadForRouter.mounted)\n      ) {\n        return\n      }\n      mountLoadForRouter = { router, mounted: true }\n      const tryLoad = async () => {\n        try {\n          await router.load()\n        } catch (err) {\n          console.error(err)\n        }\n      }\n      tryLoad()\n    })\n  })\n\n  Solid.createRenderEffect(\n    Solid.on(\n      [previousIsLoading, isLoading],\n      ([previousIsLoading, isLoading]) => {\n        if (previousIsLoading.previous && !isLoading) {\n          router.emit({\n            type: 'onLoad',\n            ...getLocationChangeInfo(router.state),\n          })\n        }\n      },\n    ),\n  )\n\n  Solid.createComputed(\n    Solid.on(\n      [isPagePending, previousIsPagePending],\n      ([isPagePending, previousIsPagePending]) => {\n        // emit onBeforeRouteMount\n        if (previousIsPagePending.previous && !isPagePending) {\n          router.emit({\n            type: 'onBeforeRouteMount',\n            ...getLocationChangeInfo(router.state),\n          })\n        }\n      },\n    ),\n  )\n\n  Solid.createRenderEffect(\n    Solid.on(\n      [isAnyPending, previousIsAnyPending],\n      ([isAnyPending, previousIsAnyPending]) => {\n        if (previousIsAnyPending.previous && !isAnyPending) {\n          const changeInfo = getLocationChangeInfo(router.state)\n          router.emit({\n            type: 'onResolved',\n            ...changeInfo,\n          })\n\n          router.__store.setState((s) => ({\n            ...s,\n            status: 'idle',\n            resolvedLocation: s.location,\n          }))\n\n          if (changeInfo.hrefChanged) {\n            handleHashScroll(router)\n          }\n        }\n      },\n    ),\n  )\n\n  return null\n}\n"],"names":["Transitioner","router","useRouter","mountLoadForRouter","mounted","isLoading","useRouterState","select","isServer","isSolidTransitioning","startSolidTransition","Solid","useTransition","hasPendingMatches","s","matches","some","d","status","previousIsLoading","usePrevious","isAnyPending","previousIsAnyPending","isPagePending","previousIsPagePending","startTransition","fn","onMount","unsub","history","subscribe","load","nextLocation","buildLocation","to","latestLocation","pathname","search","params","hash","state","_includeValidateSearch","trimPathRight","publicHref","commitLocation","replace","onCleanup","createRenderEffect","untrack","window","ssr","tryLoad","err","console","error","on","previous","emit","type","getLocationChangeInfo","createComputed","changeInfo","__store","setState","resolvedLocation","location","hrefChanged","handleHashScroll"],"mappings":"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"}
+{"version":3,"file":"Transitioner.js","sources":["../../src/Transitioner.tsx"],"sourcesContent":["import * as Solid from 'solid-js'\nimport {\n  getLocationChangeInfo,\n  handleHashScroll,\n  trimPathRight,\n} from '@tanstack/router-core'\nimport { useRouter } from './useRouter'\nimport { useRouterState } from './useRouterState'\nimport { usePrevious } from './utils'\n\nexport function Transitioner() {\n  const router = useRouter()\n  let mountLoadForRouter = { router, mounted: false }\n  const isLoading = useRouterState({\n    select: ({ isLoading }) => isLoading,\n  })\n\n  const [isSolidTransitioning] = [() => false]\n\n  // Track pending state changes\n  const hasPendingMatches = useRouterState({\n    select: (s) => s.matches.some((d) => d.status === 'pending'),\n  })\n\n  const previousIsLoading = usePrevious(isLoading)\n\n  const isAnyPending = () =>\n    isLoading() || isSolidTransitioning() || hasPendingMatches()\n  const previousIsAnyPending = usePrevious(isAnyPending)\n\n  const isPagePending = () => isLoading() || hasPendingMatches()\n  const previousIsPagePending = usePrevious(isPagePending)\n\n  router.startTransition = (fn: () => void | Promise<void>) => {\n    Solid.runWithOwner(null, fn)\n  }\n\n  // Subscribe to location changes\n  // and try to load the new location\n  Solid.onSettled(() => {\n    const unsub = router.history.subscribe(router.load)\n\n    // Refresh latestLocation from the current browser URL before comparing.\n    // The URL may have been changed synchronously (e.g. via replaceState) after\n    // render() but before this effect ran, so we must not use the stale\n    // render-time location here.\n    router.updateLatestLocation()\n\n    const nextLocation = router.buildLocation({\n      to: router.latestLocation.pathname,\n      search: true,\n      params: true,\n      hash: true,\n      state: true,\n      _includeValidateSearch: true,\n    })\n\n    // Check if the current URL matches the canonical form.\n    // Compare publicHref (browser-facing URL) for consistency with\n    // the server-side redirect check in router.beforeLoad.\n    if (\n      trimPathRight(router.latestLocation.publicHref) !==\n      trimPathRight(nextLocation.publicHref)\n    ) {\n      router.commitLocation({ ...nextLocation, replace: true })\n    }\n\n    Solid.onCleanup(() => {\n      unsub()\n    })\n  })\n\n  // Try to load the initial location\n  Solid.createTrackedEffect(() => {\n    Solid.untrack(() => {\n      if (\n        // if we are hydrating from SSR, loading is triggered in ssr-client\n        (typeof window !== 'undefined' && router.ssr) ||\n        (mountLoadForRouter.router === router && mountLoadForRouter.mounted)\n      ) {\n        return\n      }\n      mountLoadForRouter = { router, mounted: true }\n      const tryLoad = async () => {\n        try {\n          await router.load()\n        } catch (err) {\n          console.error(err)\n        }\n      }\n      tryLoad()\n    })\n  })\n\n  Solid.createEffect(\n    () => [previousIsLoading(), isLoading()] as const,\n    ([previousIsLoading, isLoading]) => {\n      if (previousIsLoading.previous && !isLoading) {\n        router.emit({\n          type: 'onLoad',\n          ...getLocationChangeInfo(router.state),\n        })\n      }\n    },\n  )\n\n  Solid.createEffect(\n    () => [isPagePending(), previousIsPagePending()] as const,\n    ([isPagePending, previousIsPagePending]) => {\n      // emit onBeforeRouteMount\n      if (previousIsPagePending.previous && !isPagePending) {\n        router.emit({\n          type: 'onBeforeRouteMount',\n          ...getLocationChangeInfo(router.state),\n        })\n      }\n    },\n  )\n\n  Solid.createEffect(\n    () => [isAnyPending(), previousIsAnyPending()] as const,\n    ([isAnyPending, previousIsAnyPending]) => {\n      if (previousIsAnyPending.previous && !isAnyPending) {\n        const changeInfo = getLocationChangeInfo(router.state)\n        router.emit({\n          type: 'onResolved',\n          ...changeInfo,\n        })\n\n        router.__store.setState((s) => ({\n          ...s,\n          status: 'idle',\n          resolvedLocation: s.location,\n        }))\n\n        if (changeInfo.hrefChanged) {\n          handleHashScroll(router)\n        }\n      }\n    },\n  )\n\n  return null\n}\n"],"names":["Transitioner","router","useRouter","mountLoadForRouter","mounted","isLoading","useRouterState","select","isSolidTransitioning","hasPendingMatches","s","matches","some","d","status","previousIsLoading","usePrevious","isAnyPending","previousIsAnyPending","isPagePending","previousIsPagePending","startTransition","fn","Solid","runWithOwner","onSettled","unsub","history","subscribe","load","updateLatestLocation","nextLocation","buildLocation","to","latestLocation","pathname","search","params","hash","state","_includeValidateSearch","trimPathRight","publicHref","commitLocation","replace","onCleanup","createTrackedEffect","untrack","window","ssr","tryLoad","err","console","error","createEffect","previous","emit","type","getLocationChangeInfo","changeInfo","__store","setState","resolvedLocation","location","hrefChanged","handleHashScroll"],"mappings":"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"}

package/dist/esm/awaited.js

@@ -1,4 +1,4 @@
-import { createComponent } from "solid-js/web";
+import { createComponent } from "@solidjs/web";
 import * as Solid from "solid-js";
 import { defer, TSR_DEFERRED_PROMISE } from "@tanstack/router-core";
 function useAwaited({
@@ -13,23 +13,27 @@ function useAwaited({
   }
   return [promise[TSR_DEFERRED_PROMISE].data, promise];
 }
+function InnerAwait(props) {
+  const [data] = useAwaited({
+    promise: props.promise
+  });
+  return props.children(data);
+}
 function Await(props) {
-  const [resource] = Solid.createResource(
-    () => defer(props.promise),
-    // Simple passthrough - just return the promise for Solid to await
-    (p) => p,
-    {
-      deferStream: true
-    }
-  );
-  return createComponent(Solid.Show, {
+  return createComponent(Solid.Loading, {
     get fallback() {
       return props.fallback;
     },
-    get when() {
-      return resource();
-    },
-    children: (data) => props.children(data())
+    get children() {
+      return createComponent(InnerAwait, {
+        get promise() {
+          return props.promise;
+        },
+        get children() {
+          return props.children;
+        }
+      });
+    }
   });
 }
 export {

package/dist/esm/awaited.js.map

@@ -1 +1 @@
-{"version":3,"file":"awaited.js","sources":["../../src/awaited.tsx"],"sourcesContent":["import * as Solid from 'solid-js'\n\nimport { TSR_DEFERRED_PROMISE, defer } from '@tanstack/router-core'\nimport type { DeferredPromise } from '@tanstack/router-core'\nimport type { SolidNode } from './route'\n\nexport type AwaitOptions<T> = {\n  promise: Promise<T>\n}\n\nexport function useAwaited<T>({\n  promise: _promise,\n}: AwaitOptions<T>): [T, DeferredPromise<T>] {\n  const promise = defer(_promise)\n\n  if (promise[TSR_DEFERRED_PROMISE].status === 'pending') {\n    throw promise\n  }\n\n  if (promise[TSR_DEFERRED_PROMISE].status === 'error') {\n    throw promise[TSR_DEFERRED_PROMISE].error\n  }\n\n  return [promise[TSR_DEFERRED_PROMISE].data, promise]\n}\n\nexport function Await<T>(\n  props: AwaitOptions<T> & {\n    fallback?: SolidNode\n    children: (result: T) => SolidNode\n  },\n) {\n  const [resource] = Solid.createResource(\n    () => defer(props.promise),\n    // Simple passthrough - just return the promise for Solid to await\n    (p) => p,\n    {\n      deferStream: true,\n    },\n  )\n\n  return (\n    <Solid.Show fallback={props.fallback} when={resource()}>\n      {(data) => props.children(data())}\n    </Solid.Show>\n  )\n}\n"],"names":["useAwaited","promise","_promise","defer","TSR_DEFERRED_PROMISE","status","error","data","Await","props","resource","Solid","createResource","p","deferStream","_$createComponent","Show","fallback","when","children"],"mappings":";;;AAUO,SAASA,WAAc;AAAA,EAC5BC,SAASC;AACM,GAA4B;AAC3C,QAAMD,UAAUE,MAAMD,QAAQ;AAE9B,MAAID,QAAQG,oBAAoB,EAAEC,WAAW,WAAW;AACtD,UAAMJ;AAAAA,EACR;AAEA,MAAIA,QAAQG,oBAAoB,EAAEC,WAAW,SAAS;AACpD,UAAMJ,QAAQG,oBAAoB,EAAEE;AAAAA,EACtC;AAEA,SAAO,CAACL,QAAQG,oBAAoB,EAAEG,MAAMN,OAAO;AACrD;AAEO,SAASO,MACdC,OAIA;AACA,QAAM,CAACC,QAAQ,IAAIC,MAAMC;AAAAA,IACvB,MAAMT,MAAMM,MAAMR,OAAO;AAAA;AAAA,IAExBY,CAAAA,MAAMA;AAAAA,IACP;AAAA,MACEC,aAAa;AAAA,IAAA;AAAA,EACf;AAGF,SAAAC,gBACGJ,MAAMK,MAAI;AAAA,IAAA,IAACC,WAAQ;AAAA,aAAER,MAAMQ;AAAAA,IAAQ;AAAA,IAAA,IAAEC,OAAI;AAAA,aAAER,SAAAA;AAAAA,IAAU;AAAA,IAAAS,UAClDZ,CAAAA,SAASE,MAAMU,SAASZ,MAAM;AAAA,EAAA,CAAC;AAGvC;"}
+{"version":3,"file":"awaited.js","sources":["../../src/awaited.tsx"],"sourcesContent":["import * as Solid from 'solid-js'\n\nimport { TSR_DEFERRED_PROMISE, defer } from '@tanstack/router-core'\nimport type { DeferredPromise } from '@tanstack/router-core'\nimport type { SolidNode } from './route'\n\nexport type AwaitOptions<T> = {\n  promise: Promise<T>\n}\n\nexport function useAwaited<T>({\n  promise: _promise,\n}: AwaitOptions<T>): [T, DeferredPromise<T>] {\n  const promise = defer(_promise)\n\n  if (promise[TSR_DEFERRED_PROMISE].status === 'pending') {\n    throw promise\n  }\n\n  if (promise[TSR_DEFERRED_PROMISE].status === 'error') {\n    throw promise[TSR_DEFERRED_PROMISE].error\n  }\n\n  return [promise[TSR_DEFERRED_PROMISE].data, promise]\n}\n\nfunction InnerAwait<T>(props: {\n  promise: Promise<T>\n  children: (res: T) => SolidNode\n}) {\n  const [data] = useAwaited({ promise: props.promise })\n  return props.children(data) as any\n}\n\nexport function Await<T>(\n  props: AwaitOptions<T> & {\n    fallback?: SolidNode\n    children: (result: T) => SolidNode\n  },\n) {\n  return (\n    <Solid.Loading fallback={props.fallback as any}>\n      <InnerAwait promise={props.promise}>{props.children}</InnerAwait>\n    </Solid.Loading>\n  )\n}\n"],"names":["useAwaited","promise","_promise","defer","TSR_DEFERRED_PROMISE","status","error","data","InnerAwait","props","children","Await","_$createComponent","Solid","Loading","fallback"],"mappings":";;;AAUO,SAASA,WAAc;AAAA,EAC5BC,SAASC;AACM,GAA4B;AAC3C,QAAMD,UAAUE,MAAMD,QAAQ;AAE9B,MAAID,QAAQG,oBAAoB,EAAEC,WAAW,WAAW;AACtD,UAAMJ;AAAAA,EACR;AAEA,MAAIA,QAAQG,oBAAoB,EAAEC,WAAW,SAAS;AACpD,UAAMJ,QAAQG,oBAAoB,EAAEE;AAAAA,EACtC;AAEA,SAAO,CAACL,QAAQG,oBAAoB,EAAEG,MAAMN,OAAO;AACrD;AAEA,SAASO,WAAcC,OAGpB;AACD,QAAM,CAACF,IAAI,IAAIP,WAAW;AAAA,IAAEC,SAASQ,MAAMR;AAAAA,EAAAA,CAAS;AACpD,SAAOQ,MAAMC,SAASH,IAAI;AAC5B;AAEO,SAASI,MACdF,OAIA;AACA,SAAAG,gBACGC,MAAMC,SAAO;AAAA,IAAA,IAACC,WAAQ;AAAA,aAAEN,MAAMM;AAAAA,IAAe;AAAA,IAAA,IAAAL,WAAA;AAAA,aAAAE,gBAC3CJ,YAAU;AAAA,QAAA,IAACP,UAAO;AAAA,iBAAEQ,MAAMR;AAAAA,QAAO;AAAA,QAAA,IAAAS,WAAA;AAAA,iBAAGD,MAAMC;AAAAA,QAAQ;AAAA,MAAA,CAAA;AAAA,IAAA;AAAA,EAAA,CAAA;AAGzD;"}

package/dist/esm/lazyRouteComponent.js

@@ -1,6 +1,6 @@
-import { createComponent, Dynamic, mergeProps } from "solid-js/web";
-import { createResource } from "solid-js";
+import { createComponent, Dynamic, mergeProps } from "@solidjs/web";
 import { isModuleNotFoundError } from "@tanstack/router-core";
+import { createMemo } from "solid-js";
 function lazyRouteComponent(importer, exportName) {
   let loadPromise;
   let comp;
@@ -34,7 +34,7 @@ function lazyRouteComponent(importer, exportName) {
       throw error;
     }
     if (!comp) {
-      const [compResource] = createResource(load, {
+      const compResource = createMemo(load, {
         initialValue: comp,
         ssrLoadFrom: "initial"
       });

package/dist/esm/lazyRouteComponent.js.map

@@ -1 +1 @@
-{"version":3,"file":"lazyRouteComponent.js","sources":["../../src/lazyRouteComponent.tsx"],"sourcesContent":["import { Dynamic } from 'solid-js/web'\nimport { createResource } from 'solid-js'\nimport { isModuleNotFoundError } from '@tanstack/router-core'\nimport type { AsyncRouteComponent } from './route'\n\nexport function lazyRouteComponent<\n  T extends Record<string, any>,\n  TKey extends keyof T = 'default',\n>(\n  importer: () => Promise<T>,\n  exportName?: TKey,\n): T[TKey] extends (props: infer TProps) => any\n  ? AsyncRouteComponent<TProps>\n  : never {\n  let loadPromise: Promise<any> | undefined\n  let comp: T[TKey] | T['default']\n  let error: any\n\n  const load = () => {\n    if (!loadPromise) {\n      loadPromise = importer()\n        .then((res) => {\n          loadPromise = undefined\n          comp = res[exportName ?? 'default']\n          return comp\n        })\n        .catch((err) => {\n          error = err\n        })\n    }\n\n    return loadPromise\n  }\n\n  const lazyComp = function Lazy(props: any) {\n    // Now that we're out of preload and into actual render path,\n    // throw the error if it was a module not found error during preload\n    if (error) {\n      // If the load fails due to module not found, it may mean a new version of\n      // the build was deployed and the user's browser is still using an old version.\n      // If this happens, the old version in the user's browser would have an outdated\n      // URL to the lazy module.\n      // In that case, we want to attempt one window refresh to get the latest.\n      if (isModuleNotFoundError(error)) {\n        // We don't want an error thrown from preload in this case, because\n        // there's nothing we want to do about module not found during preload.\n        // Record the error, recover the promise with a null return,\n        // and we will attempt module not found resolution during the render path.\n\n        if (\n          error instanceof Error &&\n          typeof window !== 'undefined' &&\n          typeof sessionStorage !== 'undefined'\n        ) {\n          // Again, we want to reload one time on module not found error and not enter\n          // a reload loop if there is some other issue besides an old deploy.\n          // That's why we store our reload attempt in sessionStorage.\n          // Use error.message as key because it contains the module path that failed.\n          const storageKey = `tanstack_router_reload:${error.message}`\n          if (!sessionStorage.getItem(storageKey)) {\n            sessionStorage.setItem(storageKey, '1')\n            window.location.reload()\n\n            // Return empty component while we wait for window to reload\n            return {\n              default: () => null,\n            }\n          }\n        }\n      }\n\n      // Otherwise, just throw the error\n      throw error\n    }\n\n    if (!comp) {\n      const [compResource] = createResource(load, {\n        initialValue: comp,\n        ssrLoadFrom: 'initial',\n      })\n      return <Dynamic component={compResource()} {...props} />\n    }\n\n    return <Dynamic component={comp} {...props} />\n  }\n\n  ;(lazyComp as any).preload = load\n\n  return lazyComp as any\n}\n"],"names":["lazyRouteComponent","importer","exportName","loadPromise","comp","error","load","then","res","undefined","catch","err","lazyComp","Lazy","props","isModuleNotFoundError","Error","window","sessionStorage","storageKey","message","getItem","setItem","location","reload","default","compResource","createResource","initialValue","ssrLoadFrom","_$createComponent","Dynamic","_$mergeProps","component","preload"],"mappings":";;;AAKO,SAASA,mBAIdC,UACAC,YAGQ;AACR,MAAIC;AACJ,MAAIC;AACJ,MAAIC;AAEJ,QAAMC,OAAOA,MAAM;AACjB,QAAI,CAACH,aAAa;AAChBA,oBAAcF,SAAAA,EACXM,KAAMC,CAAAA,QAAQ;AACbL,sBAAcM;AACdL,eAAOI,IAAIN,cAAc,SAAS;AAClC,eAAOE;AAAAA,MACT,CAAC,EACAM,MAAOC,CAAAA,QAAQ;AACdN,gBAAQM;AAAAA,MACV,CAAC;AAAA,IACL;AAEA,WAAOR;AAAAA,EACT;AAEA,QAAMS,WAAW,SAASC,KAAKC,OAAY;AAGzC,QAAIT,OAAO;AAMT,UAAIU,sBAAsBV,KAAK,GAAG;AAMhC,YACEA,iBAAiBW,SACjB,OAAOC,WAAW,eAClB,OAAOC,mBAAmB,aAC1B;AAKA,gBAAMC,aAAa,0BAA0Bd,MAAMe,OAAO;AAC1D,cAAI,CAACF,eAAeG,QAAQF,UAAU,GAAG;AACvCD,2BAAeI,QAAQH,YAAY,GAAG;AACtCF,mBAAOM,SAASC,OAAAA;AAGhB,mBAAO;AAAA,cACLC,SAASA,MAAM;AAAA,YAAA;AAAA,UAEnB;AAAA,QACF;AAAA,MACF;AAGA,YAAMpB;AAAAA,IACR;AAEA,QAAI,CAACD,MAAM;AACT,YAAM,CAACsB,YAAY,IAAIC,eAAerB,MAAM;AAAA,QAC1CsB,cAAcxB;AAAAA,QACdyB,aAAa;AAAA,MAAA,CACd;AACD,aAAAC,gBAAQC,SAAOC,WAAA;AAAA,QAAA,IAACC,YAAS;AAAA,iBAAEP,aAAAA;AAAAA,QAAc;AAAA,MAAA,GAAMZ,KAAK,CAAA;AAAA,IACtD;AAEA,WAAAgB,gBAAQC,SAAOC,WAAA;AAAA,MAACC,WAAW7B;AAAAA,IAAAA,GAAUU,KAAK,CAAA;AAAA,EAC5C;AAEEF,WAAiBsB,UAAU5B;AAE7B,SAAOM;AACT;"}
+{"version":3,"file":"lazyRouteComponent.js","sources":["../../src/lazyRouteComponent.tsx"],"sourcesContent":["import { isModuleNotFoundError } from '@tanstack/router-core'\nimport { Dynamic } from '@solidjs/web'\nimport { createMemo } from 'solid-js'\nimport type { AsyncRouteComponent } from './route'\n\nexport function lazyRouteComponent<\n  T extends Record<string, any>,\n  TKey extends keyof T = 'default',\n>(\n  importer: () => Promise<T>,\n  exportName?: TKey,\n): T[TKey] extends (props: infer TProps) => any\n  ? AsyncRouteComponent<TProps>\n  : never {\n  let loadPromise: Promise<any> | undefined\n  let comp: T[TKey] | T['default']\n  let error: any\n\n  const load = () => {\n    if (!loadPromise) {\n      loadPromise = importer()\n        .then((res) => {\n          loadPromise = undefined\n          comp = res[exportName ?? 'default']\n          return comp\n        })\n        .catch((err) => {\n          error = err\n        })\n    }\n\n    return loadPromise\n  }\n\n  const lazyComp = function Lazy(props: any) {\n    // Now that we're out of preload and into actual render path,\n    // throw the error if it was a module not found error during preload\n    if (error) {\n      // If the load fails due to module not found, it may mean a new version of\n      // the build was deployed and the user's browser is still using an old version.\n      // If this happens, the old version in the user's browser would have an outdated\n      // URL to the lazy module.\n      // In that case, we want to attempt one window refresh to get the latest.\n      if (isModuleNotFoundError(error)) {\n        // We don't want an error thrown from preload in this case, because\n        // there's nothing we want to do about module not found during preload.\n        // Record the error, recover the promise with a null return,\n        // and we will attempt module not found resolution during the render path.\n\n        if (\n          error instanceof Error &&\n          typeof window !== 'undefined' &&\n          typeof sessionStorage !== 'undefined'\n        ) {\n          // Again, we want to reload one time on module not found error and not enter\n          // a reload loop if there is some other issue besides an old deploy.\n          // That's why we store our reload attempt in sessionStorage.\n          // Use error.message as key because it contains the module path that failed.\n          const storageKey = `tanstack_router_reload:${error.message}`\n          if (!sessionStorage.getItem(storageKey)) {\n            sessionStorage.setItem(storageKey, '1')\n            window.location.reload()\n\n            // Return empty component while we wait for window to reload\n            return {\n              default: () => null,\n            }\n          }\n        }\n      }\n\n      // Otherwise, just throw the error\n      throw error\n    }\n\n    if (!comp) {\n      const compResource = createMemo(load, {\n        initialValue: comp,\n        ssrLoadFrom: 'initial',\n      })\n      return <Dynamic component={compResource()} {...props} />\n    }\n\n    return <Dynamic component={comp} {...props} />\n  }\n\n  ;(lazyComp as any).preload = load\n\n  return lazyComp as any\n}\n"],"names":["lazyRouteComponent","importer","exportName","loadPromise","comp","error","load","then","res","undefined","catch","err","lazyComp","Lazy","props","isModuleNotFoundError","Error","window","sessionStorage","storageKey","message","getItem","setItem","location","reload","default","compResource","createMemo","initialValue","ssrLoadFrom","_$createComponent","Dynamic","_$mergeProps","component","preload"],"mappings":";;;AAKO,SAASA,mBAIdC,UACAC,YAGQ;AACR,MAAIC;AACJ,MAAIC;AACJ,MAAIC;AAEJ,QAAMC,OAAOA,MAAM;AACjB,QAAI,CAACH,aAAa;AAChBA,oBAAcF,SAAAA,EACXM,KAAMC,CAAAA,QAAQ;AACbL,sBAAcM;AACdL,eAAOI,IAAIN,cAAc,SAAS;AAClC,eAAOE;AAAAA,MACT,CAAC,EACAM,MAAOC,CAAAA,QAAQ;AACdN,gBAAQM;AAAAA,MACV,CAAC;AAAA,IACL;AAEA,WAAOR;AAAAA,EACT;AAEA,QAAMS,WAAW,SAASC,KAAKC,OAAY;AAGzC,QAAIT,OAAO;AAMT,UAAIU,sBAAsBV,KAAK,GAAG;AAMhC,YACEA,iBAAiBW,SACjB,OAAOC,WAAW,eAClB,OAAOC,mBAAmB,aAC1B;AAKA,gBAAMC,aAAa,0BAA0Bd,MAAMe,OAAO;AAC1D,cAAI,CAACF,eAAeG,QAAQF,UAAU,GAAG;AACvCD,2BAAeI,QAAQH,YAAY,GAAG;AACtCF,mBAAOM,SAASC,OAAAA;AAGhB,mBAAO;AAAA,cACLC,SAASA,MAAM;AAAA,YAAA;AAAA,UAEnB;AAAA,QACF;AAAA,MACF;AAGA,YAAMpB;AAAAA,IACR;AAEA,QAAI,CAACD,MAAM;AACT,YAAMsB,eAAeC,WAAWrB,MAAM;AAAA,QACpCsB,cAAcxB;AAAAA,QACdyB,aAAa;AAAA,MAAA,CACd;AACD,aAAAC,gBAAQC,SAAOC,WAAA;AAAA,QAAA,IAACC,YAAS;AAAA,iBAAEP,aAAAA;AAAAA,QAAc;AAAA,MAAA,GAAMZ,KAAK,CAAA;AAAA,IACtD;AAEA,WAAAgB,gBAAQC,SAAOC,WAAA;AAAA,MAACC,WAAW7B;AAAAA,IAAAA,GAAUU,KAAK,CAAA;AAAA,EAC5C;AAEEF,WAAiBsB,UAAU5B;AAE7B,SAAOM;AACT;"}

package/dist/esm/link.js

@@ -1,6 +1,5 @@
-import { createComponent, mergeProps, template, spread, insert, Dynamic, memo } from "solid-js/web";
+import { createComponent, mergeProps, template, spread, insert, Dynamic, memo } from "@solidjs/web";
 import * as Solid from "solid-js";
-import { mergeRefs } from "@solid-primitives/refs";
 import { isDangerousProtocol, exactPathTest, removeTrailingSlash, deepEqual, functionalUpdate, preloadWarning } from "@tanstack/router-core";
 import { isServer } from "@tanstack/router-core/isServer";
 import { useRouterState } from "./useRouterState.js";
@@ -8,6 +7,18 @@ import { useRouter } from "./useRouter.js";
 import { useIntersectionObserver } from "./utils.js";
 import { useHydrated } from "./ClientOnly.js";
 var _tmpl$ = /* @__PURE__ */ template(`<svg><a>`);
+function mergeRefs(...refs) {
+  return (el) => {
+    for (const ref of refs) {
+      if (typeof ref === "function") {
+        ref(el);
+      }
+    }
+  };
+}
+function splitProps(props, keys) {
+  return [props, Solid.omit(props, ...keys)];
+}
 const timeoutMap = /* @__PURE__ */ new WeakMap();
 function useLinkProps(options) {
   const router = useRouter();
@@ -15,13 +26,13 @@ function useLinkProps(options) {
   const shouldHydrateHash = !isServer && !!router.options.ssr;
   const hasHydrated = useHydrated();
   let hasRenderFetched = false;
-  const [local, rest] = Solid.splitProps(Solid.mergeProps({
+  const [local, rest] = splitProps(Solid.merge({
     activeProps: () => ({
       class: "active"
     }),
     inactiveProps: () => ({})
   }, options), ["activeProps", "inactiveProps", "activeOptions", "to", "preload", "preloadDelay", "hashScrollIntoView", "replace", "startTransition", "resetScroll", "viewTransition", "target", "disabled", "style", "class", "onClick", "onBlur", "onFocus", "onMouseEnter", "onMouseLeave", "onMouseOver", "onMouseOut", "onTouchStart", "ignoreBlocker"]);
-  const [_, propsSafeToSpread] = Solid.splitProps(rest, ["params", "search", "hash", "state", "mask", "reloadDocument", "unsafeRelative"]);
+  const [_, propsSafeToSpread] = splitProps(rest, ["params", "search", "hash", "state", "mask", "reloadDocument", "unsafeRelative"]);
   const currentLocation = useRouterState({
     select: (s) => s.location
   });
@@ -38,10 +49,11 @@ function useLinkProps(options) {
   });
   const from = options.from;
   const _options = () => {
-    return {
+    const result = {
       ...options,
       from
     };
+    return result;
   };
   const next = Solid.createMemo(() => {
     buildLocationKey();
@@ -137,26 +149,31 @@ function useLinkProps(options) {
       doPreload();
     }
   };
-  const [ref, setRef] = Solid.createSignal(null);
+  const [ref, setRefSignal] = Solid.createSignal(null);
+  const setRef = (el) => {
+    Solid.runWithOwner(null, () => {
+      setRefSignal(el);
+    });
+  };
   useIntersectionObserver(ref, preloadViewportIoCallback, {
     rootMargin: "100px"
   }, {
-    disabled: !!local.disabled || !(preload() === "viewport")
+    disabled: !!local.disabled || !(Solid.untrack(preload) === "viewport")
   });
-  Solid.createEffect(() => {
+  Solid.createEffect(preload, (preloadValue) => {
     if (hasRenderFetched) {
       return;
     }
-    if (!local.disabled && preload() === "render") {
+    if (!local.disabled && preloadValue === "render") {
       doPreload();
       hasRenderFetched = true;
     }
   });
-  if (externalLink()) {
-    return Solid.mergeProps(propsSafeToSpread, {
-      ref: mergeRefs(setRef, _options().ref),
+  if (Solid.untrack(externalLink)) {
+    return Solid.merge(propsSafeToSpread, {
+      // ref: mergeRefs(setRef, _options().ref),
       href: externalLink()
-    }, Solid.splitProps(local, ["target", "disabled", "style", "class", "onClick", "onBlur", "onFocus", "onMouseEnter", "onMouseLeave", "onMouseOut", "onMouseOver", "onTouchStart"])[0]);
+    }, splitProps(local, ["target", "disabled", "style", "class", "onClick", "onBlur", "onFocus", "onMouseEnter", "onMouseLeave", "onMouseOut", "onMouseOver", "onTouchStart"])[0]);
   }
   const handleClick = (e) => {
     const elementTarget = e.currentTarget.getAttribute("target");
@@ -230,7 +247,7 @@ function useLinkProps(options) {
     ...resolvedActiveProps().style,
     ...resolvedInactiveProps().style
   });
-  return Solid.mergeProps(propsSafeToSpread, resolvedActiveProps, resolvedInactiveProps, () => {
+  return Solid.merge(propsSafeToSpread, resolvedActiveProps, resolvedInactiveProps, () => {
     return {
       href: hrefOption()?.href,
       ref: mergeRefs(setRef, _options().ref),
@@ -258,7 +275,7 @@ function useLinkProps(options) {
       })(),
       ...local.disabled && {
         role: "link",
-        "aria-disabled": true
+        "aria-disabled": "true"
       },
       ...isActive() && {
         "data-status": "active",
@@ -276,10 +293,11 @@ function createLink(Comp) {
   }));
 }
 const Link = (props) => {
-  const [local, rest] = Solid.splitProps(props, ["_asChild", "children"]);
-  const [_, linkProps] = Solid.splitProps(useLinkProps(rest), ["type"]);
-  const children = Solid.createMemo(() => {
-    const ch = local.children;
+  const [local, rest] = splitProps(props, ["_asChild", "children"]);
+  const [_, linkProps] = splitProps(useLinkProps(rest), ["type"]);
+  const resolvedChildren = Solid.children(() => local.children);
+  const children = () => {
+    const ch = resolvedChildren();
     if (typeof ch === "function") {
       return ch({
         get isActive() {
@@ -291,9 +309,9 @@ const Link = (props) => {
       });
     }
     return ch;
-  });
+  };
   if (local._asChild === "svg") {
-    const [_2, svgLinkProps] = Solid.splitProps(linkProps, ["class"]);
+    const [_2, svgLinkProps] = splitProps(linkProps, ["class"]);
     return (() => {
       var _el$ = _tmpl$(), _el$2 = _el$.firstChild;
       spread(_el$2, svgLinkProps, false, true);