fix: re-export correctly

packages/react-router/src/Asset.tsx

@@ -1,5 +1,5 @@
 import * as React from 'react'
-import { isServer } from '@tanstack/router-core'
+import { isServer } from '@tanstack/router-core/isServer'
 import { useRouter } from './useRouter'
 import type { RouterManagedTag } from '@tanstack/router-core'
 

packages/react-router/src/Match.tsx

@@ -6,9 +6,9 @@ import {
   getLocationChangeInfo,
   isNotFound,
   isRedirect,
-  isServer,
   rootRouteId,
 } from '@tanstack/router-core'
+import { isServer } from '@tanstack/router-core/isServer'
 import { CatchBoundary, ErrorComponent } from './CatchBoundary'
 import { useRouterState } from './useRouterState'
 import { useRouter } from './useRouter'

packages/react-router/src/Matches.tsx

@@ -1,6 +1,7 @@
 import * as React from 'react'
 import warning from 'tiny-warning'
-import { isServer, rootRouteId } from '@tanstack/router-core'
+import { rootRouteId } from '@tanstack/router-core'
+import { isServer } from '@tanstack/router-core/isServer'
 import { CatchBoundary, ErrorComponent } from './CatchBoundary'
 import { useRouterState } from './useRouterState'
 import { useRouter } from './useRouter'

packages/react-router/src/ScriptOnce.tsx

