@tanstack/solid-router 1.155.0 → 1.157.0

package/dist/source/scroll-restoration.jsx.map

@@ -1 +1 @@
-{"version":3,"file":"scroll-restoration.jsx","sourceRoot":"","sources":["../../src/scroll-restoration.tsx"],"names":[],"mappings":"AAAA,OAAO,EACL,8BAA8B,EAC9B,UAAU,EACV,aAAa,EACb,UAAU,GACX,MAAM,uBAAuB,CAAA;AAC9B,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AACvC,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AAEzC,MAAM,UAAU,iBAAiB;IAC/B,MAAM,MAAM,GAAG,SAAS,EAAE,CAAA;IAC1B,IAAI,CAAC,MAAM,CAAC,iBAAiB,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;QAClD,OAAO,IAAI,CAAA;IACb,CAAC;IACD,IAAI,OAAO,MAAM,CAAC,OAAO,CAAC,iBAAiB,KAAK,UAAU,EAAE,CAAC;QAC3D,MAAM,aAAa,GAAG,MAAM,CAAC,OAAO,CAAC,iBAAiB,CAAC;YACrD,QAAQ,EAAE,MAAM,CAAC,cAAc;SAChC,CAAC,CAAA;QACF,IAAI,CAAC,aAAa,EAAE,CAAC;YACnB,OAAO,IAAI,CAAA;QACb,CAAC;IACH,CAAC;IACD,MAAM,MAAM,GACV,MAAM,CAAC,OAAO,CAAC,uBAAuB,IAAI,8BAA8B,CAAA;IAC1E,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC,CAAA;IAC7C,MAAM,WAAW,GACf,OAAO,KAAK,8BAA8B,CAAC,MAAM,CAAC,cAAc,CAAC;QAC/D,CAAC,CAAC,OAAO;QACT,CAAC,CAAC,SAAS,CAAA;IAEf,MAAM,oBAAoB,GAAwC;QAChE,UAAU;QACV,uBAAuB,EAAE,IAAI;KAC9B,CAAA;IACD,IAAI,WAAW,EAAE,CAAC;QAChB,oBAAoB,CAAC,GAAG,GAAG,WAAW,CAAA;IACxC,CAAC;IAED,OAAO,CACL,CAAC,UAAU,CACT,QAAQ,CAAC,CAAC,IAAI,aAAa,CAAC,QAAQ,EAAE,KAAK,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,oBAAoB,CAAC,CAAC,GAAG,CAAC,EAC/F,CACH,CAAA;AACH,CAAC"}
+{"version":3,"file":"scroll-restoration.jsx","sourceRoot":"","sources":["../../src/scroll-restoration.tsx"],"names":[],"mappings":"AAAA,OAAO,EACL,8BAA8B,EAC9B,UAAU,EACV,QAAQ,EACR,aAAa,EACb,UAAU,GACX,MAAM,uBAAuB,CAAA;AAC9B,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AACvC,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AAEzC,MAAM,UAAU,iBAAiB;IAC/B,MAAM,MAAM,GAAG,SAAS,EAAE,CAAA;IAC1B,IAAI,CAAC,MAAM,CAAC,iBAAiB,IAAI,CAAC,CAAC,QAAQ,IAAI,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC;QAChE,OAAO,IAAI,CAAA;IACb,CAAC;IACD,IAAI,OAAO,MAAM,CAAC,OAAO,CAAC,iBAAiB,KAAK,UAAU,EAAE,CAAC;QAC3D,MAAM,aAAa,GAAG,MAAM,CAAC,OAAO,CAAC,iBAAiB,CAAC;YACrD,QAAQ,EAAE,MAAM,CAAC,cAAc;SAChC,CAAC,CAAA;QACF,IAAI,CAAC,aAAa,EAAE,CAAC;YACnB,OAAO,IAAI,CAAA;QACb,CAAC;IACH,CAAC;IACD,MAAM,MAAM,GACV,MAAM,CAAC,OAAO,CAAC,uBAAuB,IAAI,8BAA8B,CAAA;IAC1E,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC,CAAA;IAC7C,MAAM,WAAW,GACf,OAAO,KAAK,8BAA8B,CAAC,MAAM,CAAC,cAAc,CAAC;QAC/D,CAAC,CAAC,OAAO;QACT,CAAC,CAAC,SAAS,CAAA;IAEf,MAAM,oBAAoB,GAAwC;QAChE,UAAU;QACV,uBAAuB,EAAE,IAAI;KAC9B,CAAA;IACD,IAAI,WAAW,EAAE,CAAC;QAChB,oBAAoB,CAAC,GAAG,GAAG,WAAW,CAAA;IACxC,CAAC;IAED,OAAO,CACL,CAAC,UAAU,CACT,QAAQ,CAAC,CAAC,IAAI,aAAa,CAAC,QAAQ,EAAE,KAAK,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,oBAAoB,CAAC,CAAC,GAAG,CAAC,EAC/F,CACH,CAAA;AACH,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/solid-router",
-  "version": "1.155.0",
+  "version": "1.157.0",
   "description": "Modern and scalable routing for Solid applications",
   "author": "Tanner Linsley",
   "license": "MIT",
@@ -92,7 +92,7 @@
     "tiny-invariant": "^1.3.3",
     "tiny-warning": "^1.0.3",
     "@tanstack/history": "1.154.14",
-    "@tanstack/router-core": "1.155.0"
+    "@tanstack/router-core": "1.157.0"
   },
   "devDependencies": {
     "@solidjs/testing-library": "^0.8.10",

package/src/Asset.tsx

@@ -1,5 +1,6 @@
 import { Link, Meta, Style, Title } from '@solidjs/meta'
 import { onCleanup, onMount } from 'solid-js'
+import { isServer } from '@tanstack/router-core'
 import { useRouter } from './useRouter'
 import type { RouterManagedTag } from '@tanstack/router-core'
 import type { JSX } from 'solid-js'
@@ -123,7 +124,7 @@ function Script({
     }
   })
 
-  if (!router.isServer) {
+  if (!(isServer ?? router.isServer)) {
     // render an empty script on the client just to avoid hydration errors
     return null
   }

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/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') {