@tanstack/solid-router 1.156.0 → 1.157.1

package/src/Match.tsx

@@ -6,6 +6,7 @@ import {
   getLocationChangeInfo,
   isNotFound,
   isRedirect,
+  isServer,
   rootRouteId,
 } from '@tanstack/router-core'
 import { Dynamic } from 'solid-js/web'
@@ -93,7 +94,7 @@ export const Match = (props: { matchId: string }) => {
           component={ResolvedSuspenseBoundary()}
           fallback={
             // Don't show fallback on server when using no-ssr mode to avoid hydration mismatch
-            router.isServer || resolvedNoSsr ? undefined : (
+            (isServer ?? router.isServer) || resolvedNoSsr ? undefined : (
               <Dynamic component={resolvePendingComponent()} />
             )
           }
@@ -129,7 +130,7 @@ export const Match = (props: { matchId: string }) => {
               <Solid.Switch>
                 <Solid.Match when={resolvedNoSsr}>
                   <Solid.Show
-                    when={!router.isServer}
+                    when={!(isServer ?? router.isServer)}
                     fallback={<Dynamic component={resolvePendingComponent()} />}
                   >
                     <MatchInner matchId={props.matchId} />
@@ -271,7 +272,7 @@ export const MatchInner = (props: { matchId: string }): any => {
             const routerMatch = router.getMatch(match().id)
             if (routerMatch && !routerMatch._nonReactive.minPendingPromise) {
               // Create a promise that will resolve after the minPendingMs
-              if (!router.isServer) {
+              if (!(isServer ?? router.isServer)) {
                 const minPendingPromise = createControlledPromise<void>()
 
                 routerMatch._nonReactive.minPendingPromise = minPendingPromise
@@ -332,7 +333,7 @@ export const MatchInner = (props: { matchId: string }): any => {
       </Solid.Match>
       <Solid.Match when={match().status === 'error'}>
         {(_) => {
-          if (router.isServer) {
+          if (isServer ?? router.isServer) {
             const RouteErrorComponent =
               (route().options.errorComponent ??
                 router.options.defaultErrorComponent) ||

package/src/Matches.tsx

@@ -1,6 +1,6 @@
 import * as Solid from 'solid-js'
 import warning from 'tiny-warning'
-import { rootRouteId } from '@tanstack/router-core'
+import { isServer, rootRouteId } from '@tanstack/router-core'
 import { CatchBoundary, ErrorComponent } from './CatchBoundary'
 import { useRouterState } from './useRouterState'
 import { useRouter } from './useRouter'
@@ -41,7 +41,8 @@ export function Matches() {
   const router = useRouter()
 
   const ResolvedSuspense =
-    router.isServer || (typeof document !== 'undefined' && router.ssr)
+    (isServer ?? router.isServer) ||
+    (typeof document !== 'undefined' && router.ssr)
       ? SafeFragment
       : Solid.Suspense
 

package/src/ScriptOnce.tsx

@@ -1,3 +1,4 @@
+import { isServer } from '@tanstack/router-core'
 import { useRouter } from './useRouter'
 
 export function ScriptOnce({
@@ -8,7 +9,7 @@ export function ScriptOnce({
   sync?: boolean
 }) {
   const router = useRouter()
-  if (!router.isServer) {
+  if (!(isServer ?? router.isServer)) {
     return null
   }
   return (

package/src/Transitioner.tsx

@@ -2,6 +2,7 @@ import * as Solid from 'solid-js'
 import {
   getLocationChangeInfo,
   handleHashScroll,
+  isServer,
   trimPathRight,
 } from '@tanstack/router-core'
 import { useRouter } from './useRouter'
@@ -15,7 +16,7 @@ export function Transitioner() {
     select: ({ isLoading }) => isLoading,
   })
 
-  if (router.isServer) {
+  if (isServer ?? router.isServer) {
     return null
   }
 

package/src/link.tsx

@@ -134,25 +134,23 @@ export function useLinkProps<
   })
 
   const hrefOption = Solid.createMemo(() => {
-    if (_options().disabled) {
-      return undefined
+    if (_options().disabled) return undefined
+    // Use publicHref - it contains the correct href for display
+    // When a rewrite changes the origin, publicHref is the full URL
+    // Otherwise it's the origin-stripped path
+    // This avoids constructing URL objects in the hot path
+    const location = next().maskedLocation ?? next()
+    const publicHref = location.publicHref
+    const external = location.external
+
+    if (external) {
+      return { href: publicHref, external: true }
     }
-    let href
-    const maskedLocation = next().maskedLocation
-    if (maskedLocation) {
-      href = maskedLocation.url.href
-    } else {
-      href = next().url.href
-    }
-    let external = false
-    if (router.origin) {
-      if (href.startsWith(router.origin)) {
-        href = router.history.createHref(href.replace(router.origin, ''))
-      } else {
-        external = true
-      }
+
+    return {
+      href: router.history.createHref(publicHref) || '/',
+      external: false,
     }
-    return { href, external }
   })
 
   const externalLink = Solid.createMemo(() => {

package/src/scroll-restoration.tsx

@@ -1,6 +1,7 @@
 import {
   defaultGetScrollRestorationKey,
   escapeHtml,
+  isServer,
   restoreScroll,
   storageKey,
 } from '@tanstack/router-core'
@@ -9,7 +10,7 @@ import { ScriptOnce } from './ScriptOnce'
 
 export function ScrollRestoration() {
   const router = useRouter()
-  if (!router.isScrollRestoring || !router.isServer) {
+  if (!router.isScrollRestoring || !(isServer ?? router.isServer)) {
     return null
   }
   if (typeof router.options.scrollRestoration === 'function') {