refactor: no additional package for isServer

labeler-config.yml

@@ -43,9 +43,6 @@
 'package: router-generator':
   - changed-files:
       - any-glob-to-any-file: 'packages/router-generator/**/*'
-'package: router-is-server':
-  - changed-files:
-      - any-glob-to-any-file: 'packages/router-is-server/**/*'
 'package: router-plugin':
   - changed-files:
       - any-glob-to-any-file: 'packages/router-plugin/**/*'

packages/react-router/vite.config.ts

@@ -5,7 +5,7 @@ import packageJson from './package.json'
 
 const config = defineConfig({
   plugins: [react()],
-  // Add 'development' condition for tests to resolve @tanstack/router-is-server
+  // Add 'development' condition for tests to resolve @tanstack/router-core/isServer
   // to the development export (isServer = undefined) instead of node (isServer = true)
   ...(process.env.VITEST && {
     resolve: {

packages/router-core/package.json

@@ -68,6 +68,86 @@
         "default": "./dist/cjs/ssr/client.cjs"
       }
     },
+    "./isServer": {
+      "development": {
+        "import": {
+          "types": "./dist/esm/isServer/development.d.ts",
+          "default": "./dist/esm/isServer/development.js"
+        },
+        "require": {
+          "types": "./dist/cjs/isServer/development.d.cts",
+          "default": "./dist/cjs/isServer/development.cjs"
+        }
+      },
+      "workerd": {
+        "import": {
+          "types": "./dist/esm/isServer/server.d.ts",
+          "default": "./dist/esm/isServer/server.js"
+        },
+        "require": {
+          "types": "./dist/cjs/isServer/server.d.cts",
+          "default": "./dist/cjs/isServer/server.cjs"
+        }
+      },
+      "worker": {
+        "import": {
+          "types": "./dist/esm/isServer/server.d.ts",
+          "default": "./dist/esm/isServer/server.js"
+        },
+        "require": {
+          "types": "./dist/cjs/isServer/server.d.cts",
+          "default": "./dist/cjs/isServer/server.cjs"
+        }
+      },
+      "browser": {
+        "import": {
+          "types": "./dist/esm/isServer/client.d.ts",
+          "default": "./dist/esm/isServer/client.js"
+        },
+        "require": {
+          "types": "./dist/cjs/isServer/client.d.cts",
+          "default": "./dist/cjs/isServer/client.cjs"
+        }
+      },
+      "deno": {
+        "import": {
+          "types": "./dist/esm/isServer/server.d.ts",
+          "default": "./dist/esm/isServer/server.js"
+        },
+        "require": {
+          "types": "./dist/cjs/isServer/server.d.cts",
+          "default": "./dist/cjs/isServer/server.cjs"
+        }
+      },
+      "node": {
+        "import": {
+          "types": "./dist/esm/isServer/server.d.ts",
+          "default": "./dist/esm/isServer/server.js"
+        },
+        "require": {
+          "types": "./dist/cjs/isServer/server.d.cts",
+          "default": "./dist/cjs/isServer/server.cjs"
+        }
+      },
+      "bun": {
+        "import": {
+          "types": "./dist/esm/isServer/server.d.ts",
+          "default": "./dist/esm/isServer/server.js"
+        },
+        "require": {
+          "types": "./dist/cjs/isServer/server.d.cts",
+          "default": "./dist/cjs/isServer/server.cjs"
+        }
+      },
+      "import": {
+        "types": "./dist/esm/isServer/client.d.ts",
+        "default": "./dist/esm/isServer/client.js"
+      },
+      "require": {
+        "types": "./dist/cjs/isServer/client.d.cts",
+        "default": "./dist/cjs/isServer/client.cjs"
+      }
+    },
     "./package.json": "./package.json"
   },
   "sideEffects": false,
@@ -80,7 +160,6 @@
   },
   "dependencies": {
     "@tanstack/history": "workspace:*",
-    "@tanstack/router-is-server": "workspace:*",
     "@tanstack/store": "^0.8.0",
     "cookie-es": "^2.0.0",
     "seroval": "^1.4.2",

packages/router-core/src/isServer.ts

@@ -1,7 +1,7 @@
 /**
  * Static server/client detection for tree-shaking support.
  *
- * This file re-exports `isServer` from `@tanstack/router-is-server` which uses
+ * This re-exports `isServer` from the `isServer/` directory which uses
  * conditional exports to provide different values based on the environment:
  *
  * - `browser` condition → `false` (client)
@@ -21,4 +21,4 @@
  * }
  * ```
  */
-export { isServer } from '@tanstack/router-is-server'
+export { isServer } from './isServer/development'

packages/router-core/src/isServer/client.ts

@@ -0,0 +1 @@
+export const isServer = false

packages/router-core/src/isServer/server.ts

@@ -0,0 +1 @@
+export const isServer = true

packages/router-core/vite.config.ts

@@ -18,7 +18,14 @@ const config = defineConfig({
 export default mergeConfig(
   config,
   tanstackViteConfig({
-    entry: ['./src/index.ts', './src/ssr/client.ts', './src/ssr/server.ts'],
+    entry: [
+      './src/index.ts',
+      './src/ssr/client.ts',
+      './src/ssr/server.ts',
+      './src/isServer/server.ts',
+      './src/isServer/client.ts',
+      './src/isServer/development.ts',
+    ],
     srcDir: './src',
   }),
 )

packages/solid-router/vite.config.ts

@@ -25,7 +25,7 @@ const config = defineConfig(({ mode }) => {
 
   return {
     plugins: [solid()] as ViteUserConfig['plugins'],
-    // Add 'development' condition for tests to resolve @tanstack/router-is-server
+    // Add 'development' condition for tests to resolve @tanstack/router-core/isServer
     // to the development export (isServer = undefined) instead of node (isServer = true)
     ...(process.env.VITEST && {
       resolve: {

packages/vue-router/vite.config.ts

@@ -14,7 +14,7 @@ const config = defineConfig({
     alias: {
       '@tanstack/vue-router': resolve(__dirname, 'src'),
     },
-    // Add 'development' condition for tests to resolve @tanstack/router-is-server
+    // Add 'development' condition for tests to resolve @tanstack/router-core/isServer
     // to the development export (isServer = undefined) instead of node (isServer = true)
     ...(process.env.VITEST && { conditions: ['development'] }),
   },