@@ -1,4 +1,4 @@
-import { isServer } from '@tanstack/router-core'
+import { isServer } from '@tanstack/router-core/isServer'
 import { useRouter } from './useRouter'
 
 /**

packages/react-router/src/link.tsx

@@ -5,10 +5,10 @@ import {
   exactPathTest,
   functionalUpdate,
   isDangerousProtocol,
-  isServer,
   preloadWarning,
   removeTrailingSlash,
 } from '@tanstack/router-core'
+import { isServer } from '@tanstack/router-core/isServer'
 import { useRouterState } from './useRouterState'
 import { useRouter } from './useRouter'
 

packages/react-router/src/scroll-restoration.tsx

@@ -1,10 +1,10 @@
 import {
   defaultGetScrollRestorationKey,
   escapeHtml,
-  isServer,
   restoreScroll,
   storageKey,
 } from '@tanstack/router-core'
+import { isServer } from '@tanstack/router-core/isServer'
 import { useRouter } from './useRouter'
 import { ScriptOnce } from './ScriptOnce'
 

packages/router-core/src/index.ts

@@ -105,7 +105,6 @@ export {
 export { encode, decode } from './qss'
 export { rootRouteId } from './root'
 export type { RootRouteId } from './root'
-export { isServer } from './isServer'
 
 export { BaseRoute, BaseRouteApi, BaseRootRoute } from './route'
 export type {

packages/router-core/src/load-matches.ts

@@ -1,10 +1,10 @@
 import { batch } from '@tanstack/store'
 import invariant from 'tiny-invariant'
+import { isServer } from '@tanstack/router-core/isServer'
 import { createControlledPromise, isPromise } from './utils'
 import { isNotFound } from './not-found'
 import { rootRouteId } from './root'
 import { isRedirect } from './redirect'
-import { isServer } from './isServer'
 import type { NotFoundError } from './not-found'
 import type { ParsedLocation } from './location'
 import type {

packages/router-core/src/router.ts

@@ -1,5 +1,6 @@
 import { Store, batch } from '@tanstack/store'
 import { createBrowserHistory, parseHref } from '@tanstack/history'
+import { isServer } from '@tanstack/router-core/isServer'
 import {
   createControlledPromise,
   decodePath,
@@ -26,7 +27,6 @@ import {
   trimPath,
   trimPathRight,
 } from './path'
-import { isServer } from './isServer'
 import { createLRUCache } from './lru-cache'
 import { isNotFound } from './not-found'
 import { setupScrollRestoration } from './scroll-restoration'

packages/router-core/src/scroll-restoration.ts

@@ -1,5 +1,5 @@
+import { isServer } from '@tanstack/router-core/isServer'
 import { functionalUpdate } from './utils'
-import { isServer } from './isServer'
 import type { AnyRouter } from './router'
 import type { ParsedLocation } from './location'
 import type { NonNullableUpdater } from './utils'

packages/router-core/tsconfig.json

@@ -1,4 +1,9 @@
 {
   "extends": "../../tsconfig.json",
+  "compilerOptions": {
+    "paths": {
+      "@tanstack/router-core/isServer": ["./src/isServer/development.ts"]
+    }
+  },
   "include": ["src", "vite.config.ts", "tests", "vite-minify-plugin.ts"]
 }

packages/router-core/vite.config.ts

@@ -1,3 +1,4 @@
+import path from 'node:path'
 import { defineConfig, mergeConfig } from 'vitest/config'
 import { tanstackViteConfig } from '@tanstack/config/vite'
 import minifyScriptPlugin from './vite-minify-plugin'
@@ -12,6 +13,14 @@ const config = defineConfig({
     watch: false,
     environment: 'jsdom',
     typecheck: { enabled: true },
+    alias: {
+      // For tests only, resolve to development.ts which returns undefined
+      // so that router.isServer fallback is used
+      '@tanstack/router-core/isServer': path.resolve(
+        __dirname,
+        'src/isServer/development.ts',
+      ),
+    },
   },
 })
 
@@ -27,5 +36,6 @@ export default mergeConfig(
       './src/isServer/development.ts',
     ],
     srcDir: './src',
+    externalDeps: ['@tanstack/router-core/isServer'],
   }),
 )

packages/router-ssr-query-core/src/index.ts

@@ -2,7 +2,8 @@ import {
   dehydrate as queryDehydrate,
   hydrate as queryHydrate,
 } from '@tanstack/query-core'
-import { isRedirect, isServer } from '@tanstack/router-core'
+import { isRedirect } from '@tanstack/router-core'
+import { isServer } from '@tanstack/router-core/isServer'
 import type { AnyRouter } from '@tanstack/router-core'
 import type {
   QueryClient,

packages/solid-router/src/Asset.tsx

@@ -1,6 +1,6 @@
 import { Link, Meta, Style, Title } from '@solidjs/meta'
 import { onCleanup, onMount } from 'solid-js'
-import { isServer } from '@tanstack/router-core'
+import { isServer } from '@tanstack/router-core/isServer'
 import { useRouter } from './useRouter'
 import type { RouterManagedTag } from '@tanstack/router-core'
 import type { JSX } from 'solid-js'

packages/solid-router/src/Match.tsx

@@ -6,9 +6,9 @@ import {
   getLocationChangeInfo,
   isNotFound,
   isRedirect,
-  isServer,
   rootRouteId,
 } from '@tanstack/router-core'
+import { isServer } from '@tanstack/router-core/isServer'
 import { Dynamic } from 'solid-js/web'
 import { CatchBoundary, ErrorComponent } from './CatchBoundary'
 import { useRouterState } from './useRouterState'

packages/solid-router/src/Matches.tsx

@@ -1,6 +1,7 @@
 import * as Solid from 'solid-js'
 import warning from 'tiny-warning'
-import { isServer, rootRouteId } from '@tanstack/router-core'
+import { rootRouteId } from '@tanstack/router-core'
+import { isServer } from '@tanstack/router-core/isServer'
 import { CatchBoundary, ErrorComponent } from './CatchBoundary'
 import { useRouterState } from './useRouterState'
 import { useRouter } from './useRouter'

packages/solid-router/src/ScriptOnce.tsx

@@ -1,4 +1,4 @@
-import { isServer } from '@tanstack/router-core'
+import { isServer } from '@tanstack/router-core/isServer'
 import { useRouter } from './useRouter'
 
 export function ScriptOnce({

packages/solid-router/src/Transitioner.tsx

@@ -2,9 +2,9 @@ import * as Solid from 'solid-js'
 import {
   getLocationChangeInfo,
   handleHashScroll,
-  isServer,
   trimPathRight,
 } from '@tanstack/router-core'
+import { isServer } from '@tanstack/router-core/isServer'
 import { useRouter } from './useRouter'
 import { useRouterState } from './useRouterState'
 import { usePrevious } from './utils'

packages/solid-router/src/scroll-restoration.tsx

@@ -1,10 +1,10 @@
 import {
   defaultGetScrollRestorationKey,
   escapeHtml,
-  isServer,
   restoreScroll,
   storageKey,
 } from '@tanstack/router-core'
+import { isServer } from '@tanstack/router-core/isServer'
 import { useRouter } from './useRouter'
 import { ScriptOnce } from './ScriptOnce'
 

packages/vue-router/src/Asset.tsx

@@ -1,5 +1,5 @@
 import * as Vue from 'vue'
-import { isServer } from '@tanstack/router-core'
+import { isServer } from '@tanstack/router-core/isServer'
 import { useRouter } from './useRouter'
 import type { RouterManagedTag } from '@tanstack/router-core'
 

packages/vue-router/src/Match.tsx

@@ -6,9 +6,9 @@ import {
   getLocationChangeInfo,
   isNotFound,
   isRedirect,
-  isServer,
   rootRouteId,
 } from '@tanstack/router-core'
+import { isServer } from '@tanstack/router-core/isServer'
 import { CatchBoundary, ErrorComponent } from './CatchBoundary'
 import { ClientOnly } from './ClientOnly'
 import { useRouterState } from './useRouterState'

packages/vue-router/src/Matches.tsx

@@ -1,6 +1,6 @@
 import * as Vue from 'vue'
 import warning from 'tiny-warning'
-import { isServer } from '@tanstack/router-core'
+import { isServer } from '@tanstack/router-core/isServer'
 import { CatchBoundary } from './CatchBoundary'
 import { useRouterState } from './useRouterState'
 import { useRouter } from './useRouter'

packages/vue-router/src/ScriptOnce.tsx

@@ -1,5 +1,5 @@
 import * as Vue from 'vue'
-import { isServer } from '@tanstack/router-core'
+import { isServer } from '@tanstack/router-core/isServer'
 import { useRouter } from './useRouter'
 
 export const ScriptOnce = Vue.defineComponent({

packages/vue-router/src/Transitioner.tsx

@@ -2,9 +2,9 @@ import * as Vue from 'vue'
 import {
   getLocationChangeInfo,
   handleHashScroll,
-  isServer,
   trimPathRight,
 } from '@tanstack/router-core'
+import { isServer } from '@tanstack/router-core/isServer'
 import { useRouter } from './useRouter'
 import { useRouterState } from './useRouterState'
 import { usePrevious } from './utils'

packages/vue-router/src/scroll-restoration.tsx

@@ -2,10 +2,10 @@ import * as Vue from 'vue'
 import {
   defaultGetScrollRestorationKey,
   escapeHtml,
-  isServer,
   restoreScroll,
   storageKey,
 } from '@tanstack/router-core'
+import { isServer } from '@tanstack/router-core/isServer'
 import { useRouter } from './useRouter'
 import { ScriptOnce } from './ScriptOnce'