diff --git a/e2e/react-start/basic-auth/src/components/DefaultCatchBoundary.tsx b/e2e/react-start/basic-auth/src/components/DefaultCatchBoundary.tsx index 405fb5f4..ef2daa1e 100644 --- a/e2e/react-start/basic-auth/src/components/DefaultCatchBoundary.tsx +++ b/e2e/react-start/basic-auth/src/components/DefaultCatchBoundary.tsx @@ -1,15 +1,17 @@ import { ErrorComponent, Link, - useLocation, + rootRouteId, + useMatch, useRouter, } from '@tanstack/react-router' import type { ErrorComponentProps } from '@tanstack/react-router' export function DefaultCatchBoundary({ error }: ErrorComponentProps) { const router = useRouter() - const isRoot = useLocation({ - select: (location) => location.pathname === '/', + const isRoot = useMatch({ + strict: false, + select: (state) => state.id === rootRouteId, }) console.error(error) diff --git a/e2e/react-start/basic-cloudflare/src/components/DefaultCatchBoundary.tsx b/e2e/react-start/basic-cloudflare/src/components/DefaultCatchBoundary.tsx index 405fb5f4..ef2daa1e 100644 --- a/e2e/react-start/basic-cloudflare/src/components/DefaultCatchBoundary.tsx +++ b/e2e/react-start/basic-cloudflare/src/components/DefaultCatchBoundary.tsx @@ -1,15 +1,17 @@ import { ErrorComponent, Link, - useLocation, + rootRouteId, + useMatch, useRouter, } from '@tanstack/react-router' import type { ErrorComponentProps } from '@tanstack/react-router' export function DefaultCatchBoundary({ error }: ErrorComponentProps) { const router = useRouter() - const isRoot = useLocation({ - select: (location) => location.pathname === '/', + const isRoot = useMatch({ + strict: false, + select: (state) => state.id === rootRouteId, }) console.error(error) diff --git a/e2e/react-start/basic-react-query/src/components/DefaultCatchBoundary.tsx b/e2e/react-start/basic-react-query/src/components/DefaultCatchBoundary.tsx index 405fb5f4..ef2daa1e 100644 --- a/e2e/react-start/basic-react-query/src/components/DefaultCatchBoundary.tsx +++ b/e2e/react-start/basic-react-query/src/components/DefaultCatchBoundary.tsx @@ -1,15 +1,17 @@ import { ErrorComponent, Link, - useLocation, + rootRouteId, + useMatch, useRouter, } from '@tanstack/react-router' import type { ErrorComponentProps } from '@tanstack/react-router' export function DefaultCatchBoundary({ error }: ErrorComponentProps) { const router = useRouter() - const isRoot = useLocation({ - select: (location) => location.pathname === '/', + const isRoot = useMatch({ + strict: false, + select: (state) => state.id === rootRouteId, }) console.error(error) diff --git a/e2e/react-start/basic/src/components/DefaultCatchBoundary.tsx b/e2e/react-start/basic/src/components/DefaultCatchBoundary.tsx index 405fb5f4..ef2daa1e 100644 --- a/e2e/react-start/basic/src/components/DefaultCatchBoundary.tsx +++ b/e2e/react-start/basic/src/components/DefaultCatchBoundary.tsx @@ -1,15 +1,17 @@ import { ErrorComponent, Link, - useLocation, + rootRouteId, + useMatch, useRouter, } from '@tanstack/react-router' import type { ErrorComponentProps } from '@tanstack/react-router' export function DefaultCatchBoundary({ error }: ErrorComponentProps) { const router = useRouter() - const isRoot = useLocation({ - select: (location) => location.pathname === '/', + const isRoot = useMatch({ + strict: false, + select: (state) => state.id === rootRouteId, }) console.error(error) diff --git a/e2e/react-start/clerk-basic/src/components/DefaultCatchBoundary.tsx b/e2e/react-start/clerk-basic/src/components/DefaultCatchBoundary.tsx index 405fb5f4..ef2daa1e 100644 --- a/e2e/react-start/clerk-basic/src/components/DefaultCatchBoundary.tsx +++ b/e2e/react-start/clerk-basic/src/components/DefaultCatchBoundary.tsx @@ -1,15 +1,17 @@ import { ErrorComponent, Link, - useLocation, + rootRouteId, + useMatch, useRouter, } from '@tanstack/react-router' import type { ErrorComponentProps } from '@tanstack/react-router' export function DefaultCatchBoundary({ error }: ErrorComponentProps) { const router = useRouter() - const isRoot = useLocation({ - select: (location) => location.pathname === '/', + const isRoot = useMatch({ + strict: false, + select: (state) => state.id === rootRouteId, }) console.error(error) diff --git a/e2e/react-start/custom-basepath/src/components/DefaultCatchBoundary.tsx b/e2e/react-start/custom-basepath/src/components/DefaultCatchBoundary.tsx index 405fb5f4..ef2daa1e 100644 --- a/e2e/react-start/custom-basepath/src/components/DefaultCatchBoundary.tsx +++ b/e2e/react-start/custom-basepath/src/components/DefaultCatchBoundary.tsx @@ -1,15 +1,17 @@ import { ErrorComponent, Link, - useLocation, + rootRouteId, + useMatch, useRouter, } from '@tanstack/react-router' import type { ErrorComponentProps } from '@tanstack/react-router' export function DefaultCatchBoundary({ error }: ErrorComponentProps) { const router = useRouter() - const isRoot = useLocation({ - select: (location) => location.pathname === '/', + const isRoot = useMatch({ + strict: false, + select: (state) => state.id === rootRouteId, }) console.error(error) diff --git a/e2e/react-start/rsc-rsbuild/.gitignore b/e2e/react-start/rsc-rsbuild/.gitignore deleted file mode 100644 index 5524c48f..00000000 --- a/e2e/react-start/rsc-rsbuild/.gitignore +++ /dev/null @@ -1,24 +0,0 @@ -node_modules -!src/node_modules/ -!src/node_modules/rsc-client-pkg/ -!src/node_modules/rsc-client-pkg/** -package-lock.json -yarn.lock - -.DS_Store -.cache -.env -.vercel -.output - -/build/ -/api/ -/server/build -/public/build -/dist/ -/dist-rsbuild-*/ -/test-results/ -/playwright-report/ -/blob-report/ -/playwright/.cache/ -port-*.txt diff --git a/e2e/react-start/rsc-rsbuild/.prettierignore b/e2e/react-start/rsc-rsbuild/.prettierignore deleted file mode 100644 index 69750fb1..00000000 --- a/e2e/react-start/rsc-rsbuild/.prettierignore +++ /dev/null @@ -1 +0,0 @@ -.prettierrc diff --git a/e2e/react-start/rsc-rsbuild/package.json b/e2e/react-start/rsc-rsbuild/package.json deleted file mode 100644 index 6dc5f5f5..00000000 --- a/e2e/react-start/rsc-rsbuild/package.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "name": "tanstack-react-start-e2e-rsc-rsbuild", - "private": true, - "sideEffects": false, - "type": "module", - "scripts": { - "dev": "rsbuild dev", - "dev:e2e": "rsbuild dev --port $PORT", - "build": "rsbuild build && tsc --noEmit", - "start": "node server.js", - "test:e2e-full": "pnpm build && sh -c 'rm -f \"port-${E2E_PORT_KEY:-$npm_package_name}.txt\" \"port-${E2E_PORT_KEY:-$npm_package_name}-external.txt\"' && playwright test --project=chromium" - }, - "nx": { - "metadata": { - "playwrightModes": [ - { - "toolchain": "rsbuild", - "mode": "ssr" - } - ] - } - }, - "dependencies": { - "@tanstack/react-router": "workspace:^", - "@tanstack/react-start": "workspace:^", - "react": "^19.0.0", - "react-dom": "^19.0.0" - }, - "devDependencies": { - "@playwright/test": "^1.50.1", - "@rsbuild/core": "^2.0.8", - "@rsbuild/plugin-react": "^2.0.0", - "@tanstack/router-e2e-utils": "workspace:^", - "@types/node": "^22.10.2", - "@types/react": "^19.0.8", - "@types/react-dom": "^19.0.3", - "srvx": "^0.10.0", - "typescript": "^5.7.2" - } -} diff --git a/e2e/react-start/rsc-rsbuild/playwright.config.ts b/e2e/react-start/rsc-rsbuild/playwright.config.ts deleted file mode 100644 index 9bb7586d..00000000 --- a/e2e/react-start/rsc-rsbuild/playwright.config.ts +++ /dev/null @@ -1,58 +0,0 @@ -import fs from 'node:fs' -import { defineConfig, devices } from '@playwright/test' -import { - getDummyServerPort, - getTestServerPort, -} from '@tanstack/router-e2e-utils' -import packageJson from './package.json' with { type: 'json' } - -const e2ePortKey = process.env.E2E_PORT_KEY ?? packageJson.name -const distDir = process.env.E2E_DIST_DIR ?? 'dist' - -if (process.env.TEST_WORKER_INDEX === undefined) { - for (const portFile of [ - `port-${e2ePortKey}.txt`, - `port-${e2ePortKey}-external.txt`, - ]) { - fs.rmSync(portFile, { force: true }) - } -} - -const PORT = await getTestServerPort(e2ePortKey) -const EXTERNAL_PORT = await getDummyServerPort(e2ePortKey) -const baseURL = `http://localhost:${PORT}` - -export default defineConfig({ - testDir: './tests', - workers: 1, - reporter: [['line']], - - globalSetup: './tests/setup/global.setup.ts', - globalTeardown: './tests/setup/global.teardown.ts', - - use: { - baseURL, - }, - - webServer: { - command: 'pnpm start', - url: baseURL, - reuseExistingServer: !process.env.CI, - stdout: 'pipe', - env: { - PORT: String(PORT), - E2E_DIST_DIR: distDir, - E2E_PORT_KEY: e2ePortKey, - EXTERNAL_SERVER_URL: `http://localhost:${EXTERNAL_PORT}`, - }, - }, - - projects: [ - { - name: 'chromium', - use: { - ...devices['Desktop Chrome'], - }, - }, - ], -}) diff --git a/e2e/react-start/rsc-rsbuild/rsbuild.config.ts b/e2e/react-start/rsc-rsbuild/rsbuild.config.ts deleted file mode 100644 index 9d34d884..00000000 --- a/e2e/react-start/rsc-rsbuild/rsbuild.config.ts +++ /dev/null @@ -1,21 +0,0 @@ -import { defineConfig } from '@rsbuild/core' -import { pluginReact } from '@rsbuild/plugin-react' -import { tanstackStart } from '@tanstack/react-start/plugin/rsbuild' - -const outDir = process.env.E2E_DIST_DIR ?? 'dist' - -export default defineConfig({ - plugins: [ - pluginReact({ splitChunks: false }), - tanstackStart({ - rsc: { - enabled: true, - }, - }), - ], - output: { - distPath: { - root: outDir, - }, - }, -}) diff --git a/e2e/react-start/rsc-rsbuild/server.js b/e2e/react-start/rsc-rsbuild/server.js deleted file mode 100644 index 6d538858..00000000 --- a/e2e/react-start/rsc-rsbuild/server.js +++ /dev/null @@ -1,57 +0,0 @@ -import fs from 'node:fs' -import path from 'node:path' -import { spawn } from 'node:child_process' -import { pathToFileURL } from 'node:url' - -const distDir = process.env.E2E_DIST_DIR || 'dist' - -function resolveDistClientDir() { - return path.resolve(distDir, 'client') -} - -function resolveDistServerEntryPath() { - const serverJsPath = path.resolve(distDir, 'server', 'server.js') - if (fs.existsSync(serverJsPath)) { - return serverJsPath - } - - const indexJsPath = path.resolve(distDir, 'server', 'index.js') - if (fs.existsSync(indexJsPath)) { - return indexJsPath - } - - return serverJsPath -} - -export function resolveStartCommand() { - const distClientDir = resolveDistClientDir() - const distServerEntryPath = resolveDistServerEntryPath() - return `srvx --prod -s ${JSON.stringify(distClientDir)} ${JSON.stringify(distServerEntryPath)}` -} - -export function start() { - const child = spawn( - 'srvx', - ['--prod', '-s', resolveDistClientDir(), resolveDistServerEntryPath()], - { - stdio: 'inherit', - shell: process.platform === 'win32', - }, - ) - - child.on('exit', (code, signal) => { - if (signal) { - process.kill(process.pid, signal) - return - } - - process.exit(code ?? 0) - }) -} - -if ( - process.argv[1] && - import.meta.url === pathToFileURL(process.argv[1]).href -) { - start() -} diff --git a/e2e/react-start/rsc-rsbuild/src/node_modules/rsc-client-pkg/index.d.ts b/e2e/react-start/rsc-rsbuild/src/node_modules/rsc-client-pkg/index.d.ts deleted file mode 100644 index 38ecad99..00000000 --- a/e2e/react-start/rsc-rsbuild/src/node_modules/rsc-client-pkg/index.d.ts +++ /dev/null @@ -1,5 +0,0 @@ -import type { ReactElement } from 'react' - -export function NodeModuleClientWidget(props: { - label: string -}): ReactElement diff --git a/e2e/react-start/rsc-rsbuild/src/node_modules/rsc-client-pkg/index.js b/e2e/react-start/rsc-rsbuild/src/node_modules/rsc-client-pkg/index.js deleted file mode 100644 index 75080ca0..00000000 --- a/e2e/react-start/rsc-rsbuild/src/node_modules/rsc-client-pkg/index.js +++ /dev/null @@ -1,17 +0,0 @@ -'use client' - -import * as React from 'react' - -export function NodeModuleClientWidget(props) { - const [count, setCount] = React.useState(0) - - return React.createElement( - 'button', - { - type: 'button', - 'data-testid': 'node-module-client-widget', - onClick: () => setCount((value) => value + 1), - }, - `${props.label}: ${count}`, - ) -} diff --git a/e2e/react-start/rsc-rsbuild/src/node_modules/rsc-client-pkg/package.json b/e2e/react-start/rsc-rsbuild/src/node_modules/rsc-client-pkg/package.json deleted file mode 100644 index d8482132..00000000 --- a/e2e/react-start/rsc-rsbuild/src/node_modules/rsc-client-pkg/package.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "name": "rsc-client-pkg", - "private": true, - "version": "0.0.0", - "type": "module", - "types": "./index.d.ts", - "exports": { - ".": { - "types": "./index.d.ts", - "default": "./index.js" - } - } -} diff --git a/e2e/react-start/rsc-rsbuild/src/routeTree.gen.ts b/e2e/react-start/rsc-rsbuild/src/routeTree.gen.ts deleted file mode 100644 index 84c964d1..00000000 --- a/e2e/react-start/rsc-rsbuild/src/routeTree.gen.ts +++ /dev/null @@ -1,86 +0,0 @@ -/* eslint-disable */ - -// @ts-nocheck - -// noinspection JSUnusedGlobalSymbols - -// This file was automatically generated by TanStack Router. -// You should NOT make any changes in this file as it will be overwritten. -// Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. - -import { Route as rootRouteImport } from './routes/__root' -import { Route as RscNodeModuleClientRouteImport } from './routes/rsc-node-module-client' -import { Route as IndexRouteImport } from './routes/index' - -const RscNodeModuleClientRoute = RscNodeModuleClientRouteImport.update({ - id: '/rsc-node-module-client', - path: '/rsc-node-module-client', - getParentRoute: () => rootRouteImport, -} as any) -const IndexRoute = IndexRouteImport.update({ - id: '/', - path: '/', - getParentRoute: () => rootRouteImport, -} as any) - -export interface FileRoutesByFullPath { - '/': typeof IndexRoute - '/rsc-node-module-client': typeof RscNodeModuleClientRoute -} -export interface FileRoutesByTo { - '/': typeof IndexRoute - '/rsc-node-module-client': typeof RscNodeModuleClientRoute -} -export interface FileRoutesById { - __root__: typeof rootRouteImport - '/': typeof IndexRoute - '/rsc-node-module-client': typeof RscNodeModuleClientRoute -} -export interface FileRouteTypes { - fileRoutesByFullPath: FileRoutesByFullPath - fullPaths: '/' | '/rsc-node-module-client' - fileRoutesByTo: FileRoutesByTo - to: '/' | '/rsc-node-module-client' - id: '__root__' | '/' | '/rsc-node-module-client' - fileRoutesById: FileRoutesById -} -export interface RootRouteChildren { - IndexRoute: typeof IndexRoute - RscNodeModuleClientRoute: typeof RscNodeModuleClientRoute -} - -declare module '@tanstack/react-router' { - interface FileRoutesByPath { - '/rsc-node-module-client': { - id: '/rsc-node-module-client' - path: '/rsc-node-module-client' - fullPath: '/rsc-node-module-client' - preLoaderRoute: typeof RscNodeModuleClientRouteImport - parentRoute: typeof rootRouteImport - } - '/': { - id: '/' - path: '/' - fullPath: '/' - preLoaderRoute: typeof IndexRouteImport - parentRoute: typeof rootRouteImport - } - } -} - -const rootRouteChildren: RootRouteChildren = { - IndexRoute: IndexRoute, - RscNodeModuleClientRoute: RscNodeModuleClientRoute, -} -export const routeTree = rootRouteImport - ._addFileChildren(rootRouteChildren) - ._addFileTypes() - -import type { getRouter } from './router.tsx' -import type { createStart } from '@tanstack/react-start' -declare module '@tanstack/react-start' { - interface Register { - ssr: true - router: Awaited> - } -} diff --git a/e2e/react-start/rsc-rsbuild/src/router.tsx b/e2e/react-start/rsc-rsbuild/src/router.tsx deleted file mode 100644 index e59e199b..00000000 --- a/e2e/react-start/rsc-rsbuild/src/router.tsx +++ /dev/null @@ -1,10 +0,0 @@ -import { createRouter } from '@tanstack/react-router' -import { routeTree } from './routeTree.gen' - -export function getRouter() { - return createRouter({ - routeTree, - scrollRestoration: true, - defaultPreload: 'intent', - }) -} diff --git a/e2e/react-start/rsc-rsbuild/src/routes/__root.tsx b/e2e/react-start/rsc-rsbuild/src/routes/__root.tsx deleted file mode 100644 index 1573aae4..00000000 --- a/e2e/react-start/rsc-rsbuild/src/routes/__root.tsx +++ /dev/null @@ -1,37 +0,0 @@ -import { - HeadContent, - Outlet, - Scripts, - createRootRoute, - useHydrated, -} from '@tanstack/react-router' - -export const Route = createRootRoute({ - head: () => ({ - meta: [ - { charSet: 'utf-8' }, - { name: 'viewport', content: 'width=device-width, initial-scale=1' }, - { title: 'Rsbuild RSC test' }, - ], - }), - component: RootComponent, -}) - -function RootComponent() { - const hydrated = useHydrated() - - return ( - - - - - - - {hydrated ? 'hydrated' : 'hydrating'} - - - - - - ) -} diff --git a/e2e/react-start/rsc-rsbuild/src/routes/index.tsx b/e2e/react-start/rsc-rsbuild/src/routes/index.tsx deleted file mode 100644 index d66168b6..00000000 --- a/e2e/react-start/rsc-rsbuild/src/routes/index.tsx +++ /dev/null @@ -1,14 +0,0 @@ -import { Link, createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/')({ - component: Home, -}) - -function Home() { - return ( -

Rsbuild RSC fixture

- Node module client component -

- ) -} diff --git a/e2e/react-start/rsc-rsbuild/src/routes/rsc-node-module-client.tsx b/e2e/react-start/rsc-rsbuild/src/routes/rsc-node-module-client.tsx deleted file mode 100644 index 00994ffb..00000000 --- a/e2e/react-start/rsc-rsbuild/src/routes/rsc-node-module-client.tsx +++ /dev/null @@ -1,23 +0,0 @@ -import { createFileRoute } from '@tanstack/react-router' -import { getNodeModuleClientServerComponent } from '~/utils/nodeModuleClientServerComponent' - -export const Route = createFileRoute('/rsc-node-module-client')({ - loader: async () => { - const Server = await getNodeModuleClientServerComponent() - return { Server } - }, - component: RscNodeModuleClientComponent, -}) - -function RscNodeModuleClientComponent() { - const { Server } = Route.useLoaderData() - - return ( -

- RSC node_modules client component -

- {Server} -

- ) -} diff --git a/e2e/react-start/rsc-rsbuild/src/utils/RscClientPkgContent.tsx b/e2e/react-start/rsc-rsbuild/src/utils/RscClientPkgContent.tsx deleted file mode 100644 index 742f6cbc..00000000 --- a/e2e/react-start/rsc-rsbuild/src/utils/RscClientPkgContent.tsx +++ /dev/null @@ -1,12 +0,0 @@ -import { NodeModuleClientWidget } from 'rsc-client-pkg' - -export function RscClientPkgContent() { - return ( -

- Server rendered package boundary -

- -

- ) -} diff --git a/e2e/react-start/rsc-rsbuild/src/utils/nodeModuleClientServerComponent.tsx b/e2e/react-start/rsc-rsbuild/src/utils/nodeModuleClientServerComponent.tsx deleted file mode 100644 index 1b1fc472..00000000 --- a/e2e/react-start/rsc-rsbuild/src/utils/nodeModuleClientServerComponent.tsx +++ /dev/null @@ -1,9 +0,0 @@ -import { createServerFn } from '@tanstack/react-start' -import { renderServerComponent } from '@tanstack/react-start/rsc' -import { RscClientPkgContent } from './RscClientPkgContent' - -export const getNodeModuleClientServerComponent = createServerFn({ - method: 'GET', -}).handler(async () => { - return renderServerComponent() -}) diff --git a/e2e/react-start/rsc-rsbuild/tests/hydration.ts b/e2e/react-start/rsc-rsbuild/tests/hydration.ts deleted file mode 100644 index ed6e97c6..00000000 --- a/e2e/react-start/rsc-rsbuild/tests/hydration.ts +++ /dev/null @@ -1,7 +0,0 @@ -import { expect, type Page } from '@playwright/test' - -export async function waitForHydration(page: Page) { - await expect(page.getByTestId('app-hydrated')).toHaveText('hydrated', { - timeout: 15000, - }) -} diff --git a/e2e/react-start/rsc-rsbuild/tests/rsc-node-module-client.spec.ts b/e2e/react-start/rsc-rsbuild/tests/rsc-node-module-client.spec.ts deleted file mode 100644 index cd41cc1e..00000000 --- a/e2e/react-start/rsc-rsbuild/tests/rsc-node-module-client.spec.ts +++ /dev/null @@ -1,24 +0,0 @@ -import { expect } from '@playwright/test' -import { test } from '@tanstack/router-e2e-utils' -import { waitForHydration } from './hydration' - -test('hydrates client component imported from node_modules in RSC', async ({ - page, -}) => { - const response = await page.goto('/rsc-node-module-client') - expect(response?.status()).toBe(200) - - await expect(page.getByTestId('rsc-node-module-client-title')).toHaveText( - 'RSC node_modules client component', - ) - await expect(page.getByTestId('rsc-node-module-client-server')).toBeVisible() - await expect(page.getByTestId('node-module-client-widget')).toHaveText( - 'Node module clicks: 0', - ) - - await waitForHydration(page) - await page.getByTestId('node-module-client-widget').click() - await expect(page.getByTestId('node-module-client-widget')).toHaveText( - 'Node module clicks: 1', - ) -}) diff --git a/e2e/react-start/rsc-rsbuild/tests/setup/global.setup.ts b/e2e/react-start/rsc-rsbuild/tests/setup/global.setup.ts deleted file mode 100644 index 3def5f69..00000000 --- a/e2e/react-start/rsc-rsbuild/tests/setup/global.setup.ts +++ /dev/null @@ -1,6 +0,0 @@ -import { e2eStartDummyServer } from '@tanstack/router-e2e-utils' -import packageJson from '../../package.json' with { type: 'json' } - -export default async function setup() { - await e2eStartDummyServer(process.env.E2E_PORT_KEY ?? packageJson.name) -} diff --git a/e2e/react-start/rsc-rsbuild/tests/setup/global.teardown.ts b/e2e/react-start/rsc-rsbuild/tests/setup/global.teardown.ts deleted file mode 100644 index a9ad1445..00000000 --- a/e2e/react-start/rsc-rsbuild/tests/setup/global.teardown.ts +++ /dev/null @@ -1,6 +0,0 @@ -import { e2eStopDummyServer } from '@tanstack/router-e2e-utils' -import packageJson from '../../package.json' with { type: 'json' } - -export default async function teardown() { - await e2eStopDummyServer(process.env.E2E_PORT_KEY ?? packageJson.name) -} diff --git a/e2e/react-start/rsc-rsbuild/tsconfig.json b/e2e/react-start/rsc-rsbuild/tsconfig.json deleted file mode 100644 index cef93695..00000000 --- a/e2e/react-start/rsc-rsbuild/tsconfig.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "include": ["**/*.ts", "**/*.tsx"], - "compilerOptions": { - "strict": true, - "esModuleInterop": true, - "jsx": "react-jsx", - "module": "ESNext", - "moduleResolution": "Bundler", - "lib": ["DOM", "DOM.Iterable", "ES2022"], - "isolatedModules": true, - "resolveJsonModule": true, - "skipLibCheck": true, - "target": "ES2022", - "allowJs": true, - "forceConsistentCasingInFileNames": true, - "paths": { - "~/*": ["./src/*"] - }, - "noEmit": true - } -} diff --git a/e2e/react-start/scroll-restoration/src/components/DefaultCatchBoundary.tsx b/e2e/react-start/scroll-restoration/src/components/DefaultCatchBoundary.tsx index 405fb5f4..ef2daa1e 100644 --- a/e2e/react-start/scroll-restoration/src/components/DefaultCatchBoundary.tsx +++ b/e2e/react-start/scroll-restoration/src/components/DefaultCatchBoundary.tsx @@ -1,15 +1,17 @@ import { ErrorComponent, Link, - useLocation, + rootRouteId, + useMatch, useRouter, } from '@tanstack/react-router' import type { ErrorComponentProps } from '@tanstack/react-router' export function DefaultCatchBoundary({ error }: ErrorComponentProps) { const router = useRouter() - const isRoot = useLocation({ - select: (location) => location.pathname === '/', + const isRoot = useMatch({ + strict: false, + select: (state) => state.id === rootRouteId, }) console.error(error) diff --git a/e2e/react-start/server-functions/src/components/DefaultCatchBoundary.tsx b/e2e/react-start/server-functions/src/components/DefaultCatchBoundary.tsx index 405fb5f4..ef2daa1e 100644 --- a/e2e/react-start/server-functions/src/components/DefaultCatchBoundary.tsx +++ b/e2e/react-start/server-functions/src/components/DefaultCatchBoundary.tsx @@ -1,15 +1,17 @@ import { ErrorComponent, Link, - useLocation, + rootRouteId, + useMatch, useRouter, } from '@tanstack/react-router' import type { ErrorComponentProps } from '@tanstack/react-router' export function DefaultCatchBoundary({ error }: ErrorComponentProps) { const router = useRouter() - const isRoot = useLocation({ - select: (location) => location.pathname === '/', + const isRoot = useMatch({ + strict: false, + select: (state) => state.id === rootRouteId, }) console.error(error) diff --git a/e2e/react-start/server-routes/src/components/DefaultCatchBoundary.tsx b/e2e/react-start/server-routes/src/components/DefaultCatchBoundary.tsx index 405fb5f4..ef2daa1e 100644 --- a/e2e/react-start/server-routes/src/components/DefaultCatchBoundary.tsx +++ b/e2e/react-start/server-routes/src/components/DefaultCatchBoundary.tsx @@ -1,15 +1,17 @@ import { ErrorComponent, Link, - useLocation, + rootRouteId, + useMatch, useRouter, } from '@tanstack/react-router' import type { ErrorComponentProps } from '@tanstack/react-router' export function DefaultCatchBoundary({ error }: ErrorComponentProps) { const router = useRouter() - const isRoot = useLocation({ - select: (location) => location.pathname === '/', + const isRoot = useMatch({ + strict: false, + select: (state) => state.id === rootRouteId, }) console.error(error) diff --git a/e2e/react-start/website/src/components/DefaultCatchBoundary.tsx b/e2e/react-start/website/src/components/DefaultCatchBoundary.tsx index 405fb5f4..ef2daa1e 100644 --- a/e2e/react-start/website/src/components/DefaultCatchBoundary.tsx +++ b/e2e/react-start/website/src/components/DefaultCatchBoundary.tsx @@ -1,15 +1,17 @@ import { ErrorComponent, Link, - useLocation, + rootRouteId, + useMatch, useRouter, } from '@tanstack/react-router' import type { ErrorComponentProps } from '@tanstack/react-router' export function DefaultCatchBoundary({ error }: ErrorComponentProps) { const router = useRouter() - const isRoot = useLocation({ - select: (location) => location.pathname === '/', + const isRoot = useMatch({ + strict: false, + select: (state) => state.id === rootRouteId, }) console.error(error) diff --git a/e2e/solid-start/basic-auth/src/components/DefaultCatchBoundary.tsx b/e2e/solid-start/basic-auth/src/components/DefaultCatchBoundary.tsx index f44db955..2c0d464a 100644 --- a/e2e/solid-start/basic-auth/src/components/DefaultCatchBoundary.tsx +++ b/e2e/solid-start/basic-auth/src/components/DefaultCatchBoundary.tsx @@ -1,15 +1,17 @@ import { ErrorComponent, Link, - useLocation, + rootRouteId, + useMatch, useRouter, } from '@tanstack/solid-router' import type { ErrorComponentProps } from '@tanstack/solid-router' export function DefaultCatchBoundary({ error }: ErrorComponentProps) { const router = useRouter() - const isRoot = useLocation({ - select: (location) => location.pathname === '/', + const isRoot = useMatch({ + strict: false, + select: (state) => state.id === rootRouteId, }) console.error(error) diff --git a/e2e/solid-start/basic-cloudflare/src/components/DefaultCatchBoundary.tsx b/e2e/solid-start/basic-cloudflare/src/components/DefaultCatchBoundary.tsx index f44db955..2c0d464a 100644 --- a/e2e/solid-start/basic-cloudflare/src/components/DefaultCatchBoundary.tsx +++ b/e2e/solid-start/basic-cloudflare/src/components/DefaultCatchBoundary.tsx @@ -1,15 +1,17 @@ import { ErrorComponent, Link, - useLocation, + rootRouteId, + useMatch, useRouter, } from '@tanstack/solid-router' import type { ErrorComponentProps } from '@tanstack/solid-router' export function DefaultCatchBoundary({ error }: ErrorComponentProps) { const router = useRouter() - const isRoot = useLocation({ - select: (location) => location.pathname === '/', + const isRoot = useMatch({ + strict: false, + select: (state) => state.id === rootRouteId, }) console.error(error) diff --git a/e2e/solid-start/basic/src/components/DefaultCatchBoundary.tsx b/e2e/solid-start/basic/src/components/DefaultCatchBoundary.tsx index f44db955..2c0d464a 100644 --- a/e2e/solid-start/basic/src/components/DefaultCatchBoundary.tsx +++ b/e2e/solid-start/basic/src/components/DefaultCatchBoundary.tsx @@ -1,15 +1,17 @@ import { ErrorComponent, Link, - useLocation, + rootRouteId, + useMatch, useRouter, } from '@tanstack/solid-router' import type { ErrorComponentProps } from '@tanstack/solid-router' export function DefaultCatchBoundary({ error }: ErrorComponentProps) { const router = useRouter() - const isRoot = useLocation({ - select: (location) => location.pathname === '/', + const isRoot = useMatch({ + strict: false, + select: (state) => state.id === rootRouteId, }) console.error(error) diff --git a/e2e/solid-start/custom-basepath/src/components/DefaultCatchBoundary.tsx b/e2e/solid-start/custom-basepath/src/components/DefaultCatchBoundary.tsx index f44db955..2c0d464a 100644 --- a/e2e/solid-start/custom-basepath/src/components/DefaultCatchBoundary.tsx +++ b/e2e/solid-start/custom-basepath/src/components/DefaultCatchBoundary.tsx @@ -1,15 +1,17 @@ import { ErrorComponent, Link, - useLocation, + rootRouteId, + useMatch, useRouter, } from '@tanstack/solid-router' import type { ErrorComponentProps } from '@tanstack/solid-router' export function DefaultCatchBoundary({ error }: ErrorComponentProps) { const router = useRouter() - const isRoot = useLocation({ - select: (location) => location.pathname === '/', + const isRoot = useMatch({ + strict: false, + select: (state) => state.id === rootRouteId, }) console.error(error) diff --git a/e2e/solid-start/scroll-restoration/src/components/DefaultCatchBoundary.tsx b/e2e/solid-start/scroll-restoration/src/components/DefaultCatchBoundary.tsx index f44db955..2c0d464a 100644 --- a/e2e/solid-start/scroll-restoration/src/components/DefaultCatchBoundary.tsx +++ b/e2e/solid-start/scroll-restoration/src/components/DefaultCatchBoundary.tsx @@ -1,15 +1,17 @@ import { ErrorComponent, Link, - useLocation, + rootRouteId, + useMatch, useRouter, } from '@tanstack/solid-router' import type { ErrorComponentProps } from '@tanstack/solid-router' export function DefaultCatchBoundary({ error }: ErrorComponentProps) { const router = useRouter() - const isRoot = useLocation({ - select: (location) => location.pathname === '/', + const isRoot = useMatch({ + strict: false, + select: (state) => state.id === rootRouteId, }) console.error(error) diff --git a/e2e/solid-start/server-functions/src/components/DefaultCatchBoundary.tsx b/e2e/solid-start/server-functions/src/components/DefaultCatchBoundary.tsx index f44db955..2c0d464a 100644 --- a/e2e/solid-start/server-functions/src/components/DefaultCatchBoundary.tsx +++ b/e2e/solid-start/server-functions/src/components/DefaultCatchBoundary.tsx @@ -1,15 +1,17 @@ import { ErrorComponent, Link, - useLocation, + rootRouteId, + useMatch, useRouter, } from '@tanstack/solid-router' import type { ErrorComponentProps } from '@tanstack/solid-router' export function DefaultCatchBoundary({ error }: ErrorComponentProps) { const router = useRouter() - const isRoot = useLocation({ - select: (location) => location.pathname === '/', + const isRoot = useMatch({ + strict: false, + select: (state) => state.id === rootRouteId, }) console.error(error) diff --git a/e2e/solid-start/server-routes/src/components/DefaultCatchBoundary.tsx b/e2e/solid-start/server-routes/src/components/DefaultCatchBoundary.tsx index f44db955..2c0d464a 100644 --- a/e2e/solid-start/server-routes/src/components/DefaultCatchBoundary.tsx +++ b/e2e/solid-start/server-routes/src/components/DefaultCatchBoundary.tsx @@ -1,15 +1,17 @@ import { ErrorComponent, Link, - useLocation, + rootRouteId, + useMatch, useRouter, } from '@tanstack/solid-router' import type { ErrorComponentProps } from '@tanstack/solid-router' export function DefaultCatchBoundary({ error }: ErrorComponentProps) { const router = useRouter() - const isRoot = useLocation({ - select: (location) => location.pathname === '/', + const isRoot = useMatch({ + strict: false, + select: (state) => state.id === rootRouteId, }) console.error(error) diff --git a/e2e/solid-start/website/src/components/DefaultCatchBoundary.tsx b/e2e/solid-start/website/src/components/DefaultCatchBoundary.tsx index f44db955..2c0d464a 100644 --- a/e2e/solid-start/website/src/components/DefaultCatchBoundary.tsx +++ b/e2e/solid-start/website/src/components/DefaultCatchBoundary.tsx @@ -1,15 +1,17 @@ import { ErrorComponent, Link, - useLocation, + rootRouteId, + useMatch, useRouter, } from '@tanstack/solid-router' import type { ErrorComponentProps } from '@tanstack/solid-router' export function DefaultCatchBoundary({ error }: ErrorComponentProps) { const router = useRouter() - const isRoot = useLocation({ - select: (location) => location.pathname === '/', + const isRoot = useMatch({ + strict: false, + select: (state) => state.id === rootRouteId, }) console.error(error) diff --git a/e2e/vue-start/basic-auth/src/components/DefaultCatchBoundary.tsx b/e2e/vue-start/basic-auth/src/components/DefaultCatchBoundary.tsx index 02caf564..e11970b6 100644 --- a/e2e/vue-start/basic-auth/src/components/DefaultCatchBoundary.tsx +++ b/e2e/vue-start/basic-auth/src/components/DefaultCatchBoundary.tsx @@ -1,15 +1,17 @@ import { ErrorComponent, Link, - useLocation, + rootRouteId, + useMatch, useRouter, } from '@tanstack/vue-router' import type { ErrorComponentProps } from '@tanstack/vue-router' export function DefaultCatchBoundary({ error }: ErrorComponentProps) { const router = useRouter() - const isRoot = useLocation({ - select: (location) => location.pathname === '/', + const isRoot = useMatch({ + strict: false, + select: (state) => state.id === rootRouteId, }) console.error(error) diff --git a/e2e/vue-start/basic-cloudflare/src/components/DefaultCatchBoundary.tsx b/e2e/vue-start/basic-cloudflare/src/components/DefaultCatchBoundary.tsx index 02caf564..e11970b6 100644 --- a/e2e/vue-start/basic-cloudflare/src/components/DefaultCatchBoundary.tsx +++ b/e2e/vue-start/basic-cloudflare/src/components/DefaultCatchBoundary.tsx @@ -1,15 +1,17 @@ import { ErrorComponent, Link, - useLocation, + rootRouteId, + useMatch, useRouter, } from '@tanstack/vue-router' import type { ErrorComponentProps } from '@tanstack/vue-router' export function DefaultCatchBoundary({ error }: ErrorComponentProps) { const router = useRouter() - const isRoot = useLocation({ - select: (location) => location.pathname === '/', + const isRoot = useMatch({ + strict: false, + select: (state) => state.id === rootRouteId, }) console.error(error) diff --git a/e2e/vue-start/basic/src/components/DefaultCatchBoundary.tsx b/e2e/vue-start/basic/src/components/DefaultCatchBoundary.tsx index cd0fa98f..fe99cf62 100644 --- a/e2e/vue-start/basic/src/components/DefaultCatchBoundary.tsx +++ b/e2e/vue-start/basic/src/components/DefaultCatchBoundary.tsx @@ -1,9 +1,11 @@ import { ErrorComponent, Link, - useLocation, + rootRouteId, + useMatch, useRouter, } from '@tanstack/vue-router' +import type { ErrorComponentProps } from '@tanstack/vue-router' import { defineComponent } from 'vue' export const DefaultCatchBoundary = defineComponent({ @@ -15,8 +17,9 @@ export const DefaultCatchBoundary = defineComponent({ }, setup(props) { const router = useRouter() - const isRoot = useLocation({ - select: (location) => location.pathname === '/', + const isRoot = useMatch({ + strict: false, + select: (state) => state.id === rootRouteId, }) console.error(props.error) diff --git a/e2e/vue-start/custom-basepath/src/components/DefaultCatchBoundary.tsx b/e2e/vue-start/custom-basepath/src/components/DefaultCatchBoundary.tsx index d06f4a94..b1f818dd 100644 --- a/e2e/vue-start/custom-basepath/src/components/DefaultCatchBoundary.tsx +++ b/e2e/vue-start/custom-basepath/src/components/DefaultCatchBoundary.tsx @@ -1,15 +1,17 @@ import { ErrorComponent, Link, - useLocation, + rootRouteId, + useMatch, useRouter, } from '@tanstack/vue-router' import type { ErrorComponentProps } from '@tanstack/vue-router' export function DefaultCatchBoundary({ error }: ErrorComponentProps) { const router = useRouter() - const isRoot = useLocation({ - select: (location) => location.pathname === '/', + const isRoot = useMatch({ + strict: false, + select: (state) => state.id === rootRouteId, }) console.error(error) diff --git a/e2e/vue-start/scroll-restoration/src/components/DefaultCatchBoundary.tsx b/e2e/vue-start/scroll-restoration/src/components/DefaultCatchBoundary.tsx index d06f4a94..b1f818dd 100644 --- a/e2e/vue-start/scroll-restoration/src/components/DefaultCatchBoundary.tsx +++ b/e2e/vue-start/scroll-restoration/src/components/DefaultCatchBoundary.tsx @@ -1,15 +1,17 @@ import { ErrorComponent, Link, - useLocation, + rootRouteId, + useMatch, useRouter, } from '@tanstack/vue-router' import type { ErrorComponentProps } from '@tanstack/vue-router' export function DefaultCatchBoundary({ error }: ErrorComponentProps) { const router = useRouter() - const isRoot = useLocation({ - select: (location) => location.pathname === '/', + const isRoot = useMatch({ + strict: false, + select: (state) => state.id === rootRouteId, }) console.error(error) diff --git a/e2e/vue-start/server-functions/src/components/DefaultCatchBoundary.tsx b/e2e/vue-start/server-functions/src/components/DefaultCatchBoundary.tsx index d06f4a94..b1f818dd 100644 --- a/e2e/vue-start/server-functions/src/components/DefaultCatchBoundary.tsx +++ b/e2e/vue-start/server-functions/src/components/DefaultCatchBoundary.tsx @@ -1,15 +1,17 @@ import { ErrorComponent, Link, - useLocation, + rootRouteId, + useMatch, useRouter, } from '@tanstack/vue-router' import type { ErrorComponentProps } from '@tanstack/vue-router' export function DefaultCatchBoundary({ error }: ErrorComponentProps) { const router = useRouter() - const isRoot = useLocation({ - select: (location) => location.pathname === '/', + const isRoot = useMatch({ + strict: false, + select: (state) => state.id === rootRouteId, }) console.error(error) diff --git a/e2e/vue-start/server-routes/src/components/DefaultCatchBoundary.tsx b/e2e/vue-start/server-routes/src/components/DefaultCatchBoundary.tsx index d06f4a94..b1f818dd 100644 --- a/e2e/vue-start/server-routes/src/components/DefaultCatchBoundary.tsx +++ b/e2e/vue-start/server-routes/src/components/DefaultCatchBoundary.tsx @@ -1,15 +1,17 @@ import { ErrorComponent, Link, - useLocation, + rootRouteId, + useMatch, useRouter, } from '@tanstack/vue-router' import type { ErrorComponentProps } from '@tanstack/vue-router' export function DefaultCatchBoundary({ error }: ErrorComponentProps) { const router = useRouter() - const isRoot = useLocation({ - select: (location) => location.pathname === '/', + const isRoot = useMatch({ + strict: false, + select: (state) => state.id === rootRouteId, }) console.error(error) diff --git a/e2e/vue-start/website/src/components/DefaultCatchBoundary.tsx b/e2e/vue-start/website/src/components/DefaultCatchBoundary.tsx index d06f4a94..b1f818dd 100644 --- a/e2e/vue-start/website/src/components/DefaultCatchBoundary.tsx +++ b/e2e/vue-start/website/src/components/DefaultCatchBoundary.tsx @@ -1,15 +1,17 @@ import { ErrorComponent, Link, - useLocation, + rootRouteId, + useMatch, useRouter, } from '@tanstack/vue-router' import type { ErrorComponentProps } from '@tanstack/vue-router' export function DefaultCatchBoundary({ error }: ErrorComponentProps) { const router = useRouter() - const isRoot = useLocation({ - select: (location) => location.pathname === '/', + const isRoot = useMatch({ + strict: false, + select: (state) => state.id === rootRouteId, }) console.error(error) diff --git a/examples/react/start-bare/package.json b/examples/react/start-bare/package.json index 9596027d..6d290cfe 100644 --- a/examples/react/start-bare/package.json +++ b/examples/react/start-bare/package.json @@ -12,7 +12,7 @@ "dependencies": { "@tanstack/react-router": "^1.170.11", "@tanstack/react-router-devtools": "^1.167.0", - "@tanstack/react-start": "^1.168.20", + "@tanstack/react-start": "^1.168.19", "react": "^19.0.0", "react-dom": "^19.0.0", "zod": "^4.4.3" diff --git a/examples/react/start-basic-auth/package.json b/examples/react/start-basic-auth/package.json index d55cf244..5b8a66ec 100644 --- a/examples/react/start-basic-auth/package.json +++ b/examples/react/start-basic-auth/package.json @@ -16,7 +16,7 @@ "@prisma/client": "^7.0.0", "@tanstack/react-router": "^1.170.11", "@tanstack/react-router-devtools": "^1.167.0", - "@tanstack/react-start": "^1.168.20", + "@tanstack/react-start": "^1.168.19", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic-auth/src/components/DefaultCatchBoundary.tsx b/examples/react/start-basic-auth/src/components/DefaultCatchBoundary.tsx index 405fb5f4..ef2daa1e 100644 --- a/examples/react/start-basic-auth/src/components/DefaultCatchBoundary.tsx +++ b/examples/react/start-basic-auth/src/components/DefaultCatchBoundary.tsx @@ -1,15 +1,17 @@ import { ErrorComponent, Link, - useLocation, + rootRouteId, + useMatch, useRouter, } from '@tanstack/react-router' import type { ErrorComponentProps } from '@tanstack/react-router' export function DefaultCatchBoundary({ error }: ErrorComponentProps) { const router = useRouter() - const isRoot = useLocation({ - select: (location) => location.pathname === '/', + const isRoot = useMatch({ + strict: false, + select: (state) => state.id === rootRouteId, }) console.error(error) diff --git a/examples/react/start-basic-authjs/package.json b/examples/react/start-basic-authjs/package.json index c4250a3b..0221bb80 100644 --- a/examples/react/start-basic-authjs/package.json +++ b/examples/react/start-basic-authjs/package.json @@ -13,7 +13,7 @@ "@auth/core": "^0.41.1", "@tanstack/react-router": "^1.170.11", "@tanstack/react-router-devtools": "^1.167.0", - "@tanstack/react-start": "^1.168.20", + "@tanstack/react-start": "^1.168.19", "react": "^19.0.0", "react-dom": "^19.0.0", "start-authjs": "^1.0.0", diff --git a/examples/react/start-basic-authjs/src/components/DefaultCatchBoundary.tsx b/examples/react/start-basic-authjs/src/components/DefaultCatchBoundary.tsx index 4a22649e..260c2ea4 100644 --- a/examples/react/start-basic-authjs/src/components/DefaultCatchBoundary.tsx +++ b/examples/react/start-basic-authjs/src/components/DefaultCatchBoundary.tsx @@ -1,15 +1,17 @@ import { ErrorComponent, Link, - useLocation, + rootRouteId, + useMatch, useRouter, } from '@tanstack/react-router' import type { ErrorComponentProps } from '@tanstack/react-router' export function DefaultCatchBoundary({ error }: ErrorComponentProps) { const router = useRouter() - const isRoot = useLocation({ - select: (location) => location.pathname === '/', + const isRoot = useMatch({ + strict: false, + select: (state) => state.id === rootRouteId, }) console.error('DefaultCatchBoundary Error:', error) diff --git a/examples/react/start-basic-cloudflare/package.json b/examples/react/start-basic-cloudflare/package.json index bcf1c55c..ee7a1958 100644 --- a/examples/react/start-basic-cloudflare/package.json +++ b/examples/react/start-basic-cloudflare/package.json @@ -14,7 +14,7 @@ "dependencies": { "@tanstack/react-router": "^1.170.11", "@tanstack/react-router-devtools": "^1.167.0", - "@tanstack/react-start": "^1.168.20", + "@tanstack/react-start": "^1.168.19", "react": "^19.0.0", "react-dom": "^19.0.0" }, diff --git a/examples/react/start-basic-cloudflare/src/components/DefaultCatchBoundary.tsx b/examples/react/start-basic-cloudflare/src/components/DefaultCatchBoundary.tsx index 4a22649e..260c2ea4 100644 --- a/examples/react/start-basic-cloudflare/src/components/DefaultCatchBoundary.tsx +++ b/examples/react/start-basic-cloudflare/src/components/DefaultCatchBoundary.tsx @@ -1,15 +1,17 @@ import { ErrorComponent, Link, - useLocation, + rootRouteId, + useMatch, useRouter, } from '@tanstack/react-router' import type { ErrorComponentProps } from '@tanstack/react-router' export function DefaultCatchBoundary({ error }: ErrorComponentProps) { const router = useRouter() - const isRoot = useLocation({ - select: (location) => location.pathname === '/', + const isRoot = useMatch({ + strict: false, + select: (state) => state.id === rootRouteId, }) console.error('DefaultCatchBoundary Error:', error) diff --git a/examples/react/start-basic-react-query/package.json b/examples/react/start-basic-react-query/package.json index 3d55c805..d22935c1 100644 --- a/examples/react/start-basic-react-query/package.json +++ b/examples/react/start-basic-react-query/package.json @@ -15,7 +15,7 @@ "@tanstack/react-router": "^1.170.11", "@tanstack/react-router-devtools": "^1.167.0", "@tanstack/react-router-ssr-query": "^1.167.1", - "@tanstack/react-start": "^1.168.20", + "@tanstack/react-start": "^1.168.19", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic-react-query/src/components/DefaultCatchBoundary.tsx b/examples/react/start-basic-react-query/src/components/DefaultCatchBoundary.tsx index 405fb5f4..ef2daa1e 100644 --- a/examples/react/start-basic-react-query/src/components/DefaultCatchBoundary.tsx +++ b/examples/react/start-basic-react-query/src/components/DefaultCatchBoundary.tsx @@ -1,15 +1,17 @@ import { ErrorComponent, Link, - useLocation, + rootRouteId, + useMatch, useRouter, } from '@tanstack/react-router' import type { ErrorComponentProps } from '@tanstack/react-router' export function DefaultCatchBoundary({ error }: ErrorComponentProps) { const router = useRouter() - const isRoot = useLocation({ - select: (location) => location.pathname === '/', + const isRoot = useMatch({ + strict: false, + select: (state) => state.id === rootRouteId, }) console.error(error) diff --git a/examples/react/start-basic-static/package.json b/examples/react/start-basic-static/package.json index 878331e2..12e2086b 100644 --- a/examples/react/start-basic-static/package.json +++ b/examples/react/start-basic-static/package.json @@ -12,7 +12,7 @@ "dependencies": { "@tanstack/react-router": "^1.170.11", "@tanstack/react-router-devtools": "^1.167.0", - "@tanstack/react-start": "^1.168.20", + "@tanstack/react-start": "^1.168.19", "@tanstack/start-static-server-functions": "^1.167.12", "@vitejs/plugin-react": "^6.0.1", "react": "^19.0.0", diff --git a/examples/react/start-basic-static/src/components/DefaultCatchBoundary.tsx b/examples/react/start-basic-static/src/components/DefaultCatchBoundary.tsx index 4a22649e..260c2ea4 100644 --- a/examples/react/start-basic-static/src/components/DefaultCatchBoundary.tsx +++ b/examples/react/start-basic-static/src/components/DefaultCatchBoundary.tsx @@ -1,15 +1,17 @@ import { ErrorComponent, Link, - useLocation, + rootRouteId, + useMatch, useRouter, } from '@tanstack/react-router' import type { ErrorComponentProps } from '@tanstack/react-router' export function DefaultCatchBoundary({ error }: ErrorComponentProps) { const router = useRouter() - const isRoot = useLocation({ - select: (location) => location.pathname === '/', + const isRoot = useMatch({ + strict: false, + select: (state) => state.id === rootRouteId, }) console.error('DefaultCatchBoundary Error:', error) diff --git a/examples/react/start-basic/package.json b/examples/react/start-basic/package.json index d64718cd..4c54c775 100644 --- a/examples/react/start-basic/package.json +++ b/examples/react/start-basic/package.json @@ -12,7 +12,7 @@ "dependencies": { "@tanstack/react-router": "^1.170.11", "@tanstack/react-router-devtools": "^1.167.0", - "@tanstack/react-start": "^1.168.20", + "@tanstack/react-start": "^1.168.19", "react": "^19.0.0", "react-dom": "^19.0.0", "tailwind-merge": "^3.6.0", diff --git a/examples/react/start-basic/src/components/DefaultCatchBoundary.tsx b/examples/react/start-basic/src/components/DefaultCatchBoundary.tsx index 4a22649e..260c2ea4 100644 --- a/examples/react/start-basic/src/components/DefaultCatchBoundary.tsx +++ b/examples/react/start-basic/src/components/DefaultCatchBoundary.tsx @@ -1,15 +1,17 @@ import { ErrorComponent, Link, - useLocation, + rootRouteId, + useMatch, useRouter, } from '@tanstack/react-router' import type { ErrorComponentProps } from '@tanstack/react-router' export function DefaultCatchBoundary({ error }: ErrorComponentProps) { const router = useRouter() - const isRoot = useLocation({ - select: (location) => location.pathname === '/', + const isRoot = useMatch({ + strict: false, + select: (state) => state.id === rootRouteId, }) console.error('DefaultCatchBoundary Error:', error) diff --git a/examples/react/start-bun/package.json b/examples/react/start-bun/package.json index 173e5b7e..d636a4d3 100644 --- a/examples/react/start-bun/package.json +++ b/examples/react/start-bun/package.json @@ -18,7 +18,7 @@ "@tanstack/react-router": "^1.170.11", "@tanstack/react-router-devtools": "^1.167.0", "@tanstack/react-router-ssr-query": "^1.167.1", - "@tanstack/react-start": "^1.168.20", + "@tanstack/react-start": "^1.168.19", "@tanstack/router-plugin": "^1.168.14", "react": "^19.1.1", "react-dom": "^19.1.1", diff --git a/examples/react/start-clerk-basic/package.json b/examples/react/start-clerk-basic/package.json index 248466ab..d0b3c378 100644 --- a/examples/react/start-clerk-basic/package.json +++ b/examples/react/start-clerk-basic/package.json @@ -13,7 +13,7 @@ "@clerk/tanstack-react-start": "^0.27.14", "@tanstack/react-router": "^1.170.11", "@tanstack/react-router-devtools": "^1.167.0", - "@tanstack/react-start": "^1.168.20", + "@tanstack/react-start": "^1.168.19", "@vitejs/plugin-react": "^6.0.1", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/start-clerk-basic/src/components/DefaultCatchBoundary.tsx b/examples/react/start-clerk-basic/src/components/DefaultCatchBoundary.tsx index 405fb5f4..ef2daa1e 100644 --- a/examples/react/start-clerk-basic/src/components/DefaultCatchBoundary.tsx +++ b/examples/react/start-clerk-basic/src/components/DefaultCatchBoundary.tsx @@ -1,15 +1,17 @@ import { ErrorComponent, Link, - useLocation, + rootRouteId, + useMatch, useRouter, } from '@tanstack/react-router' import type { ErrorComponentProps } from '@tanstack/react-router' export function DefaultCatchBoundary({ error }: ErrorComponentProps) { const router = useRouter() - const isRoot = useLocation({ - select: (location) => location.pathname === '/', + const isRoot = useMatch({ + strict: false, + select: (state) => state.id === rootRouteId, }) console.error(error) diff --git a/examples/react/start-convex-trellaux/package.json b/examples/react/start-convex-trellaux/package.json index 763561f1..f2c1b018 100644 --- a/examples/react/start-convex-trellaux/package.json +++ b/examples/react/start-convex-trellaux/package.json @@ -18,7 +18,7 @@ "@tanstack/react-router": "^1.170.11", "@tanstack/react-router-devtools": "^1.167.0", "@tanstack/react-router-ssr-query": "^1.167.1", - "@tanstack/react-start": "^1.168.20", + "@tanstack/react-start": "^1.168.19", "concurrently": "^8.2.2", "convex": "^1.19.0", "ky": "^1.7.4", diff --git a/examples/react/start-convex-trellaux/src/components/DefaultCatchBoundary.tsx b/examples/react/start-convex-trellaux/src/components/DefaultCatchBoundary.tsx index 405fb5f4..ef2daa1e 100644 --- a/examples/react/start-convex-trellaux/src/components/DefaultCatchBoundary.tsx +++ b/examples/react/start-convex-trellaux/src/components/DefaultCatchBoundary.tsx @@ -1,15 +1,17 @@ import { ErrorComponent, Link, - useLocation, + rootRouteId, + useMatch, useRouter, } from '@tanstack/react-router' import type { ErrorComponentProps } from '@tanstack/react-router' export function DefaultCatchBoundary({ error }: ErrorComponentProps) { const router = useRouter() - const isRoot = useLocation({ - select: (location) => location.pathname === '/', + const isRoot = useMatch({ + strict: false, + select: (state) => state.id === rootRouteId, }) console.error(error) diff --git a/examples/react/start-counter/package.json b/examples/react/start-counter/package.json index ae909b63..ea09ed52 100644 --- a/examples/react/start-counter/package.json +++ b/examples/react/start-counter/package.json @@ -12,7 +12,7 @@ "dependencies": { "@tanstack/react-router": "^1.170.11", "@tanstack/react-router-devtools": "^1.167.0", - "@tanstack/react-start": "^1.168.20", + "@tanstack/react-start": "^1.168.19", "react": "^19.0.0", "react-dom": "^19.0.0" }, diff --git a/examples/react/start-i18n-paraglide/package.json b/examples/react/start-i18n-paraglide/package.json index 521c1957..dded25ae 100644 --- a/examples/react/start-i18n-paraglide/package.json +++ b/examples/react/start-i18n-paraglide/package.json @@ -12,7 +12,7 @@ "@tanstack/react-devtools": "^0.7.0", "@tanstack/react-router": "^1.170.11", "@tanstack/react-router-devtools": "^1.167.0", - "@tanstack/react-start": "^1.168.20", + "@tanstack/react-start": "^1.168.19", "react": "^19.1.1", "react-dom": "^19.1.1" }, diff --git a/examples/react/start-large/package.json b/examples/react/start-large/package.json index 0fbc09e7..4be25648 100644 --- a/examples/react/start-large/package.json +++ b/examples/react/start-large/package.json @@ -15,7 +15,7 @@ "@tanstack/react-query": "^5.90.0", "@tanstack/react-router": "^1.170.11", "@tanstack/react-router-devtools": "^1.167.0", - "@tanstack/react-start": "^1.168.20", + "@tanstack/react-start": "^1.168.19", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-material-ui/package.json b/examples/react/start-material-ui/package.json index df21651d..a63ebe30 100644 --- a/examples/react/start-material-ui/package.json +++ b/examples/react/start-material-ui/package.json @@ -17,7 +17,7 @@ "@mui/material": "6.4.7", "@tanstack/react-router": "^1.170.11", "@tanstack/react-router-devtools": "^1.167.0", - "@tanstack/react-start": "^1.168.20", + "@tanstack/react-start": "^1.168.19", "react": "^19.0.0", "react-dom": "^19.0.0", "zod": "^4.4.3" diff --git a/examples/react/start-rscs/package.json b/examples/react/start-rscs/package.json index fc3edeca..54d74abd 100644 --- a/examples/react/start-rscs/package.json +++ b/examples/react/start-rscs/package.json @@ -12,7 +12,7 @@ "dependencies": { "@tanstack/react-router": "^1.170.11", "@tanstack/react-router-devtools": "^1.167.0", - "@tanstack/react-start": "^1.168.20", + "@tanstack/react-start": "^1.168.19", "dexie": "^4.0.10", "react": "^19.2.0", "react-dom": "^19.2.0", diff --git a/examples/react/start-streaming-data-from-server-functions/package.json b/examples/react/start-streaming-data-from-server-functions/package.json index 7fc66684..cd6c736a 100644 --- a/examples/react/start-streaming-data-from-server-functions/package.json +++ b/examples/react/start-streaming-data-from-server-functions/package.json @@ -12,7 +12,7 @@ "dependencies": { "@tanstack/react-router": "^1.170.11", "@tanstack/react-router-devtools": "^1.167.0", - "@tanstack/react-start": "^1.168.20", + "@tanstack/react-start": "^1.168.19", "react": "^19.0.0", "react-dom": "^19.0.0", "zod": "^4.4.3" diff --git a/examples/react/start-supabase-basic/package.json b/examples/react/start-supabase-basic/package.json index 320c04c9..2697d130 100644 --- a/examples/react/start-supabase-basic/package.json +++ b/examples/react/start-supabase-basic/package.json @@ -17,7 +17,7 @@ "@supabase/supabase-js": "^2.48.1", "@tanstack/react-router": "^1.170.11", "@tanstack/react-router-devtools": "^1.167.0", - "@tanstack/react-start": "^1.168.20", + "@tanstack/react-start": "^1.168.19", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1" diff --git a/examples/react/start-supabase-basic/src/components/DefaultCatchBoundary.tsx b/examples/react/start-supabase-basic/src/components/DefaultCatchBoundary.tsx index 405fb5f4..30e64b85 100644 --- a/examples/react/start-supabase-basic/src/components/DefaultCatchBoundary.tsx +++ b/examples/react/start-supabase-basic/src/components/DefaultCatchBoundary.tsx @@ -1,15 +1,18 @@ +import * as React from 'react' import { ErrorComponent, Link, - useLocation, + rootRouteId, + useMatch, useRouter, } from '@tanstack/react-router' import type { ErrorComponentProps } from '@tanstack/react-router' export function DefaultCatchBoundary({ error }: ErrorComponentProps) { const router = useRouter() - const isRoot = useLocation({ - select: (location) => location.pathname === '/', + const isRoot = useMatch({ + strict: false, + select: (state) => state.id === rootRouteId, }) console.error(error) diff --git a/examples/react/start-tailwind-v4/package.json b/examples/react/start-tailwind-v4/package.json index 44972c71..fb141235 100644 --- a/examples/react/start-tailwind-v4/package.json +++ b/examples/react/start-tailwind-v4/package.json @@ -12,7 +12,7 @@ "dependencies": { "@tanstack/react-router": "^1.170.11", "@tanstack/react-router-devtools": "^1.167.0", - "@tanstack/react-start": "^1.168.20", + "@tanstack/react-start": "^1.168.19", "react": "^19.0.0", "react-dom": "^19.0.0", "tailwind-merge": "^3.6.0", diff --git a/examples/react/start-trellaux/package.json b/examples/react/start-trellaux/package.json index 07d831d2..8b36dcd9 100644 --- a/examples/react/start-trellaux/package.json +++ b/examples/react/start-trellaux/package.json @@ -15,7 +15,7 @@ "@tanstack/react-router": "^1.170.11", "@tanstack/react-router-devtools": "^1.167.0", "@tanstack/react-router-ssr-query": "^1.167.1", - "@tanstack/react-start": "^1.168.20", + "@tanstack/react-start": "^1.168.19", "ky": "^1.7.4", "msw": "^2.7.0", "react": "^19.0.0", diff --git a/examples/react/start-trellaux/src/components/DefaultCatchBoundary.tsx b/examples/react/start-trellaux/src/components/DefaultCatchBoundary.tsx index 4a22649e..260c2ea4 100644 --- a/examples/react/start-trellaux/src/components/DefaultCatchBoundary.tsx +++ b/examples/react/start-trellaux/src/components/DefaultCatchBoundary.tsx @@ -1,15 +1,17 @@ import { ErrorComponent, Link, - useLocation, + rootRouteId, + useMatch, useRouter, } from '@tanstack/react-router' import type { ErrorComponentProps } from '@tanstack/react-router' export function DefaultCatchBoundary({ error }: ErrorComponentProps) { const router = useRouter() - const isRoot = useLocation({ - select: (location) => location.pathname === '/', + const isRoot = useMatch({ + strict: false, + select: (state) => state.id === rootRouteId, }) console.error('DefaultCatchBoundary Error:', error) diff --git a/examples/react/start-workos/package.json b/examples/react/start-workos/package.json index d60ae5de..f0398455 100644 --- a/examples/react/start-workos/package.json +++ b/examples/react/start-workos/package.json @@ -16,7 +16,7 @@ "@radix-ui/themes": "^3.3.0", "@tanstack/react-router": "^1.170.11", "@tanstack/react-router-devtools": "^1.167.0", - "@tanstack/react-start": "^1.168.20", + "@tanstack/react-start": "^1.168.19", "@workos/authkit-tanstack-react-start": "^0.5.0", "react": "^19.0.0", "react-dom": "^19.0.0" diff --git a/examples/solid/start-basic-auth/package.json b/examples/solid/start-basic-auth/package.json index 83c05fa4..131aedee 100644 --- a/examples/solid/start-basic-auth/package.json +++ b/examples/solid/start-basic-auth/package.json @@ -16,7 +16,7 @@ "@prisma/client": "^7.0.0", "@tanstack/solid-router": "^1.170.11", "@tanstack/solid-router-devtools": "^1.167.0", - "@tanstack/solid-start": "^1.168.20", + "@tanstack/solid-start": "^1.168.19", "redaxios": "^0.5.1", "solid-js": "^1.9.10", "tailwind-merge": "^3.6.0" diff --git a/examples/solid/start-basic-auth/src/components/DefaultCatchBoundary.tsx b/examples/solid/start-basic-auth/src/components/DefaultCatchBoundary.tsx index f44db955..2c0d464a 100644 --- a/examples/solid/start-basic-auth/src/components/DefaultCatchBoundary.tsx +++ b/examples/solid/start-basic-auth/src/components/DefaultCatchBoundary.tsx @@ -1,15 +1,17 @@ import { ErrorComponent, Link, - useLocation, + rootRouteId, + useMatch, useRouter, } from '@tanstack/solid-router' import type { ErrorComponentProps } from '@tanstack/solid-router' export function DefaultCatchBoundary({ error }: ErrorComponentProps) { const router = useRouter() - const isRoot = useLocation({ - select: (location) => location.pathname === '/', + const isRoot = useMatch({ + strict: false, + select: (state) => state.id === rootRouteId, }) console.error(error) diff --git a/examples/solid/start-basic-authjs/package.json b/examples/solid/start-basic-authjs/package.json index dda3b315..36bd45ee 100644 --- a/examples/solid/start-basic-authjs/package.json +++ b/examples/solid/start-basic-authjs/package.json @@ -13,7 +13,7 @@ "@auth/core": "^0.41.1", "@tanstack/solid-router": "^1.170.11", "@tanstack/solid-router-devtools": "^1.167.0", - "@tanstack/solid-start": "^1.168.20", + "@tanstack/solid-start": "^1.168.19", "solid-js": "^1.9.10", "start-authjs": "^1.0.0", "tailwind-merge": "^3.6.0" diff --git a/examples/solid/start-basic-authjs/src/components/DefaultCatchBoundary.tsx b/examples/solid/start-basic-authjs/src/components/DefaultCatchBoundary.tsx index beff7bc2..1ae7a0cf 100644 --- a/examples/solid/start-basic-authjs/src/components/DefaultCatchBoundary.tsx +++ b/examples/solid/start-basic-authjs/src/components/DefaultCatchBoundary.tsx @@ -1,15 +1,17 @@ import { ErrorComponent, Link, - useLocation, + rootRouteId, + useMatch, useRouter, } from '@tanstack/solid-router' import type { ErrorComponentProps } from '@tanstack/solid-router' export function DefaultCatchBoundary({ error }: ErrorComponentProps) { const router = useRouter() - const isRoot = useLocation({ - select: (location) => location.pathname === '/', + const isRoot = useMatch({ + strict: false, + select: (state) => state.id === rootRouteId, }) console.error('DefaultCatchBoundary Error:', error) diff --git a/examples/solid/start-basic-cloudflare/package.json b/examples/solid/start-basic-cloudflare/package.json index 529afbd0..410dd447 100644 --- a/examples/solid/start-basic-cloudflare/package.json +++ b/examples/solid/start-basic-cloudflare/package.json @@ -14,7 +14,7 @@ "dependencies": { "@tanstack/solid-router": "^1.170.11", "@tanstack/solid-router-devtools": "^1.167.0", - "@tanstack/solid-start": "^1.168.20", + "@tanstack/solid-start": "^1.168.19", "solid-js": "^1.9.10" }, "devDependencies": { diff --git a/examples/solid/start-basic-cloudflare/src/components/DefaultCatchBoundary.tsx b/examples/solid/start-basic-cloudflare/src/components/DefaultCatchBoundary.tsx index beff7bc2..1ae7a0cf 100644 --- a/examples/solid/start-basic-cloudflare/src/components/DefaultCatchBoundary.tsx +++ b/examples/solid/start-basic-cloudflare/src/components/DefaultCatchBoundary.tsx @@ -1,15 +1,17 @@ import { ErrorComponent, Link, - useLocation, + rootRouteId, + useMatch, useRouter, } from '@tanstack/solid-router' import type { ErrorComponentProps } from '@tanstack/solid-router' export function DefaultCatchBoundary({ error }: ErrorComponentProps) { const router = useRouter() - const isRoot = useLocation({ - select: (location) => location.pathname === '/', + const isRoot = useMatch({ + strict: false, + select: (state) => state.id === rootRouteId, }) console.error('DefaultCatchBoundary Error:', error) diff --git a/examples/solid/start-basic-netlify/package.json b/examples/solid/start-basic-netlify/package.json index 851c41d5..c754484f 100644 --- a/examples/solid/start-basic-netlify/package.json +++ b/examples/solid/start-basic-netlify/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/solid-router": "^1.170.11", "@tanstack/solid-router-devtools": "^1.167.0", - "@tanstack/solid-start": "^1.168.20", + "@tanstack/solid-start": "^1.168.19", "solid-js": "^1.9.10" }, "devDependencies": { diff --git a/examples/solid/start-basic-netlify/src/components/DefaultCatchBoundary.tsx b/examples/solid/start-basic-netlify/src/components/DefaultCatchBoundary.tsx index beff7bc2..1ae7a0cf 100644 --- a/examples/solid/start-basic-netlify/src/components/DefaultCatchBoundary.tsx +++ b/examples/solid/start-basic-netlify/src/components/DefaultCatchBoundary.tsx @@ -1,15 +1,17 @@ import { ErrorComponent, Link, - useLocation, + rootRouteId, + useMatch, useRouter, } from '@tanstack/solid-router' import type { ErrorComponentProps } from '@tanstack/solid-router' export function DefaultCatchBoundary({ error }: ErrorComponentProps) { const router = useRouter() - const isRoot = useLocation({ - select: (location) => location.pathname === '/', + const isRoot = useMatch({ + strict: false, + select: (state) => state.id === rootRouteId, }) console.error('DefaultCatchBoundary Error:', error) diff --git a/examples/solid/start-basic-nitro/package.json b/examples/solid/start-basic-nitro/package.json index 0f8ad53b..efa8362f 100644 --- a/examples/solid/start-basic-nitro/package.json +++ b/examples/solid/start-basic-nitro/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/solid-router": "^1.170.11", "@tanstack/solid-router-devtools": "^1.167.0", - "@tanstack/solid-start": "^1.168.20", + "@tanstack/solid-start": "^1.168.19", "solid-js": "^1.9.10" }, "devDependencies": { diff --git a/examples/solid/start-basic-nitro/src/components/DefaultCatchBoundary.tsx b/examples/solid/start-basic-nitro/src/components/DefaultCatchBoundary.tsx index beff7bc2..1ae7a0cf 100644 --- a/examples/solid/start-basic-nitro/src/components/DefaultCatchBoundary.tsx +++ b/examples/solid/start-basic-nitro/src/components/DefaultCatchBoundary.tsx @@ -1,15 +1,17 @@ import { ErrorComponent, Link, - useLocation, + rootRouteId, + useMatch, useRouter, } from '@tanstack/solid-router' import type { ErrorComponentProps } from '@tanstack/solid-router' export function DefaultCatchBoundary({ error }: ErrorComponentProps) { const router = useRouter() - const isRoot = useLocation({ - select: (location) => location.pathname === '/', + const isRoot = useMatch({ + strict: false, + select: (state) => state.id === rootRouteId, }) console.error('DefaultCatchBoundary Error:', error) diff --git a/examples/solid/start-basic-solid-query/package.json b/examples/solid/start-basic-solid-query/package.json index ed057925..38738a2f 100644 --- a/examples/solid/start-basic-solid-query/package.json +++ b/examples/solid/start-basic-solid-query/package.json @@ -15,7 +15,7 @@ "@tanstack/solid-router": "^1.170.11", "@tanstack/solid-router-devtools": "^1.167.0", "@tanstack/solid-router-ssr-query": "^1.167.1", - "@tanstack/solid-start": "^1.168.20", + "@tanstack/solid-start": "^1.168.19", "redaxios": "^0.5.1", "solid-js": "^1.9.10", "tailwind-merge": "^3.6.0" diff --git a/examples/solid/start-basic-solid-query/src/components/DefaultCatchBoundary.tsx b/examples/solid/start-basic-solid-query/src/components/DefaultCatchBoundary.tsx index f44db955..2c0d464a 100644 --- a/examples/solid/start-basic-solid-query/src/components/DefaultCatchBoundary.tsx +++ b/examples/solid/start-basic-solid-query/src/components/DefaultCatchBoundary.tsx @@ -1,15 +1,17 @@ import { ErrorComponent, Link, - useLocation, + rootRouteId, + useMatch, useRouter, } from '@tanstack/solid-router' import type { ErrorComponentProps } from '@tanstack/solid-router' export function DefaultCatchBoundary({ error }: ErrorComponentProps) { const router = useRouter() - const isRoot = useLocation({ - select: (location) => location.pathname === '/', + const isRoot = useMatch({ + strict: false, + select: (state) => state.id === rootRouteId, }) console.error(error) diff --git a/examples/solid/start-basic-static/package.json b/examples/solid/start-basic-static/package.json index c15e356d..1b1d30ba 100644 --- a/examples/solid/start-basic-static/package.json +++ b/examples/solid/start-basic-static/package.json @@ -12,7 +12,7 @@ "dependencies": { "@tanstack/solid-router": "^1.170.11", "@tanstack/solid-router-devtools": "^1.167.0", - "@tanstack/solid-start": "^1.168.20", + "@tanstack/solid-start": "^1.168.19", "@tanstack/start-static-server-functions": "^1.167.12", "redaxios": "^0.5.1", "solid-js": "^1.9.10", diff --git a/examples/solid/start-basic-static/src/components/DefaultCatchBoundary.tsx b/examples/solid/start-basic-static/src/components/DefaultCatchBoundary.tsx index db574e0f..0dff3919 100644 --- a/examples/solid/start-basic-static/src/components/DefaultCatchBoundary.tsx +++ b/examples/solid/start-basic-static/src/components/DefaultCatchBoundary.tsx @@ -1,15 +1,17 @@ import { ErrorComponent, Link, - useLocation, + rootRouteId, + useMatch, useRouter, } from '@tanstack/solid-router' import type { ErrorComponentProps } from '@tanstack/solid-router' export function DefaultCatchBoundary({ error }: ErrorComponentProps) { const router = useRouter() - const isRoot = useLocation({ - select: (location) => location.pathname === '/', + const isRoot = useMatch({ + strict: false, + select: (state) => state.id === rootRouteId, }) console.error('DefaultCatchBoundary Error:', error) diff --git a/examples/solid/start-basic/package.json b/examples/solid/start-basic/package.json index 896166f2..34376712 100644 --- a/examples/solid/start-basic/package.json +++ b/examples/solid/start-basic/package.json @@ -12,7 +12,7 @@ "dependencies": { "@tanstack/solid-router": "^1.170.11", "@tanstack/solid-router-devtools": "^1.167.0", - "@tanstack/solid-start": "^1.168.20", + "@tanstack/solid-start": "^1.168.19", "redaxios": "^0.5.1", "solid-js": "^1.9.10", "tailwind-merge": "^3.6.0" diff --git a/examples/solid/start-basic/src/components/DefaultCatchBoundary.tsx b/examples/solid/start-basic/src/components/DefaultCatchBoundary.tsx index beff7bc2..1ae7a0cf 100644 --- a/examples/solid/start-basic/src/components/DefaultCatchBoundary.tsx +++ b/examples/solid/start-basic/src/components/DefaultCatchBoundary.tsx @@ -1,15 +1,17 @@ import { ErrorComponent, Link, - useLocation, + rootRouteId, + useMatch, useRouter, } from '@tanstack/solid-router' import type { ErrorComponentProps } from '@tanstack/solid-router' export function DefaultCatchBoundary({ error }: ErrorComponentProps) { const router = useRouter() - const isRoot = useLocation({ - select: (location) => location.pathname === '/', + const isRoot = useMatch({ + strict: false, + select: (state) => state.id === rootRouteId, }) console.error('DefaultCatchBoundary Error:', error) diff --git a/examples/solid/start-bun/package.json b/examples/solid/start-bun/package.json index cc9f41f6..ea310019 100644 --- a/examples/solid/start-bun/package.json +++ b/examples/solid/start-bun/package.json @@ -18,7 +18,7 @@ "@tanstack/solid-router": "^1.170.11", "@tanstack/solid-router-devtools": "^1.167.0", "@tanstack/solid-router-ssr-query": "^1.167.1", - "@tanstack/solid-start": "^1.168.20", + "@tanstack/solid-start": "^1.168.19", "@tanstack/router-plugin": "^1.168.14", "solid-js": "^1.9.10", "tailwindcss": "^4.2.2" diff --git a/examples/solid/start-convex-better-auth/package.json b/examples/solid/start-convex-better-auth/package.json index e6759553..a7fd380f 100644 --- a/examples/solid/start-convex-better-auth/package.json +++ b/examples/solid/start-convex-better-auth/package.json @@ -15,7 +15,7 @@ "@tailwindcss/vite": "^4.2.2", "@tanstack/solid-router": "^1.170.11", "@tanstack/solid-router-devtools": "^1.167.0", - "@tanstack/solid-start": "^1.168.20", + "@tanstack/solid-start": "^1.168.19", "better-auth": "^1.3.27", "clsx": "^2.1.1", "convex": "^1.28.2", diff --git a/examples/solid/start-counter/package.json b/examples/solid/start-counter/package.json index d96d25c8..748f67c4 100644 --- a/examples/solid/start-counter/package.json +++ b/examples/solid/start-counter/package.json @@ -12,7 +12,7 @@ "dependencies": { "@tanstack/solid-router": "^1.170.11", "@tanstack/solid-router-devtools": "^1.167.0", - "@tanstack/solid-start": "^1.168.20", + "@tanstack/solid-start": "^1.168.19", "redaxios": "^0.5.1", "solid-js": "^1.9.10", "tailwind-merge": "^3.6.0", diff --git a/examples/solid/start-i18n-paraglide/package.json b/examples/solid/start-i18n-paraglide/package.json index 0697b510..fb4a1c3b 100644 --- a/examples/solid/start-i18n-paraglide/package.json +++ b/examples/solid/start-i18n-paraglide/package.json @@ -12,7 +12,7 @@ "@tanstack/solid-devtools": "^0.7.0", "@tanstack/solid-router": "^1.170.11", "@tanstack/solid-router-devtools": "^1.167.0", - "@tanstack/solid-start": "^1.168.20", + "@tanstack/solid-start": "^1.168.19", "solid-js": "^1.9.10" }, "devDependencies": { diff --git a/examples/solid/start-large/package.json b/examples/solid/start-large/package.json index c31c3499..03acb96d 100644 --- a/examples/solid/start-large/package.json +++ b/examples/solid/start-large/package.json @@ -15,7 +15,7 @@ "@tanstack/solid-query": "^5.90.9", "@tanstack/solid-router": "^1.170.11", "@tanstack/solid-router-devtools": "^1.167.0", - "@tanstack/solid-start": "^1.168.20", + "@tanstack/solid-start": "^1.168.19", "redaxios": "^0.5.1", "solid-js": "^1.9.10", "tailwind-merge": "^3.6.0", diff --git a/examples/solid/start-streaming-data-from-server-functions/package.json b/examples/solid/start-streaming-data-from-server-functions/package.json index eb655dfa..447928d1 100644 --- a/examples/solid/start-streaming-data-from-server-functions/package.json +++ b/examples/solid/start-streaming-data-from-server-functions/package.json @@ -12,7 +12,7 @@ "dependencies": { "@tanstack/solid-router": "^1.170.11", "@tanstack/solid-router-devtools": "^1.167.0", - "@tanstack/solid-start": "^1.168.20", + "@tanstack/solid-start": "^1.168.19", "solid-js": "^1.9.10", "zod": "^4.4.3" }, diff --git a/examples/solid/start-supabase-basic/package.json b/examples/solid/start-supabase-basic/package.json index 85c72470..50794627 100644 --- a/examples/solid/start-supabase-basic/package.json +++ b/examples/solid/start-supabase-basic/package.json @@ -16,7 +16,7 @@ "@supabase/supabase-js": "^2.48.1", "@tanstack/solid-router": "^1.170.11", "@tanstack/solid-router-devtools": "^1.167.0", - "@tanstack/solid-start": "^1.168.20", + "@tanstack/solid-start": "^1.168.19", "solid-js": "^1.9.9", "redaxios": "^0.5.1" }, diff --git a/examples/solid/start-supabase-basic/src/components/DefaultCatchBoundary.tsx b/examples/solid/start-supabase-basic/src/components/DefaultCatchBoundary.tsx index 6de1f0b3..32aed20e 100644 --- a/examples/solid/start-supabase-basic/src/components/DefaultCatchBoundary.tsx +++ b/examples/solid/start-supabase-basic/src/components/DefaultCatchBoundary.tsx @@ -1,15 +1,17 @@ import { ErrorComponent, Link, - useLocation, + rootRouteId, + useMatch, useRouter, } from '@tanstack/solid-router' import type { ErrorComponentProps } from '@tanstack/solid-router' export function DefaultCatchBoundary({ error }: ErrorComponentProps) { const router = useRouter() - const isRoot = useLocation({ - select: (location) => location.pathname === '/', + const isRoot = useMatch({ + strict: false, + select: (state) => state.id === rootRouteId, }) console.error(error) diff --git a/examples/solid/start-tailwind-v4/package.json b/examples/solid/start-tailwind-v4/package.json index 0e86dbb5..dd72a341 100644 --- a/examples/solid/start-tailwind-v4/package.json +++ b/examples/solid/start-tailwind-v4/package.json @@ -12,7 +12,7 @@ "dependencies": { "@tanstack/solid-router": "^1.170.11", "@tanstack/solid-router-devtools": "^1.167.0", - "@tanstack/solid-start": "^1.168.20", + "@tanstack/solid-start": "^1.168.19", "solid-js": "^1.9.10", "tailwind-merge": "^3.6.0", "zod": "^4.4.3" diff --git a/packages/react-router/package.json b/packages/react-router/package.json index 84490c94..13a32a03 100644 --- a/packages/react-router/package.json +++ b/packages/react-router/package.json @@ -38,7 +38,8 @@ "test:perf": "vitest bench", "test:perf:dev": "pnpm run test:perf --watch --hideSkippedTests", "test:build": "publint --strict && attw --ignore-rules no-resolution --pack .", - "build": "vite build" + "build": "pnpm run build:lib", + "build:lib": "vite build" }, "type": "module", "types": "dist/esm/index.d.ts", @@ -81,13 +82,7 @@ "default": "./dist/cjs/ssr/client.cjs" } }, - "./package.json": "./package.json", - "./llms": { - "import": { - "types": "./dist/llms/index.d.ts", - "default": "./dist/llms/index.js" - } - } + "./package.json": "./package.json" }, "sideEffects": false, "files": [ diff --git a/packages/react-router/src/route.tsx b/packages/react-router/src/route.tsx index 3021e3fb..58f5198d 100644 --- a/packages/react-router/src/route.tsx +++ b/packages/react-router/src/route.tsx @@ -115,7 +115,7 @@ export class RouteApi< } useRouteContext: UseRouteContextRoute = (opts) => { - return useRouteContext({ ...(opts as any), from: this.id }) + return useRouteContext({ ...(opts as any), from: this.id as any }) } useSearch: UseSearchRoute = (opts) => { diff --git a/packages/react-router/src/useLoaderData.tsx b/packages/react-router/src/useLoaderData.tsx index 755a3961..eb82a404 100644 --- a/packages/react-router/src/useLoaderData.tsx +++ b/packages/react-router/src/useLoaderData.tsx @@ -84,8 +84,8 @@ export function useLoaderData< from: opts.from!, strict: opts.strict, structuralSharing: opts.structuralSharing, - select: (match) => { - return opts.select ? opts.select(match.loaderData) : match.loaderData + select: (s: any) => { + return opts.select ? opts.select(s.loaderData) : s.loaderData }, - }) as UseLoaderDataResult + } as any) as UseLoaderDataResult } diff --git a/packages/react-router/src/useLoaderDeps.tsx b/packages/react-router/src/useLoaderDeps.tsx index 21e7267d..0e5365ee 100644 --- a/packages/react-router/src/useLoaderDeps.tsx +++ b/packages/react-router/src/useLoaderDeps.tsx @@ -62,8 +62,8 @@ export function useLoaderDeps< const { select, ...rest } = opts return useMatch({ ...rest, - select: (match) => { - return select ? select(match.loaderDeps) : match.loaderDeps + select: (s) => { + return select ? select(s.loaderDeps) : s.loaderDeps }, }) as UseLoaderDepsResult } diff --git a/packages/react-router/src/useSearch.tsx b/packages/react-router/src/useSearch.tsx index 09f1a29b..46b6e516 100644 --- a/packages/react-router/src/useSearch.tsx +++ b/packages/react-router/src/useSearch.tsx @@ -98,7 +98,7 @@ export function useSearch< strict: opts.strict, shouldThrow: opts.shouldThrow, structuralSharing: opts.structuralSharing, - select: (match) => { + select: (match: any) => { return opts.select ? opts.select(match.search) : match.search }, }) as any diff --git a/packages/react-start-rsc/CHANGELOG.md b/packages/react-start-rsc/CHANGELOG.md index 27498b85..8845f0eb 100644 --- a/packages/react-start-rsc/CHANGELOG.md +++ b/packages/react-start-rsc/CHANGELOG.md @@ -1,12 +1,5 @@ # @tanstack/react-start-rsc -## 0.1.19 - -### Patch Changes - -- Updated dependencies [[`8091918`](https://github.com/TanStack/router/commit/80919186cbdd0deb948b46fe328881a14a08f414)]: - - @tanstack/start-plugin-core@1.171.12 - ## 0.1.18 ### Patch Changes diff --git a/packages/react-start-rsc/package.json b/packages/react-start-rsc/package.json index 587819af..9376945b 100644 --- a/packages/react-start-rsc/package.json +++ b/packages/react-start-rsc/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start-rsc", - "version": "0.1.19", + "version": "0.1.18", "description": "React Server Components support for TanStack Start", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-start/CHANGELOG.md b/packages/react-start/CHANGELOG.md index e4177ea3..173460f6 100644 --- a/packages/react-start/CHANGELOG.md +++ b/packages/react-start/CHANGELOG.md @@ -1,13 +1,5 @@ # @tanstack/react-start -## 1.168.20 - -### Patch Changes - -- Updated dependencies [[`8091918`](https://github.com/TanStack/router/commit/80919186cbdd0deb948b46fe328881a14a08f414)]: - - @tanstack/start-plugin-core@1.171.12 - - @tanstack/react-start-rsc@0.1.19 - ## 1.168.19 ### Patch Changes diff --git a/packages/react-start/package.json b/packages/react-start/package.json index fe72d05e..fb6147d2 100644 --- a/packages/react-start/package.json +++ b/packages/react-start/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start", - "version": "1.168.20", + "version": "1.168.19", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-plugin/src/core/code-splitter/compilers.ts b/packages/router-plugin/src/core/code-splitter/compilers.ts index 94111656..32eade99 100644 --- a/packages/router-plugin/src/core/code-splitter/compilers.ts +++ b/packages/router-plugin/src/core/code-splitter/compilers.ts @@ -1034,7 +1034,7 @@ export function compileCodeSplitVirtualRoute( t.variableDeclaration('const', [ t.variableDeclarator( t.identifier(splitMeta.localExporterIdent), - splitNode, + splitNode as any, ), ]), ) diff --git a/packages/solid-router/src/fileRoute.ts b/packages/solid-router/src/fileRoute.ts index 35aa4de1..afed9eae 100644 --- a/packages/solid-router/src/fileRoute.ts +++ b/packages/solid-router/src/fileRoute.ts @@ -212,7 +212,7 @@ export class LazyRoute { } useRouteContext: UseRouteContextRoute = (opts) => { - return useRouteContext({ ...(opts as any), from: this.options.id }) + return useRouteContext({ ...(opts as any), from: this.options.id }) as any } useSearch: UseSearchRoute = (opts) => { diff --git a/packages/solid-router/src/route.tsx b/packages/solid-router/src/route.tsx index 221a79ff..da7e639a 100644 --- a/packages/solid-router/src/route.tsx +++ b/packages/solid-router/src/route.tsx @@ -105,7 +105,7 @@ export class RouteApi< } useRouteContext: UseRouteContextRoute = (opts) => { - return useRouteContext({ ...(opts as any), from: this.id }) + return useRouteContext({ ...(opts as any), from: this.id as any }) as any } useSearch: UseSearchRoute = (opts) => { @@ -491,7 +491,7 @@ export class RootRoute< } useRouteContext: UseRouteContextRoute = (opts) => { - return useRouteContext({ ...(opts as any), from: this.id }) + return useRouteContext({ ...(opts as any), from: this.id }) as any } useSearch: UseSearchRoute = (opts) => { diff --git a/packages/solid-router/src/useLoaderData.tsx b/packages/solid-router/src/useLoaderData.tsx index 7b569187..c248ac71 100644 --- a/packages/solid-router/src/useLoaderData.tsx +++ b/packages/solid-router/src/useLoaderData.tsx @@ -43,8 +43,8 @@ export function useLoaderData< return useMatch({ from: opts.from!, strict: opts.strict, - select: (match) => { - return opts.select ? opts.select(match.loaderData) : match.loaderData + select: (s: any) => { + return opts.select ? opts.select(s.loaderData) : s.loaderData }, - }) as any + } as any) as any } diff --git a/packages/solid-router/src/useLoaderDeps.tsx b/packages/solid-router/src/useLoaderDeps.tsx index 41664f0a..5fe1efe4 100644 --- a/packages/solid-router/src/useLoaderDeps.tsx +++ b/packages/solid-router/src/useLoaderDeps.tsx @@ -39,8 +39,8 @@ export function useLoaderDeps< ): Accessor> { return useMatch({ ...opts, - select: (match) => { - return opts.select ? opts.select(match.loaderDeps) : match.loaderDeps + select: (s) => { + return opts.select ? opts.select(s.loaderDeps) : s.loaderDeps }, }) as Accessor> } diff --git a/packages/solid-router/src/useMatch.tsx b/packages/solid-router/src/useMatch.tsx index 858d75be..f617a2b8 100644 --- a/packages/solid-router/src/useMatch.tsx +++ b/packages/solid-router/src/useMatch.tsx @@ -124,7 +124,7 @@ export function useMatch< return undefined } - const res = opts.select ? opts.select(selectedMatch) : selectedMatch + const res = opts.select ? opts.select(selectedMatch as any) : selectedMatch if (prev === undefined) return res as TSelected return replaceEqualDeep(prev, res) as TSelected }) as any diff --git a/packages/solid-router/src/useParams.tsx b/packages/solid-router/src/useParams.tsx index f036155d..1d19158a 100644 --- a/packages/solid-router/src/useParams.tsx +++ b/packages/solid-router/src/useParams.tsx @@ -64,7 +64,7 @@ export function useParams< from: opts.from!, strict: opts.strict, shouldThrow: opts.shouldThrow, - select: (match) => { + select: (match: any) => { const params = opts.strict === false ? match.params : match._strictParams return opts.select ? opts.select(params) : params }, diff --git a/packages/solid-router/src/useRouteContext.ts b/packages/solid-router/src/useRouteContext.ts index 4a9ef1d7..6b6cf739 100644 --- a/packages/solid-router/src/useRouteContext.ts +++ b/packages/solid-router/src/useRouteContext.ts @@ -24,7 +24,7 @@ export function useRouteContext< opts: UseRouteContextOptions, ): Accessor> { return useMatch({ - ...opts, + ...(opts as any), select: (match) => opts.select ? opts.select(match.context) : match.context, }) as any diff --git a/packages/solid-router/src/useRouter.tsx b/packages/solid-router/src/useRouter.tsx index 344afe90..89b53e9d 100644 --- a/packages/solid-router/src/useRouter.tsx +++ b/packages/solid-router/src/useRouter.tsx @@ -5,7 +5,7 @@ import type { AnyRouter, RegisteredRouter } from '@tanstack/router-core' export function useRouter(opts?: { warn?: boolean }): TRouter { - const value = Solid.useContext(routerContext) + const value = Solid.useContext(routerContext as any) if (process.env.NODE_ENV !== 'production') { if ((opts?.warn ?? true) && !value) { console.warn( @@ -13,5 +13,5 @@ export function useRouter(opts?: { ) } } - return value as TRouter + return value as any } diff --git a/packages/solid-router/src/useSearch.tsx b/packages/solid-router/src/useSearch.tsx index 556cfc3d..80c4d410 100644 --- a/packages/solid-router/src/useSearch.tsx +++ b/packages/solid-router/src/useSearch.tsx @@ -64,7 +64,7 @@ export function useSearch< from: opts.from!, strict: opts.strict, shouldThrow: opts.shouldThrow, - select: (match) => { + select: (match: any) => { const search = match.search return opts.select ? opts.select(search) : search }, diff --git a/packages/solid-start/CHANGELOG.md b/packages/solid-start/CHANGELOG.md index 436f26c8..2fa0cf84 100644 --- a/packages/solid-start/CHANGELOG.md +++ b/packages/solid-start/CHANGELOG.md @@ -1,12 +1,5 @@ # @tanstack/solid-start -## 1.168.20 - -### Patch Changes - -- Updated dependencies [[`8091918`](https://github.com/TanStack/router/commit/80919186cbdd0deb948b46fe328881a14a08f414)]: - - @tanstack/start-plugin-core@1.171.12 - ## 1.168.19 ### Patch Changes diff --git a/packages/solid-start/package.json b/packages/solid-start/package.json index 7fc73aaf..2c52a15e 100644 --- a/packages/solid-start/package.json +++ b/packages/solid-start/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start", - "version": "1.168.20", + "version": "1.168.19", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-client-core/src/createMiddleware.ts b/packages/start-client-core/src/createMiddleware.ts index 9b41fbfa..8f4ff474 100644 --- a/packages/start-client-core/src/createMiddleware.ts +++ b/packages/start-client-core/src/createMiddleware.ts @@ -41,21 +41,27 @@ export const createMiddleware: CreateMiddlewareFn<{}> = (options, __opts) => { options: resolvedOptions, middleware: (middleware: any) => { return createMiddleware( - {}, + {} as any, Object.assign(resolvedOptions, { middleware }), - ) + ) as any }, inputValidator: (inputValidator: any) => { return createMiddleware( - {}, + {} as any, Object.assign(resolvedOptions, { inputValidator }), - ) + ) as any }, client: (client: any) => { - return createMiddleware({}, Object.assign(resolvedOptions, { client })) + return createMiddleware( + {} as any, + Object.assign(resolvedOptions, { client }), + ) as any }, server: (server: any) => { - return createMiddleware({}, Object.assign(resolvedOptions, { server })) + return createMiddleware( + {} as any, + Object.assign(resolvedOptions, { server }), + ) as any }, } as any } diff --git a/packages/start-client-core/src/createServerFn.ts b/packages/start-client-core/src/createServerFn.ts index d9d93a04..37d4ead1 100644 --- a/packages/start-client-core/src/createServerFn.ts +++ b/packages/start-client-core/src/createServerFn.ts @@ -25,10 +25,13 @@ import type { AnyFunctionMiddleware, AnyRequestMiddleware, AssignAllServerFnContext, + FunctionMiddlewareServerFnResult, IntersectAllValidatorInputs, IntersectAllValidatorOutputs, } from './createMiddleware' +type TODO = any + export type ServerFnStrict = boolean | { input?: boolean; output?: boolean } export interface ServerFnOptions< @@ -106,7 +109,7 @@ export const createServerFn: CreateServerFn = (options, __opts) => { ...resolvedOptions, middleware: newMiddleware, } - const res = createServerFn(undefined, newOptions) + const res = createServerFn(undefined, newOptions) as any res[TSS_SERVER_FUNCTION_FACTORY] = true return res }, @@ -147,7 +150,7 @@ export const createServerFn: CreateServerFn = (options, __opts) => { const result = await executeMiddleware(resolvedMiddleware, 'client', { ...extractedFn, ...newOptions, - data: opts?.data, + data: opts?.data as any, headers: opts?.headers, signal: opts?.signal, fetch: opts?.fetch, @@ -211,7 +214,7 @@ export const createServerFn: CreateServerFn = (options, __opts) => { ...resolvedOptions, ...options, } - return createServerFn(undefined, newOptions) + return createServerFn(undefined, newOptions) as any } return Object.assign(fun, res) as any } @@ -911,7 +914,7 @@ function serverFnBaseToMiddleware( // switch the sendContext over to context context: sendContext, fetch, - } + } as any // Execute the extracted function // but not before serializing the context @@ -921,12 +924,18 @@ function serverFnBaseToMiddleware( }, server: async ({ next, ...ctx }) => { // Execute the server function - const result = await options.serverFn?.(ctx) + const result = await options.serverFn?.(ctx as TODO) return next({ ...ctx, result, - } as any) + } as any) as unknown as FunctionMiddlewareServerFnResult< + any, + any, + any, + any, + any + > }, }, } diff --git a/packages/start-plugin-core/CHANGELOG.md b/packages/start-plugin-core/CHANGELOG.md index 156c224d..27e83949 100644 --- a/packages/start-plugin-core/CHANGELOG.md +++ b/packages/start-plugin-core/CHANGELOG.md @@ -1,11 +1,5 @@ # @tanstack/start-plugin-core -## 1.171.12 - -### Patch Changes - -- [#7540](https://github.com/TanStack/router/pull/7540) [`8091918`](https://github.com/TanStack/router/commit/80919186cbdd0deb948b46fe328881a14a08f414) - Fix Rsbuild RSC builds so client directives in packages under `node_modules` are compiled and detected correctly. - ## 1.171.11 ### Patch Changes diff --git a/packages/start-plugin-core/package.json b/packages/start-plugin-core/package.json index 3c37b7c7..2f46dbb2 100644 --- a/packages/start-plugin-core/package.json +++ b/packages/start-plugin-core/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-plugin-core", - "version": "1.171.12", + "version": "1.171.11", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-plugin-core/src/rsbuild/plugin.ts b/packages/start-plugin-core/src/rsbuild/plugin.ts index f9e48fe7..c18222f4 100644 --- a/packages/start-plugin-core/src/rsbuild/plugin.ts +++ b/packages/start-plugin-core/src/rsbuild/plugin.ts @@ -185,21 +185,6 @@ export function tanStackStartRsbuild( return mergeRsbuildConfig(rsbuildConfig, { source: { - ...(rscEnabled - ? { - include: [ - // RSC needs SWC to inspect package code in node_modules so directives such as "use client" can be discovered. - // This follows Rsbuild's documented broad include form for compiling node_modules, with core-js excluded: - // https://rsbuild.rs/config/source/include#compile-node_modules - // - // TODO: Once the Rspack rule matching needed here is ready, narrow this to React-aware packages, for example via - // descriptionData: { "peerDependencies.react": /./ }, so unrelated dependencies are not sent through swc-loader. - { - not: /[\\/]core-js[\\/]/, - }, - ], - } - : {}), define: { 'process.env.TSS_SERVER_FN_BASE': JSON.stringify(serverFnBase), 'import.meta.env.TSS_SERVER_FN_BASE': diff --git a/packages/start-plugin-core/src/rsbuild/start-router-plugin.ts b/packages/start-plugin-core/src/rsbuild/start-router-plugin.ts index 40dfb9e4..438c01ba 100644 --- a/packages/start-plugin-core/src/rsbuild/start-router-plugin.ts +++ b/packages/start-plugin-core/src/rsbuild/start-router-plugin.ts @@ -59,7 +59,7 @@ export function registerRouterPlugins( }, routerPluginContext, ) - utils.appendPlugins(generatorPlugin) + utils.appendPlugins(generatorPlugin as any) } if ( @@ -79,7 +79,7 @@ export function registerRouterPlugins( }, routerPluginContext, ) - utils.appendPlugins(splitterPlugin) + utils.appendPlugins(splitterPlugin as any) } }) } diff --git a/packages/vue-router/src/Match.tsx b/packages/vue-router/src/Match.tsx index 44e9aca0..7bd17682 100644 --- a/packages/vue-router/src/Match.tsx +++ b/packages/vue-router/src/Match.tsx @@ -166,7 +166,7 @@ export const Match = Vue.defineComponent({ if (routeNotFoundComponent.value) { content = Vue.h(CatchNotFound, { fallback: (error: any) => { - error.routeId ??= matchData.value?.routeId + error.routeId ??= matchData.value?.routeId as any // If the current not found handler doesn't exist or it has a // route ID which doesn't match the current route, rethrow the error @@ -191,7 +191,7 @@ export const Match = Vue.defineComponent({ onCatch: (error: Error) => { // Forward not found errors (we don't want to show the error component for these) if (isNotFound(error)) { - error.routeId ??= matchData.value?.routeId + error.routeId ??= matchData.value?.routeId as any throw error } if (process.env.NODE_ENV !== 'production') { diff --git a/packages/vue-router/src/Matches.tsx b/packages/vue-router/src/Matches.tsx index da8220db..a9851aef 100644 --- a/packages/vue-router/src/Matches.tsx +++ b/packages/vue-router/src/Matches.tsx @@ -258,7 +258,7 @@ export const MatchRoute = Vue.defineComponent({ if (!status.value) return null const matchRoute = useMatchRoute() - const params = matchRoute(props).value as boolean + const params = matchRoute(props as any).value as boolean // Create a component that renders the slot in a reactive manner if (!params || !slots.default) { diff --git a/packages/vue-router/src/RouterProvider.tsx b/packages/vue-router/src/RouterProvider.tsx index 3a4fe632..92bc0dfb 100644 --- a/packages/vue-router/src/RouterProvider.tsx +++ b/packages/vue-router/src/RouterProvider.tsx @@ -27,9 +27,9 @@ export const RouterContextProvider = Vue.defineComponent({ ...restAttrs, context: { ...router.options.context, - ...(restAttrs.context || {}), + ...((restAttrs.context as Record) || {}), }, - }) + } as any) // Provide router to all child components provideRouter(router) diff --git a/packages/vue-router/src/fileRoute.ts b/packages/vue-router/src/fileRoute.ts index 672328b5..79902b87 100644 --- a/packages/vue-router/src/fileRoute.ts +++ b/packages/vue-router/src/fileRoute.ts @@ -212,7 +212,7 @@ export class LazyRoute { } useRouteContext: UseRouteContextRoute = (opts) => { - return useRouteContext({ ...(opts as any), from: this.options.id }) + return useRouteContext({ ...(opts as any), from: this.options.id }) as any } useSearch: UseSearchRoute = (opts) => { diff --git a/packages/vue-router/src/lazyRouteComponent.tsx b/packages/vue-router/src/lazyRouteComponent.tsx index 77a22335..b8c040cf 100644 --- a/packages/vue-router/src/lazyRouteComponent.tsx +++ b/packages/vue-router/src/lazyRouteComponent.tsx @@ -147,7 +147,7 @@ export function lazyRouteComponent< }) // Add preload method - lazyComp.preload = load + ;(lazyComp as any).preload = load return lazyComp as any } diff --git a/packages/vue-router/src/link.tsx b/packages/vue-router/src/link.tsx index 3a5a9875..e11a6c56 100644 --- a/packages/vue-router/src/link.tsx +++ b/packages/vue-router/src/link.tsx @@ -227,7 +227,7 @@ export function useLinkProps< // Rebuild when inherited search/hash or the current route context changes. const opts = { _fromLocation: currentLocation.value, ...options } - return router.buildLocation(opts) + return router.buildLocation(opts as any) }) const preload = Vue.computed(() => { @@ -394,32 +394,38 @@ export function useLinkProps< // Create static event handlers that don't change between renders const staticEventHandlers = { - onClick: composeEventHandlers([options.onClick, handleClick]), - onBlur: composeEventHandlers([options.onBlur, handleLeave]), + onClick: composeEventHandlers([ + options.onClick, + handleClick, + ]) as any, + onBlur: composeEventHandlers([ + options.onBlur, + handleLeave, + ]) as any, onFocus: composeEventHandlers([ options.onFocus, enqueueIntentPreload, - ]), + ]) as any, onMouseenter: composeEventHandlers([ eventHandlers.onMouseenter, enqueueIntentPreload, - ]), + ]) as any, onMouseover: composeEventHandlers([ eventHandlers.onMouseover, enqueueIntentPreload, - ]), + ]) as any, onMouseleave: composeEventHandlers([ eventHandlers.onMouseleave, handleLeave, - ]), + ]) as any, onMouseout: composeEventHandlers([ eventHandlers.onMouseout, handleLeave, - ]), + ]) as any, onTouchstart: composeEventHandlers([ eventHandlers.onTouchstart, handleTouchStart, - ]), + ]) as any, } // Compute all props synchronously to avoid hydration mismatches @@ -853,7 +859,7 @@ export function createLink( name: 'CreatedLink', inheritAttrs: false, setup(_, { attrs, slots }) { - return () => Vue.h(LinkImpl, { ...attrs, _asChild: Comp }, slots) + return () => Vue.h(LinkImpl as any, { ...attrs, _asChild: Comp }, slots) }, }) as any } @@ -890,7 +896,7 @@ const LinkImpl = Vue.defineComponent({ setup(props, { attrs, slots }) { // Call useLinkProps ONCE during setup with combined props and attrs const allProps = { ...props, ...attrs } - const linkPropsSource = useLinkProps(allProps) as + const linkPropsSource = useLinkProps(allProps as any) as | LinkHTMLAttributes | Vue.ComputedRef diff --git a/packages/vue-router/src/renderRouteNotFound.tsx b/packages/vue-router/src/renderRouteNotFound.tsx index 3b029070..600a66a7 100644 --- a/packages/vue-router/src/renderRouteNotFound.tsx +++ b/packages/vue-router/src/renderRouteNotFound.tsx @@ -17,7 +17,7 @@ export function renderRouteNotFound( ): Vue.VNode { if (!route.options.notFoundComponent) { if (router.options.defaultNotFoundComponent) { - return Vue.h(router.options.defaultNotFoundComponent, data) + return Vue.h(router.options.defaultNotFoundComponent as any, data) } if (process.env.NODE_ENV !== 'production') { @@ -31,5 +31,5 @@ export function renderRouteNotFound( return Vue.h(DefaultGlobalNotFound) } - return Vue.h(route.options.notFoundComponent, data) + return Vue.h(route.options.notFoundComponent as any, data) } diff --git a/packages/vue-router/src/route.ts b/packages/vue-router/src/route.ts index d409d506..9a958f11 100644 --- a/packages/vue-router/src/route.ts +++ b/packages/vue-router/src/route.ts @@ -106,7 +106,7 @@ export class RouteApi< } useRouteContext: UseRouteContextRoute = (opts) => { - return useRouteContext({ ...(opts as any), from: this.id }) + return useRouteContext({ ...(opts as any), from: this.id as any }) as any } useSearch: UseSearchRoute = (opts) => { @@ -259,7 +259,7 @@ export class Route< } useRouteContext: UseRouteContextRoute = (opts?) => { - return useRouteContext({ ...(opts as any), from: this.id }) + return useRouteContext({ ...(opts as any), from: this.id }) as any } useSearch: UseSearchRoute = (opts) => { @@ -501,7 +501,7 @@ export class RootRoute< } useRouteContext: UseRouteContextRoute = (opts) => { - return useRouteContext({ ...(opts as any), from: this.id }) + return useRouteContext({ ...(opts as any), from: this.id }) as any } useSearch: UseSearchRoute = (opts) => { @@ -531,7 +531,11 @@ export class RootRoute< } Link: LinkComponentRoute<'/'> = ((props, ctx?: Vue.SetupContext) => { - return Vue.h(Link, { from: this.fullPath as never, ...props }, ctx?.slots) + return Vue.h( + Link as any, + { from: this.fullPath as never, ...(props as any) }, + ctx?.slots, + ) }) as LinkComponentRoute<'/'> } diff --git a/packages/vue-router/src/useBlocker.tsx b/packages/vue-router/src/useBlocker.tsx index 4802a3e8..71c6e60e 100644 --- a/packages/vue-router/src/useBlocker.tsx +++ b/packages/vue-router/src/useBlocker.tsx @@ -457,7 +457,7 @@ const BlockImpl = Vue.defineComponent({ } // If slot is a function that takes resolver, call it with the resolver - const slotContent = defaultSlot(resolver.value) + const slotContent = defaultSlot(resolver.value as any) return Vue.h(Vue.Fragment, null, slotContent) } }, @@ -483,7 +483,7 @@ export function Block(opts: PromptProps | LegacyPromptProps): Vue.VNode { : { default: () => children } : undefined - return Vue.h(BlockImpl, rest, slots) + return Vue.h(BlockImpl, rest as any, slots) } type LegacyPromptProps = { diff --git a/packages/vue-router/src/useLoaderData.tsx b/packages/vue-router/src/useLoaderData.tsx index c4cbcb2f..32314df9 100644 --- a/packages/vue-router/src/useLoaderData.tsx +++ b/packages/vue-router/src/useLoaderData.tsx @@ -43,8 +43,8 @@ export function useLoaderData< return useMatch({ from: opts.from!, strict: opts.strict, - select: (match) => { - return opts.select ? opts.select(match.loaderData) : match.loaderData + select: (s: any) => { + return opts.select ? opts.select(s.loaderData) : s.loaderData }, - }) as any + } as any) as any } diff --git a/packages/vue-router/src/useLoaderDeps.tsx b/packages/vue-router/src/useLoaderDeps.tsx index ecf9f54f..eec4525e 100644 --- a/packages/vue-router/src/useLoaderDeps.tsx +++ b/packages/vue-router/src/useLoaderDeps.tsx @@ -40,8 +40,8 @@ export function useLoaderDeps< const { select, ...rest } = opts return useMatch({ ...rest, - select: (match) => { - return select ? select(match.loaderDeps) : match.loaderDeps + select: (s) => { + return select ? select(s.loaderDeps) : s.loaderDeps }, }) as Vue.Ref> } diff --git a/packages/vue-router/src/useLocation.tsx b/packages/vue-router/src/useLocation.tsx index 2d9e4314..4c6e3153 100644 --- a/packages/vue-router/src/useLocation.tsx +++ b/packages/vue-router/src/useLocation.tsx @@ -25,7 +25,9 @@ export function useLocation< opts?: UseLocationBaseOptions, ): Vue.Ref> { const router = useRouter() - return useStore(router.stores.location, (location) => - opts?.select ? opts.select(location) : location, + return useStore( + router.stores.location, + (location) => + (opts?.select ? opts.select(location as any) : location) as any, ) as Vue.Ref> } diff --git a/packages/vue-router/src/useParams.tsx b/packages/vue-router/src/useParams.tsx index 5b501cc2..d0d9e5d6 100644 --- a/packages/vue-router/src/useParams.tsx +++ b/packages/vue-router/src/useParams.tsx @@ -64,8 +64,8 @@ export function useParams< from: opts.from!, strict: opts.strict, shouldThrow: opts.shouldThrow, - select: (match) => { + select: (match: any) => { return opts.select ? opts.select(match.params) : match.params }, - }) as any + } as any) as any } diff --git a/packages/vue-router/src/useRouteContext.ts b/packages/vue-router/src/useRouteContext.ts index 839e3119..ff974cb1 100644 --- a/packages/vue-router/src/useRouteContext.ts +++ b/packages/vue-router/src/useRouteContext.ts @@ -24,7 +24,7 @@ export function useRouteContext< opts: UseRouteContextOptions, ): Vue.Ref> { return useMatch({ - ...opts, + ...(opts as any), select: (match) => opts.select ? opts.select(match.context) : match.context, }) as any diff --git a/packages/vue-router/src/useRouter.tsx b/packages/vue-router/src/useRouter.tsx index 21afef03..e0fd9129 100644 --- a/packages/vue-router/src/useRouter.tsx +++ b/packages/vue-router/src/useRouter.tsx @@ -5,7 +5,7 @@ import type { AnyRouter, RegisteredRouter } from '@tanstack/router-core' export function useRouter(opts?: { warn?: boolean }): TRouter { - const value = Vue.inject(routerContext, null) + const value = Vue.inject(routerContext as any, null) if (process.env.NODE_ENV !== 'production') { if ((opts?.warn ?? true) && !value) { console.warn( @@ -13,5 +13,5 @@ export function useRouter(opts?: { ) } } - return value as TRouter + return value as any } diff --git a/packages/vue-router/src/useSearch.tsx b/packages/vue-router/src/useSearch.tsx index 877a1cf8..c534bd43 100644 --- a/packages/vue-router/src/useSearch.tsx +++ b/packages/vue-router/src/useSearch.tsx @@ -64,7 +64,7 @@ export function useSearch< from: opts.from!, strict: opts.strict, shouldThrow: opts.shouldThrow, - select: (match) => { + select: (match: any) => { return opts.select ? opts.select(match.search) : match.search }, }) as any diff --git a/packages/vue-start/CHANGELOG.md b/packages/vue-start/CHANGELOG.md index d4c66704..b5efe38a 100644 --- a/packages/vue-start/CHANGELOG.md +++ b/packages/vue-start/CHANGELOG.md @@ -1,12 +1,5 @@ # @tanstack/vue-start -## 1.168.19 - -### Patch Changes - -- Updated dependencies [[`8091918`](https://github.com/TanStack/router/commit/80919186cbdd0deb948b46fe328881a14a08f414)]: - - @tanstack/start-plugin-core@1.171.12 - ## 1.168.18 ### Patch Changes diff --git a/packages/vue-start/package.json b/packages/vue-start/package.json index e3410bf0..9f7a4f50 100644 --- a/packages/vue-start/package.json +++ b/packages/vue-start/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/vue-start", - "version": "1.168.19", + "version": "1.168.18", "description": "Modern and scalable routing for Vue applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index b23a2956..174e46bc 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -2018,7 +2018,7 @@ importers: version: 2.0.1 '@rsbuild/plugin-react': specifier: ^2.0.0 - version: 2.0.0(@rsbuild/core@2.0.1)(@rspack/core@2.0.5(@swc/helpers@0.5.23)) + version: 2.0.0(@rsbuild/core@2.0.1)(@rspack/core@2.0.5(@swc/helpers@0.5.21)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -2622,49 +2622,6 @@ importers: specifier: ^8.0.14 version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1) - e2e/react-start/rsc-rsbuild: - dependencies: - '@tanstack/react-router': - specifier: workspace:* - version: link:../../../packages/react-router - '@tanstack/react-start': - specifier: workspace:* - version: link:../../../packages/react-start - react: - specifier: ^19.2.3 - version: 19.2.3 - react-dom: - specifier: ^19.2.3 - version: 19.2.3(react@19.2.3) - devDependencies: - '@playwright/test': - specifier: ^1.57.0 - version: 1.58.0 - '@rsbuild/core': - specifier: ^2.0.8 - version: 2.0.8 - '@rsbuild/plugin-react': - specifier: ^2.0.0 - version: 2.0.0(@rsbuild/core@2.0.8)(@rspack/core@2.0.5(@swc/helpers@0.5.23)) - '@tanstack/router-e2e-utils': - specifier: workspace:^ - version: link:../../e2e-utils - '@types/node': - specifier: 25.0.9 - version: 25.0.9 - '@types/react': - specifier: ^19.2.8 - version: 19.2.9 - '@types/react-dom': - specifier: ^19.2.3 - version: 19.2.3(@types/react@19.2.9) - srvx: - specifier: ^0.10.0 - version: 0.10.1 - typescript: - specifier: ^5.7.2 - version: 5.9.3 - e2e/react-start/scroll-restoration: dependencies: '@tanstack/react-router': @@ -31363,9 +31320,9 @@ snapshots: transitivePeerDependencies: - supports-color - '@rsbuild/plugin-react@2.0.0(@rsbuild/core@2.0.1)(@rspack/core@2.0.5(@swc/helpers@0.5.23))': + '@rsbuild/plugin-react@2.0.0(@rsbuild/core@2.0.1)(@rspack/core@2.0.5(@swc/helpers@0.5.21))': dependencies: - '@rspack/plugin-react-refresh': 2.0.0(@rspack/core@2.0.5(@swc/helpers@0.5.23))(react-refresh@0.18.0) + '@rspack/plugin-react-refresh': 2.0.0(@rspack/core@2.0.5(@swc/helpers@0.5.21))(react-refresh@0.18.0) react-refresh: 0.18.0 optionalDependencies: '@rsbuild/core': 2.0.1 @@ -31556,6 +31513,13 @@ snapshots: optionalDependencies: '@swc/helpers': 0.5.23 + '@rspack/core@2.0.5(@swc/helpers@0.5.21)': + dependencies: + '@rspack/binding': 2.0.5 + optionalDependencies: + '@swc/helpers': 0.5.21 + optional: true + '@rspack/core@2.0.5(@swc/helpers@0.5.23)': dependencies: '@rspack/binding': 2.0.5 @@ -31564,6 +31528,12 @@ snapshots: '@rspack/lite-tapable@1.1.0': {} + '@rspack/plugin-react-refresh@2.0.0(@rspack/core@2.0.5(@swc/helpers@0.5.21))(react-refresh@0.18.0)': + dependencies: + react-refresh: 0.18.0 + optionalDependencies: + '@rspack/core': 2.0.5(@swc/helpers@0.5.21) + '@rspack/plugin-react-refresh@2.0.0(@rspack/core@2.0.5(@swc/helpers@0.5.23))(react-refresh@0.18.0)': dependencies: react-refresh: 0.18.0